peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

makeing code more readable

Browse Source
This commit is contained in:
Uwe Rathmann 2020-11-01 09:28:20 +01:00
parent a5327a68b8
commit c9e959e73f
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nodes/QskTextureNode.cpp
View File

@ -41,7 +41,7 @@ namespace
int compare( const QSGMaterial* ) const override; int compare( const QSGMaterial* ) const override;
private: private:
uint m_textureId; uint m_textureId = 0;
const bool m_isOpaque : 1; const bool m_isOpaque : 1;
}; };
@ -51,16 +51,11 @@ namespace
setShaderSourceFile( QOpenGLShader::Vertex, setShaderSourceFile( QOpenGLShader::Vertex,
QStringLiteral( ":/qt-project.org/scenegraph/shaders/opaquetexture.vert" ) ); QStringLiteral( ":/qt-project.org/scenegraph/shaders/opaquetexture.vert" ) );
if ( m_isOpaque ) const auto fragmentShaderFile = m_isOpaque
{ ? QStringLiteral( ":/qt-project.org/scenegraph/shaders/opaquetexture.frag" )
setShaderSourceFile( QOpenGLShader::Fragment, : QStringLiteral( ":/qt-project.org/scenegraph/shaders/texture.frag" );
QStringLiteral( ":/qt-project.org/scenegraph/shaders/opaquetexture.frag" ) );
} setShaderSourceFile( QOpenGLShader::Fragment, fragmentShaderFile );
else
{
setShaderSourceFile( QOpenGLShader::Fragment,
QStringLiteral( ":/qt-project.org/scenegraph/shaders/texture.frag" ) );
}
} }
char const* const* MaterialShader::attributeNames() const char const* const* MaterialShader::attributeNames() const
@ -98,8 +93,7 @@ namespace
} }
Material::Material( bool isOpaque ) Material::Material( bool isOpaque )
: m_textureId( 0 ) : m_isOpaque( isOpaque )
, m_isOpaque( isOpaque )
{ {
setFlag( Blending, true ); // alpha blending setFlag( Blending, true ); // alpha blending
} }