From d7b896c013e222f96d29baa399cd3eda24fd91fb Mon Sep 17 00:00:00 2001 From: Andrew Tribick Date: Wed, 15 Dec 2021 15:14:58 +0100 Subject: [PATCH] Remove pre-C++17 Eigen alignment code --- src/cel3ds/3dsmodel.h | 4 +--- src/celengine/body.h | 2 -- src/celengine/console.h | 2 -- src/celengine/curveplot.cpp | 3 --- src/celengine/deepskyobj.h | 2 -- src/celengine/frame.h | 4 ---- src/celengine/galaxy.cpp | 4 +--- src/celengine/galaxy.h | 4 ---- src/celengine/globular.h | 2 -- src/celengine/lightenv.h | 8 +------- src/celengine/nebula.h | 2 -- src/celengine/observer.h | 3 --- src/celengine/opencluster.h | 2 -- src/celengine/overlay.h | 2 -- src/celengine/particlesystem.h | 2 -- src/celengine/rendcontext.h | 4 ---- src/celengine/render.h | 4 ---- src/celengine/renderinfo.h | 2 -- src/celengine/renderlistentry.h | 2 -- src/celengine/skygrid.h | 2 -- src/celephem/rotation.h | 4 ---- src/celephem/samporient.cpp | 4 +--- src/celephem/scriptrotation.h | 1 - src/celestia/celestiastate.h | 2 -- src/celestia/favorites.h | 2 -- src/celestia/url.h | 2 -- src/celmath/ellipsoid.h | 2 -- src/celmath/frustum.h | 2 -- src/celmath/sphere.h | 2 -- src/celscript/legacy/command.h | 4 ---- src/celttf/truetypefont.cpp | 2 -- src/tools/cmod/cmodview/modelviewwidget.h | 2 -- 32 files changed, 4 insertions(+), 85 deletions(-) diff --git a/src/cel3ds/3dsmodel.h b/src/cel3ds/3dsmodel.h index b50d5a19c..d09b8b6e7 100644 --- a/src/cel3ds/3dsmodel.h +++ b/src/cel3ds/3dsmodel.h @@ -80,8 +80,6 @@ class M3DMeshMaterialGroup class M3DTriangleMesh { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - M3DTriangleMesh() = default; ~M3DTriangleMesh() = default; M3DTriangleMesh(const M3DTriangleMesh&) = delete; @@ -114,7 +112,7 @@ class M3DTriangleMesh private: std::vector points{}; - std::vector> texCoords{}; + std::vector texCoords{}; std::vector faces{}; std::vector smoothingGroups{}; std::vector meshMaterialGroups{}; diff --git a/src/celengine/body.h b/src/celengine/body.h index 37333f252..a9deebb60 100644 --- a/src/celengine/body.h +++ b/src/celengine/body.h @@ -122,8 +122,6 @@ class RingSystem class Body : public AstroObject { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - Body(PlanetarySystem*, const std::string& name); virtual ~Body(); diff --git a/src/celengine/console.h b/src/celengine/console.h index 4205bfc24..693942715 100644 --- a/src/celengine/console.h +++ b/src/celengine/console.h @@ -46,8 +46,6 @@ class Renderer; class Console : public std::ostream { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - static constexpr const int PageRows = 10; diff --git a/src/celengine/curveplot.cpp b/src/celengine/curveplot.cpp index 88688751d..f385dc917 100644 --- a/src/celengine/curveplot.cpp +++ b/src/celengine/curveplot.cpp @@ -158,8 +158,6 @@ static inline bool frustumCull(const Vector4d& curvePoint, class HighPrec_VertexBuffer { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - HighPrec_VertexBuffer() : currentPosition(0), capacity(4096), @@ -389,7 +387,6 @@ private: unsigned int capacity; struct Vertex { - EIGEN_MAKE_ALIGNED_OPERATOR_NEW Vector4f position; Vector4f color; float scale; diff --git a/src/celengine/deepskyobj.h b/src/celengine/deepskyobj.h index 84e1788c3..6043e15e7 100644 --- a/src/celengine/deepskyobj.h +++ b/src/celengine/deepskyobj.h @@ -36,8 +36,6 @@ class OpenCluster; class DeepSkyObject : public AstroObject { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - virtual Selection toSelection(); DeepSkyObject() = default; virtual ~DeepSkyObject() = default; diff --git a/src/celengine/frame.h b/src/celengine/frame.h index a82186c1f..31557a314 100644 --- a/src/celengine/frame.h +++ b/src/celengine/frame.h @@ -69,8 +69,6 @@ class ReferenceFrame class CachingFrame : public ReferenceFrame { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - SHARED_TYPES(CachingFrame) CachingFrame(Selection _center); @@ -180,8 +178,6 @@ class BodyMeanEquatorFrame : public ReferenceFrame class FrameVector { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - FrameVector(const FrameVector& fv); ~FrameVector() = default; FrameVector& operator=(const FrameVector&); diff --git a/src/celengine/galaxy.cpp b/src/celengine/galaxy.cpp index 53af040e3..a4cf305fd 100644 --- a/src/celengine/galaxy.cpp +++ b/src/celengine/galaxy.cpp @@ -52,7 +52,7 @@ bool operator< (const Blob& b1, const Blob& b2) return (b1.position.squaredNorm() < b2.position.squaredNorm()); } -typedef vector > BlobVector; +typedef vector BlobVector; class GalacticForm { public: @@ -291,8 +291,6 @@ void Galaxy::render(const Vector3f& offset, struct GalaxyVertex { - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - Vector4f position; Matrix texCoord; // texCoord.x = x, texCoord.y = y, texCoord.z = color index, texCoord.w = alpha }; diff --git a/src/celengine/galaxy.h b/src/celengine/galaxy.h index f76883755..d88ff0781 100644 --- a/src/celengine/galaxy.h +++ b/src/celengine/galaxy.h @@ -27,8 +27,6 @@ class Renderer; struct Blob { - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - Eigen::Vector4f position; unsigned int colorIndex; float brightness; @@ -39,8 +37,6 @@ class GalacticForm; class Galaxy : public DeepSkyObject { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - const char* getType() const override; void setType(const std::string&) override; std::string getDescription() const override; diff --git a/src/celengine/globular.h b/src/celengine/globular.h index ef418ed59..7dd6e5e37 100644 --- a/src/celengine/globular.h +++ b/src/celengine/globular.h @@ -44,8 +44,6 @@ struct GlobularForm class Globular : public DeepSkyObject { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - Globular(); const char* getType() const override; diff --git a/src/celengine/lightenv.h b/src/celengine/lightenv.h index c47737995..03d40e62b 100644 --- a/src/celengine/lightenv.h +++ b/src/celengine/lightenv.h @@ -41,8 +41,6 @@ public: class EclipseShadow { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - const Body* caster; Eigen::Quaternionf casterOrientation; Eigen::Vector3f origin; @@ -55,8 +53,6 @@ public: class RingShadow { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - RingSystem* ringSystem; Eigen::Quaternionf casterOrientation; Eigen::Vector3f origin; @@ -67,9 +63,7 @@ public: class LightingState { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - - typedef std::vector > EclipseShadowVector; + typedef std::vector EclipseShadowVector; LightingState() : nLights(0), diff --git a/src/celengine/nebula.h b/src/celengine/nebula.h index 61dc517b0..c3f1eefff 100644 --- a/src/celengine/nebula.h +++ b/src/celengine/nebula.h @@ -16,8 +16,6 @@ class Nebula : public DeepSkyObject { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - Nebula() = default; const char* getType() const override; diff --git a/src/celengine/observer.h b/src/celengine/observer.h index 0af860aae..37d1d9cb5 100644 --- a/src/celengine/observer.h +++ b/src/celengine/observer.h @@ -107,8 +107,6 @@ private: class Observer { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - static constexpr const double JourneyDuration = 5.0; static constexpr const double StartInterpolation = 0.25; static constexpr const double EndInterpolation = 0.75; @@ -236,7 +234,6 @@ public: struct JourneyParams { - EIGEN_MAKE_ALIGNED_OPERATOR_NEW double duration; double startTime; UniversalCoord from; diff --git a/src/celengine/opencluster.h b/src/celengine/opencluster.h index c7c59f984..d50c0a1a0 100644 --- a/src/celengine/opencluster.h +++ b/src/celengine/opencluster.h @@ -18,8 +18,6 @@ class OpenCluster : public DeepSkyObject { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - OpenCluster() = default; const char* getType() const override; diff --git a/src/celengine/overlay.h b/src/celengine/overlay.h index 0bf36bc0d..698bf1ce9 100644 --- a/src/celengine/overlay.h +++ b/src/celengine/overlay.h @@ -56,8 +56,6 @@ class OverlayStreamBuf : public std::streambuf class Overlay : public std::ostream { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - Overlay(Renderer&); Overlay() = delete; ~Overlay() = default; diff --git a/src/celengine/particlesystem.h b/src/celengine/particlesystem.h index f876f9acb..deff567b3 100644 --- a/src/celengine/particlesystem.h +++ b/src/celengine/particlesystem.h @@ -44,8 +44,6 @@ struct ParticleVertex class ParticleEmitter { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - ParticleEmitter(); ~ParticleEmitter(); diff --git a/src/celengine/rendcontext.h b/src/celengine/rendcontext.h index a4f4abf6b..b53d40fe6 100644 --- a/src/celengine/rendcontext.h +++ b/src/celengine/rendcontext.h @@ -28,8 +28,6 @@ class Renderer; class RenderContext { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - RenderContext(const cmod::Material*); RenderContext(Renderer*); virtual ~RenderContext() = default; @@ -96,8 +94,6 @@ class Shadow_RenderContext : public RenderContext class GLSL_RenderContext : public RenderContext { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - GLSL_RenderContext(Renderer* r, const LightingState& ls, float _objRadius, diff --git a/src/celengine/render.h b/src/celengine/render.h index a9c12a396..5456e2614 100644 --- a/src/celengine/render.h +++ b/src/celengine/render.h @@ -109,8 +109,6 @@ enum class RenderMode class Renderer { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - Renderer(); ~Renderer(); @@ -486,8 +484,6 @@ class Renderer struct RenderProperties { - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - Surface* surface{ nullptr }; const Atmosphere* atmosphere{ nullptr }; RingSystem* rings{ nullptr }; diff --git a/src/celengine/renderinfo.h b/src/celengine/renderinfo.h index 23928f40d..99bcfa639 100644 --- a/src/celengine/renderinfo.h +++ b/src/celengine/renderinfo.h @@ -21,8 +21,6 @@ class Texture; struct RenderInfo { - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - #ifdef HDR_COMPRESS Color color{ 0.5f, 0.5f, 0.5f }; #else diff --git a/src/celengine/renderlistentry.h b/src/celengine/renderlistentry.h index c677ba43f..336b6e505 100644 --- a/src/celengine/renderlistentry.h +++ b/src/celengine/renderlistentry.h @@ -18,8 +18,6 @@ class ReferenceMark; struct RenderListEntry { - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - enum RenderableType { RenderableStar, diff --git a/src/celengine/skygrid.h b/src/celengine/skygrid.h index ac872fe5f..c98bde64f 100644 --- a/src/celengine/skygrid.h +++ b/src/celengine/skygrid.h @@ -25,8 +25,6 @@ class Observer; class SkyGrid { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - enum LongitudeUnits { LongitudeDegrees, diff --git a/src/celephem/rotation.h b/src/celephem/rotation.h index 7c5a356b4..02cf4dff0 100644 --- a/src/celephem/rotation.h +++ b/src/celephem/rotation.h @@ -87,8 +87,6 @@ class RotationModel class CachingRotationModel : public RotationModel { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - CachingRotationModel(); virtual ~CachingRotationModel() = default; @@ -119,8 +117,6 @@ private: class ConstantOrientation : public RotationModel { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - ConstantOrientation(const Eigen::Quaterniond& q); virtual ~ConstantOrientation() = default; diff --git a/src/celephem/samporient.cpp b/src/celephem/samporient.cpp index b4cadd6b7..aedf25137 100644 --- a/src/celephem/samporient.cpp +++ b/src/celephem/samporient.cpp @@ -28,13 +28,11 @@ using namespace celmath; struct OrientationSample { - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - Eigen::Quaternionf q; double t; }; -typedef vector > OrientationSampleVector; +typedef vector OrientationSampleVector; /*! * Sampled orientation files are ASCII text files containing a sequence of diff --git a/src/celephem/scriptrotation.h b/src/celephem/scriptrotation.h index aea449f07..3716000e1 100644 --- a/src/celephem/scriptrotation.h +++ b/src/celephem/scriptrotation.h @@ -20,7 +20,6 @@ struct lua_State; class ScriptedRotation : public RotationModel { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW ScriptedRotation() = default; ~ScriptedRotation() = default; diff --git a/src/celestia/celestiastate.h b/src/celestia/celestiastate.h index 7ce922b26..14052f78f 100644 --- a/src/celestia/celestiastate.h +++ b/src/celestia/celestiastate.h @@ -28,8 +28,6 @@ class CelestiaCore; class CelestiaState { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - CelestiaState() = default; CelestiaState(CelestiaCore* appCore); ~CelestiaState() = default; diff --git a/src/celestia/favorites.h b/src/celestia/favorites.h index c5299858c..159b08873 100644 --- a/src/celestia/favorites.h +++ b/src/celestia/favorites.h @@ -19,8 +19,6 @@ struct FavoritesEntry { - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - std::string name; std::string selectionName; diff --git a/src/celestia/url.h b/src/celestia/url.h index 6b14f84a9..837bf945e 100644 --- a/src/celestia/url.h +++ b/src/celestia/url.h @@ -23,8 +23,6 @@ class CelestiaCore; class Url { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - constexpr static int CurrentVersion = 3; /*! The TimeSource specifies what the time will be set to when the user diff --git a/src/celmath/ellipsoid.h b/src/celmath/ellipsoid.h index 047d131aa..eb8d5de59 100644 --- a/src/celmath/ellipsoid.h +++ b/src/celmath/ellipsoid.h @@ -17,8 +17,6 @@ template class Ellipsoid { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - /*! Default Ellipsoid constructor. Create a unit sphere centered * at the origin. */ diff --git a/src/celmath/frustum.h b/src/celmath/frustum.h index 92fc130e2..2b5dc1cbd 100644 --- a/src/celmath/frustum.h +++ b/src/celmath/frustum.h @@ -19,8 +19,6 @@ namespace celmath class Frustum { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - using PlaneType = Eigen::Hyperplane; Frustum(float fov, float aspectRatio, float nearDist); diff --git a/src/celmath/sphere.h b/src/celmath/sphere.h index f3f07686b..6b31aa11b 100644 --- a/src/celmath/sphere.h +++ b/src/celmath/sphere.h @@ -17,8 +17,6 @@ namespace celmath template class Sphere { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - Sphere() : center(Eigen::Matrix::Zero()), radius(static_cast(1)) diff --git a/src/celscript/legacy/command.h b/src/celscript/legacy/command.h index 43790b75d..d23bb0f43 100644 --- a/src/celscript/legacy/command.h +++ b/src/celscript/legacy/command.h @@ -114,8 +114,6 @@ class CommandGotoLongLat : public InstantaneousCommand class CommandGotoLocation : public InstantaneousCommand { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - CommandGotoLocation(double t, const Eigen::Vector3d& translation, const Eigen::Quaterniond& rotation); @@ -339,8 +337,6 @@ class CommandSetPosition : public InstantaneousCommand class CommandSetOrientation : public InstantaneousCommand { public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - CommandSetOrientation(const Eigen::Quaternionf&); void process(ExecutionEnvironment&) override; diff --git a/src/celttf/truetypefont.cpp b/src/celttf/truetypefont.cpp index 3975888e2..f3c1a577a 100644 --- a/src/celttf/truetypefont.cpp +++ b/src/celttf/truetypefont.cpp @@ -54,8 +54,6 @@ struct UnicodeBlock struct TextureFontPrivate { - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - struct FontVertex { FontVertex(float _x, float _y, float _u, float _v) : diff --git a/src/tools/cmod/cmodview/modelviewwidget.h b/src/tools/cmod/cmodview/modelviewwidget.h index 606aa8084..587cde936 100644 --- a/src/tools/cmod/cmodview/modelviewwidget.h +++ b/src/tools/cmod/cmodview/modelviewwidget.h @@ -143,8 +143,6 @@ class ModelViewWidget : public QGLWidget { Q_OBJECT public: - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - ModelViewWidget(QWidget *parent); ~ModelViewWidget();