diff --git a/code/AssetLib/IFC/IFCCurve.cpp b/code/AssetLib/IFC/IFCCurve.cpp index 9bdf79070..44165befc 100644 --- a/code/AssetLib/IFC/IFCCurve.cpp +++ b/code/AssetLib/IFC/IFCCurve.cpp @@ -68,12 +68,12 @@ public: } // -------------------------------------------------- - bool IsClosed() const { + bool IsClosed() const override { return true; } // -------------------------------------------------- - size_t EstimateSampleCount(IfcFloat a, IfcFloat b) const { + size_t EstimateSampleCount(IfcFloat a, IfcFloat b) const override { ai_assert( InRange( a ) ); ai_assert( InRange( b ) ); @@ -87,7 +87,7 @@ public: } // -------------------------------------------------- - ParamRange GetParametricRange() const { + ParamRange GetParametricRange() const override { return std::make_pair(static_cast( 0. ), static_cast( AI_MATH_TWO_PI / conv.angle_scale )); } @@ -107,7 +107,7 @@ public: ~Circle() override = default; // -------------------------------------------------- - IfcVector3 Eval(IfcFloat u) override const { + IfcVector3 Eval(IfcFloat u) const override { u = -conv.angle_scale * u; return location + static_cast(entity.Radius)*(static_cast(std::cos(u))*p[0] + static_cast(std::sin(u))*p[1]); @@ -130,7 +130,7 @@ public: } // -------------------------------------------------- - IfcVector3 Eval(IfcFloat u) const { + IfcVector3 Eval(IfcFloat u) const override { u = -conv.angle_scale * u; return location + static_cast(entity.SemiAxis1)*static_cast(std::cos(u))*p[0] + static_cast(entity.SemiAxis2)*static_cast(std::sin(u))*p[1]; @@ -153,17 +153,17 @@ public: } // -------------------------------------------------- - bool IsClosed() const { + bool IsClosed() const override { return false; } // -------------------------------------------------- - IfcVector3 Eval(IfcFloat u) const { + IfcVector3 Eval(IfcFloat u) const override { return p + u*v; } // -------------------------------------------------- - size_t EstimateSampleCount(IfcFloat a, IfcFloat b) const { + size_t EstimateSampleCount(IfcFloat a, IfcFloat b) const override { ai_assert( InRange( a ) ); ai_assert( InRange( b ) ); // two points are always sufficient for a line segment @@ -172,7 +172,7 @@ public: // -------------------------------------------------- - void SampleDiscrete(TempMesh& out,IfcFloat a, IfcFloat b) const { + void SampleDiscrete(TempMesh& out,IfcFloat a, IfcFloat b) const override { ai_assert( InRange( a ) ); ai_assert( InRange( b ) ); @@ -186,7 +186,7 @@ public: } // -------------------------------------------------- - ParamRange GetParametricRange() const { + ParamRange GetParametricRange() const override { const IfcFloat inf = std::numeric_limits::infinity(); return std::make_pair(-inf,+inf); @@ -232,7 +232,7 @@ public: } // -------------------------------------------------- - IfcVector3 Eval(IfcFloat u) const { + IfcVector3 Eval(IfcFloat u) const override { if (curves.empty()) { return IfcVector3(); } @@ -252,7 +252,7 @@ public: } // -------------------------------------------------- - size_t EstimateSampleCount(IfcFloat a, IfcFloat b) const { + size_t EstimateSampleCount(IfcFloat a, IfcFloat b) const override { ai_assert( InRange( a ) ); ai_assert( InRange( b ) ); size_t cnt = 0; @@ -273,7 +273,7 @@ public: } // -------------------------------------------------- - void SampleDiscrete(TempMesh& out,IfcFloat a, IfcFloat b) const { + void SampleDiscrete(TempMesh& out,IfcFloat a, IfcFloat b) const override { ai_assert( InRange( a ) ); ai_assert( InRange( b ) ); @@ -291,7 +291,7 @@ public: } // -------------------------------------------------- - ParamRange GetParametricRange() const { + ParamRange GetParametricRange() const override { return std::make_pair(static_cast( 0. ),total); } @@ -371,27 +371,27 @@ public: } // -------------------------------------------------- - IfcVector3 Eval(IfcFloat p) const { + IfcVector3 Eval(IfcFloat p) const override { ai_assert(InRange(p)); return base->Eval( TrimParam(p) ); } // -------------------------------------------------- - size_t EstimateSampleCount(IfcFloat a, IfcFloat b) const { + size_t EstimateSampleCount(IfcFloat a, IfcFloat b) const override { ai_assert( InRange( a ) ); ai_assert( InRange( b ) ); return base->EstimateSampleCount(TrimParam(a),TrimParam(b)); } // -------------------------------------------------- - void SampleDiscrete(TempMesh& out,IfcFloat a,IfcFloat b) const { + void SampleDiscrete(TempMesh& out,IfcFloat a,IfcFloat b) const override { ai_assert(InRange(a)); ai_assert(InRange(b)); return base->SampleDiscrete(out,TrimParam(a),TrimParam(b)); } // -------------------------------------------------- - ParamRange GetParametricRange() const { + ParamRange GetParametricRange() const override { return std::make_pair(static_cast( 0. ),maxval); } @@ -429,7 +429,7 @@ public: } // -------------------------------------------------- - IfcVector3 Eval(IfcFloat p) const { + IfcVector3 Eval(IfcFloat p) const override { ai_assert(InRange(p)); const size_t b = static_cast(std::floor(p)); @@ -442,14 +442,14 @@ public: } // -------------------------------------------------- - size_t EstimateSampleCount(IfcFloat a, IfcFloat b) const { + size_t EstimateSampleCount(IfcFloat a, IfcFloat b) const override { ai_assert(InRange(a)); ai_assert(InRange(b)); return static_cast( std::ceil(b) - std::floor(a) ); } // -------------------------------------------------- - ParamRange GetParametricRange() const { + ParamRange GetParametricRange() const override { return std::make_pair(static_cast( 0. ),static_cast(points.size()-1)); } @@ -514,7 +514,7 @@ size_t Curve::EstimateSampleCount(IfcFloat a, IfcFloat b) const { ai_assert( InRange( a ) ); ai_assert( InRange( b ) ); - // arbitrary default value, deriving classes should supply better suited values + // arbitrary default value, deriving classes should supply better-suited values return 16; }