Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:03:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

clean up Procedural::parseShader

Browse source
This commit is contained in:
Zach Pomerantz 2016-08-29 13:56:39 -07:00
parent 1e7c00c0c8
commit 1971063b9a
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/procedural/src/procedural/Procedural.cpp
View file

@ -100,7 +100,9 @@ bool Procedural::parseVersion(const QJsonValue& version) {
return (_version == 1 || _version == 2);
}
bool Procedural::parseUrl(const QUrl& shaderUrl) {
bool Procedural::parseShader(const QUrl& shaderPath) {
auto shaderUrl = ResourceManager::normalizeURL(shaderPath);
if (!shaderUrl.isValid()) {
if (!shaderUrl.isEmpty()) {
qWarning() << "Invalid shader URL: " << shaderUrl;
@ -168,7 +170,6 @@ void Procedural::parse(const QJsonObject& proceduralData) {
auto version = proceduralData[VERSION_KEY];
auto shaderUrl = proceduralData[URL_KEY].toString();
shaderUrl = ResourceManager::normalizeURL(shaderUrl);
auto uniforms = proceduralData[UNIFORMS_KEY].toObject();
auto channels = proceduralData[CHANNELS_KEY].toArray();
@ -176,7 +177,7 @@ void Procedural::parse(const QJsonObject& proceduralData) {
// Run through parsing regardless of validity to clear old cached resources
isValid = parseVersion(version) && isValid;
isValid = parseUrl(shaderUrl) && isValid;
isValid = parseShader(shaderUrl) && isValid;
isValid = parseUniforms(uniforms) && isValid;
isValid = parseTextures(channels) && isValid;
@ -221,6 +222,7 @@ bool Procedural::ready() {
_hasStartedFade = true;
_isFading = true;
}
return true;
}

2
libraries/procedural/src/procedural/Procedural.h
View file

@ -107,7 +107,7 @@ private:
// This should only be called from the render thread, as it shares data with Procedural::prepare
void parse(const QJsonObject&);
bool parseVersion(const QJsonValue& version);
bool parseUrl(const QUrl& url);
bool parseShader(const QUrl& shaderPath);
bool parseUniforms(const QJsonObject& uniforms);
bool parseTextures(const QJsonArray& channels);