diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:05:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:05:14 +0300 |
commit | 410880552bfaf32f91eaad56bdf2c93c67cbd5c8 (patch) | |
tree | 6eca72d583c71160d9a9a44443728d5bb463ad67 /source/blender/freestyle/intern/view_map | |
parent | e74bd46ede9a957c03821e36b80ad2d2f378bf73 (diff) |
Cleanup: trailing space for freestyle
Diffstat (limited to 'source/blender/freestyle/intern/view_map')
15 files changed, 39 insertions, 39 deletions
diff --git a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp index 3243c4d1fb7..79de3ca497d 100644 --- a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp +++ b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp @@ -49,7 +49,7 @@ ArbitraryGridDensityProvider::ArbitraryGridDensityProvider(OccluderSource& sourc } ArbitraryGridDensityProvider::ArbitraryGridDensityProvider(OccluderSource& source, unsigned numCells) -: GridDensityProvider(source), numCells(numCells) +: GridDensityProvider(source), numCells(numCells) { real proscenium[4]; calculateOptimalProscenium(source, proscenium); diff --git a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp index d98a3238a25..ae0d83a3551 100644 --- a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp +++ b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp @@ -199,7 +199,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap& viewMap, bool extensiveFEdgeSe fe = fe->nextEdge(); } - // If bestOccluderTarget was not found inside the occluder proscenium, + // If bestOccluderTarget was not found inside the occluder proscenium, // we need to expand the occluder proscenium to include it. if ((*ve)->isInImage() && bestOccluderTarget != NULL && ! bestOccluderTargetFound) { // Expand occluder proscenium to enclose bestOccluderTarget @@ -249,7 +249,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap& viewMap, bool extensiveFEdgeSe FEdge *festart = (*ve)->fedgeA(); FEdge *fe = festart; do { - // If not (already) visible and center point inside occluder proscenium, + // If not (already) visible and center point inside occluder proscenium, if (!fe->isInImage() && insideProscenium(occluderProscenium, fe->center2d())) { // Use the feature edge for visibility determination fe->setIsInImage(true); diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp index a97e60d5f60..1eeb6805e7d 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp @@ -193,7 +193,7 @@ void FEdgeXDetector::computeCurvatures(WXVertex *vertex) Vec3r e1, n, v; // one vertex curvature info : CurvatureInfo *C; - float radius = _sphereRadius * _meanEdgeSize; + float radius = _sphereRadius * _meanEdgeSize; // view independent stuff if (_computeViewIndependent) { @@ -369,7 +369,7 @@ void FEdgeXDetector::processCreaseShape(WXShape *iWShape) if (!_computeViewIndependent) return; - // Make a pass on the edges to detect the CREASE + // Make a pass on the edges to detect the CREASE vector<WEdge*>::iterator we, weend; vector<WEdge*> &wedges = iWShape->getEdgeList(); for (we = wedges.begin(), weend = wedges.end(); we != weend; ++we) { diff --git a/source/blender/freestyle/intern/view_map/Functions0D.cpp b/source/blender/freestyle/intern/view_map/Functions0D.cpp index f47e5ff16d5..15319e54f66 100644 --- a/source/blender/freestyle/intern/view_map/Functions0D.cpp +++ b/source/blender/freestyle/intern/view_map/Functions0D.cpp @@ -250,7 +250,7 @@ int Curvature2DAngleF0D::operator()(Interface0DIterator& iter) if ((N1.norm() == 0) && (N2.norm() == 0)) { Exception::raiseException(); result = 0; - return -1; + return -1; } double cosin = N1 * N2; if (cosin > 1) diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h index d2a5870f27a..f3c8957a804 100644 --- a/source/blender/freestyle/intern/view_map/Functions1D.h +++ b/source/blender/freestyle/intern/view_map/Functions1D.h @@ -101,7 +101,7 @@ public: } /*! The operator (). - * \param inter + * \param inter * The Interface1D on which we wish to evaluate the function. * \return the result of the function of type T. */ diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h index 9d373107bfa..44bce375a75 100644 --- a/source/blender/freestyle/intern/view_map/Silhouette.h +++ b/source/blender/freestyle/intern/view_map/Silhouette.h @@ -102,7 +102,7 @@ public: // Implementation of Interface0D return _Point3D.z(); } - /*! Returns the 3D point. */ + /*! Returns the 3D point. */ virtual Vec3r getPoint3D() const { return _Point3D; @@ -126,7 +126,7 @@ public: // Implementation of Interface0D return _Point2D.z(); } - /*! Returns the 2D point. */ + /*! Returns the 2D point. */ virtual Vec2r getPoint2D() const { return Vec2r(_Point2D.x(), _Point2D.y()); @@ -144,16 +144,16 @@ public: // Implementation of Interface0D /*! Returns the nature of the vertex .*/ virtual Nature::VertexNature getNature() const; - /*! Cast the Interface0D in SVertex if it can be. */ + /*! Cast the Interface0D in SVertex if it can be. */ virtual SVertex *castToSVertex(); - /*! Cast the Interface0D in ViewVertex if it can be. */ + /*! Cast the Interface0D in ViewVertex if it can be. */ virtual ViewVertex *castToViewVertex(); - /*! Cast the Interface0D in NonTVertex if it can be. */ + /*! Cast the Interface0D in NonTVertex if it can be. */ virtual NonTVertex *castToNonTVertex(); - /*! Cast the Interface0D in TVertex if it can be. */ + /*! Cast the Interface0D in TVertex if it can be. */ virtual TVertex *castToTVertex(); public: @@ -163,7 +163,7 @@ private: Id _Id; Vec3r _Point3D; Vec3r _Point2D; - set<Vec3r> _Normals; + set<Vec3r> _Normals; vector<FEdge*> _FEdges; // the edges containing this vertex SShape *_Shape; // the shape to which belongs the vertex ViewVertex *_pViewVertex; // The associated viewvertex, in case there is one. @@ -1291,10 +1291,10 @@ protected: unsigned _FrsMaterialIndex; #if 0 bool _hasVisibilityPoint; - Vec3r _VisibilityPointA; // The edge on which the visibility will be computed represented + Vec3r _VisibilityPointA; // The edge on which the visibility will be computed represented Vec3r _VisibilityPointB; // using its 2 extremity points A and B #endif - void *_Face; // In case of exact silhouette, Face is the WFace crossed by Fedge + void *_Face; // In case of exact silhouette, Face is the WFace crossed by Fedge // NOT HANDLED BY THE COPY CONSTRUCTEUR bool _FaceMark; @@ -1418,7 +1418,7 @@ private: const char *_Name; const char *_LibraryPath; BBox<Vec3r> _BBox; - vector<FrsMaterial> _FrsMaterials; + vector<FrsMaterial> _FrsMaterials; float _importance; diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.h b/source/blender/freestyle/intern/view_map/SphericalGrid.h index 5a94a84705d..2310f5ffe2f 100644 --- a/source/blender/freestyle/intern/view_map/SphericalGrid.h +++ b/source/blender/freestyle/intern/view_map/SphericalGrid.h @@ -173,7 +173,7 @@ public: // Accessors: bool orthographicProjection() const; const Vec3r& viewpoint() const; - bool enableQI() const; + bool enableQI() const; private: void getCellCoordinates(const Vec3r& point, unsigned& x, unsigned& y); @@ -317,7 +317,7 @@ inline void SphericalGrid::Iterator::reportDepth(Vec3r origin, Vec3r u, real t) // If the current occluder is the best occludee so far, save it. if (! _foundOccludee || _occludeeDepth > depth) { markCurrentOccludeeCandidate(depth); - } + } } else { #if SPHERICAL_GRID_LOGGING diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp index 4f5b4cba779..34d8ecb3a8d 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp @@ -91,7 +91,7 @@ void SteerableViewMap::Clear() } delete[] _imagesPyramids; _imagesPyramids = 0; - } + } if (!_mapping.empty()) { for (map<unsigned int, double*>::iterator m = _mapping.begin(), mend = _mapping.end(); m != mend; ++m) { delete[] (*m).second; @@ -170,7 +170,7 @@ unsigned SteerableViewMap::getSVMNumber(unsigned id) map<unsigned int, double *>::iterator o = _mapping.find(id); if (o != _mapping.end()) { double *wvalues = (*o).second; - double maxw = 0.0; + double maxw = 0.0; unsigned winner = _nbOrientations + 1; for (unsigned i = 0; i < _nbOrientations; ++i) { double w = wvalues[i]; diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.h b/source/blender/freestyle/intern/view_map/SteerableViewMap.h index 3a660627776..0327b4a460e 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.h +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.h @@ -48,7 +48,7 @@ class FEdge; class ImagePyramid; class GrayImage; -/*! This class checks for every FEdge in which steerable it belongs and stores the mapping allowing to retrieve +/*! This class checks for every FEdge in which steerable it belongs and stores the mapping allowing to retrieve * this information from the FEdge Id. */ class SteerableViewMap diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp index 52769413e79..01a6edad973 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp @@ -95,7 +95,7 @@ ViewShape *ViewMap::viewShape(unsigned id) void ViewMap::AddViewShape(ViewShape *iVShape) { - _shapeIdToIndex[iVShape->getId().getFirst()] = _VShapes.size(); + _shapeIdToIndex[iVShape->getId().getFirst()] = _VShapes.size(); _VShapes.push_back(iVShape); } @@ -305,13 +305,13 @@ static bool ViewEdgeComp(ViewVertex::directedViewEdge& dve1, ViewVertex::directe if (v1.y() > 0) { if (v2.y() < 0) return true; - else + else return (v1.x() > v2.x()); } else { if (v2.y() > 0) return false; - else + else return (v1.x() < v2.x()); } return false; @@ -387,7 +387,7 @@ void TVertex::setBackEdgeB(ViewEdge *iBackEdgeB, bool incoming) void TVertex::Replace(ViewEdge *iOld, ViewEdge *iNew) { - // theoritically, we only replace edges for which this + // theoritically, we only replace edges for which this // view vertex is the B vertex if ((iOld == _FrontEdgeA.first) && (_FrontEdgeA.first->B() == this)) { _FrontEdgeA.first = iNew; @@ -501,7 +501,7 @@ ViewVertexInternal::orientedViewEdgeIterator TVertex::edgesIterator(ViewEdge *iE /**********************************/ /* */ /* */ -/* NonTVertex */ +/* NonTVertex */ /* */ /* */ /**********************************/ diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index 8b73c8aac3a..06ab3183027 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -218,7 +218,7 @@ public: * iB2D * The x,y,z 2D coordinates of the projection of iB3D * iFEdgeB - * The second FEdge + * The second FEdge * id * The id that must be given to that TVertex */ @@ -650,7 +650,7 @@ public: /**********************************/ /* */ /* */ -/* NonTVertex */ +/* NonTVertex */ /* */ /* */ /**********************************/ @@ -1643,7 +1643,7 @@ void ViewShape::SplitEdge(FEdge *fe, const vector<TVertex*>& iViewVertices, vect ViewEdge *vEdge = fe->viewedge(); // We first need to sort the view vertices from farther to closer to fe->vertexA - SVertex *sv, *sv2; + SVertex *sv, *sv2; ViewVertex *vva, *vvb; vector<TVertex*>::const_iterator vv, vvend; for (vv = iViewVertices.begin(), vvend = iViewVertices.end(); vv != vvend; vv++) { @@ -1685,7 +1685,7 @@ void ViewShape::SplitEdge(FEdge *fe, const vector<TVertex*>& iViewVertices, vect if ((vva == 0) || (vvb == 0)) { // that means we're dealing with a closed viewedge (loop) // remove the chain that was starting by the fedge A of vEdge (which is different from fe !!!!) shape->RemoveEdgeFromChain(vEdge->fedgeA()); - // we set + // we set vEdge->setA(*vv); vEdge->setB(*vv); vEdge->setFEdgeA(newEdge); diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index 794c782bb73..5b7576ccd3d 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -1004,7 +1004,7 @@ ViewMap *ViewMapBuilder::BuildViewMap(WingedEdge& we, visibility_algo iAlgo, rea computeInitialViewEdges(we); // Detects cusps - computeCusps(_ViewMap); + computeCusps(_ViewMap); // Compute intersections ComputeIntersections(_ViewMap, sweep_line, epsilon); @@ -1059,7 +1059,7 @@ void ViewMapBuilder::CullViewEdges(ViewMap *ioViewMap, real viewProscenium[4], r cout << "Origin: [" << prosceniumOrigin[0] << ", " << prosceniumOrigin[1] << "]"<< endl; } - // A separate occluder proscenium will also be maintained, starting out the same as the viewport proscenium, and + // A separate occluder proscenium will also be maintained, starting out the same as the viewport proscenium, and // expanding as necessary so that it encompasses the center point of at least one feature edge in each retained view // edge. // The occluder proscenium will be used later to cull occluding triangles before they are inserted into the Grid. @@ -1182,7 +1182,7 @@ void ViewMapBuilder::CullViewEdges(ViewMap *ioViewMap, real viewProscenium[4], r FEdge *festart = (*ve)->fedgeA(); FEdge *fe = festart; do { - // If not (already) visible and center point inside occluder proscenium, + // If not (already) visible and center point inside occluder proscenium, if (!fe->isInImage() && insideProscenium(occluderProscenium, fe->center2d())) { // Use the feature edge for visibility determination fe->setIsInImage(true); @@ -2286,7 +2286,7 @@ void ViewMapBuilder::ComputeSweepLineIntersections(ViewMap *ioViewMap, real epsi for (fe = ioEdges.begin(), fend = ioEdges.end(); fe != fend; fe++) (*fe)->userdata = NULL; - // list containing the new edges resulting from splitting operations. + // list containing the new edges resulting from splitting operations. vector<FEdge*> newEdges; // retrieve the intersected edges: diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h index 440ae93c7df..acde3704625 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h @@ -159,7 +159,7 @@ public: /*! Builds the scene view map returns the list the view map * it is up to the caller to delete this ViewMap * iWRoot - * The root group node containing the WEdge structured scene + * The root group node containing the WEdge structured scene */ ViewMap *BuildViewMap(WingedEdge& we, visibility_algo iAlgo, real epsilon, const BBox<Vec3r>& bbox, unsigned int sceneNumFaces); @@ -180,7 +180,7 @@ public: /*! Computes the 2D scene silhouette edges visibility * iGrid - * For the Ray Casting algorithm. + * For the Ray Casting algorithm. */ void ComputeEdgesVisibility(ViewMap *ioViewMap, WingedEdge& we, const BBox<Vec3r>& bbox, unsigned int sceneNumFaces, visibility_algo iAlgo = ray_casting, real epsilon = 1.0e-6); diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp index 71ae68c06bc..3e80c004b5f 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp @@ -284,7 +284,7 @@ static int load(istream& in, FEdge *fe) load(in, v); fesharp->setNormalB(v); - // Materials + // Materials READ(matindex); fesharp->setaFrsMaterialIndex(matindex); READ(matindex); diff --git a/source/blender/freestyle/intern/view_map/ViewMapIterators.h b/source/blender/freestyle/intern/view_map/ViewMapIterators.h index 469c2c3b29c..b10de13cef7 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapIterators.h @@ -30,7 +30,7 @@ #include "ViewMap.h" -#include "../system/Iterator.h" //soc +#include "../system/Iterator.h" //soc namespace Freestyle { |