From c5363327e83589a4f2ec7362d87a31f6f64b9b30 Mon Sep 17 00:00:00 2001 From: James Grogan Date: Mon, 6 Feb 2023 12:00:10 +0000 Subject: [PATCH] Fix linux build. --- src/base/geometry/math/Matrix.cpp | 2 +- src/base/geometry/math/Vector.cpp | 8 ++--- src/base/geometry/path/Arc.h | 30 +++++++++---------- src/base/geometry/path/Curve.h | 2 +- src/base/geometry/points/Point.h | 4 ++- .../visual_elements/basic_shapes/LineNode.cpp | 4 +-- .../basic_shapes/PolygonNode.cpp | 4 +-- .../visual_elements/nodes/PathNode.cpp | 4 +-- .../visual_elements/svg/SvgPainter.cpp | 2 +- 9 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/base/geometry/math/Matrix.cpp b/src/base/geometry/math/Matrix.cpp index 9e0d4a6..6e3ff48 100644 --- a/src/base/geometry/math/Matrix.cpp +++ b/src/base/geometry/math/Matrix.cpp @@ -24,7 +24,7 @@ Matrix::Matrix(T value, InputType inputType) } template -void Matrix::applyTo(Vector& v) const +void Matrix::applyTo(Vector&) const { } diff --git a/src/base/geometry/math/Vector.cpp b/src/base/geometry/math/Vector.cpp index 841fb59..efdcc77 100644 --- a/src/base/geometry/math/Vector.cpp +++ b/src/base/geometry/math/Vector.cpp @@ -75,7 +75,7 @@ bool Vector::equals(const Vector& v) const } template -void Vector::inPlaceMultiply(double v) +void Vector::inPlaceMultiply(double) { //std::transform(mData.begin(), mData.end(), mData.begin(), std::bind(std::multiplies(), std::placeholders::_1, v)); } @@ -118,14 +118,14 @@ double Vector::getSelfInnerProduct() const } template -double Vector::innerPoduct(const Vector& v) const +double Vector::innerPoduct(const Vector&) const { return 0.0; //return std::inner_product(mData.begin(), mData.end(), v.mData.begin(), 0.0); } template -Vector Vector::crossProduct(const Vector& v) const +Vector Vector::crossProduct(const Vector&) const { return Vector(); //return Vector(v.mY * mZ - v.mZ * mY, v.mZ * mX - v.mX * mZ, v.mX * mY - v.mY * mX); @@ -143,7 +143,7 @@ Vector Vector::getNormalized() const } template -void Vector::scale(const std::vector& factors) +void Vector::scale(const std::vector&) { //std::transform(mData.begin(), mData.end(), factors.begin(), mData.begin(), std::multiplies()); } diff --git a/src/base/geometry/path/Arc.h b/src/base/geometry/path/Arc.h index 0d65233..a4a90fc 100644 --- a/src/base/geometry/path/Arc.h +++ b/src/base/geometry/path/Arc.h @@ -7,30 +7,30 @@ namespace ntk{ class Arc : public Curve<2> { public: - Arc(const Vector2& endoffset, double rX, double rY, double rotation = 0, bool largeArc = false, bool sweep = false); + Arc(const Vector2& endoffset, double rX, double rY, double rotation = 0, bool largeArc = false, bool sweep = false); - Vector2 getEndOffset() const override; + Vector2 getEndOffset() const override; - Bounds getBounds() const override; + Bounds getBounds() const override; - CurveType getCurveType() const override; + CurveType getCurveType() const override; - double getRx() const; + double getRx() const; - double getRy() const; + double getRy() const; - double getRotation() const; + double getRotation() const; - bool getUseLargeArc() const; + bool getUseLargeArc() const; - bool getSweepParam() const; + bool getSweepParam() const; private: - Vector2 mEndOffset; - double mRx{ 0.0 }; - double mRy{ 0.0 }; - double mRotation{ 0 }; - bool mLargeArc{ false }; - bool mSweep{ false }; + Vector2 mEndOffset; + double mRx{ 0.0 }; + double mRy{ 0.0 }; + double mRotation{ 0 }; + bool mLargeArc{ false }; + bool mSweep{ false }; }; } diff --git a/src/base/geometry/path/Curve.h b/src/base/geometry/path/Curve.h index cc25c39..af51d0f 100644 --- a/src/base/geometry/path/Curve.h +++ b/src/base/geometry/path/Curve.h @@ -14,7 +14,7 @@ template class Curve : public PathElement { public: - Curve::Type getType() const override + AbstractGeometricItem::Type getType() const override { return Curve::Type::CURVE; } diff --git a/src/base/geometry/points/Point.h b/src/base/geometry/points/Point.h index c490c9c..689f799 100644 --- a/src/base/geometry/points/Point.h +++ b/src/base/geometry/points/Point.h @@ -17,6 +17,8 @@ public: Point(const Point<2>& p); + Point(const Point& p) = default; + Point(const DiscretePoint& point); Point(const Point& reference, double offSetX, double offSetY, double offSetZ = 0); @@ -83,4 +85,4 @@ using Point3 = Point<3>; using Point2 = Point<2>; using PointPtr3 = std::unique_ptr >; -using PointPtr2 = std::unique_ptr >; \ No newline at end of file +using PointPtr2 = std::unique_ptr >; diff --git a/src/rendering/visual_elements/basic_shapes/LineNode.cpp b/src/rendering/visual_elements/basic_shapes/LineNode.cpp index bc2935d..d50fce6 100644 --- a/src/rendering/visual_elements/basic_shapes/LineNode.cpp +++ b/src/rendering/visual_elements/basic_shapes/LineNode.cpp @@ -14,7 +14,7 @@ LineNode::Type LineNode::getType() return Type::Line; } -void LineNode::createOrUpdateGeometry(SceneInfo* sceneInfo) +void LineNode::createOrUpdateGeometry(SceneInfo*) { auto line = std::make_unique(mPoints); mBackgroundItem = std::make_unique(std::move(line)); @@ -61,4 +61,4 @@ void LineNode::setEndEndStyle(LineEndNode::Style style) mEndEndStyle = style; mGeometryIsDirty = true; } -} \ No newline at end of file +} diff --git a/src/rendering/visual_elements/basic_shapes/PolygonNode.cpp b/src/rendering/visual_elements/basic_shapes/PolygonNode.cpp index c7e01f0..6377585 100644 --- a/src/rendering/visual_elements/basic_shapes/PolygonNode.cpp +++ b/src/rendering/visual_elements/basic_shapes/PolygonNode.cpp @@ -26,7 +26,7 @@ void PolygonNode::setPoints(const std::vector& points) mGeometryIsDirty = true; } -void PolygonNode::createOrUpdateGeometry(SceneInfo* sceneInfo) +void PolygonNode::createOrUpdateGeometry(SceneInfo*) { auto polygon = std::make_unique(mPoints); @@ -39,4 +39,4 @@ void PolygonNode::createOrUpdateGeometry(SceneInfo* sceneInfo) { mBackgroundItem->updateGeometry(std::move(polygon)); } -} \ No newline at end of file +} diff --git a/src/rendering/visual_elements/nodes/PathNode.cpp b/src/rendering/visual_elements/nodes/PathNode.cpp index bcbc2f8..dd7b1d4 100644 --- a/src/rendering/visual_elements/nodes/PathNode.cpp +++ b/src/rendering/visual_elements/nodes/PathNode.cpp @@ -33,7 +33,7 @@ void PathNode::setPathString(const std::string& psPath) mPathString = psPath; } -void PathNode::createOrUpdateGeometry(SceneInfo* sceneInfo) +void PathNode::createOrUpdateGeometry(SceneInfo*) { auto path = std::make_unique(); PostscriptReader reader; @@ -48,4 +48,4 @@ void PathNode::createOrUpdateGeometry(SceneInfo* sceneInfo) { mBackgroundItem->updateGeometry(std::move(path)); } -} \ No newline at end of file +} diff --git a/src/rendering/visual_elements/svg/SvgPainter.cpp b/src/rendering/visual_elements/svg/SvgPainter.cpp index 7a4a70b..84810a7 100644 --- a/src/rendering/visual_elements/svg/SvgPainter.cpp +++ b/src/rendering/visual_elements/svg/SvgPainter.cpp @@ -75,7 +75,7 @@ void SvgPainter::paintMesh(SvgDocument* document, SceneModel* model, bool showOu { const auto x = loc.getX() * transform.getScale().mX + transform.getLocation().getX(); const auto y = loc.getY() * transform.getScale().mY + transform.getLocation().getY(); - points[count] = { x, y }; + points.push_back({x, y}); count++; } svg_tri->setPoints(points);