jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix linux build.

Browse source
This commit is contained in:
James Grogan 2023-02-06 12:00:10 +00:00
parent 8192ef78e8
commit c5363327e8
9 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/base/geometry/math/Matrix.cpp
View file

@ -24,7 +24,7 @@ Matrix<T, M, N>::Matrix(T value, InputType inputType)
} }
template<typename T, std::size_t M, std::size_t N> template<typename T, std::size_t M, std::size_t N>
void Matrix<T, M, N>::applyTo(Vector<T, N>& v) const void Matrix<T, M, N>::applyTo(Vector<T, N>&) const
{ {
} }

8
src/base/geometry/math/Vector.cpp
View file

@ -75,7 +75,7 @@ bool Vector<T, DIM>::equals(const Vector<T, DIM>& v) const
} }
template<typename T, std::size_t DIM> template<typename T, std::size_t DIM>
void Vector<T, DIM>::inPlaceMultiply(double v) void Vector<T, DIM>::inPlaceMultiply(double)
{ {
//std::transform(mData.begin(), mData.end(), mData.begin(), std::bind(std::multiplies<double>(), std::placeholders::_1, v)); //std::transform(mData.begin(), mData.end(), mData.begin(), std::bind(std::multiplies<double>(), std::placeholders::_1, v));
} }
@ -118,14 +118,14 @@ double Vector<T, DIM>::getSelfInnerProduct() const
} }
template<typename T, std::size_t DIM> template<typename T, std::size_t DIM>
double Vector<T, DIM>::innerPoduct(const Vector<T, DIM>& v) const double Vector<T, DIM>::innerPoduct(const Vector<T, DIM>&) const
{ {
return 0.0; return 0.0;
//return std::inner_product(mData.begin(), mData.end(), v.mData.begin(), 0.0); //return std::inner_product(mData.begin(), mData.end(), v.mData.begin(), 0.0);
} }
template<typename T, std::size_t DIM> template<typename T, std::size_t DIM>
Vector<T, DIM> Vector<T, DIM>::crossProduct(const Vector<T, DIM>& v) const Vector<T, DIM> Vector<T, DIM>::crossProduct(const Vector<T, DIM>&) const
{ {
return Vector<T, DIM>(); return Vector<T, DIM>();
//return Vector(v.mY * mZ - v.mZ * mY, v.mZ * mX - v.mX * mZ, v.mX * mY - v.mY * mX); //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<T, DIM> Vector<T, DIM>::getNormalized() const
} }
template<typename T, std::size_t DIM> template<typename T, std::size_t DIM>
void Vector<T, DIM>::scale(const std::vector<double>& factors) void Vector<T, DIM>::scale(const std::vector<double>&)
{ {
//std::transform(mData.begin(), mData.end(), factors.begin(), mData.begin(), std::multiplies<double>()); //std::transform(mData.begin(), mData.end(), factors.begin(), mData.begin(), std::multiplies<double>());
} }

30
src/base/geometry/path/Arc.h
View file

@ -7,30 +7,30 @@ namespace ntk{
class Arc : public Curve<2> class Arc : public Curve<2>
{ {
public: 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: private:
Vector2 mEndOffset; Vector2 mEndOffset;
double mRx{ 0.0 }; double mRx{ 0.0 };
double mRy{ 0.0 }; double mRy{ 0.0 };
double mRotation{ 0 }; double mRotation{ 0 };
bool mLargeArc{ false }; bool mLargeArc{ false };
bool mSweep{ false }; bool mSweep{ false };
}; };
} }

2
src/base/geometry/path/Curve.h
View file

@ -14,7 +14,7 @@ template<std::size_t DIM>
class Curve : public PathElement<DIM> class Curve : public PathElement<DIM>
{ {
public: public:
Curve::Type getType() const override AbstractGeometricItem::Type getType() const override
{ {
return Curve::Type::CURVE; return Curve::Type::CURVE;
} }

4
src/base/geometry/points/Point.h
View file

@ -17,6 +17,8 @@ public:
Point(const Point<2>& p); Point(const Point<2>& p);
Point(const Point<DIM>& p) = default;
Point(const DiscretePoint& point); Point(const DiscretePoint& point);
Point(const Point<DIM>& reference, double offSetX, double offSetY, double offSetZ = 0); Point(const Point<DIM>& reference, double offSetX, double offSetY, double offSetZ = 0);
@ -83,4 +85,4 @@ using Point3 = Point<3>;
using Point2 = Point<2>; using Point2 = Point<2>;
using PointPtr3 = std::unique_ptr<Point<3> >; using PointPtr3 = std::unique_ptr<Point<3> >;
using PointPtr2 = std::unique_ptr<Point<2> >; using PointPtr2 = std::unique_ptr<Point<2> >;

4
src/rendering/visual_elements/basic_shapes/LineNode.cpp
View file

@ -14,7 +14,7 @@ LineNode::Type LineNode::getType()
return Type::Line; return Type::Line;
} }
void LineNode::createOrUpdateGeometry(SceneInfo* sceneInfo) void LineNode::createOrUpdateGeometry(SceneInfo*)
{ {
auto line = std::make_unique<Line2>(mPoints); auto line = std::make_unique<Line2>(mPoints);
mBackgroundItem = std::make_unique<SceneModel>(std::move(line)); mBackgroundItem = std::make_unique<SceneModel>(std::move(line));
@ -61,4 +61,4 @@ void LineNode::setEndEndStyle(LineEndNode::Style style)
mEndEndStyle = style; mEndEndStyle = style;
mGeometryIsDirty = true; mGeometryIsDirty = true;
} }
} }

4
src/rendering/visual_elements/basic_shapes/PolygonNode.cpp
View file

@ -26,7 +26,7 @@ void PolygonNode::setPoints(const std::vector<Point2>& points)
mGeometryIsDirty = true; mGeometryIsDirty = true;
} }
void PolygonNode::createOrUpdateGeometry(SceneInfo* sceneInfo) void PolygonNode::createOrUpdateGeometry(SceneInfo*)
{ {
auto polygon = std::make_unique<Polygon2>(mPoints); auto polygon = std::make_unique<Polygon2>(mPoints);
@ -39,4 +39,4 @@ void PolygonNode::createOrUpdateGeometry(SceneInfo* sceneInfo)
{ {
mBackgroundItem->updateGeometry(std::move(polygon)); mBackgroundItem->updateGeometry(std::move(polygon));
} }
} }

4
src/rendering/visual_elements/nodes/PathNode.cpp
View file

@ -33,7 +33,7 @@ void PathNode::setPathString(const std::string& psPath)
mPathString = psPath; mPathString = psPath;
} }
void PathNode::createOrUpdateGeometry(SceneInfo* sceneInfo) void PathNode::createOrUpdateGeometry(SceneInfo*)
{ {
auto path = std::make_unique<GeometryPath>(); auto path = std::make_unique<GeometryPath>();
PostscriptReader reader; PostscriptReader reader;
@ -48,4 +48,4 @@ void PathNode::createOrUpdateGeometry(SceneInfo* sceneInfo)
{ {
mBackgroundItem->updateGeometry(std::move(path)); mBackgroundItem->updateGeometry(std::move(path));
} }
} }

2
src/rendering/visual_elements/svg/SvgPainter.cpp
View file

@ -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 x = loc.getX() * transform.getScale().mX + transform.getLocation().getX();
const auto y = loc.getY() * transform.getScale().mY + transform.getLocation().getY(); const auto y = loc.getY() * transform.getScale().mY + transform.getLocation().getY();
points[count] = { x, y }; points.push_back({x, y});
count++; count++;
} }
svg_tri->setPoints(points); svg_tri->setPoints(points);