From 05fa58c39b0f01c4f1295eed5a5f76a6ad940b69 Mon Sep 17 00:00:00 2001 From: Sebastian Piwell Date: Fri, 13 May 2016 10:39:26 -0400 Subject: [PATCH] Delete ScreenSpaceCygnet with lua script --- modules/iswa/rendering/dataplane.cpp | 1 - modules/iswa/rendering/screenspacecygnet.cpp | 7 +++++++ modules/iswa/util/iswamanager_lua.inl | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/iswa/rendering/dataplane.cpp b/modules/iswa/rendering/dataplane.cpp index 7818467370..268a9259e3 100644 --- a/modules/iswa/rendering/dataplane.cpp +++ b/modules/iswa/rendering/dataplane.cpp @@ -271,7 +271,6 @@ void DataPlane::readHeader(std::string& dataBuffer){ } } - _dataOptions.setValue(std::vector(1,0)); if(_data->groupId > 0) diff --git a/modules/iswa/rendering/screenspacecygnet.cpp b/modules/iswa/rendering/screenspacecygnet.cpp index 01a5bca29a..ea6689dd4a 100644 --- a/modules/iswa/rendering/screenspacecygnet.cpp +++ b/modules/iswa/rendering/screenspacecygnet.cpp @@ -56,6 +56,13 @@ ScreenSpaceCygnet::ScreenSpaceCygnet(const ghoul::Dictionary& dictionary) _lastUpdateRealTime = _realTime; _minRealTimeUpdateInterval = 100; + _delete.onChange([this](){ + OsEng.scriptEngine().queueScript( + "openspace.iswa.removeScreenSpaceCygnet("+std::to_string(_cygnetId)+");" + ); + }); + // IswaManager::ref().deleteIswaCygnet(name());}); + } ScreenSpaceCygnet::~ScreenSpaceCygnet(){} diff --git a/modules/iswa/util/iswamanager_lua.inl b/modules/iswa/util/iswamanager_lua.inl index 7128e15dc5..81bccad4af 100644 --- a/modules/iswa/util/iswamanager_lua.inl +++ b/modules/iswa/util/iswamanager_lua.inl @@ -94,6 +94,9 @@ int iswa_removeScrenSpaceCygnet(lua_State* L){ return 0; } + auto info = cygnetInformation[id]; + info->selected = false; + std::string script = "openspace.unregisterScreenSpaceRenderable('" + cygnetInformation[id]->name + "');"; OsEng.scriptEngine().queueScript(script); return 0;