From b62ff11c753bcf2e7ee15d73894b8b0e6663a841 Mon Sep 17 00:00:00 2001 From: Michael Nilsson Date: Mon, 4 Apr 2016 16:38:18 -0400 Subject: [PATCH] example creation of screenspacecygnet --- modules/iswa/rendering/iswacontainer.cpp | 2 -- modules/iswa/util/iswamanager.cpp | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/iswa/rendering/iswacontainer.cpp b/modules/iswa/rendering/iswacontainer.cpp index d47da26100..1be6f54f92 100644 --- a/modules/iswa/rendering/iswacontainer.cpp +++ b/modules/iswa/rendering/iswacontainer.cpp @@ -49,8 +49,6 @@ bool ISWAContainer::initialize(){ //addISWACygnet("${OPENSPACE_DATA}/test.png"); addISWACygnet(7); - OsEng.renderEngine().registerScreenSpaceRenderable(std::make_shared(6, "${OPENSPACE_DATA}/scene/iswa/6.jpg")); - return true; } diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index e55552498f..bd858afda0 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -60,6 +60,9 @@ namespace openspace{ if(extension == "cdf"){ std::shared_ptr kw = std::make_shared(absPath(path)); cygnet = std::make_shared(kw, path); + } else if(id == 5) { + //check some other condition that id==5 (based on metadata maybe?) + OsEng.renderEngine().registerScreenSpaceRenderable(std::make_shared(id, path)); } else { cygnet = std::make_shared(id, path); }