History

Nest JS props in SceneScriptingInterface

Zach Pomerantz committed 10 years ago

Commit 5a86f0c1 parent 111a8ca5 files · +224 −111Browse files

Showing the changes to libraries/script-engine/src/SceneScriptingInterface.cpp (1 of 5 files). Show all

Unified · Split

libraries/script-engine/src/SceneScriptingInterface.cpp+61−46
@@ -13,99 +13,95 @@ · 12 unmodified lines
1313
1414 #include <procedural/ProceduralSkybox.h>
1515
16−SceneScriptingInterface::SceneScriptingInterface() {
17− // Let's make sure the sunSkyStage is using a proceduralSkybox
18− _skyStage->setSkybox(model::SkyboxPointer(new ProceduralSkybox()));
16+float SceneScripting::Location::getLongitude() const {
17+ return _skyStage->getOriginLongitude();
1918 }
2019
21−void SceneScriptingInterface::setShouldRenderAvatars(bool shouldRenderAvatars) {
22− if (shouldRenderAvatars != _shouldRenderAvatars) {
23− _shouldRenderAvatars = shouldRenderAvatars;
24− emit shouldRenderAvatarsChanged(_shouldRenderAvatars);
25− }
20+float SceneScripting::Location::getLatitude() const {
21+ return _skyStage->getOriginLatitude();
2622 }
2723
28−void SceneScriptingInterface::setShouldRenderEntities(bool shouldRenderEntities) {
29− if (shouldRenderEntities != _shouldRenderEntities) {
30− _shouldRenderEntities = shouldRenderEntities;
31− emit shouldRenderEntitiesChanged(_shouldRenderEntities);
32− }
24+float SceneScripting::Location::getAltitude() const {
25+ return _skyStage->getOriginSurfaceAltitude();
3326 }
3427
35−void SceneScriptingInterface::setStageOrientation(const glm::quat& orientation) {
36− _skyStage->setOriginOrientation(orientation);
37−}
38−void SceneScriptingInterface::setStageLocation(float longitude, float latitude, float altitude) {
39− _skyStage->setOriginLocation(longitude, latitude, altitude);
28+void SceneScripting::Location::setLongitude(float longitude) {
29+ _skyStage->setOriginLongitude(longitude);
4030 }
4131
42−float SceneScriptingInterface::getStageLocationLongitude() const {
43− return _skyStage->getOriginLongitude();
44−}
45−float SceneScriptingInterface::getStageLocationLatitude() const {
46− return _skyStage->getOriginLatitude();
32+void SceneScripting::Location::setLatitude(float latitude) {
33+ _skyStage->setOriginLatitude(latitude);
4734 }
48−float SceneScriptingInterface::getStageLocationAltitude() const {
49− return _skyStage->getOriginSurfaceAltitude();
35+
36+void SceneScripting::Location::setAltitude(float altitude) {
37+ _skyStage->setOriginSurfaceAltitude(altitude);
5038 }
5139
52−void SceneScriptingInterface::setStageDayTime(float hour) {
40+void SceneScripting::Time::setHour(float hour) {
5341 _skyStage->setDayTime(hour);
5442 }
5543
56−float SceneScriptingInterface::getStageDayTime() const {
44+float SceneScripting::Time::getHour() const {
5745 return _skyStage->getDayTime();
5846 }
5947
60−void SceneScriptingInterface::setStageYearTime(int day) {
48+void SceneScripting::Time::setDay(int day) {
6149 _skyStage->setYearTime(day);
6250 }
6351
64−int SceneScriptingInterface::getStageYearTime() const {
52+int SceneScripting::Time::getDay() const {
6553 return _skyStage->getYearTime();
6654 }
6755
68−void SceneScriptingInterface::setKeyLightColor(const glm::vec3& color) {
56+glm::vec3 SceneScripting::KeyLight::getColor() const {
57+ return _skyStage->getSunColor();
58+}
59+
60+void SceneScripting::KeyLight::setColor(const glm::vec3& color) {
6961 _skyStage->setSunColor(color);
7062 }
7163
72−glm::vec3 SceneScriptingInterface::getKeyLightColor() const {
73− return _skyStage->getSunColor();
64+float SceneScripting::KeyLight::getIntensity() const {
65+ return _skyStage->getSunIntensity();
7466 }
7567
76−void SceneScriptingInterface::setKeyLightIntensity(float intensity) {
68+void SceneScripting::KeyLight::setIntensity(float intensity) {
7769 _skyStage->setSunIntensity(intensity);
7870 }
7971
80−float SceneScriptingInterface::getKeyLightIntensity() const {
81− return _skyStage->getSunIntensity();
72+float SceneScripting::KeyLight::getAmbientIntensity() const {
73+ return _skyStage->getSunAmbientIntensity();
8274 }
8375
84−void SceneScriptingInterface::setKeyLightAmbientIntensity(float intensity) {
76+void SceneScripting::KeyLight::setAmbientIntensity(float intensity) {
8577 _skyStage->setSunAmbientIntensity(intensity);
8678 }
8779
88−float SceneScriptingInterface::getKeyLightAmbientIntensity() const {
89− return _skyStage->getSunAmbientIntensity();
80+glm::vec3 SceneScripting::KeyLight::getDirection() const {
81+ return _skyStage->getSunDirection();
9082 }
9183
92−void SceneScriptingInterface::setKeyLightDirection(const glm::vec3& direction) {
84+void SceneScripting::KeyLight::setDirection(const glm::vec3& direction) {
9385 _skyStage->setSunDirection(direction);
9486 }
9587
96−glm::vec3 SceneScriptingInterface::getKeyLightDirection() const {
97− return _skyStage->getSunDirection();
88+void SceneScripting::Stage::setOrientation(const glm::quat& orientation) const {
89+ _skyStage->setOriginOrientation(orientation);
90+}
91+
92+void SceneScripting::Stage::setLocation(float longitude, float latitude, float altitude) {
93+ _skyStage->setOriginLocation(longitude, latitude, altitude);
9894 }
9995
100−void SceneScriptingInterface::setStageSunModelEnable(bool isEnabled) {
96+void SceneScripting::Stage::setSunModelEnable(bool isEnabled) {
10197 _skyStage->setSunModelEnable(isEnabled);
10298 }
10399
104−bool SceneScriptingInterface::isStageSunModelEnabled() const {
100+bool SceneScripting::Stage::isSunModelEnabled() const {
105101 return _skyStage->isSunModelEnabled();
106102 }
107103
108−void SceneScriptingInterface::setBackgroundMode(const QString& mode) {
104+void SceneScripting::Stage::setBackgroundMode(const QString& mode) {
109105 if (mode == QString("inherit")) {
110106 _skyStage->setBackgroundMode(model::SunSkyStage::NO_BACKGROUND);
111107 } else if (mode == QString("atmosphere")) {
@@ -115,7 +111,7 @@ void SceneScriptingInterface::setBackgroundMode(const QString& mode) { · 3 unmodified lines
115111 }
116112 }
117113
118−QString SceneScriptingInterface::getBackgroundMode() const {
114+QString SceneScripting::Stage::getBackgroundMode() const {
119115 switch (_skyStage->getBackgroundMode()) {
120116 case model::SunSkyStage::NO_BACKGROUND:
121117 return QString("inherit");
@@ -128,6 +124,25 @@ QString SceneScriptingInterface::getBackgroundMode() const { · 6 unmodified lines
128124 };
129125 }
130126
127+SceneScriptingInterface::SceneScriptingInterface() : _stage{ std::make_unique<SceneScripting::Stage>(_skyStage) } {
128+ // Let's make sure the sunSkyStage is using a proceduralSkybox
129+ _skyStage->setSkybox(model::SkyboxPointer(new ProceduralSkybox()));
130+}
131+
132+void SceneScriptingInterface::setShouldRenderAvatars(bool shouldRenderAvatars) {
133+ if (shouldRenderAvatars != _shouldRenderAvatars) {
134+ _shouldRenderAvatars = shouldRenderAvatars;
135+ emit shouldRenderAvatarsChanged(_shouldRenderAvatars);
136+ }
137+}
138+
139+void SceneScriptingInterface::setShouldRenderEntities(bool shouldRenderEntities) {
140+ if (shouldRenderEntities != _shouldRenderEntities) {
141+ _shouldRenderEntities = shouldRenderEntities;
142+ emit shouldRenderEntitiesChanged(_shouldRenderEntities);
143+ }
144+}
145+
131146 model::SunSkyStagePointer SceneScriptingInterface::getSkyStage() const {
132147 return _skyStage;
133−}
148+}