diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html
index d96fc7d76d..e525818e51 100644
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@@ -33,6 +33,21 @@
);
};
}
+ function createEmitGroupNumberPropertyUpdateFunction(group, propertyName) {
+ return function() {
+ var properties = {};
+ properties[group] = {};
+ properties[group][propertyName] = this.value;
+ EventBridge.emitWebEvent(
+ JSON.stringify({
+ type: "update",
+ properties: properties,
+ })
+ );
+ };
+ }
+
+
function createEmitTextPropertyUpdateFunction(propertyName) {
return function() {
var properties = {};
@@ -46,6 +61,20 @@
};
}
+ function createEmitGroupTextPropertyUpdateFunction(group,propertyName) {
+ return function() {
+ var properties = {};
+ properties[group] = {};
+ properties[group][propertyName] = this.value;
+ EventBridge.emitWebEvent(
+ JSON.stringify({
+ type: "update",
+ properties: properties,
+ })
+ );
+ };
+ }
+
function createEmitVec3PropertyUpdateFunction(property, elX, elY, elZ) {
return function() {
var data = {
@@ -62,6 +91,23 @@
}
};
+ function createEmitGroupVec3PropertyUpdateFunction(group, property, elX, elY, elZ) {
+ return function() {
+ var data = {
+ type: "update",
+ properties: {
+ }
+ };
+ data.properties[group] = { };
+ data.properties[group][property] = {
+ x: elX.value,
+ y: elY.value,
+ z: elZ.value,
+ };
+ EventBridge.emitWebEvent(JSON.stringify(data));
+ }
+ };
+
function createEmitVec3PropertyUpdateFunctionWithMultiplier(property, elX, elY, elZ, multiplier) {
return function() {
var data = {
@@ -94,6 +140,24 @@
}
};
+ function createEmitGroupColorPropertyUpdateFunction(group, property, elRed, elGreen, elBlue) {
+ return function() {
+ var data = {
+ type: "update",
+ properties: {
+ }
+ };
+ data.properties[group] = { };
+
+ data.properties[group][property] = {
+ red: elRed.value,
+ green: elGreen.value,
+ blue: elBlue.value,
+ };
+ EventBridge.emitWebEvent(JSON.stringify(data));
+ }
+ };
+
function loaded() {
var allSections = [];
var elID = document.getElementById("property-id");
@@ -559,20 +623,33 @@
elZoneStageDay.addEventListener('change', createEmitNumberPropertyUpdateFunction('stageDay'));
elZoneStageHour.addEventListener('change', createEmitNumberPropertyUpdateFunction('stageHour'));
- elZoneBackgroundMode.addEventListener('change', createEmitTextPropertyUpdateFunction('backgroundMode'));
- var zoneSkyboxColorChangeFunction = createEmitColorPropertyUpdateFunction(
- 'skybox.color', elZoneSkyboxColorRed, elZoneSkyboxColorGreen, elZoneSkyboxColorBlue);
- elZoneSkyboxURL.addEventListener('change', createEmitTextPropertyUpdateFunction('skybox.url'));
- var zoneAtmosphereCenterChangeFunction = createEmitVec3PropertyUpdateFunction(
- 'atmosphere.center', elZoneAtmosphereCenterX, elZoneAtmosphereCenterY, elZoneAtmosphereCenterZ);
- elZoneAtmosphereInnerRadius.addEventListener('change', createEmitNumberPropertyUpdateFunction('atmosphere.innerRadius'));
- elZoneAtmosphereOuterRadius.addEventListener('change', createEmitNumberPropertyUpdateFunction('atmosphere.outerRadius'));
- elZoneAtmosphereMieScattering.addEventListener('change', createEmitNumberPropertyUpdateFunction('atmosphere.mieScattering'));
- elZoneAtmosphereRayleighScattering.addEventListener('change', createEmitNumberPropertyUpdateFunction('atmosphere.rayleighScattering'));
- var zoneAtmosphereCenterChangeFunction = createEmitVec3PropertyUpdateFunction(
- 'atmosphere.scatteringWavelengths', elZoneAtmosphereScatteringWavelengthsX,
+ elZoneBackgroundMode.addEventListener('change', createEmitTextPropertyUpdateFunction('backgroundMode'));
+ var zoneSkyboxColorChangeFunction = createEmitGroupColorPropertyUpdateFunction('skybox','color',
+ elZoneSkyboxColorRed, elZoneSkyboxColorGreen, elZoneSkyboxColorBlue);
+ elZoneSkyboxColorRed.addEventListener('change', zoneSkyboxColorChangeFunction);
+ elZoneSkyboxColorGreen.addEventListener('change', zoneSkyboxColorChangeFunction);
+ elZoneSkyboxColorBlue.addEventListener('change', zoneSkyboxColorChangeFunction);
+
+ elZoneSkyboxURL.addEventListener('change', createEmitGroupTextPropertyUpdateFunction('skybox','url'));
+
+ var zoneAtmosphereCenterChangeFunction = createEmitGroupVec3PropertyUpdateFunction(
+ 'atmosphere','center', elZoneAtmosphereCenterX, elZoneAtmosphereCenterY, elZoneAtmosphereCenterZ);
+ elZoneAtmosphereCenterX.addEventListener('change', zoneAtmosphereCenterChangeFunction);
+ elZoneAtmosphereCenterY.addEventListener('change', zoneAtmosphereCenterChangeFunction);
+ elZoneAtmosphereCenterZ.addEventListener('change', zoneAtmosphereCenterChangeFunction);
+
+
+ elZoneAtmosphereInnerRadius.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('atmosphere','innerRadius'));
+ elZoneAtmosphereOuterRadius.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('atmosphere','outerRadius'));
+ elZoneAtmosphereMieScattering.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('atmosphere','mieScattering'));
+ elZoneAtmosphereRayleighScattering.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('atmosphere','rayleighScattering'));
+ var zoneAtmosphereScatterWavelengthsChangeFunction = createEmitGroupVec3PropertyUpdateFunction(
+ 'atmosphere','scatteringWavelengths', elZoneAtmosphereScatteringWavelengthsX,
elZoneAtmosphereScatteringWavelengthsY, elZoneAtmosphereScatteringWavelengthsZ);
+ elZoneAtmosphereScatteringWavelengthsX.addEventListener('change', zoneAtmosphereScatterWavelengthsChangeFunction);
+ elZoneAtmosphereScatteringWavelengthsY.addEventListener('change', zoneAtmosphereScatterWavelengthsChangeFunction);
+ elZoneAtmosphereScatteringWavelengthsZ.addEventListener('change', zoneAtmosphereScatterWavelengthsChangeFunction);
elMoveSelectionToGrid.addEventListener("click", function() {
EventBridge.emitWebEvent(JSON.stringify({
@@ -1059,21 +1136,21 @@
Atmosphere Scattering Wavelenghts
diff --git a/libraries/entities/src/AtmospherePropertyGroup.cpp b/libraries/entities/src/AtmospherePropertyGroup.cpp
index b9b49f8c45..c1210be24e 100644
--- a/libraries/entities/src/AtmospherePropertyGroup.cpp
+++ b/libraries/entities/src/AtmospherePropertyGroup.cpp
@@ -89,6 +89,14 @@ bool AtmospherePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& property
READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, float, _rayleighScattering);
READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, glm::vec3, _scatteringWavelengths);
READ_ENTITY_PROPERTY(PROP_ATMOSPHERE_HAS_STARS, bool, _hasStars);
+
+ DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ATMOSPHERE_CENTER, Center);
+ DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ATMOSPHERE_INNER_RADIUS, InnerRadius);
+ DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ATMOSPHERE_OUTER_RADIUS, OuterRadius);
+ DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ATMOSPHERE_MIE_SCATTERING, MieScattering);
+ DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ATMOSPHERE_RAYLEIGH_SCATTERING, RayleighScattering);
+ DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS, ScatteringWavelengths);
+ DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ATMOSPHERE_HAS_STARS, HasStars);
processedBytes += bytesRead;
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index ab41367fa9..0b3472fc09 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -181,6 +181,10 @@ void EntityItemProperties::debugDump() const {
qCDebug(entities) << " _dimensions=" << getDimensions();
qCDebug(entities) << " _modelURL=" << _modelURL;
qCDebug(entities) << " _compoundShapeURL=" << _compoundShapeURL;
+
+ getAtmosphere().debugDump();
+ getSkybox().debugDump();
+
qCDebug(entities) << " changed properties...";
EntityPropertyFlags props = getChangedProperties();
props.debugDumpBits();
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 8ea521a8e9..13b2377032 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -279,6 +279,9 @@ inline QDebug operator<<(QDebug debug, const EntityItemProperties& properties) {
DEBUG_PROPERTY_IF_CHANGED(debug, properties, ParticleRadius, particleRadius, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, MarketplaceID, marketplaceID, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, BackgroundMode, backgroundMode, "");
+
+ properties.getAtmosphere().debugDump();
+ properties.getSkybox().debugDump();
debug << " last edited:" << properties.getLastEdited() << "\n";
debug << " edited ago:" << properties.getEditedAgo() << "\n";
diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h
index 3f25f9353e..1b10b6eb7a 100644
--- a/libraries/entities/src/EntityItemPropertiesMacros.h
+++ b/libraries/entities/src/EntityItemPropertiesMacros.h
@@ -107,6 +107,11 @@
} \
}
+#define DECODE_GROUP_PROPERTY_HAS_CHANGED(P,N) \
+ if (propertyFlags.getHasProperty(P)) { \
+ set##N##Changed(true); \
+ }
+
#define READ_ENTITY_PROPERTY_COLOR(P,M) \
if (propertyFlags.getHasProperty(P)) { \
if (overwriteLocalData) { \
diff --git a/libraries/entities/src/SkyboxPropertyGroup.cpp b/libraries/entities/src/SkyboxPropertyGroup.cpp
index 8b304d0523..23530108ce 100644
--- a/libraries/entities/src/SkyboxPropertyGroup.cpp
+++ b/libraries/entities/src/SkyboxPropertyGroup.cpp
@@ -59,7 +59,10 @@ bool SkyboxPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlag
READ_ENTITY_PROPERTY_XCOLOR(PROP_SKYBOX_COLOR, _color);
READ_ENTITY_PROPERTY_STRING(PROP_SKYBOX_URL, setURL);
-
+
+ DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_SKYBOX_COLOR, Color);
+ DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_SKYBOX_URL, URL);
+
processedBytes += bytesRead;
return true;