mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-16 00:38:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA

Browse Source
This commit is contained in:
Sebastian Piwell
2016-06-10 11:51:39 -04:00
parent e2e5d39d3f 9800ca72be
commit 82fed8a9c5
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scene/default.scene
View File

@@ -30,6 +30,8 @@ function postInitialization()
openspace.printInfo("Done setting default values")
openspace.iswa.addCdfFiles("${OPENSPACE_DATA}/cdflist.json");
--openspace.iswa.addCygnet(7);
end

8
modules/onscreengui/src/guiiswacomponent.cpp
View File

@@ -88,9 +88,9 @@ void GuiIswaComponent::render() {
if(_gmdata != gmdatavalue){
if(_gmdata){
std::string x = "openspace.iswa.addCygnet(-4,'Data','GMData');";
std::string y = "openspace.iswa.addCygnet(-5,'Data','GMData');";
std::string z = "openspace.iswa.addCygnet(-6,'Data','GMData');";
std::string x = "openspace.iswa.addCygnet(-1,'Data','GMData');";
std::string y = "openspace.iswa.addCygnet(-2,'Data','GMData');";
std::string z = "openspace.iswa.addCygnet(-3,'Data','GMData');";
OsEng.scriptEngine().queueScript(x+y+z);
}else{
OsEng.scriptEngine().queueScript("openspace.iswa.removeGroup('GMData');");
@@ -110,7 +110,7 @@ void GuiIswaComponent::render() {
if(_iondata != iondatavalue){
if(_iondata){
OsEng.scriptEngine().queueScript("openspace.iswa.addCygnet(-7,'Data','Ionosphere');");
OsEng.scriptEngine().queueScript("openspace.iswa.addCygnet(-10,'Data','Ionosphere');");
}else{
OsEng.scriptEngine().queueScript("openspace.iswa.removeGroup('Ionosphere');");
}