sofa-framework · fredroy · Jun 28, 2021 · Jun 17, 2021 · Jun 18, 2021 · Jun 18, 2021
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/core/visual/DrawTool.h b/SofaKernel/modules/Sofa.Compat/src/sofa/core/visual/DrawTool.h
@@ -21,13 +21,6 @@
 ******************************************************************************/
 #pragma once
 
-#include <sofa/helper/visual/DrawTool.h>
+#include <sofa/config.h>
 
-
-SOFA_DEPRECATED_HEADER(v21.06, "sofa/helper/visual/DrawTool.h")
-
-namespace sofa::core::visual
-{
-    using DrawTool = sofa::helper::visual::DrawTool;
-
-} // namespace sofa::core::visual
+SOFA_DISABLED_HEADER("v20.12 (PR#1649)", "v21.06", "sofa/helper/visual/DrawTool.h")
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/core/visual/DrawToolGL.h b/SofaKernel/modules/Sofa.Compat/src/sofa/core/visual/DrawToolGL.h
@@ -21,26 +21,6 @@
 ******************************************************************************/
 #pragma once
 
+#include <sofa/config.h>
 
-#if __has_include(<sofa/gl/DrawToolGL.h>)
-#include <sofa/gl/DrawToolGL.h>
-#define GL_DRAWTOOLGL_ENABLE_WRAPPER
-
-SOFA_DEPRECATED_HEADER(v21.06, "sofa/gl/DrawToolGL.h")
-
-#else
-#error "OpenGL headers have been moved to Sofa.GL. Therefore you will need to link against Sofa.GL if you need OpenGL (PR1649), and include <sofa/gl/DrawToolGL.h> instead of this one."
-#endif
-
-#ifdef GL_DRAWTOOLGL_ENABLE_WRAPPER
-
-namespace sofa::core::visual
-{
-    using DrawToolGL = sofa::gl::DrawToolGL;
-
-} // namespace sofa::core::visual
-
-#endif // GL_DRAWTOOLGL_ENABLE_WRAPPER
-
-#undef GL_DRAWTOOLGL_ENABLE_WRAPPER
-
+SOFA_DISABLED_HEADER("v20.12 (PR#1649)", "v21.06", "sofa/gl/DrawToolGL.h")
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/BoundingBox.h b/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/BoundingBox.h
@@ -23,7 +23,7 @@
 
 #include <sofa/type/BoundingBox.h>
 
-// SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/BoundingBox.h")
+// SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/BoundingBox.h")
 
 namespace sofa::defaulttype
 {

diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Frame.h b/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Frame.h
@@ -23,7 +23,7 @@
 
 #include <sofa/type/Frame.h>
 
-// SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/Frame.h")
+// SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/Frame.h")
 
 namespace sofa::defaulttype
 {

diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Mat.h b/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Mat.h
@@ -32,7 +32,7 @@
 // The following SOFA_DEPRECATED_HEADER is commented to avoid a massive number of warnings.
 // This flag will be enabled once all the code base in Sofa is ported to Sofa.Type.
 // (PR #1790)
-//SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/Mat.h")
+//SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/Mat.h")
 
 namespace sofa::defaulttype
 {

diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/MatSym.h b/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/MatSym.h
@@ -27,7 +27,7 @@
 // The following SOFA_DEPRECATED_HEADER is commented to avoid a massive number of warnings.
 // This flag will be enabled once all the code base in Sofa is ported to Sofa.Type.
 // (PR #1790)
-// SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/MatSym.h")
+// SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/MatSym.h")
 
 namespace sofa::defaulttype
 {

diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Mat_solve_Cholesky.h b/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Mat_solve_Cholesky.h
@@ -23,4 +23,4 @@
 
 #include <sofa/type/Mat_solve_Cholesky.h>
 
-SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/Mat_solve_Cholesky.h")
+SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/Mat_solve_Cholesky.h")
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Mat_solve_LU.h b/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Mat_solve_LU.h
@@ -23,4 +23,4 @@
 
 #include <sofa/type/Mat_solve_LU.h>
 
-SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/Mat_solve_LU.h")
+SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/Mat_solve_LU.h")
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Mat_solve_SVD.h b/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Mat_solve_SVD.h
@@ -23,4 +23,4 @@
 
 #include <sofa/type/Mat_solve_SVD.h>
 
-SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/Mat_solve_SVD.h")
+SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/Mat_solve_SVD.h")
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Quat.h b/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Quat.h
@@ -26,7 +26,7 @@
 // The following SOFA_DEPRECATED_HEADER is commented to avoid a massive number of warnings.
 // This flag will be enabled once all the code base in Sofa is ported to Sofa.Type.
 // (PR #1790)
-// SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/Quat.h")
+// SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/Quat.h")
 
 #include <sofa/defaulttype/Vec.h>
 #include <sofa/defaulttype/Mat.h>

diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/RGBAColor.h b/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/RGBAColor.h
@@ -25,7 +25,6 @@
 
 namespace sofa::defaulttype
 {
-    [[deprecated("sofa::defaulttype::RGBAColor is now part in sofa::type::RGBAColor. Please update your code.")]]
+    SOFA_ATTRIBUTE_DEPRECATED("v21.06 (PR#1818)", "v21.12", "Use sofa::type::RGBAColor instead.")
     typedef sofa::type::RGBAColor RGBAColor;
-
-} // namespace sofa::defaulttype
+}
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Ray.h b/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Ray.h
@@ -23,7 +23,7 @@
 
 #include <sofa/type/Ray.h>
 
-// SOFA_DEPRECATED_HEADER(v21.12, "sofa/defaulttype/Ray.h")
+// SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/defaulttype/Ray.h")
 
 namespace sofa::defaulttype
 {

diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Vec.h b/SofaKernel/modules/Sofa.Compat/src/sofa/defaulttype/Vec.h
@@ -27,7 +27,7 @@
 // The following SOFA_DEPRECATED_HEADER is commented to avoid a massive number of warnings.
 // This flag will be enabled once all the code base in Sofa is ported to Sofa.Type.
 // (PR #1790)
-//SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/Vec.h")
+//SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/Vec.h")
 
 namespace sofa::defaulttype
 {

diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/helper/DualQuat.h b/SofaKernel/modules/Sofa.Compat/src/sofa/helper/DualQuat.h
@@ -26,7 +26,7 @@
 // The following SOFA_DEPRECATED_HEADER is commented to avoid a massive number of warnings.
 // This flag will be enabled once all the code base in Sofa is ported to Sofa.Type.
 // (PR #1790)
-// SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/DualQuat.h")
+// SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/DualQuat.h")
 
 namespace sofa::helper
 {

diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/helper/DualQuat.inl b/SofaKernel/modules/Sofa.Compat/src/sofa/helper/DualQuat.inl
@@ -26,4 +26,4 @@
 // The following SOFA_DEPRECATED_HEADER is commented to avoid a massive number of warnings.
 // This flag will be enabled once all the code base in Sofa is ported to Sofa.Type.
 // (PR #1790)
-// SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/DualQuat.inl")
+// SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/DualQuat.inl")
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/helper/Quater.h b/SofaKernel/modules/Sofa.Compat/src/sofa/helper/Quater.h
@@ -26,7 +26,7 @@
 // The following SOFA_DEPRECATED_HEADER is commented to avoid a massive number of warnings.
 // This flag will be enabled once all the code base in Sofa is ported to Sofa.Type.
 // (PR #1790)
-//SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/Quat.h")
+//SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/Quat.h")
 
 #include <sofa/defaulttype/Vec.h>
 #include <sofa/defaulttype/Mat.h>

diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/helper/Quater.inl b/SofaKernel/modules/Sofa.Compat/src/sofa/helper/Quater.inl
@@ -26,4 +26,4 @@
 // The following SOFA_DEPRECATED_HEADER is commented to avoid a massive number of warnings.
 // This flag will be enabled once all the code base in Sofa is ported to Sofa.Type.
 // (PR #1790)
-// SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/Quat.inl")
+// SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/Quat.inl")
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/helper/SVector.h b/SofaKernel/modules/Sofa.Compat/src/sofa/helper/SVector.h
@@ -25,7 +25,7 @@
 
 // The following SOFA_DEPRECATED_HEADER is commented to avoid a massive number of warnings.
 // This flag will be enabled once all the code base in Sofa is ported to Sofa.Type.
-//SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/SVector.h")
+//SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/SVector.h")
 
 namespace sofa::helper
 {

diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/helper/fixed_array.h b/SofaKernel/modules/Sofa.Compat/src/sofa/helper/fixed_array.h
@@ -26,7 +26,7 @@
 // The following SOFA_DEPRECATED_HEADER is commented to avoid a massive number of warnings.
 // This flag will be enabled once all the code base in Sofa is ported to Sofa.Type.
 // (PR #1790)
-//SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/fixed_array.h")
+//SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/fixed_array.h")
 
 namespace sofa::helper
 {

diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/helper/fixed_array_algorithms.h b/SofaKernel/modules/Sofa.Compat/src/sofa/helper/fixed_array_algorithms.h
@@ -26,7 +26,7 @@
 // The following SOFA_DEPRECATED_HEADER is commented to avoid a massive number of warnings.
 // This flag will be enabled once all the code base in Sofa is ported to Sofa.Type.
 // (PR #1790)
-//SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/fixed_array_algorithms.h")
+//SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/fixed_array_algorithms.h")
 
 namespace sofa::helper::pairwise
 {

diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/helper/gl/Axis.h b/SofaKernel/modules/Sofa.Compat/src/sofa/helper/gl/Axis.h
@@ -21,26 +21,6 @@
 ******************************************************************************/
 #pragma once
 
-#include <sofa/helper/config.h>
+#include <sofa/config.h>
 
-#if __has_include(<sofa/gl/Axis.h>)
-#include <sofa/gl/Axis.h>
-#define GL_AXIS_ENABLE_WRAPPER
-
-SOFA_DEPRECATED_HEADER(v21.06, "sofa/gl/Axis.h")
-
-#else
-#error "OpenGL headers have been moved to Sofa.GL. Therefore you will need to link against Sofa.GL if you need OpenGL (PR1649), and include <sofa/gl/Axis.h> instead of this one."
-#endif
-
-#ifdef GL_AXIS_ENABLE_WRAPPER
-
-namespace sofa::helper::gl
-{
-    using Axis = sofa::gl::Axis;
-
-} // namespace sofa::helper::gl
-
-#endif // GL_AXIS_ENABLE_WRAPPER
-
-#undef GL_AXIS_ENABLE_WRAPPER
+SOFA_DISABLED_HEADER("v20.12 (PR#1649)", "v21.06", "sofa/gl/Axis.h")
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/helper/gl/BasicShapes.h b/SofaKernel/modules/Sofa.Compat/src/sofa/helper/gl/BasicShapes.h
@@ -21,78 +21,6 @@
 ******************************************************************************/
 #pragma once
 
-#include <sofa/helper/config.h>
+#include <sofa/config.h>
 
-#if __has_include(<sofa/gl/BasicShapes.h>)
-#include <sofa/gl/BasicShapes.h>
-#define GL_BASICSHAPES_ENABLE_WRAPPER
-
-SOFA_DEPRECATED_HEADER(v21.06, "sofa/gl/BasicShapes.h")
-
-#else
-#error "OpenGL headers have been moved to Sofa.GL. Therefore you will need to link against Sofa.GL if you need OpenGL (PR1649), and include <sofa/gl/BasicShapes.h> instead of this one."
-#endif
-
-#ifdef GL_BASICSHAPES_ENABLE_WRAPPER
-#include <sofa/helper/fixed_array.h>
-
-namespace sofa::helper::gl
-{
-template <typename V>
-void drawCone(const V& p1, const V& p2, const float& radius1, const float& radius2, const int subd = 8)
-{
-    sofa::gl::drawCone<V>(p1, p2, radius1, radius2, subd);
-}
-
-
-template <typename V>
-void drawCylinder(const V& p1, const V& p2, const float& rad, const int subd = 8)
-{
-    sofa::gl::drawCylinder<V>(p1, p2, rad, subd);
-}
-
-
-template <typename V>
-void drawArrow(const V& p1, const V& p2, const float& rad, const int subd = 8)
-{
-    sofa::gl::drawArrow<V>(p1, p2, rad, subd);
-}
-
-
-template <typename V>
-void drawSphere(const V& center, const float& rad, const int subd1 = 8, const int subd2 = 8)
-{
-    sofa::gl::drawSphere<V>(center, rad, subd1, subd2);
-}
-
-template <typename V>
-void drawEllipsoid(const V& center, const float& radx, const float& rady, const float& radz, const int subd1 = 8, const int subd2 = 8)
-{
-    sofa::gl::drawEllipsoid<V>(center, radx, rady, subd1, subd2);
-}
-
-template <typename V>
-void drawWireSphere(const V& center, const float& rad, const int subd1 = 8, const int subd2 = 8)
-{
-    sofa::gl::drawWireSphere<V>(center, rad, subd1, subd2);
-}
-
-template <typename V>
-void drawTorus(const float* coordinateMatrix, const float& bodyRad = 0.0, const float& rad = 1.0, const int precision = 20,
-    const V& color = sofa::helper::fixed_array<int, 3>(255, 215, 180))
-{
-    sofa::gl::drawTorus<V>(coordinateMatrix, bodyRad, rad, precision, color);
-}
-
-template <typename V>
-void drawEmptyParallelepiped(const V& vert1, const V& vert2, const V& vert3, const V& vert4, const V& vecFromFaceToOppositeFace, const float& rad = 1.0, const int precision = 8,
-    const V& color = sofa::helper::fixed_array<int, 3>(255, 0, 0))
-{
-    sofa::gl::drawEmptyParallelepiped<V>(vert1, vert2, vert3, vert4, vecFromFaceToOppositeFace, rad, precision, color);
-}
-
-} // namespace sofa::helper::gl
-
-#endif // GL_BASICSHAPES_ENABLE_WRAPPER
-
-#undef GL_BASICSHAPES_ENABLE_WRAPPER
+SOFA_DISABLED_HEADER("v20.12 (PR#1649)", "v21.06", "sofa/gl/BasicShapes.h")
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/helper/gl/Capture.h b/SofaKernel/modules/Sofa.Compat/src/sofa/helper/gl/Capture.h
@@ -21,26 +21,6 @@
 ******************************************************************************/
 #pragma once
 
-#include <sofa/helper/config.h>
+#include <sofa/config.h>
 
-#if __has_include(<sofa/gl/Capture.h>)
-#include <sofa/gl/Capture.h>
-#define GL_CAPTURE_ENABLE_WRAPPER
-
-SOFA_DEPRECATED_HEADER(v21.06, "sofa/gl/Capture.h")
-
-#else
-#error "OpenGL headers have been moved to Sofa.GL. Therefore you will need to link against Sofa.GL if you need OpenGL (PR1649), and include <sofa/gl/Capture.h> instead of this one."
-#endif
-
-#ifdef GL_CAPTURE_ENABLE_WRAPPER
-
-namespace sofa::helper::gl
-{
-    using Capture = sofa::gl::Capture;
-
-} // namespace sofa::helper::gl
-
-#endif // GL_CAPTURE_ENABLE_WRAPPER
-
-#undef GL_CAPTURE_ENABLE_WRAPPER
+SOFA_DISABLED_HEADER("v20.12 (PR#1649)", "v21.06", "sofa/gl/Capture.h")
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/helper/gl/Color.h b/SofaKernel/modules/Sofa.Compat/src/sofa/helper/gl/Color.h
@@ -21,26 +21,6 @@
 ******************************************************************************/
 #pragma once
 
-#include <sofa/helper/config.h>
+#include <sofa/config.h>
 
-#if __has_include(<sofa/gl/Color.h>)
-#include <sofa/gl/Color.h>
-#define GL_COLOR_ENABLE_WRAPPER
-
-SOFA_DEPRECATED_HEADER(v21.06, "sofa/gl/Color.h")
-
-#else
-#error "OpenGL headers have been moved to Sofa.GL. Therefore you will need to link against Sofa.GL if you need OpenGL (PR1649), and include <sofa/gl/Color.h> instead of this one."
-#endif
-
-#ifdef GL_COLOR_ENABLE_WRAPPER
-
-namespace sofa::helper::gl
-{
-    using Color = sofa::gl::Color;
-
-} // namespace sofa::helper::gl
-
-#endif // GL_COLOR_ENABLE_WRAPPER
-
-#undef GL_COLOR_ENABLE_WRAPPER
+SOFA_DISABLED_HEADER("v20.12 (PR#1649)", "v21.06", "sofa/gl/Color.h")
diff --git a/SofaKernel/modules/Sofa.Compat/src/sofa/helper/gl/Cylinder.h b/SofaKernel/modules/Sofa.Compat/src/sofa/helper/gl/Cylinder.h
@@ -21,26 +21,6 @@
 ******************************************************************************/
 #pragma once
 
-#include <sofa/helper/config.h>
+#include <sofa/config.h>
 
-#if __has_include(<sofa/gl/Cylinder.h>)
-#include <sofa/gl/Cylinder.h>
-#define GL_CYLINDER_ENABLE_WRAPPER
-
-SOFA_DEPRECATED_HEADER(v21.06, "sofa/gl/Cylinder.h")
-
-#else
-#error "OpenGL headers have been moved to Sofa.GL. Therefore you will need to link against Sofa.GL if you need OpenGL (PR1649), and include <sofa/gl/Cylinder.h> instead of this one."
-#endif
-
-#ifdef GL_CYLINDER_ENABLE_WRAPPER
-
-namespace sofa::helper::gl
-{
-    using Cylinder = sofa::gl::Cylinder;
-
-} // namespace sofa::helper::gl
-
-#endif // GL_CYLINDER_ENABLE_WRAPPER
-
-#undef GL_CYLINDER_ENABLE_WRAPPER
+SOFA_DISABLED_HEADER("v20.12 (PR#1649)", "v21.06", "sofa/gl/Cylinder.h")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,4 +23,4 @@

		#include <sofa/type/Mat_solve_Cholesky.h>

		SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/Mat_solve_Cholesky.h")
		SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/Mat_solve_Cholesky.h")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,4 +23,4 @@

		#include <sofa/type/Mat_solve_LU.h>

		SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/Mat_solve_LU.h")
		SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/Mat_solve_LU.h")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,4 +23,4 @@

		#include <sofa/type/Mat_solve_SVD.h>

		SOFA_DEPRECATED_HEADER(v21.12, "sofa/type/Mat_solve_SVD.h")
		SOFA_DEPRECATED_HEADER("v21.06", "v21.12", "sofa/type/Mat_solve_SVD.h")