Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Geomagic] FIX compilation error in Geomagic plugin with removal of SOFA_FLOAT/DOUBLE #898

Merged
merged 1 commit into from
Jan 18, 2019
Merged

[Geomagic] FIX compilation error in Geomagic plugin with removal of SOFA_FLOAT/DOUBLE #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions applications/plugins/Geomagic/src/GeomagicDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ void GeomagicDriver::initDevice()
m_omniVisualNode = rootContext->createChild("omniVisu " + d_deviceName.getValue());
m_omniVisualNode->updateContext();

rigidDOF = sofa::core::objectmodel::New<component::container::MechanicalObject<sofa::defaulttype::Rigid3dTypes> >();
rigidDOF = sofa::core::objectmodel::New<component::container::MechanicalObject<sofa::defaulttype::Rigid3Types> >();
m_omniVisualNode->addObject(rigidDOF);
rigidDOF->name.setValue("rigidDOF");

Expand Down Expand Up @@ -356,7 +356,7 @@ void GeomagicDriver::initDevice()
visualNode[i].visu->updateVisual();

// create the visual mapping and at it to the graph //
visualNode[i].mapping = sofa::core::objectmodel::New< sofa::component::mapping::RigidMapping< Rigid3dTypes, ExtVec3fTypes > >();
visualNode[i].mapping = sofa::core::objectmodel::New< sofa::component::mapping::RigidMapping< Rigid3Types, ExtVec3Types > >();
visualNode[i].node->addObject(visualNode[i].mapping);
visualNode[i].mapping->setModels(rigidDOF.get(), visualNode[i].visu.get());
visualNode[i].mapping->name.setValue("RigidMapping");
Expand All @@ -381,7 +381,7 @@ void GeomagicDriver::initDevice()

for (int j = 0; j<NVISUALNODE; j++)
{
sofa::defaulttype::ResizableExtVector< sofa::defaulttype::Vec<3, float> > &scaleMapping = *(visualNode[j].mapping->points.beginEdit());
sofa::defaulttype::ResizableExtVector< sofa::defaulttype::Vec3 > &scaleMapping = *(visualNode[j].mapping->points.beginEdit());
for (size_t i = 0; i<scaleMapping.size(); i++)
scaleMapping[i] *= (float)(d_scale.getValue());
visualNode[j].mapping->points.endEdit();
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/Geomagic/src/GeomagicDriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class SOFA_GEOMAGIC_API GeomagicDriver : public Controller
{
simulation::Node::SPtr node;
sofa::component::visualmodel::OglModel::SPtr visu;
sofa::component::mapping::RigidMapping< Rigid3dTypes , ExtVec3fTypes >::SPtr mapping;
sofa::component::mapping::RigidMapping< Rigid3Types , ExtVec3Types >::SPtr mapping;
};

Data< std::string > d_deviceName; ///< Name of device Configuration
Expand Down