Cleanup: tweak Freestyle #includes in preparation for clang-format sorting

2020-03-06 16:45:16 +01:00
parent 96e2bd8493
commit 85424397b1
38 changed files with 78 additions and 1 deletions
@@ -1,4 +1,6 @@
 /* Pre-compiled headers, see: D2606. */
+
+/* clang-format off */
 #include <Python.h>
 #include <pthread.h>
 #include <string>
@@ -45,3 +47,5 @@
 #include "intern/python/BPy_ViewMap.h"
 #include "intern/python/BPy_ViewShape.h"
 #include "intern/python/Director.h"
+
+/* clang-format on */
@@ -18,6 +18,7 @@
 * \ingroup freestyle
 */

+/* clang-format off */
 #include "Controller.h"
 #include "AppView.h"
 #include "../image/Image.h"
@@ -28,7 +29,7 @@
 #include "../stroke/StyleModule.h"

 #include "../system/StringUtils.h"
-
+/* clang-format on */
 namespace Freestyle {

 AppCanvas::AppCanvas() : Canvas()
@@ -22,6 +22,7 @@
 * \brief Configuration file
 */

+/* clang-format off */
 #include <string>
 #include <algorithm>
 #include "../system/Precision.h"
@@ -29,6 +30,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */

 using namespace std;

@@ -18,6 +18,7 @@
 * \ingroup freestyle
 */

+/* clang-format off */
 #include <iostream>

 #include "Controller.h"
@@ -45,6 +46,7 @@ extern "C" {

 #include "FRS_freestyle.h"
 }
+/* clang-format on */

 namespace Freestyle {

@@ -21,6 +21,7 @@
 * \ingroup freestyle
 */

+/* clang-format off */
 #include "AppConfig.h"
 #include "../geometry/Geom.h"
 #include "../geometry/BBox.h"
@@ -32,6 +33,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */

 namespace Freestyle {

@@ -18,6 +18,7 @@
 * \ingroup freestyle
 */

+/* clang-format off */
 extern "C" {
 #include <Python.h>
 }
@@ -69,6 +70,7 @@ extern "C" {
 #include "DNA_freestyle_types.h"

 #include "FRS_freestyle.h"
+/* clang-format off */

 namespace Freestyle {

@@ -21,6 +21,7 @@
 * \ingroup freestyle
 */

+/* clang-format off */
 #include <string.h>
 #include <float.h>

@@ -63,6 +64,7 @@ extern "C" {
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */

 namespace Freestyle {

@@ -18,6 +18,7 @@
 * \ingroup freestyle
 */

+/* clang-format off */
 #include "BlenderStrokeRenderer.h"

 #include "../application/AppConfig.h"
@@ -67,6 +68,7 @@ extern "C" {
 }

 #include <limits.h>
+/* clang-format on */

 namespace Freestyle {

@@ -22,6 +22,7 @@
 * \brief A class to hold a bounding box
 */

+/* clang-format off */
 #include <stdlib.h>
 #include <algorithm>

@@ -30,6 +31,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */

 namespace Freestyle {

@@ -20,11 +20,13 @@
 * \brief from "Graphics Gems", Academic Press, 1990
 */

+/* clang-format off */
 #include <cstdlib>  // for malloc and free
 #include <stdio.h>
 #include <math.h>

 #include "FitCurve.h"
+/* clang-format on */

 using namespace std;

@@ -19,6 +19,7 @@
 * \brief Class to define a cleaner of geometry providing a set of useful tools
 */

+/* clang-format off */
 #if 0
 #  if defined(__GNUC__) && (__GNUC__ >= 3)
 // hash_map is not part of the C++ standard anymore;
@@ -38,6 +39,7 @@
 #include "../system/TimeUtils.h"

 #include "BKE_global.h"
+/* clang-format on */

 using namespace std;

@@ -29,8 +29,10 @@
 * \ingroup freestyle
 */

+/* clang-format off */
 #include "matrix_util.h"
 #include "normal_cycle.h"
+/* clang-format on */

 namespace Freestyle {

@@ -19,6 +19,7 @@
 * \brief Class to define a canvas designed to draw style modules
 */

+/* clang-format off */
 #include <sstream>
 #include <vector>

@@ -45,6 +46,7 @@ extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 }
+/* clang-format on */

 using namespace std;

@@ -19,10 +19,12 @@
 * \brief Class to define a chain of viewedges.
 */

+/* clang-format off */
 #include "Chain.h"

 #include "../view_map/ViewMapIterators.h"
 #include "../view_map/ViewMapAdvancedIterators.h"
+/* clang-format on */

 namespace Freestyle {

@@ -22,6 +22,7 @@
 * \brief Chaining iterators
 */

+/* clang-format off */
 #include <iostream>

 #include "Predicates1D.h"
@@ -31,6 +32,7 @@
 #include "../view_map/ViewMap.h"
 #include "../view_map/ViewMapIterators.h"
 #include "../view_map/ViewMapAdvancedIterators.h"
+/* clang-format on */

 // using namespace ViewEdgeInternal;

@@ -19,6 +19,7 @@
 * \brief Class to define a container for curves
 */

+/* clang-format off */
 #include <stdio.h> /* printf */

 #include "Curve.h"
@@ -27,6 +28,7 @@

 #include "BKE_global.h"
 #include "BLI_utildefines.h"
+/* clang-format on */

 namespace Freestyle {

@@ -19,6 +19,7 @@
 * \brief Class gathering stroke creation algorithms
 */

+/* clang-format off */
 #include <algorithm>
 #include <stdexcept>

@@ -29,6 +30,7 @@
 #include "CurveIterators.h"

 #include "BKE_global.h"
+/* clang-format on */

 namespace Freestyle {

@@ -19,8 +19,10 @@
 * \brief Class to define the Postscript rendering of a stroke
 */

+/* clang-format off */
 #include "Canvas.h"
 #include "PSStrokeRenderer.h"
+/* clang-format on */

 namespace Freestyle {

@@ -22,6 +22,7 @@
 * \brief Class gathering stroke creation algorithms
 */

+/* clang-format off */
 #include <string>

 #include "AdvancedFunctions1D.h"
@@ -34,6 +35,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */

 namespace Freestyle {

@@ -19,6 +19,7 @@
 * \brief Classes to define a stroke
 */

+/* clang-format off */
 #include "Stroke.h"
 #include "StrokeIterators.h"
 #include "StrokeAdvancedIterators.h"
@@ -26,6 +27,7 @@

 #include "BKE_global.h"
 #include "BKE_node.h"
+/* clang-format on */

 namespace Freestyle {

@@ -19,9 +19,11 @@
 * \brief Class to define a layer of strokes.
 */

+/* clang-format off */
 #include "Canvas.h"
 #include "Stroke.h"
 #include "StrokeLayer.h"
+/* clang-format on */

 namespace Freestyle {

@@ -22,6 +22,7 @@
 * \brief Classes to render a stroke with OpenGL
 */

+/* clang-format off */
 #include <map>
 #include <string.h>
 #include <algorithm>
@@ -36,6 +37,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */

 namespace Freestyle {

@@ -19,6 +19,7 @@
 * \brief Class to define the representation of a stroke (for display purpose)
 */

+/* clang-format off */
 #include "Stroke.h"
 #include "StrokeIterators.h"
 #include "StrokeAdvancedIterators.h"
@@ -26,6 +27,7 @@
 #include "StrokeRep.h"

 #include "BKE_global.h"
+/* clang-format on */

 using namespace std;

@@ -19,12 +19,14 @@
 * \brief Class to build a Node Tree designed to be displayed from a set of strokes structure.
 */

+/* clang-format off */
 #include "StrokeAdvancedIterators.h"
 #include "StrokeTesselator.h"

 #include "../scene_graph/OrientedLineRep.h"
 #include "../scene_graph/NodeGroup.h"
 #include "../scene_graph/NodeShape.h"
+/* clang-format on */

 namespace Freestyle {

@@ -34,9 +34,11 @@
 #ifndef TEXTSTROKERENDERER_H
 #define TEXTSTROKERENDERER_H

+/* clang-format off */
 #include "StrokeRenderer.h"
 #include "../system/FreestyleConfig.h"
 #include <fstream>
+/* clang-format on */

 namespace Freestyle {

@@ -22,6 +22,7 @@
 * \brief Python Interpreter
 */

+/* clang-format off */
 #include <iostream>

 extern "C" {
@@ -48,6 +49,7 @@ extern "C" {

 #include "bpy_capi_utils.h"
 }
+/* clang-format on */

 namespace Freestyle {

@@ -19,10 +19,12 @@
 * \brief String utilities
 */

+/* clang-format off */
 // soc #include <qfileinfo.h>

 #include "FreestyleConfig.h"
 #include "StringUtils.h"
+/* clang-format on */

 namespace Freestyle {

@@ -22,6 +22,7 @@
 * \brief String utilities
 */

+/* clang-format off */
 #include <cstring>
 #include <iostream>
 #include <sstream>
@@ -32,6 +33,7 @@ extern "C" {
 #include "BLI_string.h"
 #include "BLI_path_util.h"
 }
+/* clang-format on */

 using namespace std;

@@ -22,6 +22,7 @@
 * \brief Class to define a cell grid surrounding the projected image of a scene
 */

+/* clang-format off */
 #include <stdexcept>
 #include <algorithm>
 #include <memory>
@@ -36,6 +37,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */

 namespace Freestyle {

@@ -20,6 +20,7 @@
 * implies that this geom engine has as member data the viewpoint, transformations, projections...
 */

+/* clang-format off */
 #include <cstring>
 #include <cstdio>

@@ -29,6 +30,7 @@
 #include "../geometry/GeomUtils.h"

 #include "BKE_global.h"
+/* clang-format on */

 using namespace std;

@@ -24,6 +24,7 @@

 #define SPHERICAL_GRID_LOGGING 0

+/* clang-format off */
 // I would like to avoid using deque because including ViewMap.h and <deque> or <vector> separately
 // results in redefinitions of identifiers. ViewMap.h already includes <vector> so it should be a
 // safe fall-back.
@@ -47,6 +48,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */

 namespace Freestyle {

@@ -20,6 +20,7 @@
 * to.
 */

+/* clang-format off */
 #include <sstream>

 #include "Silhouette.h"
@@ -37,6 +38,7 @@ extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 }
+/* clang-format on */

 namespace Freestyle {

@@ -19,6 +19,7 @@
 * \brief Classes to define a View Map (ViewVertex, ViewEdge, etc.)
 */

+/* clang-format off */
 #include <float.h>

 #include "ViewMap.h"
@@ -26,6 +27,7 @@
 #include "ViewMapAdvancedIterators.h"

 #include "../geometry/GeomUtils.h"
+/* clang-format on */

 namespace Freestyle {

@@ -19,6 +19,7 @@
 * \brief Class to build silhouette edges from a Winged-Edge structure
 */

+/* clang-format off */
 #include <algorithm>
 #include <memory>
 #include <stdexcept>
@@ -39,6 +40,7 @@
 #include "../winged_edge/WFillGrid.h"

 #include "BKE_global.h"
+/* clang-format on */

 namespace Freestyle {

@@ -22,6 +22,7 @@
 * \brief Class to build a Node Tree designed to be displayed from a Silhouette View Map structure.
 */

+/* clang-format off */
 #include "Silhouette.h"
 #include "ViewMap.h"

@@ -36,6 +37,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */

 namespace Freestyle {

@@ -19,8 +19,10 @@
 * \brief Class to fill in a grid from a SceneGraph (uses only the WingedEdge structures)
 */

+/* clang-format off */
 #include "WEdge.h"
 #include "WFillGrid.h"
+/* clang-format on */

 namespace Freestyle {

@@ -19,8 +19,10 @@
 * \brief Class to fill in a grid from a SceneGraph (uses only the WingedEdge structures)
 */

+/* clang-format off */
 #include "WEdge.h"
 #include "WSFillGrid.h"
+/* clang-format on */

 namespace Freestyle {

@@ -20,8 +20,10 @@
 * info (silhouette etc...)) structure from a polygonal model
 */

+/* clang-format off */
 #include "WXEdge.h"
 #include "WXEdgeBuilder.h"
+/* clang-format on */

 namespace Freestyle {