rename ColorRampTexture

qgis · Dec 3, 2020 · ae749de · ae749de
1 parent 1ca1841
commit ae749de
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/3d/mesh/qgsmesh3dmaterial_p.cpp b/src/3d/mesh/qgsmesh3dmaterial_p.cpp
@@ -152,11 +152,11 @@ void QgsMesh3dMaterial::configure()
     {
       case QgsMesh3dMaterial::ZValue:
         // if the color shading is done with the Z value of vertices, the color ramp has to be adapted with vertical scale
-        colorRampTexture->addTextureImage( new ColorRampTexture( mSymbol->colorRampShader(), mSymbol->verticalScale() ) );
+        colorRampTexture->addTextureImage( new QgsColorRampTexture( mSymbol->colorRampShader(), mSymbol->verticalScale() ) );
         break;
       case QgsMesh3dMaterial::ScalarDataSet:
         // if the color shading is done with scalar dataset, no vertical scale to use
-        colorRampTexture->addTextureImage( new ColorRampTexture( mSymbol->colorRampShader(), 1 ) );
+        colorRampTexture->addTextureImage( new QgsColorRampTexture( mSymbol->colorRampShader(), 1 ) );
         break;
     }
 

diff --git a/src/3d/qgscolorramptexture.cpp b/src/3d/qgscolorramptexture.cpp
@@ -21,13 +21,13 @@
 
 // ColorRampTextureGenerator
 
-ColorRampTextureGenerator::ColorRampTextureGenerator( const QgsColorRampShader &colorRampShader, double verticalScale )
+QgsColorRampTextureGenerator::QgsColorRampTextureGenerator( const QgsColorRampShader &colorRampShader, double verticalScale )
   : mColorRampShader( colorRampShader )
   , mVerticalScale( verticalScale )
 {
 }
 
-Qt3DRender::QTextureImageDataPtr ColorRampTextureGenerator::operator()()
+Qt3DRender::QTextureImageDataPtr QgsColorRampTextureGenerator::operator()()
 {
   Qt3DRender::QTextureImageDataPtr dataPtr = Qt3DRender::QTextureImageDataPtr::create();
   dataPtr->setFormat( QOpenGLTexture::RGBA32F );
@@ -67,9 +67,9 @@ Qt3DRender::QTextureImageDataPtr ColorRampTextureGenerator::operator()()
   return dataPtr;
 }
 
-bool ColorRampTextureGenerator::operator==( const Qt3DRender::QTextureImageDataGenerator &other ) const
+bool QgsColorRampTextureGenerator::operator==( const Qt3DRender::QTextureImageDataGenerator &other ) const
 {
-  const ColorRampTextureGenerator *otherFunctor = functor_cast<ColorRampTextureGenerator>( &other );
+  const QgsColorRampTextureGenerator *otherFunctor = functor_cast<QgsColorRampTextureGenerator>( &other );
   if ( !otherFunctor )
     return false;
 
@@ -101,17 +101,17 @@ bool ColorRampTextureGenerator::operator==( const Qt3DRender::QTextureImageDataG
 
 // ColorRampTexture
 
-ColorRampTexture::ColorRampTexture( const QgsColorRampShader &colorRampShader, double verticalScale, Qt3DCore::QNode *parent )
+QgsColorRampTexture::QgsColorRampTexture( const QgsColorRampShader &colorRampShader, double verticalScale, Qt3DCore::QNode *parent )
   : Qt3DRender::QAbstractTextureImage( parent ),
     mColorRampShader( colorRampShader ),
     mVerticalScale( verticalScale )
 {
 
 }
 
-Qt3DRender::QTextureImageDataGeneratorPtr ColorRampTexture::dataGenerator() const
+Qt3DRender::QTextureImageDataGeneratorPtr QgsColorRampTexture::dataGenerator() const
 {
-  return Qt3DRender::QTextureImageDataGeneratorPtr( new ColorRampTextureGenerator( mColorRampShader, mVerticalScale ) );
+  return Qt3DRender::QTextureImageDataGeneratorPtr( new QgsColorRampTextureGenerator( mColorRampShader, mVerticalScale ) );
 }
 
 /// @endcond
diff --git a/src/3d/qgscolorramptexture.h b/src/3d/qgscolorramptexture.h
@@ -36,29 +36,29 @@
 #include "qgsmeshlayerutils.h"
 #include "qgstriangularmesh.h"
 
-class ColorRampTextureGenerator: public Qt3DRender::QTextureImageDataGenerator
+class QgsColorRampTextureGenerator: public Qt3DRender::QTextureImageDataGenerator
 {
 
   public:
-    ColorRampTextureGenerator( const QgsColorRampShader &colorRampShader, double verticalScale = 1 );
+    QgsColorRampTextureGenerator( const QgsColorRampShader &colorRampShader, double verticalScale = 1 );
 
   public:
     Qt3DRender::QTextureImageDataPtr operator()() override;
 
     bool operator ==( const Qt3DRender::QTextureImageDataGenerator &other ) const override;
 
-    QT3D_FUNCTOR( ColorRampTextureGenerator )
+    QT3D_FUNCTOR( QgsColorRampTextureGenerator )
 
   private:
     QgsColorRampShader mColorRampShader;
     double mVerticalScale = 1;
 };
 
 
-class ColorRampTexture: public Qt3DRender::QAbstractTextureImage
+class QgsColorRampTexture: public Qt3DRender::QAbstractTextureImage
 {
   public:
-    ColorRampTexture( const QgsColorRampShader &colorRampShader, double verticalScale = 1, Qt3DCore::QNode *parent = nullptr );
+    QgsColorRampTexture( const QgsColorRampShader &colorRampShader, double verticalScale = 1, Qt3DCore::QNode *parent = nullptr );
     // QAbstractTextureImage interface
   protected:
     Qt3DRender::QTextureImageDataGeneratorPtr dataGenerator() const override;

diff --git a/src/3d/qgspointcloudlayerchunkloader_p.cpp b/src/3d/qgspointcloudlayerchunkloader_p.cpp
@@ -232,7 +232,7 @@ Qt3DRender::QMaterial *QgsPointCloud3DSymbolHandler::constructMaterial()
     if ( colorRampShader.colorRampItemList().count() > 0 )
     {
       colorRampTexture = new Qt3DRender::QTexture1D( mat );
-      colorRampTexture->addTextureImage( new ColorRampTexture( colorRampShader, 1 ) );
+      colorRampTexture->addTextureImage( new QgsColorRampTexture( colorRampShader, 1 ) );
       colorRampTexture->setMinificationFilter( Qt3DRender::QTexture1D::Linear );
       colorRampTexture->setMagnificationFilter( Qt3DRender::QTexture1D::Linear );
     }