diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-16 17:44:37 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-18 13:50:25 +0200 |
| commit | b46d416987a4f62a3bcc6e4038e6b949c5b9af4b (patch) | |
| tree | 341874d8340051786bb1223de5d63c8f84ba7405 /src/render/io/gltfparser.cpp | |
| parent | 16749ae5dbab2caa67d816a6778cdfd92e9510ac (diff) | |
QShaderProgram: remove source file properties, replace by helper method
Only the source code QByteArray properties remain. The user is still able to
load a shader from a source file by using the shaderFromSource helper method
and assigning what it returns to one of the QByteArray source code properties.
Change-Id: I5246498fa680ec74d095d7a45f0b1bce239efc13
Task-number: QTBUG-41536
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io/gltfparser.cpp')
| -rw-r--r-- | src/render/io/gltfparser.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index d5feb9464..497506538 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -69,6 +69,7 @@ #include <QColor> #include <QVector2D> #include <QVector3D> +#include <QUrl> // need to move these to somewhere common? #include <Qt3DRenderer/private/renderstate_p.h> @@ -751,8 +752,8 @@ void GLTFParser::processJSONProgram( QString id, QJsonObject jsonObj) return; } - prog->setFragmentShaderSourceFile(m_shaderPaths[fragName]); - prog->setVertexShaderSourceFile(m_shaderPaths[vertName]); + prog->setFragmentShaderCode(Qt3D::QShaderProgram::loadSource(QUrl(m_shaderPaths[fragName]))); + prog->setVertexShaderCode(Qt3D::QShaderProgram::loadSource(QUrl(m_shaderPaths[vertName]))); m_programs[id] = prog; } |