Showing the changes to libraries/script-engine/src/SceneScriptingInterface.h (1 of 71 files). Show all
Unified · Split
| @@ -23,7 +23,7 @@ namespace SceneScripting { · 22 unmodified lines | |||
| 23 | Q_OBJECT | 23 | Q_OBJECT |
| 24 | 24 | ||
| 25 | public: | 25 | public: |
| 26 | Location(model::SunSkyStagePointer skyStage) : _skyStage{ skyStage } {} | 26 | Location(graphics::SunSkyStagePointer skyStage) : _skyStage{ skyStage } {} |
| 27 | 27 | ||
| 28 | Q_PROPERTY(float longitude READ getLongitude WRITE setLongitude) | 28 | Q_PROPERTY(float longitude READ getLongitude WRITE setLongitude) |
| 29 | Q_PROPERTY(float latitude READ getLatitude WRITE setLatitude) | 29 | Q_PROPERTY(float latitude READ getLatitude WRITE setLatitude) |
| @@ -37,7 +37,7 @@ namespace SceneScripting { · 7 unmodified lines | |||
| 37 | void setAltitude(float altitude); | 37 | void setAltitude(float altitude); |
| 38 | 38 | ||
| 39 | protected: | 39 | protected: |
| 40 | model::SunSkyStagePointer _skyStage; | 40 | graphics::SunSkyStagePointer _skyStage; |
| 41 | }; | 41 | }; |
| 42 | using LocationPointer = std::unique_ptr<Location>; | 42 | using LocationPointer = std::unique_ptr<Location>; |
| 43 | 43 | ||
| @@ -45,7 +45,7 @@ namespace SceneScripting { · 1 unmodified line | |||
| 45 | Q_OBJECT | 45 | Q_OBJECT |
| 46 | 46 | ||
| 47 | public: | 47 | public: |
| 48 | Time(model::SunSkyStagePointer skyStage) : _skyStage{ skyStage } {} | 48 | Time(graphics::SunSkyStagePointer skyStage) : _skyStage{ skyStage } {} |
| 49 | 49 | ||
| 50 | Q_PROPERTY(float hour READ getHour WRITE setHour) | 50 | Q_PROPERTY(float hour READ getHour WRITE setHour) |
| 51 | Q_PROPERTY(int day READ getDay WRITE setDay) | 51 | Q_PROPERTY(int day READ getDay WRITE setDay) |
| @@ -56,7 +56,7 @@ namespace SceneScripting { · 4 unmodified lines | |||
| 56 | void setDay(int day); | 56 | void setDay(int day); |
| 57 | 57 | ||
| 58 | protected: | 58 | protected: |
| 59 | model::SunSkyStagePointer _skyStage; | 59 | graphics::SunSkyStagePointer _skyStage; |
| 60 | }; | 60 | }; |
| 61 | using TimePointer = std::unique_ptr<Time>; | 61 | using TimePointer = std::unique_ptr<Time>; |
| 62 | 62 | ||
| @@ -64,7 +64,7 @@ namespace SceneScripting { · 1 unmodified line | |||
| 64 | Q_OBJECT | 64 | Q_OBJECT |
| 65 | 65 | ||
| 66 | public: | 66 | public: |
| 67 | KeyLight(model::SunSkyStagePointer skyStage) : _skyStage{ skyStage } {} | 67 | KeyLight(graphics::SunSkyStagePointer skyStage) : _skyStage{ skyStage } {} |
| 68 | 68 | ||
| 69 | Q_PROPERTY(glm::vec3 color READ getColor WRITE setColor) | 69 | Q_PROPERTY(glm::vec3 color READ getColor WRITE setColor) |
| 70 | Q_PROPERTY(float intensity READ getIntensity WRITE setIntensity) | 70 | Q_PROPERTY(float intensity READ getIntensity WRITE setIntensity) |
| @@ -87,7 +87,7 @@ namespace SceneScripting { · 16 unmodified lines | |||
| 87 | void setAmbientMap(const gpu::TexturePointer& map); | 87 | void setAmbientMap(const gpu::TexturePointer& map); |
| 88 | 88 | ||
| 89 | protected: | 89 | protected: |
| 90 | model::SunSkyStagePointer _skyStage; | 90 | graphics::SunSkyStagePointer _skyStage; |
| 91 | }; | 91 | }; |
| 92 | using KeyLightPointer = std::unique_ptr<KeyLight>; | 92 | using KeyLightPointer = std::unique_ptr<KeyLight>; |
| 93 | 93 | ||
| @@ -95,7 +95,7 @@ namespace SceneScripting { · 1 unmodified line | |||
| 95 | Q_OBJECT | 95 | Q_OBJECT |
| 96 | 96 | ||
| 97 | public: | 97 | public: |
| 98 | Stage(model::SunSkyStagePointer skyStage) | 98 | Stage(graphics::SunSkyStagePointer skyStage) |
| 99 | : _skyStage{ skyStage }, | 99 | : _skyStage{ skyStage }, |
| 100 | _location{ new Location{ skyStage } }, _time{ new Time{ skyStage } }, _keyLight{ new KeyLight{ skyStage } }{} | 100 | _location{ new Location{ skyStage } }, _time{ new Time{ skyStage } }, _keyLight{ new KeyLight{ skyStage } }{} |
| 101 | 101 | ||
| @@ -122,7 +122,7 @@ namespace SceneScripting { · 20 unmodified lines | |||
| 122 | QString getBackgroundMode() const; | 122 | QString getBackgroundMode() const; |
| 123 | 123 | ||
| 124 | protected: | 124 | protected: |
| 125 | model::SunSkyStagePointer _skyStage; | 125 | graphics::SunSkyStagePointer _skyStage; |
| 126 | LocationPointer _location; | 126 | LocationPointer _location; |
| 127 | TimePointer _time; | 127 | TimePointer _time; |
| 128 | KeyLightPointer _keyLight; | 128 | KeyLightPointer _keyLight; |
| @@ -146,7 +146,7 @@ public: · 17 unmodified lines | |||
| 146 | Q_PROPERTY(SceneScripting::Stage* stage READ getStage) | 146 | Q_PROPERTY(SceneScripting::Stage* stage READ getStage) |
| 147 | SceneScripting::Stage* getStage() const { return _stage.get(); } | 147 | SceneScripting::Stage* getStage() const { return _stage.get(); } |
| 148 | 148 | ||
| 149 | model::SunSkyStagePointer getSkyStage() const; | 149 | graphics::SunSkyStagePointer getSkyStage() const; |
| 150 | 150 | ||
| 151 | signals: | 151 | signals: |
| 152 | void shouldRenderAvatarsChanged(bool shouldRenderAvatars); | 152 | void shouldRenderAvatarsChanged(bool shouldRenderAvatars); |
| @@ -156,7 +156,7 @@ protected: · 3 unmodified lines | |||
| 156 | SceneScriptingInterface(); | 156 | SceneScriptingInterface(); |
| 157 | ~SceneScriptingInterface() {}; | 157 | ~SceneScriptingInterface() {}; |
| 158 | 158 | ||
| 159 | model::SunSkyStagePointer _skyStage = std::make_shared<model::SunSkyStage>(); | 159 | graphics::SunSkyStagePointer _skyStage = std::make_shared<graphics::SunSkyStage>(); |
| 160 | SceneScripting::StagePointer _stage; | 160 | SceneScripting::StagePointer _stage; |
| 161 | 161 | ||
| 162 | bool _shouldRenderAvatars = true; | 162 | bool _shouldRenderAvatars = true; |