diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-04 12:01:10 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-04 18:47:31 +0400 |
commit | 62bf22e27b47fd929e54c4e127a1bba02faf5f34 (patch) | |
tree | 4214ca2c050a8f281140e49fda9b2590b42d98e5 /source/blender/freestyle/intern/stroke | |
parent | 685d785c98c9b1ee3e7da6e1a148ae2b911e8998 (diff) |
Freestyle: Removed SVertex _curvatureFredo and _directionFredo and their getter/setter methods..
These data elements are undocumented and of little use. For now they are commented out
in the implementation in favor of less memory consumption, and a very limited support for
these data components in the Python API was just removed (should be easy to recover).
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
-rw-r--r-- | source/blender/freestyle/intern/stroke/Curve.cpp | 6 | ||||
-rw-r--r-- | source/blender/freestyle/intern/stroke/Curve.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp index af9c8c2869d..e5dc27a0c57 100644 --- a/source/blender/freestyle/intern/stroke/Curve.cpp +++ b/source/blender/freestyle/intern/stroke/Curve.cpp @@ -475,7 +475,6 @@ real CurvePoint::curvature2d_as_angle() const return __A->curvature2d_as_angle(); return ((1 - _t2d) * __A->curvature2d_as_angle() + _t2d * __B->curvature2d_as_angle()); } -#endif real CurvePoint::curvatureFredo() const { @@ -494,6 +493,7 @@ Vec2d CurvePoint::directionFredo () const return __A->directionFredo(); return ((1 - _t2d) * __A->directionFredo() + _t2d * __B->directionFredo()); } +#endif /**********************************/ /* */ @@ -813,14 +813,12 @@ real Curve::local_average_density(float sigma, int iCombination ) const return result; #endif } -#endif /* UNUSED */ // #define EPS_CURVA_DIR 0.01 void Curve::computeCurvatureAndOrientation () { -#if 0 const_vertex_iterator v = vertices_begin(), vend = vertices_end(), v2, prevV, v0; Vec2d p0, p1, p2; Vec3r p; @@ -924,7 +922,7 @@ void Curve::computeCurvatureAndOrientation () p0 = p1; p1 = p2; } -#endif } +#endif } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 7e3b6732bff..fd4150c6c13 100644 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -337,10 +337,10 @@ public: Vec3r curvature2d_as_vector() const; /*! angle in radians */ real curvature2d_as_angle() const; -#endif real curvatureFredo() const; Vec2d directionFredo() const; +#endif }; @@ -422,8 +422,10 @@ public: return "Curve"; } +#if 0 /* fredo's curvature storage */ void computeCurvatureAndOrientation(); +#endif /*! Adds a single vertex (CurvePoint) at the end of the Curve */ inline void push_vertex_back(Vertex *iVertex) |