qgis · 3nids · Dec 11, 2024 · Dec 10, 2024 · Dec 11, 2024 · Dec 11, 2024
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,8 +17,6 @@ repos:
       exclude: |
         (?x)^(
             src/core/.*|
-            src/3d/.*|
-            src/server/.*|
             tests/code_layout/sipify/sipifyheader.h
         )$
 

diff --git a/python/3d/auto_generated/lights/qgslightsource.sip.in b/python/3d/auto_generated/lights/qgslightsource.sip.in
@@ -24,7 +24,6 @@ Base class for light sources in 3d scenes.
 #include "qgslightsource.h"
 %End
   public:
-
     virtual ~QgsLightSource();
 
     virtual Qgis::LightSourceType type() const = 0;

diff --git a/python/3d/auto_generated/materials/qgsabstractmaterialsettings.sip.in b/python/3d/auto_generated/materials/qgsabstractmaterialsettings.sip.in
@@ -12,7 +12,7 @@
 
 
 enum class QgsMaterialSettingsRenderingTechnique
-  {
+{
   Triangles,
   Lines,
   InstancedPoints,
@@ -40,7 +40,6 @@ Context settings for a material.
 #include "qgsabstractmaterialsettings.h"
 %End
   public:
-
     bool isSelected() const;
 %Docstring
 Returns ``True`` if the material should represent a selected state.
@@ -113,7 +112,6 @@ Abstract base class for material settings.
     }
 %End
   public:
-
     virtual ~QgsAbstractMaterialSettings();
 
     virtual QString type() const = 0;

diff --git a/python/3d/auto_generated/materials/qgsgoochmaterialsettings.sip.in b/python/3d/auto_generated/materials/qgsgoochmaterialsettings.sip.in
@@ -28,7 +28,6 @@ with three color components: ambient, diffuse and specular.
 #include "qgsgoochmaterialsettings.h"
 %End
   public:
-
     QgsGoochMaterialSettings();
 
     virtual QString type() const;

diff --git a/python/3d/auto_generated/materials/qgsmaterialregistry.sip.in b/python/3d/auto_generated/materials/qgsmaterialregistry.sip.in
@@ -28,7 +28,6 @@ Stores metadata about one 3D material settings class.
 #include "qgsmaterialregistry.h"
 %End
   public:
-
     QgsMaterialSettingsAbstractMetadata( const QString &type, const QString &visibleName, const QIcon &icon = QIcon() );
 %Docstring
 Constructor for QgsMaterialSettingsAbstractMetadata, with the specified ``type`` and ``visibleName``.
@@ -88,7 +87,6 @@ Qgs3D.materialRegistry().
 #include "qgsmaterialregistry.h"
 %End
   public:
-
     QgsMaterialRegistry();
     ~QgsMaterialRegistry();
 

diff --git a/python/3d/auto_generated/materials/qgsmetalroughmaterialsettings.sip.in b/python/3d/auto_generated/materials/qgsmetalroughmaterialsettings.sip.in
@@ -27,7 +27,6 @@ A PBR metal rough shading material used for rendering.
 #include "qgsmetalroughmaterialsettings.h"
 %End
   public:
-
     QgsMetalRoughMaterialSettings();
 
     virtual QString type() const;

diff --git a/python/3d/auto_generated/materials/qgsnullmaterialsettings.sip.in b/python/3d/auto_generated/materials/qgsnullmaterialsettings.sip.in
@@ -28,7 +28,6 @@ Null shading material used for rendering models and scenes with native textures.
 #include "qgsnullmaterialsettings.h"
 %End
   public:
-
     QgsNullMaterialSettings();
 
     virtual QString type() const;
@@ -49,7 +48,6 @@ Returns a new instance of QgsNullMaterialSettings.
 
     virtual QMap<QString, QString> toExportParameters() const;
 
-
 };
 
 

diff --git a/python/3d/auto_generated/materials/qgsphongmaterialsettings.sip.in b/python/3d/auto_generated/materials/qgsphongmaterialsettings.sip.in
@@ -26,7 +26,6 @@ with three color components: ambient, diffuse and specular.
 #include "qgsphongmaterialsettings.h"
 %End
   public:
-
     QgsPhongMaterialSettings();
 
     virtual QString type() const;

diff --git a/python/3d/auto_generated/materials/qgsphongtexturedmaterialsettings.sip.in b/python/3d/auto_generated/materials/qgsphongtexturedmaterialsettings.sip.in
@@ -27,7 +27,6 @@ A phong shading model with diffuse texture map.
 #include "qgsphongtexturedmaterialsettings.h"
 %End
   public:
-
     QgsPhongTexturedMaterialSettings();
 
     virtual QString type() const;

diff --git a/python/3d/auto_generated/materials/qgssimplelinematerialsettings.sip.in b/python/3d/auto_generated/materials/qgssimplelinematerialsettings.sip.in
@@ -28,7 +28,6 @@ Basic shading material used for rendering simple lines as solid line components.
 #include "qgssimplelinematerialsettings.h"
 %End
   public:
-
     QgsSimpleLineMaterialSettings();
 
     virtual QString type() const;

diff --git a/python/3d/auto_generated/processing/qgs3dalgorithms.sip.in b/python/3d/auto_generated/processing/qgs3dalgorithms.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class Qgs3DAlgorithms: QgsProcessingProvider
+class Qgs3DAlgorithms : QgsProcessingProvider
 {
 %Docstring(signature="appended")
 QGIS 3D processing algorithm provider.
@@ -19,7 +19,6 @@ QGIS 3D processing algorithm provider.
 #include "qgs3dalgorithms.h"
 %End
   public:
-
     Qgs3DAlgorithms( QObject *parent = 0 );
 %Docstring
 Constructor for Qgs3DAlgorithms.
@@ -39,14 +38,10 @@ Constructor for Qgs3DAlgorithms.
 
 
   protected:
-
     virtual void loadAlgorithms();
 
-
 };
 
-
-
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/3d/auto_generated/qgs3d.sip.in b/python/3d/auto_generated/qgs3d.sip.in
@@ -24,7 +24,6 @@ related to 3D classes.
 %End
   public:
 
-
     static Qgs3D *instance();
 %Docstring
 Returns a pointer to the singleton instance.

diff --git a/python/3d/auto_generated/qgs3dmapcanvas.sip.in b/python/3d/auto_generated/qgs3dmapcanvas.sip.in
@@ -37,7 +37,6 @@ Qgs3DMapCanvas is a convenience wrapper to simplify the creation of a 3D window
 #include "qgs3dmapcanvas.h"
 %End
   public:
-
     Qgs3DMapCanvas();
     ~Qgs3DMapCanvas();
 
@@ -58,7 +57,6 @@ Returns access to the view's camera controller. Returns ``None`` if the scene ha
 
 
   protected:
-
     virtual void showEvent( QShowEvent *e );
 
 %Docstring

diff --git a/python/3d/auto_generated/qgs3dmapscene.sip.in b/python/3d/auto_generated/qgs3dmapscene.sip.in
@@ -132,7 +132,7 @@ it may be useful to temporarily disable scene updates.
 .. versionadded:: 3.40
 %End
 
- static QMap< QString, Qgs3DMapScene * > openScenes() /Deprecated/;
+ static QMap<QString, Qgs3DMapScene *> openScenes() /Deprecated/;
 %Docstring
 Returns a map of 3D map scenes (by name) open in the QGIS application.
 

diff --git a/python/3d/auto_generated/qgs3dmapsettings.sip.in b/python/3d/auto_generated/qgs3dmapsettings.sip.in
@@ -28,7 +28,6 @@ Definition of the world.
 #include "qgs3dmapsettings.h"
 %End
   public:
-
     Qgs3DMapSettings();
     Qgs3DMapSettings( const Qgs3DMapSettings &other );
     ~Qgs3DMapSettings();

diff --git a/python/3d/auto_generated/qgs3dtypes.sip.in b/python/3d/auto_generated/qgs3dtypes.sip.in
@@ -25,7 +25,6 @@ Defines enumerations and other auxiliary types for QGIS 3D
 #include "qgs3dtypes.h"
 %End
   public:
-
     enum CullingMode
     {
       NoCulling,
@@ -41,8 +40,6 @@ Defines enumerations and other auxiliary types for QGIS 3D
       Main3DRenderer,
       Selected3DRenderer,
     };
-
-
 };
 
 /************************************************************************

diff --git a/python/3d/auto_generated/qgsabstractvectorlayer3drenderer.sip.in b/python/3d/auto_generated/qgsabstractvectorlayer3drenderer.sip.in
@@ -26,7 +26,6 @@ a single tile for the whole layer, for count=3 there will be 16 tiles.
 #include "qgsabstractvectorlayer3drenderer.h"
 %End
   public:
-
     int zoomLevelsCount() const;
 %Docstring
 Returns number of zoom levels. One zoom level means there will be one tile.

diff --git a/python/3d/auto_generated/qgscameracontroller.sip.in b/python/3d/auto_generated/qgscameracontroller.sip.in
@@ -23,7 +23,6 @@ Object that controls camera movement based on user input
 #include "qgscameracontroller.h"
 %End
   public:
-
     ~QgsCameraController();
 
 

diff --git a/python/3d/auto_generated/qgscamerapose.sip.in b/python/3d/auto_generated/qgscamerapose.sip.in
@@ -30,7 +30,6 @@ The pose is defined with the following parameters:
 #include "qgscamerapose.h"
 %End
   public:
-
     QgsVector3D centerPoint() const;
 %Docstring
 Returns center point (towards which point the camera is looking)

diff --git a/python/3d/auto_generated/qgslayoutitem3dmap.sip.in b/python/3d/auto_generated/qgslayoutitem3dmap.sip.in
@@ -43,7 +43,6 @@ Implements support of 3D map views in print layouts
     }
 %End
   public:
-
     QgsLayoutItem3DMap( QgsLayout *layout /TransferThis/ );
 %Docstring
 Constructor for QgsLayoutItem3DMap, with the specified parent ``layout``.

diff --git a/python/3d/auto_generated/qgsrulebased3drenderer.sip.in b/python/3d/auto_generated/qgsrulebased3drenderer.sip.in
@@ -57,7 +57,6 @@ Similar to rule-based 2D renderer and rule-based labeling, it allows specificati
 #include "qgsrulebased3drenderer.h"
 %End
   public:
-
     typedef QList<QgsRuleBased3DRenderer::Rule *> RuleList;
     typedef QHash<const QgsRuleBased3DRenderer::Rule *, QgsFeature3DHandler *> RuleToHandlerMap;
 

diff --git a/python/3d/auto_generated/qgstiledscenelayer3drenderer.sip.in b/python/3d/auto_generated/qgstiledscenelayer3drenderer.sip.in
@@ -11,7 +11,6 @@
 
 
 
-
 class QgsTiledSceneLayer3DRendererMetadata : Qgs3DRendererAbstractMetadata
 {
 %Docstring(signature="appended")

diff --git a/python/3d/auto_generated/symbols/qgsline3dsymbol.sip.in b/python/3d/auto_generated/symbols/qgsline3dsymbol.sip.in
@@ -25,7 +25,6 @@ class QgsLine3DSymbol : QgsAbstract3DSymbol /NoDefaultCtors/
 #include "qgsline3dsymbol.h"
 %End
   public:
-
     QgsLine3DSymbol();
     ~QgsLine3DSymbol();
 
@@ -44,7 +43,7 @@ Caller takes ownership of the returned symbol.
 
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
 
-    virtual QList< Qgis::GeometryType > compatibleGeometryTypes() const;
+    virtual QList<Qgis::GeometryType> compatibleGeometryTypes() const;
 
     virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer );
 

diff --git a/python/3d/auto_generated/symbols/qgspoint3dsymbol.sip.in b/python/3d/auto_generated/symbols/qgspoint3dsymbol.sip.in
@@ -50,7 +50,7 @@ Caller takes ownership of the returned symbol.
 
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
 
-    virtual QList< Qgis::GeometryType > compatibleGeometryTypes() const;
+    virtual QList<Qgis::GeometryType> compatibleGeometryTypes() const;
 
     virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer );
 
@@ -196,6 +196,7 @@ Sets transform for individual objects represented by the symbol
 Returns transform for billboards
 %End
 
+
   private:
     QgsPoint3DSymbol &operator=( const QgsPoint3DSymbol & );
 };

diff --git a/python/3d/auto_generated/symbols/qgspointcloud3dsymbol.sip.in b/python/3d/auto_generated/symbols/qgspointcloud3dsymbol.sip.in
@@ -27,7 +27,6 @@ class QgsPointCloud3DSymbol : QgsAbstract3DSymbol /Abstract/
 #include "qgspointcloud3dsymbol.h"
 %End
   public:
-
     enum RenderingStyle
     {
       // Do not render anything

diff --git a/python/3d/auto_generated/symbols/qgspolygon3dsymbol.sip.in b/python/3d/auto_generated/symbols/qgspolygon3dsymbol.sip.in
@@ -37,7 +37,7 @@ class QgsPolygon3DSymbol : QgsAbstract3DSymbol /NoDefaultCtors/
 
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
 
-    virtual QList< Qgis::GeometryType > compatibleGeometryTypes() const;
+    virtual QList<Qgis::GeometryType> compatibleGeometryTypes() const;
 
     virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer );
 

diff --git a/python/PyQt6/3d/auto_generated/lights/qgslightsource.sip.in b/python/PyQt6/3d/auto_generated/lights/qgslightsource.sip.in
@@ -24,7 +24,6 @@ Base class for light sources in 3d scenes.
 #include "qgslightsource.h"
 %End
   public:
-
     virtual ~QgsLightSource();
 
     virtual Qgis::LightSourceType type() const = 0;

diff --git a/python/PyQt6/3d/auto_generated/materials/qgsabstractmaterialsettings.sip.in b/python/PyQt6/3d/auto_generated/materials/qgsabstractmaterialsettings.sip.in
@@ -12,7 +12,7 @@
 
 
 enum class QgsMaterialSettingsRenderingTechnique /BaseType=IntEnum/
-  {
+{
   Triangles,
   Lines,
   InstancedPoints,
@@ -40,7 +40,6 @@ Context settings for a material.
 #include "qgsabstractmaterialsettings.h"
 %End
   public:
-
     bool isSelected() const;
 %Docstring
 Returns ``True`` if the material should represent a selected state.
@@ -113,7 +112,6 @@ Abstract base class for material settings.
     }
 %End
   public:
-
     virtual ~QgsAbstractMaterialSettings();
 
     virtual QString type() const = 0;

diff --git a/python/PyQt6/3d/auto_generated/materials/qgsgoochmaterialsettings.sip.in b/python/PyQt6/3d/auto_generated/materials/qgsgoochmaterialsettings.sip.in
@@ -28,7 +28,6 @@ with three color components: ambient, diffuse and specular.
 #include "qgsgoochmaterialsettings.h"
 %End
   public:
-
     QgsGoochMaterialSettings();
 
     virtual QString type() const;

diff --git a/python/PyQt6/3d/auto_generated/materials/qgsmaterialregistry.sip.in b/python/PyQt6/3d/auto_generated/materials/qgsmaterialregistry.sip.in
@@ -28,7 +28,6 @@ Stores metadata about one 3D material settings class.
 #include "qgsmaterialregistry.h"
 %End
   public:
-
     QgsMaterialSettingsAbstractMetadata( const QString &type, const QString &visibleName, const QIcon &icon = QIcon() );
 %Docstring
 Constructor for QgsMaterialSettingsAbstractMetadata, with the specified ``type`` and ``visibleName``.
@@ -88,7 +87,6 @@ Qgs3D.materialRegistry().
 #include "qgsmaterialregistry.h"
 %End
   public:
-
     QgsMaterialRegistry();
     ~QgsMaterialRegistry();
 

diff --git a/python/PyQt6/3d/auto_generated/materials/qgsmetalroughmaterialsettings.sip.in b/python/PyQt6/3d/auto_generated/materials/qgsmetalroughmaterialsettings.sip.in
@@ -27,7 +27,6 @@ A PBR metal rough shading material used for rendering.
 #include "qgsmetalroughmaterialsettings.h"
 %End
   public:
-
     QgsMetalRoughMaterialSettings();
 
     virtual QString type() const;

diff --git a/python/PyQt6/3d/auto_generated/materials/qgsnullmaterialsettings.sip.in b/python/PyQt6/3d/auto_generated/materials/qgsnullmaterialsettings.sip.in
@@ -28,7 +28,6 @@ Null shading material used for rendering models and scenes with native textures.
 #include "qgsnullmaterialsettings.h"
 %End
   public:
-
     QgsNullMaterialSettings();
 
     virtual QString type() const;
@@ -49,7 +48,6 @@ Returns a new instance of QgsNullMaterialSettings.
 
     virtual QMap<QString, QString> toExportParameters() const;
 
-
 };
 
 

diff --git a/python/PyQt6/3d/auto_generated/materials/qgsphongmaterialsettings.sip.in b/python/PyQt6/3d/auto_generated/materials/qgsphongmaterialsettings.sip.in
@@ -26,7 +26,6 @@ with three color components: ambient, diffuse and specular.
 #include "qgsphongmaterialsettings.h"
 %End
   public:
-
     QgsPhongMaterialSettings();
 
     virtual QString type() const;

diff --git a/python/PyQt6/3d/auto_generated/materials/qgsphongtexturedmaterialsettings.sip.in b/python/PyQt6/3d/auto_generated/materials/qgsphongtexturedmaterialsettings.sip.in
@@ -27,7 +27,6 @@ A phong shading model with diffuse texture map.
 #include "qgsphongtexturedmaterialsettings.h"
 %End
   public:
-
     QgsPhongTexturedMaterialSettings();
 
     virtual QString type() const;
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,6 @@ Base class for light sources in 3d scenes. @@
     #include "qgslightsource.h"
     %End
       public:
         virtual ~QgsLightSource();
         virtual Qgis::LightSourceType type() const = 0;
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,7 +11,6 @@




		class QgsTiledSceneLayer3DRendererMetadata : Qgs3DRendererAbstractMetadata
		{
		%Docstring(signature="appended")
Expand Down