[Bf-blender-cvs] [1e8697cd809] master: Cleanup: comments (long lines) in freestyle
Campbell Barton
noreply at git.blender.org
Wed May 1 00:05:39 CEST 2019
Commit: 1e8697cd8094183a3f356bf8564284a31ffb89fc
Author: Campbell Barton
Date: Tue Apr 30 17:50:57 2019 +1000
Branches: master
https://developer.blender.org/rB1e8697cd8094183a3f356bf8564284a31ffb89fc
Cleanup: comments (long lines) in freestyle
===================================================================
M source/blender/freestyle/intern/application/AppView.h
M source/blender/freestyle/intern/application/Controller.cpp
M source/blender/freestyle/intern/application/Controller.h
M source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
M source/blender/freestyle/intern/geometry/FastGrid.h
M source/blender/freestyle/intern/geometry/FitCurve.cpp
M source/blender/freestyle/intern/geometry/GeomCleaner.h
M source/blender/freestyle/intern/geometry/GeomUtils.cpp
M source/blender/freestyle/intern/geometry/GeomUtils.h
M source/blender/freestyle/intern/geometry/Grid.cpp
M source/blender/freestyle/intern/geometry/Grid.h
M source/blender/freestyle/intern/geometry/GridHelpers.cpp
M source/blender/freestyle/intern/geometry/GridHelpers.h
M source/blender/freestyle/intern/geometry/SweepLine.h
M source/blender/freestyle/intern/image/GaussianFilter.h
M source/blender/freestyle/intern/image/Image.h
M source/blender/freestyle/intern/image/ImagePyramid.cpp
M source/blender/freestyle/intern/image/ImagePyramid.h
M source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
M source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
M source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
M source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
M source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
M source/blender/freestyle/intern/scene_graph/Node.h
M source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.cpp
M source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
M source/blender/freestyle/intern/scene_graph/NodeGroup.cpp
M source/blender/freestyle/intern/scene_graph/NodeGroup.h
M source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
M source/blender/freestyle/intern/scene_graph/Rep.cpp
M source/blender/freestyle/intern/scene_graph/Rep.h
M source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
M source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp
M source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
M source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
M source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
M source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
M source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
M source/blender/freestyle/intern/stroke/Canvas.cpp
M source/blender/freestyle/intern/stroke/Canvas.h
M source/blender/freestyle/intern/stroke/Chain.cpp
M source/blender/freestyle/intern/stroke/ChainingIterators.cpp
M source/blender/freestyle/intern/stroke/ChainingIterators.h
M source/blender/freestyle/intern/stroke/Curve.cpp
M source/blender/freestyle/intern/stroke/Curve.h
M source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h
M source/blender/freestyle/intern/stroke/CurveIterators.h
M source/blender/freestyle/intern/stroke/Operators.cpp
M source/blender/freestyle/intern/stroke/Operators.h
M source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
M source/blender/freestyle/intern/stroke/Predicates0D.h
M source/blender/freestyle/intern/stroke/Predicates1D.h
M source/blender/freestyle/intern/stroke/QInformationMap.h
M source/blender/freestyle/intern/stroke/Stroke.cpp
M source/blender/freestyle/intern/stroke/Stroke.h
M source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h
M source/blender/freestyle/intern/stroke/StrokeIterators.h
M source/blender/freestyle/intern/stroke/StrokeRenderer.h
M source/blender/freestyle/intern/stroke/StrokeRep.cpp
M source/blender/freestyle/intern/stroke/StrokeShader.h
M source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
M source/blender/freestyle/intern/system/PointerSequence.h
M source/blender/freestyle/intern/system/PythonInterpreter.h
M source/blender/freestyle/intern/system/StringUtils.cpp
M source/blender/freestyle/intern/view_map/BoxGrid.h
M source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
M source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
M source/blender/freestyle/intern/view_map/FEdgeXDetector.h
M source/blender/freestyle/intern/view_map/Functions0D.cpp
M source/blender/freestyle/intern/view_map/Functions0D.h
M source/blender/freestyle/intern/view_map/Functions1D.h
M source/blender/freestyle/intern/view_map/GridDensityProvider.h
M source/blender/freestyle/intern/view_map/Interface0D.h
M source/blender/freestyle/intern/view_map/Interface1D.h
M source/blender/freestyle/intern/view_map/Silhouette.cpp
M source/blender/freestyle/intern/view_map/Silhouette.h
M source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
M source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
M source/blender/freestyle/intern/view_map/SphericalGrid.cpp
M source/blender/freestyle/intern/view_map/SphericalGrid.h
M source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
M source/blender/freestyle/intern/view_map/SteerableViewMap.h
M source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
M source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
M source/blender/freestyle/intern/view_map/ViewMap.cpp
M source/blender/freestyle/intern/view_map/ViewMap.h
M source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
M source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
M source/blender/freestyle/intern/view_map/ViewMapBuilder.h
M source/blender/freestyle/intern/view_map/ViewMapIO.cpp
M source/blender/freestyle/intern/view_map/ViewMapIterators.h
M source/blender/freestyle/intern/view_map/ViewMapTesselator.h
M source/blender/freestyle/intern/winged_edge/Curvature.cpp
M source/blender/freestyle/intern/winged_edge/WEdge.cpp
M source/blender/freestyle/intern/winged_edge/WEdge.h
M source/blender/freestyle/intern/winged_edge/WXEdge.cpp
M source/blender/freestyle/intern/winged_edge/WXEdge.h
M source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
M source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
M source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
M source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
===================================================================
diff --git a/source/blender/freestyle/intern/application/AppView.h b/source/blender/freestyle/intern/application/AppView.h
index 0b029895b8c..deb099349cb 100644
--- a/source/blender/freestyle/intern/application/AppView.h
+++ b/source/blender/freestyle/intern/application/AppView.h
@@ -43,7 +43,7 @@ class AppView {
virtual ~AppView();
public:
- //inherited
+ // inherited
inline unsigned int width()
{
return _width;
@@ -246,7 +246,7 @@ class AppView {
protected:
float _Fovy;
- //The root node container
+ // The root node container
NodeGroup _RootNode;
NodeDrawingStyle *_ModelRootNode;
NodeDrawingStyle *_SilhouetteRootNode;
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index d516b865eab..4d5ffda5f38 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -179,7 +179,7 @@ Controller::~Controller()
_ProgressBar = NULL;
}
- //delete _current_dirs;
+ // delete _current_dirs;
}
void Controller::setView(AppView *iView)
@@ -300,7 +300,7 @@ int Controller::LoadMesh(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph
_RootNode->AddChild(new NodeViewLayer(*re->scene, *view_layer));
sceneHashFunc.reset();
- //blenderScene->accept(sceneHashFunc);
+ // blenderScene->accept(sceneHashFunc);
_RootNode->accept(sceneHashFunc);
if (G.debug & G_DEBUG_FREESTYLE) {
cout << "Scene hash : " << sceneHashFunc.toString() << endl;
@@ -626,7 +626,7 @@ void Controller::ComputeViewMap()
void Controller::ComputeSteerableViewMap()
{
-#if 0 //soc
+#if 0 // soc
if ((!_Canvas) || (!_ViewMap))
return;
diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h
index b287a515ba1..613ea2cb45c 100644
--- a/source/blender/freestyle/intern/application/Controller.h
+++ b/source/blender/freestyle/intern/application/Controller.h
@@ -58,7 +58,7 @@ class Controller {
void setPassZ(float *buf, int width, int height);
void setContext(bContext *C);
- //soc
+ // soc
void init_options();
int LoadMesh(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph);
@@ -175,15 +175,15 @@ class Controller {
private:
// Main Window:
- //AppMainWindow *_pMainWindow;
+ // AppMainWindow *_pMainWindow;
// List of models currently loaded
vector<string> _ListOfModels;
// Current directories
- //ConfigIO* _current_dirs;
+ // ConfigIO* _current_dirs;
- //View
+ // View
// 3D
AppView *_pView;
@@ -195,7 +195,7 @@ class Controller {
RenderMonitor *_pRenderMonitor;
- //Model
+ // Model
// Drawing Structure
NodeGroup *_RootNode;
@@ -217,7 +217,7 @@ class Controller {
#endif
// debug
- //NodeUser<ViewMap> *_ViewMapNode; // FIXME
+ // NodeUser<ViewMap> *_ViewMapNode; // FIXME
// Chronometer:
Chronometer _Chrono;
@@ -229,7 +229,7 @@ class Controller {
int _edgeTesselationNature;
FastGrid _Grid;
- //HashGrid _Grid;
+ // HashGrid _Grid;
BBox<Vec3r> _Scene3dBBox;
unsigned int _SceneNumFaces;
@@ -241,9 +241,9 @@ class Controller {
int _render_count;
- //AppStyleWindow *_pStyleWindow;
- //AppOptionsWindow *_pOptionsWindow;
- //AppDensityCurvesWindow *_pDensityCurvesWindow;
+ // AppStyleWindow *_pStyleWindow;
+ // AppOptionsWindow *_pOptionsWindow;
+ // AppDensityCurvesWindow *_pDensityCurvesWindow;
ViewMapBuilder::visibility_algo _VisibilityAlgo;
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index 63ff4cc5457..7ef3e23d379 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -384,9 +384,10 @@ static void prepare(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph)
bool logical_and = ((lineset->flags & FREESTYLE_LINESET_FE_AND) != 0);
// negation operator
if (lineset->flags & FREESTYLE_LINESET_FE_NOT) {
- // convert an Exclusive condition into an Inclusive equivalent using De Morgan's laws:
- // NOT (X OR Y) --> (NOT X) AND (NOT Y)
- // NOT (X AND Y) --> (NOT X) OR (NOT Y)
+ // convert an Exclusive condition into an
+ // Inclusive equivalent using De Morgan's laws:
+ // - NOT (X OR Y) --> (NOT X) AND (NOT Y)
+ // - NOT (X AND Y) --> (NOT X) OR (NOT Y)
for (int i = 0; i < num_edge_types; i++)
conditions[i].value *= -1;
logical_and = !logical_and;
diff --git a/source/blender/freestyle/intern/geometry/FastGrid.h b/source/blender/freestyle/intern/geometry/FastGrid.h
index e2345d4831c..a3b20661fa6 100644
--- a/source/blender/freestyle/intern/geometry/FastGrid.h
+++ b/source/blender/freestyle/intern/geometry/FastGrid.h
@@ -28,7 +28,8 @@ namespace Freestyle {
/*! Class to define a regular grid used for ray casting computations
* We don't use a hashtable here. The grid is explicitly stored for faster computations.
- * However, this might result in significant increase in memory usage (compared to the regular grid)
+ * However, this might result in significant increase in memory usage
+ * (compared to the regular grid).
*/
class FastGrid : public Grid {
public:
@@ -43,8 +44,9 @@ class FastGrid : public Grid {
clear();
}
- /*! clears the grid
- * Deletes all the cells, clears the hashtable, resets size, size of cell, number of cells.
+ /*!
+ * clears the grid
+ * Deletes all the cells, clears the hashtable, resets size, size of cell, number of cells.
*/
virtual void clear();
diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp
index b0408826763..368c3d2f46c 100644
--- a/source/blender/freestyle/intern/geometry/FitCurve.cpp
+++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp
@@ -181,8 +181,8 @@ static BezierCurve GenerateBezier(
alpha_l = det_X_C1 / det_C0_C1;
alpha_r = det_C0_X / det_C0_C1;
- /* If alpha negative, use the Wu/Barsky heuristic (see text) (if alpha is 0, you get coincident control points
- * that lead to divide by zero in any subsequent NewtonRaphsonRootFind() call).
+ /* If alpha negative, use the Wu/Barsky heuristic (see text) (if alpha is 0, you get coincident
+ * control points that lead to divide by zero in any subsequent NewtonRaphsonRootFind() call).
*/
if (alpha_l < 1.0e-6 || alpha_r < 1.0e-6) {
double dist = V2DistanceBetween2Points(&d[last], &d[first]) / 3.0;
@@ -194,8 +194,9 @@ static BezierCurve GenerateBezier(
return bezCurve;
}
- /* First and last control points of the Bezier curve are positioned exactly at the first and last data points
- * Control points 1 and 2 are positioned an alpha distance out on the tangent vectors, left and right, respectively
+ /* First and last control points of the Bezier curve are positioned exactly at the first and last
+ * data points Control points 1 and 2 are positioned an alpha distance out on the tangent
+ * vectors, left and right, respectively
*/
bezCurve[0] = d[first];
bezCurve[3] = d[last];
diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.h b/source/blender/freestyle/intern/geometry/GeomCleaner.h
index 5fedf94b479..253d3553010 100644
--- a/source/blender/freestyle/intern/geometry/GeomCleaner.h
+++ b/source/blender/freestyle/intern/geometry/GeomCleaner.h
@@ -45,20 +45,24 @@ class GeomCleaner {
/*! Sorts an array of Indexed vertices
* iVertices
- * Array of vertices to sort. It is organized as a float series of vertex coordinates: XYZXYZXYZ...
+ * Array of vertices to sort.
+ * It is organized as a float series of vertex coordinates: XYZXYZXYZ...
* iVSize
* The size of iVertices array.
* iIndices
- * The array containing the vertex indices (used to refer to the vertex coordinates in an indexed face). Each
- * element is an unsignedeger multiple of 3.
+ * The array containing the vertex indices
+ * (used to refer to the vertex coordinates in an indexed face).
+ * Each element is an unsignedeger multiple of 3.
* iISize
* The size of iIndices array
* oVertices
- * Output of sorted vertices. A vertex v1 precedes another one v2 in this array if v1.x<v2.x,
- * or v1.x=v2.x && v1.y < v2.y or v1.x=v2.y && v1.y=v2.y && v1.z < v2.z.
+ * Output of sorted vertices.
+ * A vertex v1 precedes another one v2 in this array
+ * if v1.x<v2.x, or v1.x=v2.x && v1.y < v2.y or v1.x=v2.y && v1.y=v2.y && v1.z < v2.z.
* The array is organized as a 3-float serie giving the vertices coordinates: XYZXYZXYZ...
* oIndices
- * Output corresponding to the iIndices array but reorganized in order to match the sorted vertex array.
+ * Output corresponding to the iIndices array but reorganized in
+ * order to match the sorted vertex array.
*/
static void SortIndexedVertexArray(const float *iVertices,
unsigned iVSize,
@@ -67,13 +71,16 @@ class GeomCleaner {
float **oVertices,
unsigned **oIndices);
- /*! Compress a SORTED indexed vertex array by eliminating multiple appearing occurences of a single vertex.
+ /*! Compress a SORTED indexed vertex array by eliminating multiple
+ * appearing occurences of a single vertex.
* iVertices
- * The SORTED vertex array to compress. It is organized as a float series of vertex coordinates: XYZXYZXYZ...
+ * The SORTED vertex array to compress.
+ * It is organized as a float series of vertex coordinates: XYZXYZXYZ...
* iVSize
* The size of iVertices array.
* iIndices
- * The array containing the vertex indices (used to refer to the vertex coordinates in an indexed face).
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list