Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 02:48:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Create Render/Scene unique_ptr without C++14 make_unique

Browse source
This commit is contained in:
Zach Pomerantz 2015-12-21 15:37:13 -08:00
parent f146b207c4
commit 4df8fa4ac3
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/render-utils/src/RenderScriptingInterface.h
View file

@ -97,11 +97,11 @@ protected:
RenderScripting::Tone* getTone() const { return _tone.get(); } RenderScripting::Tone* getTone() const { return _tone.get(); }
RenderScripting::ItemStatePointer _opaque = std::make_unique<RenderScripting::ItemState>(); RenderScripting::ItemStatePointer _opaque = RenderScripting::ItemStatePointer{new RenderScripting::ItemState{}};
RenderScripting::ItemStatePointer _transparent = std::make_unique<RenderScripting::ItemState>(); RenderScripting::ItemStatePointer _transparent = RenderScripting::ItemStatePointer{new RenderScripting::ItemState{}};
RenderScripting::ItemCounterPointer _overlay3D = std::make_unique<RenderScripting::ItemCounter>(); RenderScripting::ItemCounterPointer _overlay3D = RenderScripting::ItemCounterPointer{new RenderScripting::ItemCounter{}};
RenderScripting::TonePointer _tone = std::make_unique<RenderScripting::Tone>(); RenderScripting::TonePointer _tone = RenderScripting::TonePointer{ new RenderScripting::Tone{} };
// Options // Options
int _drawStatus = 0; int _drawStatus = 0;

4
libraries/script-engine/src/SceneScriptingInterface.cpp
View file

@ -124,7 +124,7 @@ QString SceneScripting::Stage::getBackgroundMode() const {
}; };
} }
SceneScriptingInterface::SceneScriptingInterface() : _stage{ std::make_unique<SceneScripting::Stage>(_skyStage) } { SceneScriptingInterface::SceneScriptingInterface() : _stage{ new SceneScripting::Stage{ _skyStage } } {
// Let's make sure the sunSkyStage is using a proceduralSkybox // Let's make sure the sunSkyStage is using a proceduralSkybox
_skyStage->setSkybox(model::SkyboxPointer(new ProceduralSkybox())); _skyStage->setSkybox(model::SkyboxPointer(new ProceduralSkybox()));
} }
@ -145,4 +145,4 @@ void SceneScriptingInterface::setShouldRenderEntities(bool shouldRenderEntities)
model::SunSkyStagePointer SceneScriptingInterface::getSkyStage() const { model::SunSkyStagePointer SceneScriptingInterface::getSkyStage() const {
return _skyStage; return _skyStage;
} }

6
libraries/script-engine/src/SceneScriptingInterface.h
View file

@ -90,7 +90,9 @@ namespace SceneScripting {
Q_OBJECT Q_OBJECT
public: public:
Stage(model::SunSkyStagePointer skyStage) : _skyStage{ skyStage }, _location{ std::make_unique<Location>(skyStage) }, _time{ std::make_unique<Time>(skyStage) }, _keyLight{ std::make_unique<KeyLight>(skyStage) } {} Stage(model::SunSkyStagePointer skyStage)
: _skyStage{ skyStage },
_location{ new Location{ skyStage } }, _time{ new Time{ skyStage } }, _keyLight{ new KeyLight{ skyStage } }{}
Q_INVOKABLE void setOrientation(const glm::quat& orientation) const; Q_INVOKABLE void setOrientation(const glm::quat& orientation) const;
@ -155,4 +157,4 @@ protected:
bool _shouldRenderEntities = true; bool _shouldRenderEntities = true;
}; };
#endif // hifi_SceneScriptingInterface_h #endif // hifi_SceneScriptingInterface_h