From a3d59834a35f34688a146e00690f2784f981b75f Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Mon, 27 Oct 2014 12:48:41 +0100 Subject: QTechnique refactored Change-Id: I0389c19a52aa690b5eaa8c2a3e7dee6a2b17e565 Task-number: QTBUG-41533 Reviewed-by: Sean Harmer --- src/render/io/gltfparser.cpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/render/io/gltfparser.cpp') diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index a035f29f0..38522b0e6 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -534,28 +534,28 @@ QMaterial* GLTFParser::material(QString id) processName(jsonObj, mat); - QJsonObject values = tech.value(KEY_VALUES).toObject(); - foreach (QString vName, values.keys()) { - QParameter* param = technique->parameterByName(vName); - if (!param) { - qWarning() << "unknown parameter:" << vName << "in technique" << tname - << "processing material" << id; - continue; - } +// QJsonObject values = tech.value(KEY_VALUES).toObject(); +// foreach (QString vName, values.keys()) { +// QParameter* param = technique->parameterForName(vName); +// if (!param) { +// qWarning() << "unknown parameter:" << vName << "in technique" << tname +// << "processing material" << id; +// continue; +// } - if (param->isTextureType()) { - QString textureId = values.value(vName).toString(); - if (!m_textures.contains(textureId)) { - qWarning() << "unknown texture" << textureId << "for parameter" << vName - << "of material" << id; - } else { - mat->setTextureParameter(vName, m_textures.value(textureId)); - } - } else { - // QVariant var = parameterValueFromJSON(param, values.value(vName)); - mat->addParameter(param); - } - } // of material technique-instance values iteration +// if (param->isTextureType()) { +// QString textureId = values.value(vName).toString(); +// if (!m_textures.contains(textureId)) { +// qWarning() << "unknown texture" << textureId << "for parameter" << vName +// << "of material" << id; +// } else { +// mat->setTextureParameter(vName, m_textures.value(textureId)); +// } +// } else { +// // QVariant var = parameterValueFromJSON(param, values.value(vName)); +// mat->addParameter(param); +// } +// } // of material technique-instance values iteration m_materialCache[id] = mat; return mat; -- cgit v1.2.3