Use the same vertex shader for different skybox implementations

qgis · Aug 2, 2020 · 737143d · 737143d
1 parent 7746575
commit 737143d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/src/3d/qgsskyboxentity.cpp b/src/3d/qgsskyboxentity.cpp
@@ -101,7 +101,7 @@ QgsHDRSkyboxEntity::QgsHDRSkyboxEntity( const QString &hdrTexturePath, QNode *pa
   , mGlShader( new Qt3DRender::QShaderProgram( this ) )
 {
   mLoadedTexture->setGenerateMipMaps( false );
-  mGlShader->setVertexShaderCode( Qt3DRender::QShaderProgram::loadSource( QUrl( QStringLiteral( "qrc:/shaders/hdr_skybox.vert" ) ) ) );
+  mGlShader->setVertexShaderCode( Qt3DRender::QShaderProgram::loadSource( QUrl( QStringLiteral( "qrc:/shaders/skybox.vert" ) ) ) );
   mGlShader->setFragmentShaderCode( Qt3DRender::QShaderProgram::loadSource( QUrl( QStringLiteral( "qrc:/shaders/hdr_skybox.frag" ) ) ) );
   mGl3RenderPass->setShaderProgram( mGlShader );
 

diff --git a/src/3d/shaders.qrc b/src/3d/shaders.qrc
@@ -15,6 +15,5 @@
         <file>shaders/skybox.frag</file>
         <file>shaders/skybox.vert</file>
         <file>shaders/hdr_skybox.frag</file>
-        <file>shaders/hdr_skybox.vert</file>
     </qresource>
 </RCC>
diff --git a/src/3d/shaders/hdr_skybox.vert b/src/3d/shaders/hdr_skybox.vert