Fix linux compilation.

This commit is contained in:
James Grogan 2023-01-23 10:08:29 +00:00
parent ec57e3b534
commit 990cde402b
28 changed files with 245 additions and 161 deletions

View file

@ -5,6 +5,11 @@ void AbstractMesh::addConstantNodeVectorAttribute(const std::string& tag, const
}
AbstractMesh::~AbstractMesh()
{
}
std::vector<std::vector<double> > AbstractMesh::getNodeVectorAttributes(const std::string& tag)
{
std::vector<std::vector<double> > attribs(mNodes.size());

View file

@ -20,7 +20,7 @@ public:
QUAD
};
virtual ~AbstractMesh() = default;
virtual ~AbstractMesh();
void addVectorAttribute(const std::string& tag, const std::vector<double>& values);

View file

@ -14,6 +14,11 @@ CircleNode::CircleNode(const Transform& transform, double radius)
mMinorRadius = mRadius;
}
CircleNode::~CircleNode()
{
}
CircleNode::Type CircleNode::getType()
{
return Type::Circle;

View file

@ -10,6 +10,8 @@ class CircleNode : public GeometryNode
public:
CircleNode(const Transform& transform, double radius);
virtual ~CircleNode();
Type getType() override;
double getRadius() const;

View file

@ -9,6 +9,11 @@ GridNode::GridNode(const Transform& transform)
}
GridNode::~GridNode()
{
}
void GridNode::setNumX(std::size_t numX)
{
if (mNumberX != numX)

View file

@ -10,6 +10,8 @@ class GridNode : public MaterialNode
public:
GridNode(const Transform& transform);
virtual ~GridNode();
void setNumX(std::size_t numX);
void setNumY(std::size_t numY);

View file

@ -8,6 +8,11 @@ MaterialNode::MaterialNode(const Transform& transform)
}
MaterialNode::~MaterialNode()
{
}
const Color& MaterialNode::getFillColor() const
{
return mFillColor;

View file

@ -8,6 +8,7 @@ class MaterialNode : public AbstractVisualNode
{
public:
MaterialNode(const Transform& transform);
virtual ~MaterialNode();
const Color& getFillColor() const;
const Color& getStrokeColor() const;

View file

@ -9,6 +9,28 @@ MeshNode::MeshNode(const Transform& transform)
}
MeshNode::~MeshNode()
{
}
SceneItem* MeshNode::getSceneItem(std::size_t idx) const
{
return mModel.get();
}
std::size_t MeshNode::getNumSceneItems() const
{
if (mWorkingMesh)
{
return 1;
}
else
{
return 0;
}
}
void MeshNode::setWidth(double width)
{
if (mWidth != width)
@ -33,23 +55,6 @@ void MeshNode::setMesh(AbstractMesh* mesh)
mMeshIsDirty = true;
}
SceneItem* MeshNode::getSceneItem(std::size_t idx) const
{
return mModel.get();
}
std::size_t MeshNode::getNumSceneItems() const
{
if (mWorkingMesh)
{
return 1;
}
else
{
return 0;
}
}
void MeshNode::update(SceneInfo* sceneInfo)
{
if (!mModel || mMeshIsDirty)

View file

@ -9,6 +9,8 @@ class MeshNode : public MaterialNode
{
public:
MeshNode(const Transform& transform);
virtual ~MeshNode();
void setMesh(AbstractMesh* mesh);
SceneItem* getSceneItem(std::size_t idx) const override;

View file

@ -5,6 +5,11 @@ SceneItem::SceneItem()
}
SceneItem::~SceneItem()
{
}
const Color& SceneItem::getFillColor() const
{
return mFillColor;
@ -20,6 +25,11 @@ const Transform& SceneItem::getTransform() const
return mTransform;
}
const std::string& SceneItem::getName() const
{
return mName;
}
double SceneItem::getOutlineThickness() const
{
return mOutlineThickness;
@ -78,3 +88,8 @@ void SceneItem::updateTransform(const Transform& transform)
mTransform = transform;
}
}
void SceneItem::setName(const std::string& name)
{
mName = name;
}

View file

@ -18,7 +18,7 @@ public:
SceneItem();
virtual ~SceneItem() = default;
virtual ~SceneItem();
const Color& getFillColor() const;
@ -30,6 +30,8 @@ public:
double getOutlineThickness() const;
const std::string& getName() const;
bool hasFillColor() const;
bool hasOutlineColor() const;
@ -44,18 +46,10 @@ public:
void setFillColor(const Color& color);
void setName(const std::string& name);
void updateTransform(const Transform& transform);
void setName(const std::string& name)
{
mName = name;
}
const std::string& getName() const
{
return mName;
}
protected:
Transform mTransform;

View file

@ -10,6 +10,11 @@ SceneModel::SceneModel(std::unique_ptr<AbstractMesh> mesh)
}
SceneModel::~SceneModel()
{
}
SceneModel::SceneModel(std::unique_ptr<AbstractGeometricItem> geometry)
: SceneItem(),
mGeometry(std::move(geometry))

View file

@ -15,6 +15,8 @@ class SceneModel : public SceneItem
{
public:
SceneModel() = default;
virtual ~SceneModel();
explicit SceneModel(std::unique_ptr<AbstractMesh> mesh);
explicit SceneModel(std::unique_ptr<AbstractGeometricItem> geometry);