From 6eea2bac8c479f7300091c0a8f6db39b489fe06e Mon Sep 17 00:00:00 2001
From: Vincent Magnoux <vmagnoux20@gmail.com>
Date: Wed, 16 Jan 2019 12:07:45 -0500
Subject: [PATCH] [Geomagic] FIX compilation error in Geomagic plugin with the
 removal of SOFA_FLOAT and SOFA_DOUBLE

---
 applications/plugins/Geomagic/src/GeomagicDriver.cpp | 6 +++---
 applications/plugins/Geomagic/src/GeomagicDriver.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/applications/plugins/Geomagic/src/GeomagicDriver.cpp b/applications/plugins/Geomagic/src/GeomagicDriver.cpp
index 8cd154e0840..68195732c5b 100644
--- a/applications/plugins/Geomagic/src/GeomagicDriver.cpp
+++ b/applications/plugins/Geomagic/src/GeomagicDriver.cpp
@@ -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");
 
@@ -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");
@@ -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();
diff --git a/applications/plugins/Geomagic/src/GeomagicDriver.h b/applications/plugins/Geomagic/src/GeomagicDriver.h
index 2cb186404f6..29121910ae5 100644
--- a/applications/plugins/Geomagic/src/GeomagicDriver.h
+++ b/applications/plugins/Geomagic/src/GeomagicDriver.h
@@ -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