Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Rename terrain texture for clarity
  • Loading branch information
nyalldawson committed Aug 3, 2020
1 parent 7c08046 commit 798ed57
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions python/3d/auto_additions/qgsabstractmaterialsettings.py
Expand Up @@ -9,7 +9,7 @@
QgsAbstractMaterialSettings.InstancedPoints.__doc__ = "Instanced based rendering, requiring triangles and point data"
QgsAbstractMaterialSettings.Points = QgsMaterialSettingsRenderingTechnique.Points
QgsAbstractMaterialSettings.Points.__doc__ = "Point based rendering, requires point data"
QgsAbstractMaterialSettings.Terrain = QgsMaterialSettingsRenderingTechnique.Terrain
QgsAbstractMaterialSettings.Terrain.__doc__ = "Terrain rendering"
QgsMaterialSettingsRenderingTechnique.__doc__ = 'Material rendering techniques\n\n.. versionadded:: 3.16\n\n' + '* ``Triangles``: ' + QgsMaterialSettingsRenderingTechnique.Triangles.__doc__ + '\n' + '* ``Lines``: ' + QgsMaterialSettingsRenderingTechnique.Lines.__doc__ + '\n' + '* ``InstancedPoints``: ' + QgsMaterialSettingsRenderingTechnique.InstancedPoints.__doc__ + '\n' + '* ``Points``: ' + QgsMaterialSettingsRenderingTechnique.Points.__doc__ + '\n' + '* ``Terrain``: ' + QgsMaterialSettingsRenderingTechnique.Terrain.__doc__
QgsAbstractMaterialSettings.TrianglesWithFixedTexture = QgsMaterialSettingsRenderingTechnique.TrianglesWithFixedTexture
QgsAbstractMaterialSettings.TrianglesWithFixedTexture.__doc__ = "Triangle based rendering, using a fixed, non-user-configurable texture (e.g. for terrain rendering)"
QgsMaterialSettingsRenderingTechnique.__doc__ = 'Material rendering techniques\n\n.. versionadded:: 3.16\n\n' + '* ``Triangles``: ' + QgsMaterialSettingsRenderingTechnique.Triangles.__doc__ + '\n' + '* ``Lines``: ' + QgsMaterialSettingsRenderingTechnique.Lines.__doc__ + '\n' + '* ``InstancedPoints``: ' + QgsMaterialSettingsRenderingTechnique.InstancedPoints.__doc__ + '\n' + '* ``Points``: ' + QgsMaterialSettingsRenderingTechnique.Points.__doc__ + '\n' + '* ``TrianglesWithFixedTexture``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesWithFixedTexture.__doc__
# --
Expand Up @@ -17,7 +17,7 @@ enum class QgsMaterialSettingsRenderingTechnique
Lines,
InstancedPoints,
Points,
Terrain,
TrianglesWithFixedTexture,
};


Expand Down
2 changes: 1 addition & 1 deletion src/3d/qgsabstractmaterialsettings.h
Expand Up @@ -38,7 +38,7 @@ enum class QgsMaterialSettingsRenderingTechnique SIP_MONKEYPATCH_SCOPEENUM_UNNES
Lines, //!< Line based rendering, requires line data
InstancedPoints, //!< Instanced based rendering, requiring triangles and point data
Points, //!< Point based rendering, requires point data
Terrain, //!< Terrain rendering
TrianglesWithFixedTexture, //!< Triangle based rendering, using a fixed, non-user-configurable texture (e.g. for terrain rendering)
};


Expand Down
4 changes: 2 additions & 2 deletions src/3d/qgsgoochmaterialsettings.cpp
Expand Up @@ -34,7 +34,7 @@ bool QgsGoochMaterialSettings::supportsTechnique( QgsMaterialSettingsRenderingTe
switch ( technique )
{
case QgsMaterialSettingsRenderingTechnique::Triangles:
case QgsMaterialSettingsRenderingTechnique::Terrain:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
return true;

case QgsMaterialSettingsRenderingTechnique::Lines:
Expand Down Expand Up @@ -82,7 +82,7 @@ Qt3DRender::QMaterial *QgsGoochMaterialSettings::toMaterial( QgsMaterialSettings
switch ( technique )
{
case QgsMaterialSettingsRenderingTechnique::Triangles:
case QgsMaterialSettingsRenderingTechnique::Terrain:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
{
Qt3DExtras::QGoochMaterial *material = new Qt3DExtras::QGoochMaterial;
material->setDiffuse( mDiffuse );
Expand Down
4 changes: 2 additions & 2 deletions src/3d/qgsphongmaterialsettings.cpp
Expand Up @@ -41,7 +41,7 @@ bool QgsPhongMaterialSettings::supportsTechnique( QgsMaterialSettingsRenderingTe
case QgsMaterialSettingsRenderingTechnique::Lines:
case QgsMaterialSettingsRenderingTechnique::InstancedPoints:
case QgsMaterialSettingsRenderingTechnique::Points:
case QgsMaterialSettingsRenderingTechnique::Terrain:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
return true;
}
return false;
Expand Down Expand Up @@ -121,7 +121,7 @@ Qt3DRender::QMaterial *QgsPhongMaterialSettings::toMaterial( QgsMaterialSettings
case QgsMaterialSettingsRenderingTechnique::Triangles:
case QgsMaterialSettingsRenderingTechnique::InstancedPoints:
case QgsMaterialSettingsRenderingTechnique::Points:
case QgsMaterialSettingsRenderingTechnique::Terrain:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
{
bool fitsInCache = false;
QImage textureSourceImage;
Expand Down
2 changes: 1 addition & 1 deletion src/app/3d/qgs3dmapconfigwidget.cpp
Expand Up @@ -105,7 +105,7 @@ Qgs3DMapConfigWidget::Qgs3DMapConfigWidget( Qgs3DMapSettings *map, QgsMapCanvas
chkShowLightSourceOrigins->setChecked( mMap->showLightSourceOrigins() );

groupTerrainShading->setChecked( mMap->isTerrainShadingEnabled() );
widgetTerrainMaterial->setTechnique( QgsMaterialSettingsRenderingTechnique::Terrain );
widgetTerrainMaterial->setTechnique( QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture );
QgsPhongMaterialSettings terrainShadingMaterial = mMap->terrainShadingMaterial();
widgetTerrainMaterial->setSettings( &terrainShadingMaterial, nullptr );

Expand Down
2 changes: 1 addition & 1 deletion src/app/3d/qgsphongmaterialwidget.cpp
Expand Up @@ -64,7 +64,7 @@ void QgsPhongMaterialWidget::setTechnique( QgsMaterialSettingsRenderingTechnique
break;
}

case QgsMaterialSettingsRenderingTechnique::Terrain:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
{
lblAmbient->setVisible( true );
btnAmbient->setVisible( true );
Expand Down

0 comments on commit 798ed57

Please sign in to comment.