split the point cloud handler

qgis · Dec 3, 2020 · a271e81 · a271e81
1 parent 3cc478c
commit a271e81
Show file tree

Hide file tree

Showing 11 changed files with 508 additions and 217 deletions.
diff --git a/python/3d/3d_auto.sip b/python/3d/3d_auto.sip
@@ -24,3 +24,4 @@
 %Include auto_generated/symbols/qgspointcloud3dsymbol.sip
 %Include auto_generated/qgs3dmapexportsettings.sip
 %Include auto_generated/qgscolorramptexture.sip
+%Include auto_generated/symbols/qgspointcloud3dsymbol_p.sip
diff --git a/python/3d/auto_generated/qgscolorramptexture.sip.in b/python/3d/auto_generated/qgscolorramptexture.sip.in
@@ -0,0 +1,22 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/3d/qgscolorramptexture.h                                         *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+
+
+
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/3d/qgscolorramptexture.h                                         *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
diff --git a/python/3d/auto_generated/symbols/qgspointcloud3dsymbol.sip.in b/python/3d/auto_generated/symbols/qgspointcloud3dsymbol.sip.in
@@ -9,9 +9,6 @@
 
 
 
-namespace Qt3DRender
-{
-};
 
 class QgsPointCloud3DSymbol : QgsAbstract3DSymbol
 {
@@ -43,10 +40,6 @@ class QgsPointCloud3DSymbol : QgsAbstract3DSymbol
       RGBRendering
     };
 
-    QgsPointCloud3DSymbol( QgsPointCloudLayer *layer, QgsPointCloud3DSymbol::RenderingStyle style );
-%Docstring
-Constructor for QgsPointCloud3DSymbol
-%End
     ~QgsPointCloud3DSymbol();
 
     virtual QString type() const;
@@ -85,14 +78,9 @@ Returns the rendering style used to render the point cloud
     virtual unsigned int byteStride() = 0;
 %Docstring
 Returns the byte stride for the geometries used to for the vertex buffer
-%End
-    virtual void fillMaterial( Qt3DRender::QMaterial *material ) = 0;
-%Docstring
-Used to fill material object with necessary QParameters (and consequently opengl uniforms)
 %End
 
   protected:
-    float mPointSize = 2.0f;
 };
 
 class QgsSingleColorPointCloud3DSymbol : QgsPointCloud3DSymbol
@@ -140,8 +128,6 @@ Sets the color used by the renderer when using SingleColor rendering mode
 %End
 
     virtual unsigned int byteStride();
-    virtual void fillMaterial( Qt3DRender::QMaterial *material );
-
 
 
 };
@@ -226,8 +212,6 @@ Sets the minimum and maximum values used when classifying colors in the color ra
 %End
 
     virtual unsigned int byteStride();
-    virtual void fillMaterial( Qt3DRender::QMaterial *material );
-
 
 };
 
@@ -262,8 +246,6 @@ Constructor for QgsRGBPointCloud3DSymbol
 
 
     virtual unsigned int byteStride();
-    virtual void fillMaterial( Qt3DRender::QMaterial *material );
-
 };
 
 /************************************************************************

diff --git a/python/3d/auto_generated/symbols/qgspointcloud3dsymbol_p.sip.in b/python/3d/auto_generated/symbols/qgspointcloud3dsymbol_p.sip.in
@@ -0,0 +1,22 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/3d/symbols/qgspointcloud3dsymbol_p.h                             *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+
+
+
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/3d/symbols/qgspointcloud3dsymbol_p.h                             *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
diff --git a/src/3d/CMakeLists.txt b/src/3d/CMakeLists.txt
@@ -72,6 +72,7 @@ set(QGIS_3D_SRCS
   symbols/qgspolygon3dsymbol.cpp
   symbols/qgspolygon3dsymbol_p.cpp
   symbols/qgspointcloud3dsymbol.cpp
+  symbols/qgspointcloud3dsymbol_p.cpp
 
   terrain/qgsdemterraingenerator.cpp
   terrain/qgsdemterraintilegeometry_p.cpp
@@ -168,6 +169,7 @@ set(QGIS_3D_PRIVATE_HDRS
   symbols/qgsmesh3dsymbol_p.h
   symbols/qgspoint3dsymbol_p.h
   symbols/qgspolygon3dsymbol_p.h
+  symbols/qgspointcloud3dsymbol_p.h
   terrain/qgsdemterraintilegeometry_p.h
   terrain/qgsdemterraintileloader_p.h
   terrain/qgsterrainentity_p.h

diff --git a/src/3d/qgscolorramptexture.h b/src/3d/qgscolorramptexture.h
@@ -35,6 +35,7 @@
 #include "qgsmeshlayer.h"
 #include "qgsmeshlayerutils.h"
 #include "qgstriangularmesh.h"
+#ifndef SIP_RUN
 
 class QgsColorRampTextureGenerator: public Qt3DRender::QTextureImageDataGenerator
 {
@@ -68,6 +69,8 @@ class QgsColorRampTexture: public Qt3DRender::QAbstractTextureImage
     double mVerticalScale = 1;
 };
 
+#endif
+
 /// @endcond
 
 #endif // QGSCOLORRAMPTEXTURE_H