Merge pull request qgis#58879 from m-kuhn/install-3d-headers

Install 3D headers
YoannQDQ · Sep 30, 2024 · d4d7684 · d4d7684
2 parents 6f3e33e + 4a0d2a3
commit d4d7684
Show file tree

Hide file tree

Showing 41 changed files with 161 additions and 134 deletions.
diff --git a/src/3d/CMakeLists.txt b/src/3d/CMakeLists.txt
@@ -56,11 +56,11 @@ set(QGIS_3D_SRCS
   qgsvirtualpointcloudentity_p.cpp
 
   chunks/qgschunkboundsentity_p.cpp
-  chunks/qgschunkedentity_p.cpp
+  chunks/qgschunkedentity.cpp
   chunks/qgschunklist_p.cpp
-  chunks/qgschunkloader_p.cpp
-  chunks/qgschunknode_p.cpp
-  chunks/qgschunkqueuejob_p.cpp
+  chunks/qgschunkloader.cpp
+  chunks/qgschunknode.cpp
+  chunks/qgschunkqueuejob.cpp
 
   lights/qgsdirectionallightsettings.cpp
   lights/qgslightsource.cpp
@@ -102,11 +102,11 @@ set(QGIS_3D_SRCS
   terrain/qgsonlineterraingenerator.cpp
   terrain/qgsquantizedmeshterraingenerator.cpp
   terrain/qgsterraindownloader.cpp
-  terrain/qgsterrainentity_p.cpp
+  terrain/qgsterrainentity.cpp
   terrain/qgsterraingenerator.cpp
   terrain/qgsterraintexturegenerator_p.cpp
   terrain/qgsterraintextureimage_p.cpp
-  terrain/qgsterraintileloader_p.cpp
+  terrain/qgsterraintileloader.cpp
 
   mesh/qgsmesh3dgeometry_p.cpp
   mesh/qgsmesh3dentity_p.cpp
@@ -124,6 +124,7 @@ set(QGIS_3D_HDRS
   qgs3dmapsettings.h
   qgs3dmaptool.h
   qgs3drendercontext.h
+  qgs3dmapsceneentity.h
   qgs3dsceneexporter.h
   qgs3dtypes.h
   qgs3dutils.h
@@ -189,10 +190,13 @@ set(QGIS_3D_HDRS
   terrain/qgsquantizedmeshterraingenerator.h
   terrain/qgsterraindownloader.h
   terrain/qgsterraingenerator.h
-  terrain/qgsterraintileloader_p.h
+  terrain/qgsterraintileloader.h
+  terrain/qgsterrainentity.h
 
-  chunks/qgschunkloader_p.h
-  chunks/qgschunkqueuejob_p.h
+  chunks/qgschunkloader.h
+  chunks/qgschunkqueuejob.h
+  chunks/qgschunknode.h
+  chunks/qgschunkedentity.h
 
   mesh/qgsmeshterraingenerator.h
 )
@@ -202,11 +206,8 @@ set(QGIS_3D_PRIVATE_HDRS
   qgsvectorlayerchunkloader_p.h
   qgspointcloudlayerchunkloader_p.h
   qgsvirtualpointcloudentity_p.h
-  qgs3dmapsceneentity_p.h
   chunks/qgschunkboundsentity_p.h
-  chunks/qgschunkedentity_p.h
   chunks/qgschunklist_p.h
-  chunks/qgschunknode_p.h
   symbols/qgsline3dsymbol_p.h
   symbols/qgslinematerial_p.h
   symbols/qgslinevertexdata_p.h
@@ -215,13 +216,13 @@ set(QGIS_3D_PRIVATE_HDRS
   symbols/qgspointcloud3dsymbol_p.h
   terrain/qgsdemterraintilegeometry_p.h
   terrain/qgsdemterraintileloader_p.h
-  terrain/qgsterrainentity_p.h
   terrain/qgsterraintexturegenerator_p.h
   terrain/qgsterraintextureimage_p.h
   terrain/qgsterraintileentity_p.h
   mesh/qgsmesh3dentity_p.h
   mesh/qgsmesh3dgeometry_p.h
   mesh/qgsmesh3dmaterial_p.h
+  mesh/qgsmeshterraintileloader_p.h
   qgscolorramptexture.h
 )
 

diff --git a/src/3d/chunks/qgschunkedentity_p.cpp → src/3d/chunks/qgschunkedentity.cpp b/src/3d/chunks/qgschunkedentity_p.cpp → src/3d/chunks/qgschunkedentity.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgschunkedentity_p.cpp
+  qgschunkedentity.cpp
   --------------------------------------
   Date                 : July 2017
   Copyright            : (C) 2017 by Martin Dobias
@@ -13,16 +13,16 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgschunkedentity_p.h"
+#include "qgschunkedentity.h"
 
 #include <QElapsedTimer>
 #include <QVector4D>
 
 #include "qgs3dutils.h"
 #include "qgschunkboundsentity_p.h"
 #include "qgschunklist_p.h"
-#include "qgschunkloader_p.h"
-#include "qgschunknode_p.h"
+#include "qgschunkloader.h"
+#include "qgschunknode.h"
 
 #include "qgseventtracing.h"
 

diff --git a/src/3d/chunks/qgschunkedentity_p.h → src/3d/chunks/qgschunkedentity.h b/src/3d/chunks/qgschunkedentity_p.h → src/3d/chunks/qgschunkedentity.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgschunkedentity_p.h
+  qgschunkedentity.h
   --------------------------------------
   Date                 : July 2017
   Copyright            : (C) 2017 by Martin Dobias
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSCHUNKEDENTITY_P_H
-#define QGSCHUNKEDENTITY_P_H
+#ifndef QGSCHUNKEDENTITY_H
+#define QGSCHUNKEDENTITY_H
 
 ///@cond PRIVATE
 
@@ -27,7 +27,7 @@
 // version without notice, or even be removed.
 //
 
-#include "qgs3dmapsceneentity_p.h"
+#include "qgs3dmapsceneentity.h"
 #include <numeric>
 
 #define SIP_NO_FILE
@@ -52,7 +52,7 @@ namespace QgsRayCastingUtils
 
 #include <QTime>
 
-#include "qgschunknode_p.h"
+#include "qgschunknode.h"
 
 
 /**
@@ -171,4 +171,4 @@ class QgsChunkedEntity : public Qgs3DMapSceneEntity
 
 /// @endcond
 
-#endif // QGSCHUNKEDENTITY_P_H
+#endif // QGSCHUNKEDENTITY_H
diff --git a/src/3d/chunks/qgschunklist_p.cpp b/src/3d/chunks/qgschunklist_p.cpp
@@ -15,7 +15,7 @@
 
 #include "qgschunklist_p.h"
 
-#include "qgschunknode_p.h"
+#include "qgschunknode.h"
 
 ///@cond PRIVATE
 

diff --git a/src/3d/chunks/qgschunkloader_p.cpp → src/3d/chunks/qgschunkloader.cpp b/src/3d/chunks/qgschunkloader_p.cpp → src/3d/chunks/qgschunkloader.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgschunkloader_p.cpp
+  qgschunkloader.cpp
   --------------------------------------
   Date                 : October 2020
   Copyright            : (C) 2020 by Martin Dobias
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgschunkloader_p.h"
-#include "qgschunknode_p.h"
+#include "qgschunkloader.h"
+#include "qgschunknode.h"
 
 #include <QVector>
 ///@cond PRIVATE

diff --git a/src/3d/chunks/qgschunkloader_p.h → src/3d/chunks/qgschunkloader.h b/src/3d/chunks/qgschunkloader_p.h → src/3d/chunks/qgschunkloader.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgschunkloader_p.h
+  qgschunkloader.h
   --------------------------------------
   Date                 : July 2017
   Copyright            : (C) 2017 by Martin Dobias
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSCHUNKLOADER_P_H
-#define QGSCHUNKLOADER_P_H
+#ifndef QGSCHUNKLOADER_H
+#define QGSCHUNKLOADER_H
 
 ///@cond PRIVATE
 
@@ -27,7 +27,7 @@
 // version without notice, or even be removed.
 //
 
-#include "qgschunkqueuejob_p.h"
+#include "qgschunkqueuejob.h"
 
 #define SIP_NO_FILE
 
@@ -142,4 +142,4 @@ class _3D_EXPORT QgsQuadtreeChunkLoaderFactory : public QgsChunkLoaderFactory
 
 /// @endcond
 
-#endif // QGSCHUNKLOADER_P_H
+#endif // QGSCHUNKLOADER_H
diff --git a/src/3d/chunks/qgschunknode_p.cpp → src/3d/chunks/qgschunknode.cpp b/src/3d/chunks/qgschunknode_p.cpp → src/3d/chunks/qgschunknode.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgschunknode_p.cpp
+  qgschunknode.cpp
   --------------------------------------
   Date                 : July 2017
   Copyright            : (C) 2017 by Martin Dobias
@@ -13,11 +13,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgschunknode_p.h"
+#include "qgschunknode.h"
 
-#include "qgschunkedentity_p.h"  // for ChunkLoader destructor
+#include "qgschunkedentity.h"  // for ChunkLoader destructor
 #include "qgschunklist_p.h"
-#include "qgschunkloader_p.h"
+#include "qgschunkloader.h"
 #include <Qt3DCore/QEntity>
 
 ///@cond PRIVATE

diff --git a/src/3d/chunks/qgschunknode_p.h → src/3d/chunks/qgschunknode.h b/src/3d/chunks/qgschunknode_p.h → src/3d/chunks/qgschunknode.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgschunknode_p.h
+  qgschunknode.h
   --------------------------------------
   Date                 : July 2017
   Copyright            : (C) 2017 by Martin Dobias
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSCHUNKNODE_P_H
-#define QGSCHUNKNODE_P_H
+#ifndef QGSCHUNKNODE_H
+#define QGSCHUNKNODE_H
 
 ///@cond PRIVATE
 

diff --git a/src/3d/chunks/qgschunkqueuejob_p.cpp → src/3d/chunks/qgschunkqueuejob.cpp b/src/3d/chunks/qgschunkqueuejob_p.cpp → src/3d/chunks/qgschunkqueuejob.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgschunkqueuejob_p.cpp
+  qgschunkqueuejob.cpp
   --------------------------------------
   Date                 : July 2017
   Copyright            : (C) 2017 by Martin Dobias
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgschunkqueuejob_p.h"
+#include "qgschunkqueuejob.h"
 
 ///@cond PRIVATE
 

diff --git a/src/3d/chunks/qgschunkqueuejob_p.h → src/3d/chunks/qgschunkqueuejob.h b/src/3d/chunks/qgschunkqueuejob_p.h → src/3d/chunks/qgschunkqueuejob.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgschunkqueuejob_p.h
+  qgschunkqueuejob.h
   --------------------------------------
   Date                 : July 2017
   Copyright            : (C) 2017 by Martin Dobias
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSCHUNKQUEUEJOB_P_H
-#define QGSCHUNKQUEUEJOB_P_H
+#ifndef QGSCHUNKQUEUEJOB_H
+#define QGSCHUNKQUEUEJOB_H
 
 ///@cond PRIVATE
 
@@ -101,4 +101,4 @@ class QgsChunkQueueJobFactory
 
 /// @endcond
 
-#endif // QGSCHUNKQUEUEJOB_P_H
+#endif // QGSCHUNKQUEUEJOB_H
diff --git a/src/3d/mesh/qgsmeshterraingenerator.cpp b/src/3d/mesh/qgsmeshterraingenerator.cpp
@@ -16,13 +16,14 @@
  ***************************************************************************/
 
 #include "qgsmeshterraingenerator.h"
+#include "qgsmeshterraintileloader_p.h"
 
 #include <Qt3DRender/QMaterial>
 
 #include "qgsmesh3dentity_p.h"
 #include "qgsmeshlayer.h"
 #include "qgsmeshlayer3drenderer.h"
-#include "qgsterrainentity_p.h"
+#include "qgsterrainentity.h"
 #include "qgsmeshlayerutils.h"
 #include "qgs3dmapsettings.h"
 #include "qgs3drendercontext.h"

diff --git a/src/3d/mesh/qgsmeshterraingenerator.h b/src/3d/mesh/qgsmeshterraingenerator.h
@@ -23,33 +23,9 @@
 #include "qgsmeshlayer.h"
 #include "qgstriangularmesh.h"
 #include "qgsterraingenerator.h"
-#include "qgsterraintileloader_p.h"
 
 #define SIP_NO_FILE
 
-///@cond PRIVATE
-
-//! Chunk loader for mesh terrain implementation
-class QgsMeshTerrainTileLoader: public QgsTerrainTileLoader
-{
-    Q_OBJECT
-  public:
-    //! Construct the loader for a node
-    QgsMeshTerrainTileLoader( QgsTerrainEntity *terrain,
-                              QgsChunkNode *node,
-                              const QgsTriangularMesh &triangularMesh,
-                              const QgsMesh3DSymbol *symbol );
-
-    //! Create the 3D entity and returns it
-    Qt3DCore::QEntity *createEntity( Qt3DCore::QEntity *parent ) override;
-
-  private:
-    QgsTriangularMesh mTriangularMesh;
-    std::unique_ptr< QgsMesh3DSymbol > mSymbol;
-};
-
-///@endcond
-
 /**
  * \ingroup 3d
  * \brief Implementation of terrain generator that uses the Z values of a mesh layer to build a terrain

diff --git a/src/3d/mesh/qgsmeshterraintileloader_p.h b/src/3d/mesh/qgsmeshterraintileloader_p.h
@@ -0,0 +1,50 @@
+/***************************************************************************
+                         qgsmeshterraintileloader_p.h
+                         -------------------------
+    begin                : September 2024
+    copyright            : (C) 2024 by Matthias Kuhn
+    email                : [email protected]
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSMESHTERRAINTILELOADER_H
+#define QGSMESHTERRAINTILELOADER_H
+
+#include "qgsmesh3dsymbol.h"
+#include "qgstriangularmesh.h"
+#include "qgsterraintileloader.h"
+
+#define SIP_NO_FILE
+
+///@cond PRIVATE
+
+//! Chunk loader for mesh terrain implementation
+class QgsMeshTerrainTileLoader: public QgsTerrainTileLoader
+{
+    Q_OBJECT
+  public:
+    //! Construct the loader for a node
+    QgsMeshTerrainTileLoader( QgsTerrainEntity *terrain,
+                              QgsChunkNode *node,
+                              const QgsTriangularMesh &triangularMesh,
+                              const QgsMesh3DSymbol *symbol );
+
+    //! Create the 3D entity and returns it
+    Qt3DCore::QEntity *createEntity( Qt3DCore::QEntity *parent ) override;
+
+  private:
+    QgsTriangularMesh mTriangularMesh;
+    std::unique_ptr< QgsMesh3DSymbol > mSymbol;
+};
+
+///@endcond
+
+#endif