more deprecations (stored pointer to intersection) and remove warnings

sofa-framework · Mar 18, 2024 · fdf45e6 · fdf45e6
1 parent f17acc1
commit fdf45e6
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 4 deletions.
diff --git a/...Intersection/src/sofa/component/collision/detection/intersection/DiscreteIntersection.cpp b/...Intersection/src/sofa/component/collision/detection/intersection/DiscreteIntersection.cpp
@@ -90,6 +90,7 @@ int DiscreteIntersection::computeIntersection(Cube& cube1, Cube& cube2, OutputVe
     SOFA_UNUSED(cube1);
     SOFA_UNUSED(cube2);
     SOFA_UNUSED(contacts);
+    SOFA_UNUSED(currentIntersection);
 
     return 0;
 }

diff --git a/...rsection/src/sofa/component/collision/detection/intersection/MeshDiscreteIntersection.cpp b/...rsection/src/sofa/component/collision/detection/intersection/MeshDiscreteIntersection.cpp
@@ -50,6 +50,8 @@ bool MeshDiscreteIntersection::testIntersection(Triangle&, Line&, const sofa::co
 
 int MeshDiscreteIntersection::computeIntersection(Triangle& e1, Line& e2, OutputVector* contacts, const core::collision::Intersection* currentIntersection)
 {
+    SOFA_UNUSED(currentIntersection);
+
     static_assert(std::is_same_v<Triangle::Coord, Line::Coord>, "Data mismatch");
     static_assert(Triangle::Coord::total_size == 3, "Must be a vec type");
 

diff --git a/...tersection/src/sofa/component/collision/detection/intersection/MeshDiscreteIntersection.h b/...tersection/src/sofa/component/collision/detection/intersection/MeshDiscreteIntersection.h
@@ -58,6 +58,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API MeshDiscreteIntersecti
     template<class T> int computeIntersection(collision::geometry::TSphere<T>&, collision::geometry::Triangle&, OutputVector*);
 
 protected:
+    SOFA_ATTRIBUTE_DEPRECATED__COLLISION_DETECTION_INTERSECTION_AS_PARAMETER()
     DiscreteIntersection* intersection;
 
 };

diff --git a/...rsection/src/sofa/component/collision/detection/intersection/MeshDiscreteIntersection.inl b/...rsection/src/sofa/component/collision/detection/intersection/MeshDiscreteIntersection.inl
@@ -31,6 +31,8 @@ namespace sofa::component::collision::detection::intersection
 template<class T>
 bool MeshDiscreteIntersection::testIntersection(collision::geometry::TSphere<T>& sph, collision::geometry::Triangle& triangle, const core::collision::Intersection* currentIntersection)
 {
+    SOFA_UNUSED(currentIntersection);
+
     const double EPSILON = 0.00001;
     //Vertices of the triangle:
     const type::Vec3 p0 = triangle.p1();
@@ -82,6 +84,8 @@ bool MeshDiscreteIntersection::testIntersection(collision::geometry::TSphere<T>&
 template<class T>
 int MeshDiscreteIntersection::computeIntersection(collision::geometry::TSphere<T>& sph, collision::geometry::Triangle& triangle, OutputVector* contacts, const core::collision::Intersection* currentIntersection)
 {
+    SOFA_UNUSED(currentIntersection);
+
     const double EPSILON = 0.00001;
     //Vertices of the triangle:
     const type::Vec3 p0 = triangle.p1();

diff --git a/...ection/src/sofa/component/collision/detection/intersection/MeshMinProximityIntersection.h b/...ection/src/sofa/component/collision/detection/intersection/MeshMinProximityIntersection.h
@@ -96,6 +96,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API MeshMinProximityInters
 
 protected:
 
+    SOFA_ATTRIBUTE_DEPRECATED__COLLISION_DETECTION_INTERSECTION_AS_PARAMETER()
     MinProximityIntersection* intersection;
 };
 
@@ -196,7 +197,7 @@ int MeshMinProximityIntersection::computeIntersection(collision::geometry::Trian
     }
     else
     {
-        msg_warning(intersection) << "Null distance between contact detected";
+        msg_warning(currentIntersection) << "Null distance between contact detected";
         detection->normal= type::Vec3(1,0,0);
     }
     detection->value -= contactDist;
@@ -335,7 +336,7 @@ int MeshMinProximityIntersection::computeIntersection(collision::geometry::TSphe
     }
     else
     {
-        msg_warning(intersection) << "Null distance between contact detected";
+        msg_warning(currentIntersection) << "Null distance between contact detected";
         detection->normal= type::Vec3(1,0,0);
     }
     detection->value -= contactDist;

diff --git a/...tion/src/sofa/component/collision/detection/intersection/MeshNewProximityIntersection.inl b/...tion/src/sofa/component/collision/detection/intersection/MeshNewProximityIntersection.inl
@@ -360,6 +360,7 @@ bool MeshNewProximityIntersection::testIntersection(collision::geometry::Line& e
 {
     SOFA_UNUSED(e1);
     SOFA_UNUSED(e2);
+    SOFA_UNUSED(currentIntersection);
 
     msg_warning(intersection) << "Unnecessary call to NewProximityIntersection::testIntersection(Line,Sphere).";
     return true;
@@ -387,6 +388,7 @@ bool MeshNewProximityIntersection::testIntersection(collision::geometry::Triangl
 {
     SOFA_UNUSED(e1);
     SOFA_UNUSED(e2);
+    SOFA_UNUSED(currentIntersection);
 
     msg_warning(intersection) << "Unnecessary call to NewProximityIntersection::testIntersection(Triangle,Sphere).";
     return true;

diff --git a/...rsection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.cpp b/...rsection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.cpp
@@ -67,11 +67,15 @@ void NewProximityIntersection::init()
 
 bool NewProximityIntersection::testIntersection(Cube& cube1, Cube& cube2, const core::collision::Intersection* currentIntersection)
 {
+    SOFA_UNUSED(currentIntersection);
+
     return BaseProximityIntersection::testIntersection(cube1, cube2);
 }
 
 int NewProximityIntersection::computeIntersection(Cube& cube1, Cube& cube2, OutputVector* contacts, const core::collision::Intersection* currentIntersection)
 {
+    SOFA_UNUSED(currentIntersection);
+
     return BaseProximityIntersection::computeIntersection(cube1, cube2, contacts);
 }
 

diff --git a/...ntersection/src/sofa/component/collision/detection/intersection/RayDiscreteIntersection.h b/...ntersection/src/sofa/component/collision/detection/intersection/RayDiscreteIntersection.h
@@ -63,6 +63,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API RayDiscreteIntersectio
 
 protected:
 
+    SOFA_ATTRIBUTE_DEPRECATED__COLLISION_DETECTION_INTERSECTION_AS_PARAMETER()
     DiscreteIntersection* intersection;
 
 };

diff --git a/...ersection/src/sofa/component/collision/detection/intersection/RayDiscreteIntersection.inl b/...ersection/src/sofa/component/collision/detection/intersection/RayDiscreteIntersection.inl
@@ -33,6 +33,8 @@ namespace sofa::component::collision::detection::intersection
 template<class T>
 bool RayDiscreteIntersection::testIntersection(collision::geometry::Ray & ray1, collision::geometry::TSphere<T>& sph2, const core::collision::Intersection* currentIntersection)
 {
+    SOFA_UNUSED(currentIntersection);
+
     // Center of the sphere
     const type::Vec3 sph2Pos(sph2.center());
     // Radius of the sphere
@@ -51,6 +53,8 @@ bool RayDiscreteIntersection::testIntersection(collision::geometry::Ray & ray1,
 template<class T>
 int RayDiscreteIntersection::computeIntersection(collision::geometry::Ray& ray1, collision::geometry::TSphere<T>& sph2, OutputVector* contacts, const core::collision::Intersection* currentIntersection)
 {
+    SOFA_UNUSED(currentIntersection);
+
     // Center of the sphere
     const type::Vec3 sph2Pos(sph2.center());
     // Radius of the sphere

diff --git a/...ction/src/sofa/component/collision/detection/intersection/RayNewProximityIntersection.cpp b/...ction/src/sofa/component/collision/detection/intersection/RayNewProximityIntersection.cpp
@@ -123,12 +123,16 @@ int RayNewProximityIntersection::computeIntersection(Ray &t1, Triangle &t2, Outp
 
 bool RayNewProximityIntersection::testIntersection( Ray& /*rRay*/, RigidSphere&, const core::collision::Intersection* currentIntersection)
 {
+    SOFA_UNUSED(currentIntersection);
+
     return false;
 }
 
 
 int RayNewProximityIntersection::computeIntersection(Ray& rRay, RigidSphere& rSphere, OutputVector* contacts, const core::collision::Intersection* currentIntersection)
 {
+    SOFA_UNUSED(currentIntersection);
+
     const Vec3 v3SphereCenter = rSphere.center( );
     const SReal fSphereRadii = rSphere.r();
 

diff --git a/...section/src/sofa/component/collision/detection/intersection/RayNewProximityIntersection.h b/...section/src/sofa/component/collision/detection/intersection/RayNewProximityIntersection.h
@@ -57,6 +57,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API RayNewProximityInterse
     int computeIntersection(collision::geometry::Ray& rRay, collision::geometry::RigidSphere& rSphere, OutputVector*);
 protected:
 
+    SOFA_ATTRIBUTE_DEPRECATED__COLLISION_DETECTION_INTERSECTION_AS_PARAMETER()
     NewProximityIntersection* intersection;
 };
 

diff --git a/...n/src/sofa/component/collision/detection/intersection/TetrahedronDiscreteIntersection.cpp b/...n/src/sofa/component/collision/detection/intersection/TetrahedronDiscreteIntersection.cpp
@@ -44,6 +44,8 @@ TetrahedronDiscreteIntersection::TetrahedronDiscreteIntersection(DiscreteInterse
 
 bool TetrahedronDiscreteIntersection::testIntersection(Tetrahedron&, Point&, const core::collision::Intersection* currentIntersection)
 {
+    SOFA_UNUSED(currentIntersection);
+
     return true;
 }
 

diff --git a/Sofa/framework/Core/src/sofa/core/collision/Intersection.h b/Sofa/framework/Core/src/sofa/core/collision/Intersection.h
@@ -83,9 +83,9 @@ class ElementIntersector
     virtual std::string name() const = 0;
 
     SOFA_ATTRIBUTE_DEPRECATED__CORE_INTERSECTION_AS_PARAMETER()
-    virtual bool canIntersect(core::CollisionElementIterator elem1, core::CollisionElementIterator elem2) { return false; };
+    virtual bool canIntersect(core::CollisionElementIterator, core::CollisionElementIterator) { return false; };
     SOFA_ATTRIBUTE_DEPRECATED__CORE_INTERSECTION_AS_PARAMETER()
-    virtual int intersect(core::CollisionElementIterator elem1, core::CollisionElementIterator elem2, DetectionOutputVector* contacts) { return 0; };
+    virtual int intersect(core::CollisionElementIterator, core::CollisionElementIterator, DetectionOutputVector*) { return 0; };
 };
 
 /// Table storing associations between types of collision models and intersectors implementing intersection tests