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
13 13
14#include <procedural/ProceduralSkybox.h>14#include <procedural/ProceduralSkybox.h>
15 15
16SceneScriptingInterface::SceneScriptingInterface() {16float SceneScripting::Location::getLongitude() const {
17 // Let's make sure the sunSkyStage is using a proceduralSkybox17 return _skyStage->getOriginLongitude();
18 _skyStage->setSkybox(model::SkyboxPointer(new ProceduralSkybox()));
19}18}
20 19
21void SceneScriptingInterface::setShouldRenderAvatars(bool shouldRenderAvatars) {20float SceneScripting::Location::getLatitude() const {
22 if (shouldRenderAvatars != _shouldRenderAvatars) {21 return _skyStage->getOriginLatitude();
23 _shouldRenderAvatars = shouldRenderAvatars;
24 emit shouldRenderAvatarsChanged(_shouldRenderAvatars);
25 }
26}22}
27 23
28void SceneScriptingInterface::setShouldRenderEntities(bool shouldRenderEntities) {24float SceneScripting::Location::getAltitude() const {
29 if (shouldRenderEntities != _shouldRenderEntities) {25 return _skyStage->getOriginSurfaceAltitude();
30 _shouldRenderEntities = shouldRenderEntities;
31 emit shouldRenderEntitiesChanged(_shouldRenderEntities);
32 }
33}26}
34 27
35void SceneScriptingInterface::setStageOrientation(const glm::quat& orientation) {28void SceneScripting::Location::setLongitude(float longitude) {
36 _skyStage->setOriginOrientation(orientation);29 _skyStage->setOriginLongitude(longitude);
37}
38void SceneScriptingInterface::setStageLocation(float longitude, float latitude, float altitude) {
39 _skyStage->setOriginLocation(longitude, latitude, altitude);
40}30}
41 31
42float SceneScriptingInterface::getStageLocationLongitude() const {32void SceneScripting::Location::setLatitude(float latitude) {
43 return _skyStage->getOriginLongitude();33 _skyStage->setOriginLatitude(latitude);
44}
45float SceneScriptingInterface::getStageLocationLatitude() const {
46 return _skyStage->getOriginLatitude();
47}34}
48float SceneScriptingInterface::getStageLocationAltitude() const {35
49 return _skyStage->getOriginSurfaceAltitude();36void SceneScripting::Location::setAltitude(float altitude) {
37 _skyStage->setOriginSurfaceAltitude(altitude);
50}38}
51 39
52void SceneScriptingInterface::setStageDayTime(float hour) {40void SceneScripting::Time::setHour(float hour) {
53 _skyStage->setDayTime(hour);41 _skyStage->setDayTime(hour);
54}42}
55 43
56float SceneScriptingInterface::getStageDayTime() const {44float SceneScripting::Time::getHour() const {
57 return _skyStage->getDayTime();45 return _skyStage->getDayTime();
58}46}
59 47
60void SceneScriptingInterface::setStageYearTime(int day) {48void SceneScripting::Time::setDay(int day) {
61 _skyStage->setYearTime(day);49 _skyStage->setYearTime(day);
62}50}
63 51
64int SceneScriptingInterface::getStageYearTime() const {52int SceneScripting::Time::getDay() const {
65 return _skyStage->getYearTime();53 return _skyStage->getYearTime();
66}54}
67 55
68void SceneScriptingInterface::setKeyLightColor(const glm::vec3& color) {56glm::vec3 SceneScripting::KeyLight::getColor() const {
57 return _skyStage->getSunColor();
58}
59
60void SceneScripting::KeyLight::setColor(const glm::vec3& color) {
69 _skyStage->setSunColor(color);61 _skyStage->setSunColor(color);
70}62}
71 63
72glm::vec3 SceneScriptingInterface::getKeyLightColor() const {64float SceneScripting::KeyLight::getIntensity() const {
73 return _skyStage->getSunColor();65 return _skyStage->getSunIntensity();
74}66}
75 67
76void SceneScriptingInterface::setKeyLightIntensity(float intensity) {68void SceneScripting::KeyLight::setIntensity(float intensity) {
77 _skyStage->setSunIntensity(intensity);69 _skyStage->setSunIntensity(intensity);
78}70}
79 71
80float SceneScriptingInterface::getKeyLightIntensity() const {72float SceneScripting::KeyLight::getAmbientIntensity() const {
81 return _skyStage->getSunIntensity();73 return _skyStage->getSunAmbientIntensity();
82}74}
83 75
84void SceneScriptingInterface::setKeyLightAmbientIntensity(float intensity) {76void SceneScripting::KeyLight::setAmbientIntensity(float intensity) {
85 _skyStage->setSunAmbientIntensity(intensity);77 _skyStage->setSunAmbientIntensity(intensity);
86}78}
87 79
88float SceneScriptingInterface::getKeyLightAmbientIntensity() const {80glm::vec3 SceneScripting::KeyLight::getDirection() const {
89 return _skyStage->getSunAmbientIntensity();81 return _skyStage->getSunDirection();
90}82}
91 83
92void SceneScriptingInterface::setKeyLightDirection(const glm::vec3& direction) {84void SceneScripting::KeyLight::setDirection(const glm::vec3& direction) {
93 _skyStage->setSunDirection(direction);85 _skyStage->setSunDirection(direction);
94}86}
95 87
96glm::vec3 SceneScriptingInterface::getKeyLightDirection() const {88void SceneScripting::Stage::setOrientation(const glm::quat& orientation) const {
97 return _skyStage->getSunDirection();89 _skyStage->setOriginOrientation(orientation);
90}
91
92void SceneScripting::Stage::setLocation(float longitude, float latitude, float altitude) {
93 _skyStage->setOriginLocation(longitude, latitude, altitude);
98}94}
99 95
100void SceneScriptingInterface::setStageSunModelEnable(bool isEnabled) {96void SceneScripting::Stage::setSunModelEnable(bool isEnabled) {
101 _skyStage->setSunModelEnable(isEnabled);97 _skyStage->setSunModelEnable(isEnabled);
102}98}
103 99
104bool SceneScriptingInterface::isStageSunModelEnabled() const {100bool SceneScripting::Stage::isSunModelEnabled() const {
105 return _skyStage->isSunModelEnabled();101 return _skyStage->isSunModelEnabled();
106}102}
107 103
108void SceneScriptingInterface::setBackgroundMode(const QString& mode) {104void SceneScripting::Stage::setBackgroundMode(const QString& mode) {
109 if (mode == QString("inherit")) {105 if (mode == QString("inherit")) {
110 _skyStage->setBackgroundMode(model::SunSkyStage::NO_BACKGROUND);106 _skyStage->setBackgroundMode(model::SunSkyStage::NO_BACKGROUND);
111 } else if (mode == QString("atmosphere")) {107 } else if (mode == QString("atmosphere")) {
@@ -115,7 +111,7 @@ void SceneScriptingInterface::setBackgroundMode(const QString& mode) { · 3 unmodified lines
115 }111 }
116}112}
117 113
118QString SceneScriptingInterface::getBackgroundMode() const {114QString SceneScripting::Stage::getBackgroundMode() const {
119 switch (_skyStage->getBackgroundMode()) {115 switch (_skyStage->getBackgroundMode()) {
120 case model::SunSkyStage::NO_BACKGROUND:116 case model::SunSkyStage::NO_BACKGROUND:
121 return QString("inherit");117 return QString("inherit");
@@ -128,6 +124,25 @@ QString SceneScriptingInterface::getBackgroundMode() const { · 6 unmodified lines
128 };124 };
129}125}
130 126
127SceneScriptingInterface::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
132void SceneScriptingInterface::setShouldRenderAvatars(bool shouldRenderAvatars) {
133 if (shouldRenderAvatars != _shouldRenderAvatars) {
134 _shouldRenderAvatars = shouldRenderAvatars;
135 emit shouldRenderAvatarsChanged(_shouldRenderAvatars);
136 }
137}
138
139void SceneScriptingInterface::setShouldRenderEntities(bool shouldRenderEntities) {
140 if (shouldRenderEntities != _shouldRenderEntities) {
141 _shouldRenderEntities = shouldRenderEntities;
142 emit shouldRenderEntitiesChanged(_shouldRenderEntities);
143 }
144}
145
131model::SunSkyStagePointer SceneScriptingInterface::getSkyStage() const {146model::SunSkyStagePointer SceneScriptingInterface::getSkyStage() const {
132 return _skyStage;147 return _skyStage;
133}148}