Skip to content

Commit 8c8ec42

Browse files
hzellerkintel
andauthored
glview: in impelementations, move the corresponding declaration header to top. (openscad#5371)
This is the last directory in src/glview for this to be done. (All the others have been done in openscad#5327 already). Co-authored-by: Marius Kintel <marius@kintel.net>
1 parent 46e3980 commit 8c8ec42

File tree

7 files changed

+19
-12
lines changed

7 files changed

+19
-12
lines changed

src/glview/VertexArray.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
#include "glview/VertexArray.h"
2+
13
#include <cstring>
24
#include <cassert>
35
#include <array>
46
#include <utility>
57
#include <vector>
68
#include <memory>
79
#include <cstdio>
8-
#include "glview/VertexArray.h"
910

1011
#include "utils/printutils.h"
1112

src/glview/cgal/CGALRenderUtils.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#include <algorithm>
21
#include "glview/cgal/CGALRenderUtils.h"
32

3+
#include <algorithm>
4+
45

56
// this function resolves a 3x3 linear eqauation system
67
/*

src/glview/cgal/CGALRenderer.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
*
2525
*/
2626

27+
#include "glview/cgal/CGALRenderer.h"
28+
2729
#include <cassert>
2830
#include <limits>
2931
#include <utility>
@@ -40,7 +42,6 @@
4042
#include "utils/printutils.h"
4143

4244
#include "glview/cgal/CGALRenderUtils.h"
43-
#include "glview/cgal/CGALRenderer.h"
4445
#ifdef ENABLE_CGAL
4546
#include "geometry/cgal/CGALHybridPolyhedron.h"
4647
#include "glview/cgal/CGAL_OGL_VBOPolyhedron.h"

src/glview/cgal/LegacyCGALRenderer.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
*
2525
*/
2626

27+
#include "glview/cgal/LegacyCGALRenderer.h"
28+
2729
#include <cassert>
2830
#include <limits>
2931
#include <memory>
@@ -38,7 +40,6 @@
3840
#include "geometry/PolySetUtils.h"
3941
#include "utils/printutils.h"
4042

41-
#include "glview/cgal/LegacyCGALRenderer.h"
4243
#include "glview/LegacyRendererUtils.h"
4344
#include "glview/cgal/CGALRenderUtils.h"
4445
#ifdef ENABLE_CGAL

src/glview/preview/CSGTreeNormalizer.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
#include "glview/preview/CSGTreeNormalizer.h"
2+
13
#include <cassert>
24
#include <utility>
35
#include <memory>
46
#include <stack>
57

6-
#include "glview/preview/CSGTreeNormalizer.h"
78
#include "core/CSGNode.h"
89
#include "utils/printutils.h"
910

src/glview/preview/LegacyOpenCSGRenderer.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@
2424
*
2525
*/
2626

27+
#include "glview/preview/LegacyOpenCSGRenderer.h"
28+
2729
#include "core/enums.h"
2830
#include "glview/system-gl.h"
29-
#include "glview/preview/LegacyOpenCSGRenderer.h"
3031
#include "glview/LegacyRendererUtils.h"
3132

3233
#include <memory>

src/glview/system-gl.cc

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11

22
/* OpenGL helper functions */
33

4-
#include <algorithm>
5-
#include <iostream>
6-
#include <vector>
7-
#include <sstream>
8-
#include <string>
9-
104
#ifdef USE_GLAD
115
#define GLAD_GL_IMPLEMENTATION
126
#define GLAD_EGL_IMPLEMENTATION
137
#ifdef _WIN32
148
#define GLAD_WGL_IMPLEMENTATION
159
#endif
1610
#endif
11+
1712
#include "glview/system-gl.h"
1813

14+
#include <algorithm>
15+
#include <iostream>
16+
#include <vector>
17+
#include <sstream>
18+
#include <string>
19+
1920
#include <boost/algorithm/string.hpp>
2021
#include <boost/format.hpp>
2122

0 commit comments

Comments
 (0)