Revert "[src] Fix some warnings and error due to change in SOFA master"

This reverts commit da35503.

Author: epernod

src/InfinyToolkit/InteractionTools/ArticulatedToolManager.cpp

@@ -30,7 +30,7 @@
 #include <sofa/component/topology/container/dynamic/TetrahedronSetTopologyModifier.h>
 #include <sofa/core/topology/TopologyData.inl>
 
-#include <sofa/component/collision/geometry/SphereCollisionModel.h>
+#include <sofa/component/collision/geometry/SphereModel.h>
 
 
 namespace sofa::infinytoolkit

src/InfinyToolkit/InteractionTools/BaseJawModel.h

@@ -21,7 +21,7 @@
 
 #include <InfinyToolkit/config.h>
 #include <sofa/type/Vec.h>
-#include <sofa/core/objectmodel/BaseComponent.h>
+#include <sofa/core/objectmodel/BaseObject.h>
 #include <sofa/core/behavior/BaseMechanicalState.h>
 #include <sofa/core/topology/BaseMeshTopology.h>
 #include <sofa/core/CollisionModel.h>
@@ -42,10 +42,10 @@ class GrabContactInfo
 	double dist; // equalt to (pB - pA).norm - contactDistance
 };
 
-class SOFA_INFINYTOOLKIT_API BaseJawModel : public core::objectmodel::BaseComponent
+class SOFA_INFINYTOOLKIT_API BaseJawModel : public core::objectmodel::BaseObject
 {
 public:
-	SOFA_CLASS(BaseJawModel, core::objectmodel::BaseComponent);
+	SOFA_CLASS(BaseJawModel, core::objectmodel::BaseObject);
 
 	using Vec3 = sofa::type::Vec3;
 

src/InfinyToolkit/PliersPositionsMapper.cpp

@@ -86,10 +86,10 @@ void PliersPositionsMapper::doUpdate()
 
 		const BaseMeshTopology::Tetra& tetra = m_topo->getTetra(idTetra);
 
-		sofa::type::Vec3 p0 = _positions[tetra[0]];
-		sofa::type::Vec3 p1 = _positions[tetra[1]];
-		sofa::type::Vec3 p2 = _positions[tetra[2]];
-		sofa::type::Vec3 p3 = _positions[tetra[3]];
+		sofa::type::Vec3f p0 = _positions[tetra[0]];
+		sofa::type::Vec3f p1 = _positions[tetra[1]];
+		sofa::type::Vec3f p2 = _positions[tetra[2]];
+		sofa::type::Vec3f p3 = _positions[tetra[3]];
 
 		tubePositions[i] = (p0 + p1 + p2 + p3) / 4;
 	}
@@ -214,10 +214,10 @@ void PliersPositionsMapper::draw(const core::visual::VisualParams* vparams)
     {
         const BaseMeshTopology::Tetra& tetra = m_topo->getTetra(_tetraTube[i]);
 
-		sofa::type::Vec3 p0 = _positions[tetra[0]];
-        sofa::type::Vec3 p1 = _positions[tetra[1]];
-        sofa::type::Vec3 p2 = _positions[tetra[2]];
-        sofa::type::Vec3 p3 = _positions[tetra[3]];
+		sofa::type::Vec3f p0 = _positions[tetra[0]];
+        sofa::type::Vec3f p1 = _positions[tetra[1]];
+        sofa::type::Vec3f p2 = _positions[tetra[2]];
+        sofa::type::Vec3f p3 = _positions[tetra[3]];
         vparams->drawTool()->drawTetrahedron(p0, p1, p2, p3, color);
     }