Add transparency support for phong materials

2025-10-16 00:05:45 -04:00 · 2022-05-10 13:36:35 +01:00 · 2022-05-10 13:36:35 +01:00 · e24f5cbbef
commit e24f5cbbef
parent c69fcd7ed4
9 changed files with 254 additions and 86 deletions
--- a/python/3d/auto_generated/materials/qgsphongmaterialsettings.sip.in
+++ b/python/3d/auto_generated/materials/qgsphongmaterialsettings.sip.in
@ -66,6 +66,13 @@ Returns specular color component
    float shininess() const;
 %Docstring
 Returns shininess of the surface
+%End
+
+    float opacity() const;
+%Docstring
+Returns the opacity of the surface
+
+.. versionadded:: 3.26
 %End

    virtual QMap<QString, QString> toExportParameters() const;
@ -88,6 +95,15 @@ Sets specular color component
 Sets shininess of the surface
 %End

+    void setOpacity( float opacity );
+%Docstring
+Sets shininess of the surface
+
+.. versionadded:: 3.26
+%End
+
+
+
    virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );

    virtual void writeXml( QDomElement &elem, const QgsReadWriteContext &context ) const;
--- a/src/3d/materials/qgsphongmaterialsettings.cpp
+++ b/src/3d/materials/qgsphongmaterialsettings.cpp
@ -20,6 +20,7 @@
 #include "qgsimagecache.h"
 #include <Qt3DExtras/QDiffuseMapMaterial>
 #include <Qt3DExtras/QPhongMaterial>
+#include <Qt3DExtras/QPhongAlphaMaterial>
 #include <Qt3DRender/QAttribute>
 #include <Qt3DRender/QBuffer>
 #include <Qt3DRender/QGeometry>
@ -69,6 +70,7 @@ void QgsPhongMaterialSettings::readXml( const QDomElement &elem, const QgsReadWr
  mDiffuse = QgsSymbolLayerUtils::decodeColor( elem.attribute( QStringLiteral( "diffuse" ), QStringLiteral( "178,178,178" ) ) );
  mSpecular = QgsSymbolLayerUtils::decodeColor( elem.attribute( QStringLiteral( "specular" ), QStringLiteral( "255,255,255" ) ) );
  mShininess = elem.attribute( QStringLiteral( "shininess" ) ).toFloat();
+  mOpacity = elem.attribute( QStringLiteral( "opacity" ), QStringLiteral( "1.0" ) ).toFloat();

  QgsAbstractMaterialSettings::readXml( elem, context );
 }
@ -79,6 +81,7 @@ void QgsPhongMaterialSettings::writeXml( QDomElement &elem, const QgsReadWriteCo
  elem.setAttribute( QStringLiteral( "diffuse" ), QgsSymbolLayerUtils::encodeColor( mDiffuse ) );
  elem.setAttribute( QStringLiteral( "specular" ), QgsSymbolLayerUtils::encodeColor( mSpecular ) );
  elem.setAttribute( QStringLiteral( "shininess" ), mShininess );
+  elem.setAttribute( QStringLiteral( "opacity" ), mOpacity );

  QgsAbstractMaterialSettings::writeXml( elem, context );
 }
@ -98,6 +101,24 @@ Qt3DRender::QMaterial *QgsPhongMaterialSettings::toMaterial( QgsMaterialSettings
      if ( dataDefinedProperties().hasActiveProperties() )
        return dataDefinedMaterial();

+      if ( mOpacity != 1 )
+      {
+        Qt3DExtras::QPhongAlphaMaterial *material  = new Qt3DExtras::QPhongAlphaMaterial;
+        material->setDiffuse( mDiffuse );
+        material->setAmbient( mAmbient );
+        material->setSpecular( mSpecular );
+        material->setShininess( mShininess );
+        material->setAlpha( mOpacity );
+
+        if ( context.isSelected() )
+        {
+          // update the material with selection colors
+          material->setDiffuse( context.selectionColor() );
+          material->setAmbient( context.selectionColor().darker() );
+        }
+        return material;
+      }
+
      Qt3DExtras::QPhongMaterial *material  = new Qt3DExtras::QPhongMaterial;
      material->setDiffuse( mDiffuse );
      material->setAmbient( mAmbient );
--- a/src/3d/materials/qgsphongmaterialsettings.h
+++ b/src/3d/materials/qgsphongmaterialsettings.h
@ -73,6 +73,12 @@ class _3D_EXPORT QgsPhongMaterialSettings : public QgsAbstractMaterialSettings
    //! Returns shininess of the surface
    float shininess() const { return mShininess; }

+    /**
+     * Returns the opacity of the surface
+     * \since QGIS 3.26
+     */
+    float opacity() const { return mOpacity; }
+
    QMap<QString, QString> toExportParameters() const override;

    //! Sets ambient color component
@ -84,6 +90,14 @@ class _3D_EXPORT QgsPhongMaterialSettings : public QgsAbstractMaterialSettings
    //! Sets shininess of the surface
    void setShininess( float shininess ) { mShininess = shininess; }

+    /**
+     * Sets shininess of the surface
+     * \since QGIS 3.26
+     */
+    void setOpacity( float opacity ) { mOpacity = opacity; }
+
+
+
    void readXml( const QDomElement &elem, const QgsReadWriteContext &context ) override;
    void writeXml( QDomElement &elem, const QgsReadWriteContext &context ) const override;

@ -110,6 +124,7 @@ class _3D_EXPORT QgsPhongMaterialSettings : public QgsAbstractMaterialSettings
    QColor mDiffuse{ QColor::fromRgbF( 0.7f, 0.7f, 0.7f, 1.0f ) };
    QColor mSpecular{ QColor::fromRgbF( 1.0f, 1.0f, 1.0f, 1.0f ) };
    float mShininess = 0.0f;
+    float mOpacity = 1.0f;

    //! Constructs a material from shader files
    Qt3DRender::QMaterial *dataDefinedMaterial() const;
--- a/src/3d/qgs3dmapscene.cpp
+++ b/src/3d/qgs3dmapscene.cpp
@ -25,6 +25,7 @@
 #include <Qt3DRender/QSceneLoader>
 #include <Qt3DExtras/QForwardRenderer>
 #include <Qt3DExtras/QPhongMaterial>
+#include <Qt3DExtras/QPhongAlphaMaterial>
 #include <Qt3DExtras/QSphereMesh>
 #include <Qt3DLogic/QFrameAction>
 #include <Qt3DRender/QEffect>
@ -911,6 +912,19 @@ void Qgs3DMapScene::finalizeNewEntity( Qt3DCore::QEntity *newEntity )

    bm->setViewportSize( mCameraController->viewport().size() );
  }
+
+  // Finalize adding the 3D transparent objects by adding the layer components to the entities
+  for ( Qt3DExtras::QPhongAlphaMaterial *ph : newEntity->findChildren<Qt3DExtras::QPhongAlphaMaterial *>() )
+  {
+    Qt3DCore::QEntity *entity = qobject_cast<Qt3DCore::QEntity *>( ph->parent() );
+    if ( !entity )
+      continue;
+    QgsShadowRenderingFrameGraph *frameGraph = mEngine->frameGraph();
+    Qt3DRender::QLayer *layer = frameGraph->transparentObjectLayer();
+    if ( entity->components().contains( layer ) )
+      continue;
+    entity->addComponent( layer );
+  }
 }

 int Qgs3DMapScene::maximumTextureSize() const
--- a/src/3d/qgsshadowrenderingframegraph.cpp
+++ b/src/3d/qgsshadowrenderingframegraph.cpp
@ -26,7 +26,8 @@
 #include <Qt3DRender/QBuffer>
 #include <Qt3DRender/QTechnique>
 #include <Qt3DRender/QGraphicsApiFilter>
-
+#include <Qt3DRender/QBlendEquation>
+#include <Qt3DRender/QSortPolicy>

 Qt3DRender::QFrameGraphNode *QgsShadowRenderingFrameGraph::constructTexturesPreviewPass()
 {
@ -46,6 +47,14 @@ Qt3DRender::QFrameGraphNode *QgsShadowRenderingFrameGraph::constructTexturesPrev

 Qt3DRender::QFrameGraphNode *QgsShadowRenderingFrameGraph::constructForwardRenderPass()
 {
+  // The branch structure:
+  // mMainCameraSelector
+  // mForwardRenderLayerFilter
+  // mForwardRenderTargetSelector
+  // opaqueObjectsFilter       | transparentObjectsLayerFilter
+  // forwaredRenderStateSet    | sortPolicy
+  // mFrustumCulling           | transparentObjectsRenderStateSet
+  // mForwardClearBuffers      |
  mMainCameraSelector = new Qt3DRender::QCameraSelector;
  mMainCameraSelector->setCamera( mMainCamera );

@ -85,12 +94,11 @@ Qt3DRender::QFrameGraphNode *QgsShadowRenderingFrameGraph::constructForwardRende
  mForwardRenderTargetSelector = new Qt3DRender::QRenderTargetSelector( mForwardRenderLayerFilter );
  mForwardRenderTargetSelector->setTarget( forwardRenderTarget );

-  mForwardClearBuffers = new Qt3DRender::QClearBuffers( mForwardRenderTargetSelector );
-  mForwardClearBuffers->setClearColor( QColor::fromRgbF( 0.0, 0.0, 1.0, 1.0 ) );
-  mForwardClearBuffers->setBuffers( Qt3DRender::QClearBuffers::ColorDepthBuffer );
-  mForwardClearBuffers->setClearDepthValue( 1.0f );
+  Qt3DRender::QLayerFilter *opaqueObjectsFilter = new Qt3DRender::QLayerFilter( mForwardRenderTargetSelector );
+  opaqueObjectsFilter->addLayer( mTransparentObjectsPassLayer );
+  opaqueObjectsFilter->setFilterMode( Qt3DRender::QLayerFilter::DiscardAnyMatchingLayers );

-  Qt3DRender::QRenderStateSet *forwaredRenderStateSet = new Qt3DRender::QRenderStateSet( mForwardClearBuffers );
+  Qt3DRender::QRenderStateSet *forwaredRenderStateSet = new Qt3DRender::QRenderStateSet( opaqueObjectsFilter );

  Qt3DRender::QDepthTest *depthTest = new Qt3DRender::QDepthTest;
  depthTest->setDepthFunction( Qt3DRender::QDepthTest::Less );
@ -102,6 +110,38 @@ Qt3DRender::QFrameGraphNode *QgsShadowRenderingFrameGraph::constructForwardRende

  mFrustumCulling = new Qt3DRender::QFrustumCulling( forwaredRenderStateSet );

+  mForwardClearBuffers = new Qt3DRender::QClearBuffers( mFrustumCulling );
+  mForwardClearBuffers->setClearColor( QColor::fromRgbF( 0.0, 0.0, 1.0, 1.0 ) );
+  mForwardClearBuffers->setBuffers( Qt3DRender::QClearBuffers::ColorDepthBuffer );
+  mForwardClearBuffers->setClearDepthValue( 1.0f );
+
+  Qt3DRender::QLayerFilter *transparentObjectsLayerFilter = new Qt3DRender::QLayerFilter( mForwardRenderTargetSelector );
+  transparentObjectsLayerFilter->addLayer( mTransparentObjectsPassLayer );
+  transparentObjectsLayerFilter->setFilterMode( Qt3DRender::QLayerFilter::AcceptAnyMatchingLayers );
+
+  Qt3DRender::QSortPolicy *sortPolicy = new Qt3DRender::QSortPolicy( transparentObjectsLayerFilter );
+  QVector<Qt3DRender::QSortPolicy::SortType> sortTypes;
+  sortTypes.push_back( Qt3DRender::QSortPolicy::BackToFront );
+  sortTypes.push_back( Qt3DRender::QSortPolicy::Material );
+  sortTypes.push_back( Qt3DRender::QSortPolicy::StateChangeCost );
+  sortTypes.push_back( Qt3DRender::QSortPolicy::FrontToBack );
+  sortPolicy->setSortTypes( sortTypes );
+
+  Qt3DRender::QRenderStateSet *transparentObjectsRenderStateSet = new Qt3DRender::QRenderStateSet( sortPolicy );
+  {
+    Qt3DRender::QDepthTest *depthTest = new Qt3DRender::QDepthTest;
+    depthTest->setDepthFunction( Qt3DRender::QDepthTest::Less );
+    transparentObjectsRenderStateSet->addRenderState( depthTest );
+
+    Qt3DRender::QCullFace *cullFace = new Qt3DRender::QCullFace;
+    cullFace->setMode( Qt3DRender::QCullFace::CullingMode::NoCulling );
+    transparentObjectsRenderStateSet->addRenderState( cullFace );
+
+    Qt3DRender::QBlendEquation *blendEquation = new Qt3DRender::QBlendEquation;
+    blendEquation->setBlendFunction( Qt3DRender::QBlendEquation::Subtract );
+    transparentObjectsRenderStateSet->addRenderState( blendEquation );
+  }
+
  return mMainCameraSelector;
 }

@ -352,13 +392,14 @@ QgsShadowRenderingFrameGraph::QgsShadowRenderingFrameGraph( QSurface *surface, Q
  mCastShadowsLayer = new Qt3DRender::QLayer;
  mForwardRenderLayer = new Qt3DRender::QLayer;
  mDepthRenderPassLayer = new Qt3DRender::QLayer;
-
+  mTransparentObjectsPassLayer = new Qt3DRender::QLayer;

  mPostprocessPassLayer->setRecursive( true );
  mPreviewLayer->setRecursive( true );
  mCastShadowsLayer->setRecursive( true );
  mForwardRenderLayer->setRecursive( true );
  mDepthRenderPassLayer->setRecursive( true );
+  mTransparentObjectsPassLayer->setRecursive( true );

  mRenderSurfaceSelector = new Qt3DRender::QRenderSurfaceSelector;

--- a/src/3d/qgsshadowrenderingframegraph.h
+++ b/src/3d/qgsshadowrenderingframegraph.h
@ -78,6 +78,12 @@ class QgsShadowRenderingFrameGraph : public Qt3DCore::QEntity
    //! Returns a layer object used to indicate that an entity will be rendered during the forward rendering pass
    Qt3DRender::QLayer *forwardRenderLayer() { return mForwardRenderLayer; }

+    /**
+     * Returns a layer object used to indicate that the object is transparent
+     * \since QGIS 3.26
+     */
+    Qt3DRender::QLayer *transparentObjectLayer() { return mTransparentObjectsPassLayer; }
+
    //! Returns the main camera
    Qt3DRender::QCamera *mainCamera() { return mMainCamera; }
    //! Returns the light camera
@ -220,6 +226,7 @@ class QgsShadowRenderingFrameGraph : public Qt3DCore::QEntity
    Qt3DRender::QLayer *mForwardRenderLayer = nullptr;
    Qt3DRender::QLayer *mCastShadowsLayer = nullptr;
    Qt3DRender::QLayer *mDepthRenderPassLayer = nullptr;
+    Qt3DRender::QLayer *mTransparentObjectsPassLayer = nullptr;

    QgsPostprocessingEntity *mPostprocessingEntity = nullptr;

--- a/src/app/3d/qgsphongmaterialwidget.cpp
+++ b/src/app/3d/qgsphongmaterialwidget.cpp
@ -33,6 +33,11 @@ QgsPhongMaterialWidget::QgsPhongMaterialWidget( QWidget *parent )
  connect( mAmbientDataDefinedButton, &QgsPropertyOverrideButton::changed, this, &QgsPhongMaterialWidget::changed );
  connect( mDiffuseDataDefinedButton, &QgsPropertyOverrideButton::changed, this, &QgsPhongMaterialWidget::changed );
  connect( mSpecularDataDefinedButton, &QgsPropertyOverrideButton::changed, this, &QgsPhongMaterialWidget::changed );
+  connect( mOpacitySlider, &QSlider::valueChanged, this, &QgsPhongMaterialWidget::changed );
+  connect( mOpacitySlider, &QSlider::valueChanged, this, [&]( int value )
+  {
+    mOpacityPercentageLabel->setText( QStringLiteral( "%1%" ).arg( value ) );
+  } );
 }

 QgsMaterialSettingsWidget *QgsPhongMaterialWidget::create()
@ -100,6 +105,7 @@ void QgsPhongMaterialWidget::setSettings( const QgsAbstractMaterialSettings *set
  btnAmbient->setColor( phongMaterial->ambient() );
  btnSpecular->setColor( phongMaterial->specular() );
  spinShininess->setValue( phongMaterial->shininess() );
+  mOpacitySlider->setValue( phongMaterial->opacity() * 100.0 );

  mPropertyCollection = settings->dataDefinedProperties();

@ -115,6 +121,7 @@ QgsAbstractMaterialSettings *QgsPhongMaterialWidget::settings()
  m->setAmbient( btnAmbient->color() );
  m->setSpecular( btnSpecular->color() );
  m->setShininess( spinShininess->value() );
+  m->setOpacity( mOpacitySlider->value() / 100.0 );

  mPropertyCollection.setProperty( QgsAbstractMaterialSettings::Diffuse, mDiffuseDataDefinedButton->toProperty() );
  mPropertyCollection.setProperty( QgsAbstractMaterialSettings::Ambient, mAmbientDataDefinedButton->toProperty() );
--- a/src/ui/3d/phongmaterialwidget.ui
+++ b/src/ui/3d/phongmaterialwidget.ui
@ -14,13 +14,20 @@
   <string notr="true">Form</string>
  </property>
  <layout class="QGridLayout" name="gridLayout">
-   <item row="3" column="0">
-    <widget class="QLabel" name="lblShininess">
+   <item row="1" column="2">
+    <widget class="QgsPropertyOverrideButton" name="mAmbientDataDefinedButton">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="lblDiffuse">
     <property name="toolTip">
-      <string>How shiny smooth surfaces are.</string>
+      <string>Color of light reflected from rough surfaces.</string>
     </property>
     <property name="text">
-      <string>Shininess</string>
+      <string>Diffuse</string>
     </property>
    </widget>
   </item>
@ -56,6 +63,37 @@
     </property>
    </widget>
   </item>
+   <item row="3" column="1">
+    <widget class="QgsDoubleSpinBox" name="spinShininess">
+     <property name="maximum">
+      <double>1000.000000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QgsPropertyOverrideButton" name="mDiffuseDataDefinedButton">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="lblShininess">
+     <property name="toolTip">
+      <string>How shiny smooth surfaces are.</string>
+     </property>
+     <property name="text">
+      <string>Shininess</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QgsPropertyOverrideButton" name="mSpecularDataDefinedButton">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
   <item row="2" column="0">
    <widget class="QLabel" name="lblSpecular">
     <property name="toolTip">
@ -66,23 +104,6 @@
     </property>
    </widget>
   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="lblDiffuse">
-     <property name="toolTip">
-      <string>Color of light reflected from rough surfaces.</string>
-     </property>
-     <property name="text">
-      <string>Diffuse</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QgsDoubleSpinBox" name="spinShininess">
-     <property name="maximum">
-      <double>1000.000000000000000</double>
-     </property>
-    </widget>
-   </item>
   <item row="1" column="0">
    <widget class="QLabel" name="lblAmbient">
     <property name="toolTip">
@ -109,24 +130,30 @@
     </property>
    </widget>
   </item>
-   <item row="0" column="2">
-    <widget class="QgsPropertyOverrideButton" name="mDiffuseDataDefinedButton">
-     <property name="text">
-      <string>...</string>
+   <item row="4" column="1">
+    <widget class="QSlider" name="mOpacitySlider">
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>100</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
     </property>
    </widget>
   </item>
-   <item row="1" column="2">
-    <widget class="QgsPropertyOverrideButton" name="mAmbientDataDefinedButton">
+   <item row="4" column="0">
+    <widget class="QLabel" name="lblOpacity">
     <property name="text">
-      <string>...</string>
+      <string>Opacity</string>
     </property>
    </widget>
   </item>
-   <item row="2" column="2">
-    <widget class="QgsPropertyOverrideButton" name="mSpecularDataDefinedButton">
+   <item row="4" column="2">
+    <widget class="QLabel" name="mOpacityPercentageLabel">
     <property name="text">
-      <string>...</string>
+      <string>100%</string>
     </property>
    </widget>
   </item>
--- a/src/ui/3d/phongtexturedmaterialwidgetbase.ui
+++ b/src/ui/3d/phongtexturedmaterialwidgetbase.ui
@ -15,18 +15,21 @@
  </property>
  <layout class="QGridLayout" name="gridLayout">
   <item row="5" column="1">
-    <widget class="QgsDoubleSpinBox" name="textureRotationSpinBox">
+    <widget class="QgsDoubleSpinBox" name="textureScaleSpinBox">
     <property name="suffix">
-      <string> °</string>
+      <string> %</string>
     </property>
     <property name="minimum">
-      <double>-360.000000000000000</double>
+      <double>0.010000000000000</double>
     </property>
     <property name="maximum">
-      <double>360.000000000000000</double>
+      <double>100000.000000000000000</double>
     </property>
     <property name="singleStep">
-      <double>0.500000000000000</double>
+      <double>1.000000000000000</double>
+     </property>
+     <property name="value">
+      <double>100.000000000000000</double>
     </property>
    </widget>
   </item>
@ -37,16 +40,6 @@
     </property>
    </widget>
   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="lblSpecular">
-     <property name="toolTip">
-      <string>Color of light reflecting from smooth surfaces.</string>
-     </property>
-     <property name="text">
-      <string>Specular</string>
-     </property>
-    </widget>
-   </item>
   <item row="1" column="1">
    <widget class="QgsColorButton" name="btnSpecular">
     <property name="sizePolicy">
@ -63,29 +56,23 @@
     </property>
    </widget>
   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="lblTextureScale">
+   <item row="4" column="1">
+    <widget class="QgsImageSourceLineEdit" name="textureFile" native="true"/>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="lblSpecular">
+     <property name="toolTip">
+      <string>Color of light reflecting from smooth surfaces.</string>
+     </property>
     <property name="text">
-      <string>Texture scale</string>
+      <string>Specular</string>
     </property>
    </widget>
   </item>
-   <item row="4" column="1">
-    <widget class="QgsDoubleSpinBox" name="textureScaleSpinBox">
-     <property name="suffix">
-      <string> %</string>
-     </property>
-     <property name="minimum">
-      <double>0.010000000000000</double>
-     </property>
-     <property name="maximum">
-      <double>100000.000000000000000</double>
-     </property>
-     <property name="singleStep">
-      <double>1.000000000000000</double>
-     </property>
-     <property name="value">
-      <double>100.000000000000000</double>
+   <item row="6" column="0">
+    <widget class="QLabel" name="lblTextureRotation">
+     <property name="text">
+      <string>Texture rotation</string>
     </property>
    </widget>
   </item>
@ -99,6 +86,23 @@
     </property>
    </widget>
   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="lblTextureScale">
+     <property name="text">
+      <string>Texture scale</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="lblShininess">
+     <property name="toolTip">
+      <string>How shiny smooth surfaces are.</string>
+     </property>
+     <property name="text">
+      <string>Shininess</string>
+     </property>
+    </widget>
+   </item>
   <item row="0" column="1">
    <widget class="QgsColorButton" name="btnAmbient">
     <property name="sizePolicy">
@ -115,30 +119,46 @@
     </property>
    </widget>
   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="lblTextureRotation">
+   <item row="4" column="0">
+    <widget class="QLabel" name="lblTextureScale_2">
     <property name="text">
-      <string>Texture rotation</string>
+      <string>Diffuse texture</string>
     </property>
    </widget>
   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="lblShininess">
-     <property name="toolTip">
-      <string>How shiny smooth surfaces are.</string>
+   <item row="6" column="1">
+    <widget class="QgsDoubleSpinBox" name="textureRotationSpinBox">
+     <property name="suffix">
+      <string> °</string>
     </property>
+     <property name="minimum">
+      <double>-360.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>360.000000000000000</double>
+     </property>
+     <property name="singleStep">
+      <double>0.500000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="lblOpacity">
     <property name="text">
-      <string>Shininess</string>
+      <string>Opacity</string>
     </property>
    </widget>
   </item>
   <item row="3" column="1">
-    <widget class="QgsImageSourceLineEdit" name="textureFile" native="true"/>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="lblTextureScale_2">
-     <property name="text">
-      <string>Diffuse texture</string>
+    <widget class="QSlider" name="mOpacitySlider">
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>100</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
     </property>
    </widget>
   </item>