[3D] add support for gl_clipdistance + scene rotation (part 2)

python/3d/auto_generated/qgs3dmapsettings.sip.in

@@ -48,7 +48,7 @@ Resolves references to other objects (map layers) after the call to :py:func:`~Q
 
     QgsRectangle extent() const;
 %Docstring
-Returns the 3D scene's 2D extent in the 3D scene's CRS
+Returns the 3D scene's 2D bounding box of the extent in the 3D scene's CRS.
 
 .. seealso:: :py:func:`crs`
 
@@ -57,13 +57,10 @@ Returns the 3D scene's 2D extent in the 3D scene's CRS
 
     void setExtent( const QgsRectangle &extent );
 %Docstring
-Sets the 3D scene's 2D ``extent`` in the 3D scene's CRS, while also setting the scene's origin to the extent's center
-This needs to be called during initialization, as terrain will only be generated
-within this extent and layer 3D data will only be loaded within this extent too.
+Sets the 3D scene's 2D ``extent`` in the 3D scene's CRS
+This calls setBox to set 3D scene box.
 
-.. seealso:: :py:func:`setOrigin`
-
-.. seealso:: :py:func:`setCrs`
+.. seealso:: :py:func:`setBox`
 
 .. versionadded:: 3.30
 %End
@@ -83,6 +80,26 @@ to improve the precision.
     QgsVector3D origin() const;
 %Docstring
 Returns coordinates in map CRS at which 3D scene has origin (0,0,0)
+%End
+
+    void setBox( const QgsOrientedBox3D &box );
+%Docstring
+Sets the 3D scene's ``box`` in the 3D scene's CRS, while also setting the scene's origin to the box's center
+This needs to be called during initialization, as terrain will only be generated
+within this extent and layer 3D data will only be loaded within this extent too.
+
+.. seealso:: :py:func:`setOrigin`
+
+.. seealso:: :py:func:`setCrs`
+
+.. versionadded:: 3.40
+%End
+
+    QgsOrientedBox3D box() const;
+%Docstring
+Returns the 3D scene's box in the 3D scene's CRS.
+
+.. versionadded:: 3.40
 %End
 
     QgsVector3D mapToWorldCoordinates( const QgsVector3D &mapCoords ) const;
@@ -934,9 +951,9 @@ Emitted when the debug overaly is enabled or disabled
 
     void extentChanged();
 %Docstring
-Emitted when the 3d view's 2d extent has changed
+Emitted when the 3d view's extent has changed
 
-.. seealso:: :py:func:`setExtent`
+.. seealso:: :py:func:`setBox`
 
 .. versionadded:: 3.30
 %End

python/PyQt6/3d/auto_generated/qgs3dmapsettings.sip.in

@@ -48,7 +48,7 @@ Resolves references to other objects (map layers) after the call to :py:func:`~Q
 
     QgsRectangle extent() const;
 %Docstring
-Returns the 3D scene's 2D extent in the 3D scene's CRS
+Returns the 3D scene's 2D bounding box of the extent in the 3D scene's CRS.
 
 .. seealso:: :py:func:`crs`
 
@@ -57,13 +57,10 @@ Returns the 3D scene's 2D extent in the 3D scene's CRS
 
     void setExtent( const QgsRectangle &extent );
 %Docstring
-Sets the 3D scene's 2D ``extent`` in the 3D scene's CRS, while also setting the scene's origin to the extent's center
-This needs to be called during initialization, as terrain will only be generated
-within this extent and layer 3D data will only be loaded within this extent too.
+Sets the 3D scene's 2D ``extent`` in the 3D scene's CRS
+This calls setBox to set 3D scene box.
 
-.. seealso:: :py:func:`setOrigin`
-
-.. seealso:: :py:func:`setCrs`
+.. seealso:: :py:func:`setBox`
 
 .. versionadded:: 3.30
 %End
@@ -83,6 +80,26 @@ to improve the precision.
     QgsVector3D origin() const;
 %Docstring
 Returns coordinates in map CRS at which 3D scene has origin (0,0,0)
+%End
+
+    void setBox( const QgsOrientedBox3D &box );
+%Docstring
+Sets the 3D scene's ``box`` in the 3D scene's CRS, while also setting the scene's origin to the box's center
+This needs to be called during initialization, as terrain will only be generated
+within this extent and layer 3D data will only be loaded within this extent too.
+
+.. seealso:: :py:func:`setOrigin`
+
+.. seealso:: :py:func:`setCrs`
+
+.. versionadded:: 3.40
+%End
+
+    QgsOrientedBox3D box() const;
+%Docstring
+Returns the 3D scene's box in the 3D scene's CRS.
+
+.. versionadded:: 3.40
 %End
 
     QgsVector3D mapToWorldCoordinates( const QgsVector3D &mapCoords ) const;
@@ -934,9 +951,9 @@ Emitted when the debug overaly is enabled or disabled
 
     void extentChanged();
 %Docstring
-Emitted when the 3d view's 2d extent has changed
+Emitted when the 3d view's extent has changed
 
-.. seealso:: :py:func:`setExtent`
+.. seealso:: :py:func:`setBox`
 
 .. versionadded:: 3.30
 %End

python/PyQt6/core/auto_generated/geometry/qgsorientedbox3d.sip.in

@@ -128,6 +128,14 @@ Returns box transformed by a 4x4 matrix.
 Returns ``True`` if the box intersects the ``other`` box.
 %End
 
+
+    QgsVector3D eulerAngles() const /HoldGIL/;
+%Docstring
+Calculates roll, pitch, and yaw Euler angles (in degrees) that corresponds to the rotation of the box
+
+.. versionadded:: 3.40
+%End
+
     SIP_PYOBJECT __repr__();
 %MethodCode
     QString str = QStringLiteral( "<QgsOrientedBox3D([%1, %2, %3], [%4, %5, %6, %7, %8, %9, %10, %11, %12])>" )

python/PyQt6/core/auto_generated/qgsmatrix4x4.sip.in

@@ -58,6 +58,14 @@ Returns matrix data (in column-major order)
 Multiplies this matrix by another that translates coordinates by the components of a ``vector``.
 %End
 
+
+    void rotate( double angle, const QgsVector3D &vector );
+%Docstring
+Multiples this matrix by another that rotates coordinates through ``angle`` degrees about ``vector``.
+
+.. versionadded:: 3.40
+%End
+
     QgsVector3D map( const QgsVector3D &vector ) const /HoldGIL/;
 %Docstring
 Matrix-vector multiplication (vector is converted to homogeneous coordinates [X,Y,Z,1] and back)

python/PyQt6/core/auto_generated/qgsvector3d.sip.in

@@ -84,6 +84,8 @@ Sets vector coordinates
 
     QgsVector3D operator-( const QgsVector3D &other ) const /HoldGIL/;
 
+    const QgsVector3D operator-() const /HoldGIL/;
+
     QgsVector3D operator *( const double factor ) const /HoldGIL/;
 
     QgsVector3D operator /( const double factor ) const /HoldGIL/;

python/core/auto_generated/geometry/qgsorientedbox3d.sip.in

@@ -128,6 +128,14 @@ Returns box transformed by a 4x4 matrix.
 Returns ``True`` if the box intersects the ``other`` box.
 %End
 
+
+    QgsVector3D eulerAngles() const /HoldGIL/;
+%Docstring
+Calculates roll, pitch, and yaw Euler angles (in degrees) that corresponds to the rotation of the box
+
+.. versionadded:: 3.40
+%End
+
     SIP_PYOBJECT __repr__();
 %MethodCode
     QString str = QStringLiteral( "<QgsOrientedBox3D([%1, %2, %3], [%4, %5, %6, %7, %8, %9, %10, %11, %12])>" )

python/core/auto_generated/qgsmatrix4x4.sip.in

@@ -58,6 +58,14 @@ Returns matrix data (in column-major order)
 Multiplies this matrix by another that translates coordinates by the components of a ``vector``.
 %End
 
+
+    void rotate( double angle, const QgsVector3D &vector );
+%Docstring
+Multiples this matrix by another that rotates coordinates through ``angle`` degrees about ``vector``.
+
+.. versionadded:: 3.40
+%End
+
     QgsVector3D map( const QgsVector3D &vector ) const /HoldGIL/;
 %Docstring
 Matrix-vector multiplication (vector is converted to homogeneous coordinates [X,Y,Z,1] and back)

python/core/auto_generated/qgsvector3d.sip.in

@@ -84,6 +84,8 @@ Sets vector coordinates
 
     QgsVector3D operator-( const QgsVector3D &other ) const /HoldGIL/;
 
+    const QgsVector3D operator-() const /HoldGIL/;
+
     QgsVector3D operator *( const double factor ) const /HoldGIL/;
 
     QgsVector3D operator /( const double factor ) const /HoldGIL/;

src/3d/CMakeLists.txt

@@ -65,6 +65,7 @@ set(QGIS_3D_SRCS
   lights/qgspointlightsettings.cpp
 
   materials/qgsabstractmaterialsettings.cpp
+  materials/qgsdiffusespecularmaterial.cpp
   materials/qgsgoochmaterialsettings.cpp
   materials/qgsmaterialregistry.cpp
   materials/qgsmetalroughmaterial.cpp
@@ -73,6 +74,7 @@ set(QGIS_3D_SRCS
   materials/qgsphongmaterialsettings.cpp
   materials/qgsphongtexturedmaterialsettings.cpp
   materials/qgssimplelinematerialsettings.cpp
+  materials/qgstexturematerial.cpp
 
   processing/qgs3dalgorithms.cpp
   processing/qgsalgorithmtessellate.cpp
@@ -157,6 +159,7 @@ set(QGIS_3D_HDRS
   lights/qgspointlightsettings.h
 
   materials/qgsabstractmaterialsettings.h
+  materials/qgsdiffusespecularmaterial.h
   materials/qgsgoochmaterialsettings.h
   materials/qgsmaterialregistry.h
   materials/qgsmetalroughmaterial.h
@@ -165,6 +168,7 @@ set(QGIS_3D_HDRS
   materials/qgsphongmaterialsettings.h
   materials/qgsphongtexturedmaterialsettings.h
   materials/qgssimplelinematerialsettings.h
+  materials/qgstexturematerial.h
 
   symbols/qgsbillboardgeometry.h
   symbols/qgsline3dsymbol.h

src/3d/materials/qgsabstractmaterialsettings.h

@@ -27,6 +27,7 @@ class QDomElement;
 class QgsReadWriteContext;
 class QgsLineMaterial;
 class QgsExpressionContext;
+class Qgs3DMapSettings;
 
 #ifndef SIP_RUN
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -179,7 +180,7 @@ class _3D_EXPORT QgsAbstractMaterialSettings SIP_ABSTRACT
      * The \a technique argument specifies the rendering technique which will be used with the returned
      * material.
      */
-    virtual Qt3DRender::QMaterial *toMaterial( QgsMaterialSettingsRenderingTechnique technique, const QgsMaterialContext &context ) const = 0 SIP_FACTORY;
+    virtual Qt3DRender::QMaterial *toMaterial( const Qgs3DMapSettings &mapSettings, QgsMaterialSettingsRenderingTechnique technique, const QgsMaterialContext &context ) const = 0 SIP_FACTORY;
 
     /**
      * Returns the parameters to be exported to .mtl file