diff --git a/libraries/render-utils/src/RenderScriptingInterface.h b/libraries/render-utils/src/RenderScriptingInterface.h index 19e57445e1..08226ef6df 100644 --- a/libraries/render-utils/src/RenderScriptingInterface.h +++ b/libraries/render-utils/src/RenderScriptingInterface.h @@ -97,11 +97,11 @@ protected: RenderScripting::Tone* getTone() const { return _tone.get(); } - RenderScripting::ItemStatePointer _opaque = std::make_unique(); - RenderScripting::ItemStatePointer _transparent = std::make_unique(); - RenderScripting::ItemCounterPointer _overlay3D = std::make_unique(); + RenderScripting::ItemStatePointer _opaque = RenderScripting::ItemStatePointer{new RenderScripting::ItemState{}}; + RenderScripting::ItemStatePointer _transparent = RenderScripting::ItemStatePointer{new RenderScripting::ItemState{}}; + RenderScripting::ItemCounterPointer _overlay3D = RenderScripting::ItemCounterPointer{new RenderScripting::ItemCounter{}}; - RenderScripting::TonePointer _tone = std::make_unique(); + RenderScripting::TonePointer _tone = RenderScripting::TonePointer{ new RenderScripting::Tone{} }; // Options int _drawStatus = 0; diff --git a/libraries/script-engine/src/SceneScriptingInterface.cpp b/libraries/script-engine/src/SceneScriptingInterface.cpp index e3d16912f4..062e502d6e 100644 --- a/libraries/script-engine/src/SceneScriptingInterface.cpp +++ b/libraries/script-engine/src/SceneScriptingInterface.cpp @@ -124,7 +124,7 @@ QString SceneScripting::Stage::getBackgroundMode() const { }; } -SceneScriptingInterface::SceneScriptingInterface() : _stage{ std::make_unique(_skyStage) } { +SceneScriptingInterface::SceneScriptingInterface() : _stage{ new SceneScripting::Stage{ _skyStage } } { // Let's make sure the sunSkyStage is using a proceduralSkybox _skyStage->setSkybox(model::SkyboxPointer(new ProceduralSkybox())); } @@ -145,4 +145,4 @@ void SceneScriptingInterface::setShouldRenderEntities(bool shouldRenderEntities) model::SunSkyStagePointer SceneScriptingInterface::getSkyStage() const { return _skyStage; -} \ No newline at end of file +} diff --git a/libraries/script-engine/src/SceneScriptingInterface.h b/libraries/script-engine/src/SceneScriptingInterface.h index da107b3126..0be8b066aa 100644 --- a/libraries/script-engine/src/SceneScriptingInterface.h +++ b/libraries/script-engine/src/SceneScriptingInterface.h @@ -90,7 +90,9 @@ namespace SceneScripting { Q_OBJECT public: - Stage(model::SunSkyStagePointer skyStage) : _skyStage{ skyStage }, _location{ std::make_unique(skyStage) }, _time{ std::make_unique