diff options
Diffstat (limited to 'source/blender/freestyle/intern/scene_graph')
21 files changed, 26 insertions, 81 deletions
diff --git a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h index 631f4b99adc..ca1e2351868 100644 --- a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h +++ b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_DRAWING_STYLE_H__ -#define __FREESTYLE_DRAWING_STYLE_H__ +#pragma once /** \file * \ingroup freestyle @@ -124,5 +123,3 @@ DrawingStyle &DrawingStyle::operator=(const DrawingStyle &ds) } } /* namespace Freestyle */ - -#endif // __FREESTYLE_DRAWING_STYLE_H__ diff --git a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h index 80cd783f164..18d3c8839dd 100644 --- a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h +++ b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_MATERIAL_H__ -#define __FREESTYLE_MATERIAL_H__ +#pragma once /** \file * \ingroup freestyle @@ -479,5 +478,3 @@ bool FrsMaterial::operator==(const FrsMaterial &m) const } } /* namespace Freestyle */ - -#endif // __FREESTYLE_MATERIAL_H__ diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h index f8dd25913c1..9d1fc009e37 100644 --- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h +++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_INDEXED_FACE_SET_H__ -#define __FREESTYLE_INDEXED_FACE_SET_H__ +#pragma once /** \file * \ingroup freestyle @@ -311,5 +310,3 @@ class IndexedFaceSet : public Rep { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_INDEXED_FACE_SET_H__ diff --git a/source/blender/freestyle/intern/scene_graph/LineRep.h b/source/blender/freestyle/intern/scene_graph/LineRep.h index e45a33d9fc4..43fd736570f 100644 --- a/source/blender/freestyle/intern/scene_graph/LineRep.h +++ b/source/blender/freestyle/intern/scene_graph/LineRep.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_LINE_REP_H__ -#define __FREESTYLE_LINE_REP_H__ +#pragma once /** \file * \ingroup freestyle @@ -149,5 +148,3 @@ class LineRep : public Rep { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_LINE_REP_H__ diff --git a/source/blender/freestyle/intern/scene_graph/Node.h b/source/blender/freestyle/intern/scene_graph/Node.h index 96072993590..07bf186ea39 100644 --- a/source/blender/freestyle/intern/scene_graph/Node.h +++ b/source/blender/freestyle/intern/scene_graph/Node.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_NODE_H__ -#define __FREESTYLE_NODE_H__ +#pragma once /** \file * \ingroup freestyle @@ -113,5 +112,3 @@ class Node : public BaseObject { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_NODE_H__ diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp index ad2310d7875..052ae73da43 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp @@ -52,8 +52,8 @@ NodeCamera::NodeCamera(CameraType camera_type) : camera_type_(camera_type) #if 0 /* UNUSED, gives warning in gcc */ NodeCamera::NodeCamera(const NodeCamera &iBrother) : camera_type_(iBrother.camera_type_) { - memcpy(modelview_matrix_, iBrother.modelview_matrix_, 16 * sizeof(double)); - memcpy(projection_matrix_, iBrother.projection_matrix_, 16 * sizeof(double)); + memcpy(modelview_matrix_, iBrother.modelview_matrix_, sizeof(double[16])); + memcpy(projection_matrix_, iBrother.projection_matrix_, sizeof(double[16])); } #endif @@ -64,12 +64,12 @@ void NodeCamera::accept(SceneVisitor &v) void NodeCamera::setModelViewMatrix(double modelview_matrix[16]) { - memcpy(modelview_matrix_, modelview_matrix, 16 * sizeof(double)); + memcpy(modelview_matrix_, modelview_matrix, sizeof(double[16])); } void NodeCamera::setProjectionMatrix(double projection_matrix[16]) { - memcpy(projection_matrix_, projection_matrix, 16 * sizeof(double)); + memcpy(projection_matrix_, projection_matrix, sizeof(double[16])); } NodeOrthographicCamera::NodeOrthographicCamera() diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h index 2878e7a834e..cc7b1f7f67c 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeCamera.h +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_NODE_CAMERA_H__ -#define __FREESTYLE_NODE_CAMERA_H__ +#pragma once /** \file * \ingroup freestyle @@ -217,5 +216,3 @@ class NodePerspectiveCamera : public NodeCamera { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_NODE_CAMERA_H__ diff --git a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h index f1dfad06250..8bbdaf30bad 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h +++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_NODE_DRAWING_STYLE_H__ -#define __FREESTYLE_NODE_DRAWING_STYLE_H__ +#pragma once /** \file * \ingroup freestyle @@ -106,5 +105,3 @@ class NodeDrawingStyle : public NodeGroup { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_NODE_DRAWING_STYLE_H__ diff --git a/source/blender/freestyle/intern/scene_graph/NodeGroup.h b/source/blender/freestyle/intern/scene_graph/NodeGroup.h index 5ef16255e46..0558e22bed1 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeGroup.h +++ b/source/blender/freestyle/intern/scene_graph/NodeGroup.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_NODE_GROUP_H__ -#define __FREESTYLE_NODE_GROUP_H__ +#pragma once /** \file * \ingroup freestyle @@ -80,5 +79,3 @@ class NodeGroup : public Node { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_NODE_GROUP_H__ diff --git a/source/blender/freestyle/intern/scene_graph/NodeLight.h b/source/blender/freestyle/intern/scene_graph/NodeLight.h index 046b61beaf4..bf8389441b6 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeLight.h +++ b/source/blender/freestyle/intern/scene_graph/NodeLight.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_NODE_LIGHT_H__ -#define __FREESTYLE_NODE_LIGHT_H__ +#pragma once /** \file * \ingroup freestyle @@ -101,5 +100,3 @@ class NodeLight : public Node { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_NODE_LIGHT_H__ diff --git a/source/blender/freestyle/intern/scene_graph/NodeShape.h b/source/blender/freestyle/intern/scene_graph/NodeShape.h index 13ee265ec10..5f7a24b85d5 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeShape.h +++ b/source/blender/freestyle/intern/scene_graph/NodeShape.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_NODE_SHAPE_H__ -#define __FREESTYLE_NODE_SHAPE_H__ +#pragma once /** \file * \ingroup freestyle @@ -93,5 +92,3 @@ class NodeShape : public Node { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_NODE_SHAPE_H__ diff --git a/source/blender/freestyle/intern/scene_graph/NodeTransform.h b/source/blender/freestyle/intern/scene_graph/NodeTransform.h index 1118417657f..9d55046a515 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeTransform.h +++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_NODE_TRANSFORM_H__ -#define __FREESTYLE_NODE_TRANSFORM_H__ +#pragma once /** \file * \ingroup freestyle @@ -98,5 +97,3 @@ class NodeTransform : public NodeGroup { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_NODE_TRANSFORM_H__ diff --git a/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h index 2339abe9aed..d52155eb216 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h +++ b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_NODE_VIEW_LAYER_H__ -#define __FREESTYLE_NODE_VIEW_LAYER_H__ +#pragma once /** \file * \ingroup freestyle @@ -59,5 +58,3 @@ class NodeViewLayer : public Node { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_NODE_VIEW_LAYER_H__ diff --git a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp index 9e83527acad..e8e21d37d00 100644 --- a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp +++ b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp @@ -27,7 +27,9 @@ namespace Freestyle { void OrientedLineRep::accept(SceneVisitor &v) { - Rep::accept(v); + Rep::accept(v); // NOLINT(bugprone-parent-virtual-call), this seems to intentionally *not* call + // the parent class' accept() function, but rather the grandparent's. The + // v.visitLineRep(*this); call below is actually what the parent class would do. if (!frs_material()) { v.visitOrientedLineRep(*this); } diff --git a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h index 2e39259077e..c33fd529c69 100644 --- a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h +++ b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_ORIENTED_LINE_REP_H__ -#define __FREESTYLE_ORIENTED_LINE_REP_H__ +#pragma once /** \file * \ingroup freestyle @@ -62,5 +61,3 @@ class OrientedLineRep : public LineRep { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_ORIENTED_LINE_REP_H__ diff --git a/source/blender/freestyle/intern/scene_graph/Rep.h b/source/blender/freestyle/intern/scene_graph/Rep.h index 58553d257d9..dae5272beed 100644 --- a/source/blender/freestyle/intern/scene_graph/Rep.h +++ b/source/blender/freestyle/intern/scene_graph/Rep.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_REP_H__ -#define __FREESTYLE_REP_H__ +#pragma once /** \file * \ingroup freestyle @@ -181,5 +180,3 @@ class Rep : public BaseObject { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_REP_H__ diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.h b/source/blender/freestyle/intern/scene_graph/SceneHash.h index 05c0880f806..605e2ddaa84 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneHash.h +++ b/source/blender/freestyle/intern/scene_graph/SceneHash.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_SCENE_HASH_H__ -#define __FREESTYLE_SCENE_HASH_H__ +#pragma once /** \file * \ingroup freestyle @@ -78,5 +77,3 @@ class SceneHash : public SceneVisitor { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_SCENE_HASH_H__ diff --git a/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h index f19233bba3b..9436bdccf57 100644 --- a/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h +++ b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_SCENE_PRETTY_PRINTER_H__ -#define __FREESTYLE_SCENE_PRETTY_PRINTER_H__ +#pragma once /** \file * \ingroup freestyle @@ -96,5 +95,3 @@ class ScenePrettyPrinter : public SceneVisitor { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_SCENE_PRETTY_PRINTER_H__ diff --git a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h index 81a478e8cf3..72e0f4cbb28 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h +++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_SCENE_VISITOR_H__ -#define __FREESTYLE_SCENE_VISITOR_H__ +#pragma once /** \file * \ingroup freestyle @@ -111,5 +110,3 @@ class SceneVisitor { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_SCENE_VISITOR_H__ diff --git a/source/blender/freestyle/intern/scene_graph/TriangleRep.h b/source/blender/freestyle/intern/scene_graph/TriangleRep.h index e4190faae6f..4461b38d68b 100644 --- a/source/blender/freestyle/intern/scene_graph/TriangleRep.h +++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_TRIANGLE_REP_H__ -#define __FREESTYLE_TRIANGLE_REP_H__ +#pragma once /** \file * \ingroup freestyle @@ -142,5 +141,3 @@ class TriangleRep : public Rep { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_TRIANGLE_REP_H__ diff --git a/source/blender/freestyle/intern/scene_graph/VertexRep.h b/source/blender/freestyle/intern/scene_graph/VertexRep.h index 3831be3105a..278cfa694f7 100644 --- a/source/blender/freestyle/intern/scene_graph/VertexRep.h +++ b/source/blender/freestyle/intern/scene_graph/VertexRep.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FREESTYLE_VERTEX_REP_H__ -#define __FREESTYLE_VERTEX_REP_H__ +#pragma once /** \file * \ingroup freestyle @@ -129,5 +128,3 @@ class VertexRep : public Rep { }; } /* namespace Freestyle */ - -#endif // __FREESTYLE_VERTEX_REP_H__ |