Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 20:58:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Corrected copy of ambient URL.

Browse source
This commit is contained in:
Nissim Hadar 2018-01-12 00:22:06 -08:00
parent a1f25bf49c
commit 50a030b68b
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/entities/src/EntityTree.cpp
View file

@ -2242,7 +2242,7 @@ bool EntityTree::readFromMap(QVariantMap& map) {
// map will have a top-level list keyed as "Entities". This will be extracted // map will have a top-level list keyed as "Entities". This will be extracted
// and iterated over. Each member of this list is converted to a QVariantMap, then // and iterated over. Each member of this list is converted to a QVariantMap, then
// to a QScriptValue, and then to EntityItemProperties. These properties are used // to a QScriptValue, and then to EntityItemProperties. These properties are used
// to add the new entity to the EnitytTree. // to add the new entity to the EntityTree.
QVariantList entitiesQList = map["Entities"].toList(); QVariantList entitiesQList = map["Entities"].toList();
QScriptEngine scriptEngine; QScriptEngine scriptEngine;
@ -2286,7 +2286,10 @@ bool EntityTree::readFromMap(QVariantMap& map) {
// Fix for older content not containing these fields in the zones // Fix for older content not containing these fields in the zones
if (needsConversion && (properties.getType() == EntityTypes::EntityType::Zone)) { if (needsConversion && (properties.getType() == EntityTypes::EntityType::Zone)) {
// The ambient URL has been moved from "keyLight" to "ambientLight" // The ambient URL has been moved from "keyLight" to "ambientLight"
properties.getAmbientLight().setAmbientURL(entityMap["ambientURL"].toString()); if (entityMap.contains("keyLight")) {
QVariantMap keyLightObject = entityMap["keyLight"].toMap();
properties.getAmbientLight().setAmbientURL(keyLightObject["ambientURL"].toString());
}
// The background should be enabled if the mode is skybox // The background should be enabled if the mode is skybox
// Note that if the values are default then they are not stored in the JSON file // Note that if the values are default then they are not stored in the JSON file