diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-05-07 12:27:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-25 14:49:05 +0200 |
| commit | 7a5e17c4262758b7ed7d509e4c63f2d11cabce03 (patch) | |
| tree | 5ae0689eb459f51ab01483662044ff7f2838b58a /src/render/io/gltfparser.cpp | |
| parent | f60762945df3693a140c562b07a4d611e910f9c4 (diff) | |
Quick3DEffect and EffectNode
Effect has been transformed to a non QObject abstract. EffectNode and
Quick3DEffect subclass Effect. This was needed so that Quick3DEffect can have
node children such as ShaderProgram.
Few changes to the backend and renderer to accommodate that a Material's effect
is now returned as a Node instead of an Effect as an Effect cannot be
registered as qml types as it has no QObject base.
Change-Id: Ief40f1d784151a085f244c35b3ed09a93dcc153e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io/gltfparser.cpp')
| -rw-r--r-- | src/render/io/gltfparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index add653b94..c9888af2d 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -49,7 +49,7 @@ #include <material.h> #include <technique.h> #include <shaderprogram.h> -#include <effect.h> +#include <effectnode.h> #include <camera.h> #include <transform.h> #include <matrixtransform.h> @@ -438,7 +438,7 @@ Material* GLTFParser::material(QString id) Technique *technique = m_techniques.value(tname); if (!m_effectProxies.contains(tname)) { - Effect* eff = new Effect; + EffectNode* eff = new EffectNode; eff->setObjectName(tname); eff->addTechnique(technique); m_effectProxies[tname] = eff; |