spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove pre-C++17 Eigen alignment code

pull/1273/head
Andrew Tribick 2021-12-15 15:14:58 +01:00 committed by ajtribick
parent 9651e9e265
commit d7b896c013
32 changed files with 4 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cel3ds/3dsmodel.h
View File

@ -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<Eigen::Vector3f> points{};
std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f>> texCoords{};
std::vector<Eigen::Vector2f> texCoords{};
std::vector<std::uint16_t> faces{};
std::vector<std::uint32_t> smoothingGroups{};
std::vector<M3DMeshMaterialGroup> meshMaterialGroups{};

2
src/celengine/body.h
View File

@ -122,8 +122,6 @@ class RingSystem
class Body : public AstroObject
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
Body(PlanetarySystem*, const std::string& name);
virtual ~Body();

2
src/celengine/console.h
View File

@ -46,8 +46,6 @@ class Renderer;
class Console : public std::ostream
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
static constexpr const int PageRows = 10;

3
src/celengine/curveplot.cpp
View File

@ -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;

2
src/celengine/deepskyobj.h
View File

@ -36,8 +36,6 @@ class OpenCluster;
class DeepSkyObject : public AstroObject
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
virtual Selection toSelection();
DeepSkyObject() = default;
virtual ~DeepSkyObject() = default;

4
src/celengine/frame.h
View File

@ -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&);

4
src/celengine/galaxy.cpp
View File

@ -52,7 +52,7 @@ bool operator< (const Blob& b1, const Blob& b2)
return (b1.position.squaredNorm() < b2.position.squaredNorm());
}
typedef vector<Blob, aligned_allocator<Blob> > BlobVector;
typedef vector<Blob> BlobVector;
class GalacticForm
{
public:
@ -291,8 +291,6 @@ void Galaxy::render(const Vector3f& offset,
struct GalaxyVertex
{
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
Vector4f position;
Matrix<GLushort, 4, 1> texCoord; // texCoord.x = x, texCoord.y = y, texCoord.z = color index, texCoord.w = alpha
};

4
src/celengine/galaxy.h
View File

@ -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;

2
src/celengine/globular.h
View File

@ -44,8 +44,6 @@ struct GlobularForm
class Globular : public DeepSkyObject
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
Globular();
const char* getType() const override;

8
src/celengine/lightenv.h
View File

@ -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<EclipseShadow, Eigen::aligned_allocator<EclipseShadow> > EclipseShadowVector;
typedef std::vector<EclipseShadow> EclipseShadowVector;
LightingState() :
nLights(0),

2
src/celengine/nebula.h
View File

@ -16,8 +16,6 @@
class Nebula : public DeepSkyObject
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
Nebula() = default;
const char* getType() const override;

3
src/celengine/observer.h
View File

@ -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;

2
src/celengine/opencluster.h
View File

@ -18,8 +18,6 @@
class OpenCluster : public DeepSkyObject
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
OpenCluster() = default;
const char* getType() const override;

2
src/celengine/overlay.h
View File

@ -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;

2
src/celengine/particlesystem.h
View File

@ -44,8 +44,6 @@ struct ParticleVertex
class ParticleEmitter
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
ParticleEmitter();
~ParticleEmitter();

4
src/celengine/rendcontext.h
View File

@ -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,

4
src/celengine/render.h
View File

@ -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 };

2
src/celengine/renderinfo.h
View File

@ -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

2
src/celengine/renderlistentry.h
View File

@ -18,8 +18,6 @@ class ReferenceMark;
struct RenderListEntry
{
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
enum RenderableType
{
RenderableStar,

2
src/celengine/skygrid.h
View File

@ -25,8 +25,6 @@ class Observer;
class SkyGrid
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
enum LongitudeUnits
{
LongitudeDegrees,

4
src/celephem/rotation.h
View File

@ -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;

4
src/celephem/samporient.cpp
View File

@ -28,13 +28,11 @@ using namespace celmath;
struct OrientationSample
{
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
Eigen::Quaternionf q;
double t;
};
typedef vector<OrientationSample, aligned_allocator<OrientationSample> > OrientationSampleVector;
typedef vector<OrientationSample> OrientationSampleVector;
/*!
* Sampled orientation files are ASCII text files containing a sequence of

1
src/celephem/scriptrotation.h
View File

@ -20,7 +20,6 @@ struct lua_State;
class ScriptedRotation : public RotationModel
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
ScriptedRotation() = default;
~ScriptedRotation() = default;

2
src/celestia/celestiastate.h
View File

@ -28,8 +28,6 @@ class CelestiaCore;
class CelestiaState
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
CelestiaState() = default;
CelestiaState(CelestiaCore* appCore);
~CelestiaState() = default;

2
src/celestia/favorites.h
View File

@ -19,8 +19,6 @@
struct FavoritesEntry
{
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
std::string name;
std::string selectionName;

2
src/celestia/url.h
View File

@ -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

2
src/celmath/ellipsoid.h
View File

@ -17,8 +17,6 @@ template<class T>
class Ellipsoid
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
/*! Default Ellipsoid constructor. Create a unit sphere centered
* at the origin.
*/

2
src/celmath/frustum.h
View File

@ -19,8 +19,6 @@ namespace celmath
class Frustum
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
using PlaneType = Eigen::Hyperplane<float, 3>;
Frustum(float fov, float aspectRatio, float nearDist);

2
src/celmath/sphere.h
View File

@ -17,8 +17,6 @@ namespace celmath
template<class T> class Sphere
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
Sphere() :
center(Eigen::Matrix<T, 3, 1>::Zero()),
radius(static_cast<T>(1))

4
src/celscript/legacy/command.h
View File

@ -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;

2
src/celttf/truetypefont.cpp
View File

@ -54,8 +54,6 @@ struct UnicodeBlock
struct TextureFontPrivate
{
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
struct FontVertex
{
FontVertex(float _x, float _y, float _u, float _v) :

2
src/tools/cmod/cmodview/modelviewwidget.h
View File

@ -143,8 +143,6 @@ class ModelViewWidget : public QGLWidget
{
Q_OBJECT
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
ModelViewWidget(QWidget *parent);
~ModelViewWidget();