Remove duplicate QgsQImageTextureImage class

qgis · Dec 12, 2020 · 515d282 · 515d282
1 parent 6e45597
commit 515d282
Showing 1 changed file with 2 additions and 23 deletions.
diff --git a/src/3d/materials/qgsphongtexturedmaterialsettings.cpp b/src/3d/materials/qgsphongtexturedmaterialsettings.cpp
@@ -18,6 +18,7 @@
 #include "qgssymbollayerutils.h"
 #include "qgsapplication.h"
 #include "qgsimagecache.h"
+#include "qgsimagetexture.h"
 #include <Qt3DExtras/QDiffuseMapMaterial>
 #include <Qt3DExtras/QPhongMaterial>
 #include <Qt3DRender/QPaintedTextureImage>
@@ -89,28 +90,6 @@ void QgsPhongTexturedMaterialSettings::writeXml( QDomElement &elem, const QgsRea
   QgsAbstractMaterialSettings::writeXml( elem, context );
 }
 
-///@cond PRIVATE
-class QgsQImageTextureImage : public Qt3DRender::QPaintedTextureImage
-{
-  public:
-    QgsQImageTextureImage( const QImage &image, Qt3DCore::QNode *parent = nullptr )
-      : Qt3DRender::QPaintedTextureImage( parent )
-      , mImage( image )
-    {
-      setSize( mImage.size() );
-    }
-
-    void paint( QPainter *painter ) override
-    {
-      painter->drawImage( mImage.rect(), mImage, mImage.rect() );
-    }
-
-  private:
-
-    QImage mImage;
-
-};
-
 ///@endcond
 Qt3DRender::QMaterial *QgsPhongTexturedMaterialSettings::toMaterial( QgsMaterialSettingsRenderingTechnique technique, const QgsMaterialContext &context ) const
 {
@@ -131,7 +110,7 @@ Qt3DRender::QMaterial *QgsPhongTexturedMaterialSettings::toMaterial( QgsMaterial
       {
         Qt3DExtras::QDiffuseMapMaterial *material = new Qt3DExtras::QDiffuseMapMaterial;
 
-        QgsQImageTextureImage *textureImage = new QgsQImageTextureImage( textureSourceImage );
+        QgsImageTexture *textureImage = new QgsImageTexture( textureSourceImage );
         material->diffuse()->addTextureImage( textureImage );
 
         material->diffuse()->wrapMode()->setX( Qt3DRender::QTextureWrapMode::Repeat );