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

Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance

Browse source
This commit is contained in:
Nissim Hadar 2018-01-06 10:02:12 -08:00
commit d5be9365fe
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2287,13 +2287,11 @@ bool EntityTree::readFromMap(QVariantMap& map) {
properties.setKeyLightMode(COMPONENT_MODE_ENABLED); properties.setKeyLightMode(COMPONENT_MODE_ENABLED);
} }
if (!entityMap.contains("skyboxMode")) { if (entityMap.contains("backgroundMode") && properties.getBackgroundModeAsString() == "skybox") {
if (entityMap.contains("backgroundMode") && properties.getBackgroundModeAsString() == "inherit") { properties.setSkyboxMode(COMPONENT_MODE_ENABLED);
// The content creator has set the combo to NOTHING - this is actually inherit } else {
properties.setSkyboxMode(COMPONENT_MODE_INHERIT); // The content creator has set the combo to NOTHING - this is actually inherit
} else { properties.setSkyboxMode(COMPONENT_MODE_INHERIT);
properties.setSkyboxMode(COMPONENT_MODE_ENABLED);
}
} }
if (!entityMap.contains("ambientLightMode")) { if (!entityMap.contains("ambientLightMode")) {

3
libraries/entities/src/ZoneEntityItem.cpp
View file

@ -42,8 +42,6 @@ ZoneEntityItem::ZoneEntityItem(const EntityItemID& entityItemID) : EntityItem(en
_shapeType = DEFAULT_SHAPE_TYPE; _shapeType = DEFAULT_SHAPE_TYPE;
_compoundShapeURL = DEFAULT_COMPOUND_SHAPE_URL; _compoundShapeURL = DEFAULT_COMPOUND_SHAPE_URL;
_backgroundMode = BACKGROUND_MODE_INHERIT;
} }
EntityItemProperties ZoneEntityItem::getProperties(EntityPropertyFlags desiredProperties) const { EntityItemProperties ZoneEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
@ -285,7 +283,6 @@ void ZoneEntityItem::debugDump() const {
qCDebug(entities) << " position:" << debugTreeVector(getWorldPosition()); qCDebug(entities) << " position:" << debugTreeVector(getWorldPosition());
qCDebug(entities) << " dimensions:" << debugTreeVector(getScaledDimensions()); qCDebug(entities) << " dimensions:" << debugTreeVector(getScaledDimensions());
qCDebug(entities) << " getLastEdited:" << debugTime(getLastEdited(), now); qCDebug(entities) << " getLastEdited:" << debugTime(getLastEdited(), now);
qCDebug(entities) << " _backgroundMode:" << EntityItemProperties::getBackgroundModeString(_backgroundMode);
qCDebug(entities) << " _hazeMode:" << EntityItemProperties::getComponentModeString(_hazeMode); qCDebug(entities) << " _hazeMode:" << EntityItemProperties::getComponentModeString(_hazeMode);
qCDebug(entities) << " _keyLightMode:" << EntityItemProperties::getComponentModeString(_keyLightMode); qCDebug(entities) << " _keyLightMode:" << EntityItemProperties::getComponentModeString(_keyLightMode);
qCDebug(entities) << " _ambientLightMode:" << EntityItemProperties::getComponentModeString(_ambientLightMode); qCDebug(entities) << " _ambientLightMode:" << EntityItemProperties::getComponentModeString(_ambientLightMode);

2
libraries/entities/src/ZoneEntityItem.h
View file

@ -128,8 +128,6 @@ protected:
ShapeType _shapeType = DEFAULT_SHAPE_TYPE; ShapeType _shapeType = DEFAULT_SHAPE_TYPE;
QString _compoundShapeURL; QString _compoundShapeURL;
BackgroundMode _backgroundMode { BACKGROUND_MODE_INHERIT };
// The following 3 values are the defaults for zone creation // The following 3 values are the defaults for zone creation
uint32_t _keyLightMode { COMPONENT_MODE_INHERIT }; uint32_t _keyLightMode { COMPONENT_MODE_INHERIT };
uint32_t _skyboxMode { COMPONENT_MODE_INHERIT }; uint32_t _skyboxMode { COMPONENT_MODE_INHERIT };