Skip to content

Commit f00321a

Browse files
committedMay 29, 2018
move tessellator from 3d to core (need also for quick library)
1 parent 264788a commit f00321a

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed
 

‎src/3d/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ SET(QGIS_3D_SRCS
99
qgscameracontroller.cpp
1010
qgsphongmaterialsettings.cpp
1111
qgstessellatedpolygongeometry.cpp
12-
qgstessellator.cpp
1312
qgstilingscheme.cpp
1413
qgsvectorlayer3drenderer.cpp
1514

@@ -41,12 +40,6 @@ SET(QGIS_3D_SRCS
4140
terrain/qgsterraintileloader_p.cpp
4241
#terrain/quantizedmeshgeometry.cpp
4342
#terrain/quantizedmeshterraingenerator.cpp
44-
45-
${CMAKE_SOURCE_DIR}/external/poly2tri/common/shapes.cc
46-
${CMAKE_SOURCE_DIR}/external/poly2tri/sweep/advancing_front.cc
47-
${CMAKE_SOURCE_DIR}/external/poly2tri/sweep/cdt.cc
48-
${CMAKE_SOURCE_DIR}/external/poly2tri/sweep/sweep_context.cc
49-
${CMAKE_SOURCE_DIR}/external/poly2tri/sweep/sweep.cc
5043
)
5144

5245
SET(QGIS_3D_MOC_HDRS
@@ -82,7 +75,6 @@ SET(QGIS_3D_HDRS
8275
qgscameracontroller.h
8376
qgsphongmaterialsettings.h
8477
qgstessellatedpolygongeometry.h
85-
qgstessellator.h
8678
qgstilingscheme.h
8779
qgsvectorlayer3drenderer.h
8880

@@ -127,7 +119,6 @@ INCLUDE_DIRECTORIES(
127119
${CMAKE_SOURCE_DIR}/src/core/metadata
128120
${CMAKE_SOURCE_DIR}/src/core/expression
129121
${CMAKE_SOURCE_DIR}/src/core/3d
130-
${CMAKE_SOURCE_DIR}/external/poly2tri
131122
${CMAKE_BINARY_DIR}/src/core
132123
${CMAKE_BINARY_DIR}/src/3d
133124
)

‎src/core/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ SET(QGIS_CORE_SRCS
1010
${CMAKE_SOURCE_DIR}/external/nmea/time.c
1111
${CMAKE_SOURCE_DIR}/external/nmea/tok.c
1212

13+
${CMAKE_SOURCE_DIR}/external/poly2tri/common/shapes.cc
14+
${CMAKE_SOURCE_DIR}/external/poly2tri/sweep/advancing_front.cc
15+
${CMAKE_SOURCE_DIR}/external/poly2tri/sweep/cdt.cc
16+
${CMAKE_SOURCE_DIR}/external/poly2tri/sweep/sweep_context.cc
17+
${CMAKE_SOURCE_DIR}/external/poly2tri/sweep/sweep.cc
18+
1319
gps/qgsgpsconnection.cpp
1420
gps/qgsgpsconnectionregistry.cpp
1521
gps/qgsgpsdconnection.cpp
@@ -291,6 +297,7 @@ SET(QGIS_CORE_SRCS
291297
qgsstringstatisticalsummary.cpp
292298
qgsstringutils.cpp
293299
qgstaskmanager.cpp
300+
qgstessellator.cpp
294301
qgstextlabelfeature.cpp
295302
qgstextrenderer.cpp
296303
qgstolerance.cpp
@@ -811,6 +818,8 @@ SET(QGIS_CORE_HDRS
811818
expression/qgsexpressionnodeimpl.h
812819
expression/qgsexpressionfunction.h
813820

821+
qgstessellator.h
822+
814823
qgis.h
815824
qgis_sip.h
816825
qgsaction.h
@@ -1204,6 +1213,7 @@ INCLUDE_DIRECTORIES(
12041213
metadata
12051214
mesh
12061215
${CMAKE_SOURCE_DIR}/external/nmea
1216+
${CMAKE_SOURCE_DIR}/external/poly2tri
12071217
)
12081218
IF (WITH_INTERNAL_QEXTSERIALPORT)
12091219
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/external/qextserialport)
File renamed without changes.

‎src/3d/qgstessellator.h renamed to ‎src/core/qgstessellator.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#ifndef QGSTESSELLATOR_H
1717
#define QGSTESSELLATOR_H
1818

19-
#include "qgis_3d.h"
19+
#include "qgis_core.h"
2020

2121
class QgsPolygon;
2222
class QgsMultiPolygon;
@@ -33,9 +33,9 @@ class QgsMultiPolygon;
3333
*
3434
* Optionally provides extrusion by adding triangles that serve as walls when extrusion height is non-zero.
3535
*
36-
* \since QGIS 3.0
36+
* \since QGIS 3.2 (since QGIS 3.0 in QGIS_3D library)
3737
*/
38-
class _3D_EXPORT QgsTessellator
38+
class CORE_EXPORT QgsTessellator
3939
{
4040
public:
4141
//! Creates tessellator with a specified origin point of the world (in map coordinates)

0 commit comments

Comments
 (0)
Please sign in to comment.