diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-25 08:26:24 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2015-07-20 00:17:54 +0300 |
| commit | 67057865405700572b29e1e3ba1f660c9be39152 (patch) | |
| tree | ee1e43069eab9beb6b77de29d8175697b551243d /source/blender/freestyle/intern/view_map | |
| parent | 431cee2ba0ee8d45e0c0104c72bb1ad3d1f0d238 (diff) | |
Freestyle: minor optimization for space from mesh importing to feature edge detection.
Several class member variables were removed (at the cost of computing their values
when retrieved) or changed to a type of smaller size. Also fixed whitespace.
Diffstat (limited to 'source/blender/freestyle/intern/view_map')
| -rw-r--r-- | source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp | 6 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/view_map/FEdgeXDetector.h | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp index 9827ec68c5d..5ec8b545b4c 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp @@ -55,8 +55,10 @@ void FEdgeXDetector::processShapes(WingedEdge& we) if (_pRenderMonitor && _pRenderMonitor->testBreak()) break; wxs = dynamic_cast<WXShape*>(*it); +#if 0 wxs->bbox(Min, Max); _bbox_diagonal = (Max - Min).norm(); +#endif if (_changes) { vector<WFace*>& wfaces = wxs->GetFaceList(); for (vector<WFace*>::iterator wf = wfaces.begin(), wfend = wfaces.end(); wf != wfend; ++wf) { @@ -117,7 +119,11 @@ void FEdgeXDetector::preProcessShape(WXShape *iWShape) _minKr = FLT_MAX; _maxKr = -FLT_MAX; _nPoints = 0; +#if 0 _meanEdgeSize = iWShape->getMeanEdgeSize(); +#else + _meanEdgeSize = iWShape->ComputeMeanEdgeSize(); +#endif vector<WFace*>& wfaces = iWShape->GetFaceList(); vector<WFace*>::iterator f, fend; diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h index 8170fc5baab..9087d05939a 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h @@ -58,7 +58,9 @@ public: _pProgressBar = NULL; _pRenderMonitor = NULL; _computeViewIndependent = true; +#if 0 _bbox_diagonal = 1.0; +#endif _meanEdgeSize = 0; _computeRidgesAndValleys = true; _computeSuggestiveContours = true; @@ -211,7 +213,9 @@ public: protected: Vec3r _Viewpoint; +#if 0 real _bbox_diagonal; // diagonal of the current processed shape bbox +#endif //oldtmp values bool _computeViewIndependent; real _meanK1; |