Skip to content
Snippets Groups Projects
Commit eb2c9bfa authored by mkroehnert's avatar mkroehnert
Browse files

CollisionModel: -> tabs

git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@551 042f3d55-54a8-47e9-b7fb-15903f145c44
parent 81590587
No related branches found
No related tags found
No related merge requests found
......@@ -242,27 +242,27 @@ VirtualRobot::CollisionModelPtr CollisionModel::CreateUnitedCollisionModel( cons
bool CollisionModel::saveModel( const std::string &modelPath, const std::string &filename )
{
if (visualization)
return visualization->saveModel(modelPath,filename);
if (modelVisualization)
return modelVisualization->saveModel(modelPath,filename);
return true; // no model given
if (visualization)
return visualization->saveModel(modelPath,filename);
if (modelVisualization)
return modelVisualization->saveModel(modelPath,filename);
return true; // no model given
}
void CollisionModel::scale( Eigen::Vector3f &scaleFactor )
{
if (model)
{
TriMeshModelPtr modelScaled = model->clone(scaleFactor);
bbox = modelScaled->boundingBox;
if (model)
{
TriMeshModelPtr modelScaled = model->clone(scaleFactor);
bbox = modelScaled->boundingBox;
#if defined(VR_COLLISION_DETECTION_PQP)
collisionModelImplementation.reset(new CollisionModelPQP(modelScaled, colChecker,id));
collisionModelImplementation.reset(new CollisionModelPQP(modelScaled, colChecker,id));
#else
collisionModelImplementation.reset(new CollisionModelDummy(colChecker));
collisionModelImplementation.reset(new CollisionModelDummy(colChecker));
#endif
}
if (visualization)
visualization->scale(scaleFactor);
}
if (visualization)
visualization->scale(scaleFactor);
}
/*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment