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

fix output of group names to be lowercase

Browse source
This commit is contained in:
ZappoMan 2015-05-06 11:30:41 -07:00
parent edb84a1a14
commit f2ebb6e821
4 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/example/entities/zoneSkyboxExample.js
View file

@ -45,6 +45,8 @@ var zoneEntityA = Entities.addEntity({
stageSunModelEnabled: true stageSunModelEnabled: true
}); });
var props = Entities.getEntityProperties(zoneEntityA);
print(JSON.stringify(props));
// register the call back so it fires before each data send // register the call back so it fires before each data send
Script.update.connect(function(deltaTime) { Script.update.connect(function(deltaTime) {

14
libraries/entities/src/AtmospherePropertyGroup.cpp
View file

@ -26,13 +26,13 @@ AtmospherePropertyGroup::AtmospherePropertyGroup() {
} }
void AtmospherePropertyGroup::copyToScriptValue(QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const { void AtmospherePropertyGroup::copyToScriptValue(QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const {
COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_VEC3(Atmosphere, Center, center); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_VEC3(Atmosphere, atmosphere, Center, center);
COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, InnerRadius, innerRadius); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, atmosphere, InnerRadius, innerRadius);
COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, OuterRadius, outerRadius); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, atmosphere, OuterRadius, outerRadius);
COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, MieScattering, mieScattering); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, atmosphere, MieScattering, mieScattering);
COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, RayleighScattering, rayleighScattering); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, atmosphere, RayleighScattering, rayleighScattering);
COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_VEC3(Atmosphere, ScatteringWavelengths, scatteringWavelengths); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_VEC3(Atmosphere, atmosphere, ScatteringWavelengths, scatteringWavelengths);
COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, HasStars, hasStars); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Atmosphere, atmosphere, HasStars, hasStars);
} }
void AtmospherePropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) { void AtmospherePropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) {

18
libraries/entities/src/EntityItemPropertiesMacros.h
View file

@ -219,37 +219,37 @@
} }
#define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_VEC3(G,P,p) \ #define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_VEC3(G,g,P,p) \
if (!skipDefaults || defaultEntityProperties.get##G().get##P() != _##p) { \ if (!skipDefaults || defaultEntityProperties.get##G().get##P() != _##p) { \
QScriptValue groupProperties = properties.property(#G); \ QScriptValue groupProperties = properties.property(#g); \
if (!groupProperties.isValid()) { \ if (!groupProperties.isValid()) { \
groupProperties = engine->newObject(); \ groupProperties = engine->newObject(); \
} \ } \
QScriptValue V = vec3toScriptValue(engine, _##p); \ QScriptValue V = vec3toScriptValue(engine, _##p); \
groupProperties.setProperty(#p, V); \ groupProperties.setProperty(#p, V); \
properties.setProperty(#G, groupProperties); \ properties.setProperty(#g, groupProperties); \
} }
#define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(G,P,p) \ #define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(G,g,P,p) \
if (!skipDefaults || defaultEntityProperties.get##G().get##P() != _##p) { \ if (!skipDefaults || defaultEntityProperties.get##G().get##P() != _##p) { \
QScriptValue groupProperties = properties.property(#G); \ QScriptValue groupProperties = properties.property(#g); \
if (!groupProperties.isValid()) { \ if (!groupProperties.isValid()) { \
groupProperties = engine->newObject(); \ groupProperties = engine->newObject(); \
} \ } \
groupProperties.setProperty(#p, _##p); \ groupProperties.setProperty(#p, _##p); \
properties.setProperty(#G, groupProperties); \ properties.setProperty(#g, groupProperties); \
} }
#define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_COLOR(G,P,p) \ #define COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_COLOR(G,g,P,p) \
if (!skipDefaults || defaultEntityProperties.get##G().get##P() != _##p) { \ if (!skipDefaults || defaultEntityProperties.get##G().get##P() != _##p) { \
QScriptValue groupProperties = properties.property(#G); \ QScriptValue groupProperties = properties.property(#g); \
if (!groupProperties.isValid()) { \ if (!groupProperties.isValid()) { \
groupProperties = engine->newObject(); \ groupProperties = engine->newObject(); \
} \ } \
QScriptValue colorValue = xColorToScriptValue(engine, _##p); \ QScriptValue colorValue = xColorToScriptValue(engine, _##p); \
groupProperties.setProperty(#p, colorValue); \ groupProperties.setProperty(#p, colorValue); \
properties.setProperty(#G, groupProperties); \ properties.setProperty(#g, groupProperties); \
} }

4
libraries/entities/src/SkyboxPropertyGroup.cpp
View file

@ -21,8 +21,8 @@ SkyboxPropertyGroup::SkyboxPropertyGroup() {
} }
void SkyboxPropertyGroup::copyToScriptValue(QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const { void SkyboxPropertyGroup::copyToScriptValue(QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const {
COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_COLOR(Skybox, Color, color); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_COLOR(Skybox, skybox, Color, color);
COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Skybox, URL, url); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(Skybox, skybox, URL, url);
} }
void SkyboxPropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) { void SkyboxPropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) {