Commit 63287479 authored by Jan Möbius's avatar Jan Möbius

Fixed build errors



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@6295 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 9d50f975
...@@ -32,7 +32,9 @@ ...@@ -32,7 +32,9 @@
#include "MovePlugin.hh" #include "MovePlugin.hh"
#include "../OpenFlipper/BasePlugin/PluginFunctions.hh" #include "../OpenFlipper/BasePlugin/PluginFunctions.hh"
#ifdef ENABLE_POLYLINE_SUPPORT
#include <ObjectTypes/PolyLine/PolyLine.hh> #include <ObjectTypes/PolyLine/PolyLine.hh>
#endif
#include <MeshTools/MeshFunctions.hh> #include <MeshTools/MeshFunctions.hh>
...@@ -119,11 +121,17 @@ void MovePlugin::translate( int _objectId , Vector _vector) { ...@@ -119,11 +121,17 @@ void MovePlugin::translate( int _objectId , Vector _vector) {
for (; v_it!=v_end; ++v_it) for (; v_it!=v_end; ++v_it)
mesh.set_point(v_it,mesh.point(v_it) + _vector ); mesh.set_point(v_it,mesh.point(v_it) + _vector );
} else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : translate PolyLine" << std::endl;
} else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : translate BSplineCurve" << std::endl;
} }
#ifdef ENABLE_POLYLINE_SUPPORT
else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : translate PolyLine" << std::endl;
}
#endif
#ifdef ENABLE_BSPLINE_CURVE_SUPPORT
else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : translate BSplineCurve" << std::endl;
}
#endif
emit updatedObject(_objectId); emit updatedObject(_objectId);
...@@ -167,11 +175,17 @@ void MovePlugin::translate( int _objectId , idList _vHandles, Vector _vector ){ ...@@ -167,11 +175,17 @@ void MovePlugin::translate( int _objectId , idList _vHandles, Vector _vector ){
mesh.set_point(vh ,mesh.point( vh ) + _vector ); mesh.set_point(vh ,mesh.point( vh ) + _vector );
} }
} else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : translate PolyLine" << std::endl;
} else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : translate BSplineCurve" << std::endl;
} }
#ifdef ENABLE_POLYLINE_SUPPORT
else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : translate PolyLine" << std::endl;
}
#endif
#ifdef ENABLE_BSPLINE_CURVE_SUPPORT
else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : translate BSplineCurve" << std::endl;
}
#endif
emit updatedObject(_objectId); emit updatedObject(_objectId);
...@@ -216,11 +230,17 @@ void MovePlugin::translateSelection( int _objectId , Vector _vector) { ...@@ -216,11 +230,17 @@ void MovePlugin::translateSelection( int _objectId , Vector _vector) {
if ( mesh.status(v_it).selected() ) if ( mesh.status(v_it).selected() )
mesh.set_point(v_it,mesh.point(v_it) + _vector ); mesh.set_point(v_it,mesh.point(v_it) + _vector );
} else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : translate PolyLine" << std::endl;
} else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : translate BSplineCurve" << std::endl;
} }
#ifdef ENABLE_POLYLINE_SUPPORT
else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : translate PolyLine" << std::endl;
}
#endif
#ifdef ENABLE_BSPLINE_CURVE_SUPPORT
else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : translate BSplineCurve" << std::endl;
}
#endif
emit updatedObject(_objectId); emit updatedObject(_objectId);
...@@ -266,11 +286,17 @@ void MovePlugin::transform( int _objectId , Matrix4x4 _matrix ){ ...@@ -266,11 +286,17 @@ void MovePlugin::transform( int _objectId , Matrix4x4 _matrix ){
mesh.set_normal(v_it, _matrix.transform_vector( mesh.normal(v_it) ) ); mesh.set_normal(v_it, _matrix.transform_vector( mesh.normal(v_it) ) );
} }
} else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : translate PolyLine" << std::endl;
} else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : translate BSplineCurve" << std::endl;
} }
#ifdef ENABLE_POLYLINE_SUPPORT
else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : transform PolyLine" << std::endl;
}
#endif
#ifdef ENABLE_BSPLINE_CURVE_SUPPORT
else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : transform BSplineCurve" << std::endl;
}
#endif
emit updatedObject(_objectId); emit updatedObject(_objectId);
...@@ -325,11 +351,17 @@ void MovePlugin::transform( int _objectId , idList _vHandles, Matrix4x4 _matrix ...@@ -325,11 +351,17 @@ void MovePlugin::transform( int _objectId , idList _vHandles, Matrix4x4 _matrix
mesh.set_normal(vh, _matrix.transform_vector( mesh.normal(vh) ) ); mesh.set_normal(vh, _matrix.transform_vector( mesh.normal(vh) ) );
} }
} else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : translate PolyLine" << std::endl;
} else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : translate BSplineCurve" << std::endl;
} }
#ifdef ENABLE_POLYLINE_SUPPORT
else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : transform PolyLine" << std::endl;
}
#endif
#ifdef ENABLE_BSPLINE_CURVE_SUPPORT
else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : transform BSplineCurve" << std::endl;
}
#endif
emit updatedObject(_objectId); emit updatedObject(_objectId);
...@@ -383,11 +415,17 @@ void MovePlugin::transformVertexSelection( int _objectId , Matrix4x4 _matrix ){ ...@@ -383,11 +415,17 @@ void MovePlugin::transformVertexSelection( int _objectId , Matrix4x4 _matrix ){
mesh.set_normal(v_it, _matrix.transform_vector( mesh.normal(v_it) ) ); mesh.set_normal(v_it, _matrix.transform_vector( mesh.normal(v_it) ) );
} }
} else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : translate PolyLine" << std::endl;
} else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : translate BSplineCurve" << std::endl;
} }
#ifdef ENABLE_POLYLINE_SUPPORT
else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : transform PolyLine" << std::endl;
}
#endif
#ifdef ENABLE_BSPLINE_CURVE_SUPPORT
else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : transform BSplineCurve" << std::endl;
}
#endif
emit updatedObject(_objectId); emit updatedObject(_objectId);
...@@ -465,12 +503,10 @@ void MovePlugin::transformFaceSelection( int _objectId , Matrix4x4 _matrix ){ ...@@ -465,12 +503,10 @@ void MovePlugin::transformFaceSelection( int _objectId , Matrix4x4 _matrix ){
mesh.set_normal(v_it, _matrix.transform_vector( mesh.normal(v_it) ) ); mesh.set_normal(v_it, _matrix.transform_vector( mesh.normal(v_it) ) );
} }
} else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : transform PolyLine" << std::endl;
} else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : transform BSplineCurve" << std::endl;
} }
emit updatedObject(_objectId); emit updatedObject(_objectId);
QString matString; QString matString;
...@@ -551,11 +587,17 @@ void MovePlugin::transformEdgeSelection( int _objectId , Matrix4x4 _matrix ){ ...@@ -551,11 +587,17 @@ void MovePlugin::transformEdgeSelection( int _objectId , Matrix4x4 _matrix ){
mesh.set_normal(v_it, _matrix.transform_vector( mesh.normal(v_it) ) ); mesh.set_normal(v_it, _matrix.transform_vector( mesh.normal(v_it) ) );
} }
} else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : transform PolyLine" << std::endl;
} else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : transform BSplineCurve" << std::endl;
} }
#ifdef ENABLE_POLYLINE_SUPPORT
else if ( object->dataType(DATA_POLY_LINE) ) {
std::cerr << "Todo : transform PolyLine" << std::endl;
}
#endif
#ifdef ENABLE_BSPLINE_CURVE_SUPPORT
else if ( object->dataType(DATA_BSPLINE_CURVE) ) {
std::cerr << "Todo : transform BSplineCurve" << std::endl;
}
#endif
emit updatedObject(_objectId); emit updatedObject(_objectId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment