diff options
| author | Paul Lemire <paul.lemire.ecortex.kdab.com> | 2014-10-27 12:48:41 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-30 17:22:04 +0100 |
| commit | a3d59834a35f34688a146e00690f2784f981b75f (patch) | |
| tree | 9e5d3eff3facc3a2c1f0da5ed94d4022ee2746a3 /src/render/io/gltfparser.cpp | |
| parent | 54d0ef3ba958e6ae0b76ca52c2ee63b1a808924c (diff) | |
QTechnique refactored
Change-Id: I0389c19a52aa690b5eaa8c2a3e7dee6a2b17e565
Task-number: QTBUG-41533
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io/gltfparser.cpp')
| -rw-r--r-- | src/render/io/gltfparser.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
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; |