Merge pull request #1072 from dlyr/remove-eigen-deprecated-macro

Remove EIGEN_MAKE_ALIGNED_OPERATOR_NEW
STORM-IRIT · Oct 20, 2023 · 143e1b0 · 143e1b0
2 parents e7c3fd9 + 698c4ba
commit 143e1b0
Show file tree

Hide file tree

Showing 25 changed files with 0 additions and 55 deletions.
diff --git a/src/Core/Asset/Camera.hpp b/src/Core/Asset/Camera.hpp
@@ -15,8 +15,6 @@ namespace Asset {
 class RA_CORE_API Camera
 {
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     /// Define the projection type.
     enum class ProjType { ORTHOGRAPHIC, PERSPECTIVE };
 

diff --git a/src/Core/Asset/GeometryData.hpp b/src/Core/Asset/GeometryData.hpp
@@ -31,8 +31,6 @@ class RA_CORE_API GeometryData : public AssetData
     using ColorArray = Vector4Array;
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     /**
      * The type of geometry.
      */

diff --git a/src/Core/Asset/HandleData.hpp b/src/Core/Asset/HandleData.hpp
@@ -19,7 +19,6 @@ namespace Asset {
  * A HandleComponentData stores the data of an animation Handle linked to an object.
  */
 struct RA_CORE_API HandleComponentData {
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
 
     HandleComponentData();
 
@@ -42,8 +41,6 @@ struct RA_CORE_API HandleComponentData {
 class RA_CORE_API HandleData : public AssetData
 {
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     /**
      * The type of Handle system.
      */

diff --git a/src/Core/Asset/LightData.hpp b/src/Core/Asset/LightData.hpp
@@ -26,8 +26,6 @@ class RA_CORE_API LightData : public AssetData
 {
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     /** Supported light type
      *
      */

diff --git a/src/Core/Containers/Grid.hpp b/src/Core/Containers/Grid.hpp
@@ -164,8 +164,6 @@ class Grid
     };
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     //
     // Constructors
     //

diff --git a/src/Core/Containers/Tex.hpp b/src/Core/Containers/Tex.hpp
@@ -17,7 +17,6 @@ class Tex : public Grid<T, N>
 {
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
     using IdxVector = typename Grid<T, N>::IdxVector;
     using Vector    = Eigen::Matrix<Scalar, N, 1>;
     using AabbND    = Eigen::AlignedBox<Scalar, N>;

diff --git a/src/Core/Geometry/TopologicalMesh.hpp b/src/Core/Geometry/TopologicalMesh.hpp
@@ -63,7 +63,6 @@ class RA_CORE_API TopologicalMesh : public OpenMesh::PolyMesh_ArrayKernelT<Topol
     class WedgeCollection;
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
     class WedgeData;
     using WedgeIndex       = Ra::Core::Utils::Index;
     using WedgeAttribIndex = Ra::Core::Utils::Index;
@@ -372,8 +371,6 @@ class RA_CORE_API TopologicalMesh : public OpenMesh::PolyMesh_ArrayKernelT<Topol
     class WedgeData
     {
       public:
-        EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
         explicit WedgeData() = default;
         inline bool operator==( const WedgeData& lhs ) const;
         inline bool operator!=( const WedgeData& lhs ) const;
@@ -413,8 +410,6 @@ class RA_CORE_API TopologicalMesh : public OpenMesh::PolyMesh_ArrayKernelT<Topol
     class RA_CORE_API Wedge
     {
       public:
-        EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
         explicit Wedge() {}
         explicit Wedge( const WedgeData& wd ) : m_wedgeData { wd }, m_refCount { 1 } {};
         const WedgeData& getWedgeData() const { return m_wedgeData; }
@@ -450,8 +445,6 @@ class RA_CORE_API TopologicalMesh : public OpenMesh::PolyMesh_ArrayKernelT<Topol
     class RA_CORE_API WedgeCollection
     {
       public:
-        EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
         /**
          * Add wd to the wedge collection, and return the index.
          * If a wedge with same data is already present, it's index is returned,

diff --git a/src/Core/Geometry/TriangleMesh.hpp b/src/Core/Geometry/TriangleMesh.hpp
@@ -25,8 +25,6 @@ namespace Geometry {
 class RA_CORE_API AttribArrayGeometry : public AbstractGeometry
 {
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     using Point  = Vector3;
     using Normal = Vector3;
 

diff --git a/src/Core/Geometry/deprecated/TopologicalMesh.cpp b/src/Core/Geometry/deprecated/TopologicalMesh.cpp
@@ -90,8 +90,6 @@ TriangleMesh TopologicalMesh::toTriangleMesh() {
         HandleAndValueVector<Vector3> _vec3;
         HandleAndValueVector<Vector4> _vec4;
 
-        EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
         bool operator==( const VertexDataInternal& lhs ) const {
             return _vertex == lhs._vertex && _normal == lhs._normal && _float == lhs._float &&
                    _vec2 == lhs._vec2 && _vec3 == lhs._vec3 && _vec4 == lhs._vec4;

diff --git a/src/Core/Geometry/deprecated/TopologicalMesh.hpp b/src/Core/Geometry/deprecated/TopologicalMesh.hpp
@@ -62,8 +62,6 @@ class RA_CORE_API TopologicalMesh : public OpenMesh::PolyMesh_ArrayKernelT<Topol
     using Vector3 = Ra::Core::Vector3;
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     /**
      * Construct a topological mesh from a triangle mesh.
      * This operation merges vertex with same position, but keeps vertex

diff --git a/src/Core/Math/DualQuaternion.hpp b/src/Core/Math/DualQuaternion.hpp
@@ -19,8 +19,6 @@ class DualQuaternion
 {
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     /// Construct an uninitialized dual quaternion.
     inline DualQuaternion() {}
 

diff --git a/src/Engine/Data/BlinnPhongMaterial.hpp b/src/Engine/Data/BlinnPhongMaterial.hpp
@@ -35,7 +35,6 @@ class RA_ENGINE_API BlinnPhongMaterial final : public Material, public Parameter
     enum class TextureSemantic { TEX_DIFFUSE, TEX_SPECULAR, TEX_NORMAL, TEX_SHININESS, TEX_ALPHA };
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
     /**
      * Construct a named Blinn-Phongmaterial
      * \param instanceName The name of this instance of the material

diff --git a/src/Engine/Data/Material.hpp b/src/Engine/Data/Material.hpp
@@ -5,10 +5,6 @@
 #include <map>
 #include <string>
 
-// This include brings only the macro EIGEN_MAKE_ALIGNED_OPERATOR_NEW in the file scope.
-// Need to be separated to reduce compilation time
-#include <Core/Types.hpp>
-
 #include <Engine/Data/RenderParameters.hpp>
 
 namespace Ra {
@@ -35,8 +31,6 @@ class RA_ENGINE_API Material : public Data::ShaderParameterProvider
     };
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
   protected:
     /**
      * Creates a named material with the given aspect

diff --git a/src/Engine/Data/VolumetricMaterial.hpp b/src/Engine/Data/VolumetricMaterial.hpp
@@ -25,7 +25,6 @@ class RA_ENGINE_API VolumetricMaterial final : public Material, public Parameter
 {
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
     /**
      * Construct a named VolumetricMaterial
      * \param name The name of the material

diff --git a/src/Engine/Rendering/RenderObject.hpp b/src/Engine/Rendering/RenderObject.hpp
@@ -36,8 +36,6 @@ namespace Rendering {
 class RA_ENGINE_API RenderObject final : public Core::Utils::IndexedObject
 {
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     /**
      * Construct a renderObject
      *

diff --git a/src/Engine/Scene/CameraComponent.hpp b/src/Engine/Scene/CameraComponent.hpp
@@ -18,8 +18,6 @@ class Entity;
 class RA_ENGINE_API CameraComponent : public Scene::Component
 {
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     CameraComponent( Entity* entity, const std::string& name, Scalar height = 1, Scalar width = 1 );
 
     ~CameraComponent() override;

diff --git a/src/Engine/Scene/DirLight.hpp b/src/Engine/Scene/DirLight.hpp
@@ -15,8 +15,6 @@ class Entity;
 class RA_ENGINE_API DirectionalLight final : public Ra::Engine::Scene::Light
 {
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     explicit DirectionalLight( Entity* entity, const std::string& name = "dirlight" );
     ~DirectionalLight() override = default;
 

diff --git a/src/Engine/Scene/Entity.hpp b/src/Engine/Scene/Entity.hpp
@@ -22,7 +22,6 @@ class System;
 class RA_ENGINE_API Entity : public Core::Utils::IndexedObject
 {
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
     explicit Entity( const std::string& name = "" );
 
     // Entities are not copyable.

diff --git a/src/Engine/Scene/Light.hpp b/src/Engine/Scene/Light.hpp
@@ -39,8 +39,6 @@ class RA_ENGINE_API Light : public Component
     };
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     /**
      * Create a new light. The new light is a component attached to the given entity
      * \param entity

diff --git a/src/Engine/Scene/PointLight.hpp b/src/Engine/Scene/PointLight.hpp
@@ -14,8 +14,6 @@ class Entity;
 class RA_ENGINE_API PointLight final : public Ra::Engine::Scene::Light
 {
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     explicit PointLight( Entity* entity, const std::string& name = "pointlight" );
     ~PointLight() override = default;
 

diff --git a/src/Engine/Scene/SpotLight.hpp b/src/Engine/Scene/SpotLight.hpp
@@ -16,8 +16,6 @@ class RA_ENGINE_API SpotLight final : public Ra::Engine::Scene::Light
 {
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     explicit SpotLight( Entity* entity, const std::string& name = "spotlight" );
     ~SpotLight() override = default;
 

diff --git a/src/Gui/TransformEditor/TransformEditor.hpp b/src/Gui/TransformEditor/TransformEditor.hpp
@@ -8,8 +8,6 @@ namespace Gui {
 class RA_GUI_API TransformEditor
 {
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     TransformEditor() : m_transform( Core::Transform::Identity() ) {}
     virtual ~TransformEditor();
 

diff --git a/src/Gui/Viewer/Gizmo/Gizmo.hpp b/src/Gui/Viewer/Gizmo/Gizmo.hpp
@@ -47,7 +47,6 @@ class Gizmo
     };
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
     Gizmo( Engine::Scene::Component* c,
            const Core::Transform& worldTo,
            const Core::Transform& t,

diff --git a/src/Gui/Viewer/Gizmo/GizmoManager.hpp b/src/Gui/Viewer/Gizmo/GizmoManager.hpp
@@ -28,8 +28,6 @@ class RA_GUI_API GizmoManager : public QObject,
     friend class KeyMappingManageable<GizmoManager>;
 
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     enum GizmoType { NONE, TRANSLATION, ROTATION, SCALE };
 
     explicit GizmoManager( QObject* parent = nullptr );

diff --git a/tests/unittest/Core/topomesh.cpp b/tests/unittest/Core/topomesh.cpp
@@ -89,8 +89,6 @@ bool isSameMesh( const Ra::Core::Geometry::TriangleMesh& meshOne,
 class WedgeDataAndIdx
 {
   public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-
     TopologicalMesh::WedgeData m_data;
 
     size_t m_idx;