diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2014-08-17 15:23:10 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-08-17 23:15:54 +0200 |
commit | 3aac7a0f18a33cc8acf76ac9e25c0cd320105174 (patch) | |
tree | bf37dec586cf43eff601bfb4b9f580afec475bb0 /src/render/io/gltfparser.cpp | |
parent | 47f2c2044887edaeed39025437411fddddcae423 (diff) |
Mark backend render classes as private and fix compilation
Change-Id: I1afb8408e03d4b5405e8ee82d1a3b6b4364d3f5d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io/gltfparser.cpp')
-rw-r--r-- | src/render/io/gltfparser.cpp | 87 |
1 files changed, 44 insertions, 43 deletions
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index 76c7ba27d..60be17f1c 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -71,8 +71,8 @@ #include <QVector3D> // need to move these to somewhere common? -#include <renderstate.h> -#include <states/blendstate.h> +#include <Qt3DRenderer/private/renderstate_p.h> +#include <Qt3DRenderer/private/blendstate_p.h> QT_BEGIN_NAMESPACE @@ -869,56 +869,57 @@ void GLTFParser::processJSONTechnique( QString id, QJsonObject jsonObj ) // pass->addUniformBinding(paramDict[pname], uniformName); } // of program-instance attributes - QJsonObject states = po.value(KEY_STATES).toObject(); - Render::RenderStateSet* ss = new Render::RenderStateSet; + // TODO: Use public state api only here +// QJsonObject states = po.value(KEY_STATES).toObject(); +// Render::RenderStateSet* ss = new Render::RenderStateSet; - Q_FOREACH (QString stateName, states.keys()) { - Render::RenderState* s= buildState(stateName.toUtf8(), states.value(stateName)); - if (!s) - continue; +// Q_FOREACH (QString stateName, states.keys()) { +// Render::RenderState* s= buildState(stateName.toUtf8(), states.value(stateName)); +// if (!s) +// continue; - ss->addState(s); - } // of program-instance attributes +// ss->addState(s); +// } // of program-instance attributes - pass->setStateSet(ss); +// pass->setStateSet(ss); t->addPass(pass); } // of passes iteration m_techniques[id] = t; } -Render::RenderState* GLTFParser::buildState(const QByteArray& nm, QJsonValue v) -{ - if (nm == "blendEnable") { - return NULL; // will see a blendEquation spec too - } - - if (nm == "blendFunc") { - QJsonObject obj = v.toObject(); - GLenum srcF = static_cast<GLenum>(obj.value(QStringLiteral("sfactor")).toInt()); - GLenum dstF = static_cast<GLenum>(obj.value(QStringLiteral("dfactor")).toInt()); - return Render::BlendState::getOrCreate(srcF, dstF); - } - - if (nm == "blendEquation") { - return Render::BlendEquation::getOrCreate(static_cast<GLenum>(v.toInt())); - } - - if (nm == "cullFaceEnable" && v.toInt()) { - return Render::CullFace::getOrCreate(GL_BACK); - } - - if (nm == "depthTestEnable" && v.toInt()) { - return Render::DepthTest::getOrCreate(GL_LESS); - } - - if (nm == "depthMask") { - return Render::DepthMask::getOrCreate(v.toInt() ? GL_TRUE : GL_FALSE); - } - - qCWarning(Render::Io) << Q_FUNC_INFO << "unsupported gltf state:" << nm; - return NULL; -} +//Render::RenderState* GLTFParser::buildState(const QByteArray& nm, QJsonValue v) +//{ +// if (nm == "blendEnable") { +// return NULL; // will see a blendEquation spec too +// } + +// if (nm == "blendFunc") { +// QJsonObject obj = v.toObject(); +// GLenum srcF = static_cast<GLenum>(obj.value(QStringLiteral("sfactor")).toInt()); +// GLenum dstF = static_cast<GLenum>(obj.value(QStringLiteral("dfactor")).toInt()); +// return Render::BlendState::getOrCreate(srcF, dstF); +// } + +// if (nm == "blendEquation") { +// return Render::BlendEquation::getOrCreate(static_cast<GLenum>(v.toInt())); +// } + +// if (nm == "cullFaceEnable" && v.toInt()) { +// return Render::CullFace::getOrCreate(GL_BACK); +// } + +// if (nm == "depthTestEnable" && v.toInt()) { +// return Render::DepthTest::getOrCreate(GL_LESS); +// } + +// if (nm == "depthMask") { +// return Render::DepthMask::getOrCreate(v.toInt() ? GL_TRUE : GL_FALSE); +// } + +// qCWarning(Render::Io) << Q_FUNC_INFO << "unsupported gltf state:" << nm; +// return NULL; +//} QFile *GLTFParser::resolveLocalData(QString path) { |