mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-13 23:20:48 -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:
Michael Nilsson
2016-03-30 15:50:52 -04:00
parent c30e215c3f add61b099e
commit 58c4354683
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scene/default.scene
View File

@@ -28,7 +28,7 @@ return {
--"gridGalactic",
--"gridEcliptic",
--"gridEquatorial",
"datasurface",
"iswa",
}
}

2
data/scene/datasurface/datasurface.mod → data/scene/iswa/iswa.mod
View File

@@ -1,6 +1,6 @@
return {
{
Name = "DataSurfaces",
Name = "iSWA",
Parent = "SolarSystem",
Renderable = {
Type = "ISWAManager",

2
scripts/default_settings.lua
View File

@@ -4,6 +4,7 @@
openspace.printInfo("Setting default values")
openspace.setPropertyValue("Sun.renderable.enabled", false)
openspace.setPropertyValue("SunGlare.renderable.enabled", false)
openspace.setPropertyValue("SunMarker.renderable.enabled", false)
openspace.setPropertyValue("EarthMarker.renderable.enabled", false)
--openspace.setPropertyValue("Constellation Bounds.renderable.enabled", false)
@@ -13,5 +14,4 @@ openspace.setPropertyValue("PlutoTexture.renderable.enabled", false)
openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.75)
openspace.setPropertyValue("MilkyWay.renderable.segments", 50)
openspace.printInfo("Done setting default values")

8
src/query/query.cpp
View File

@@ -73,11 +73,11 @@ properties::Property* property(const std::string& uri) {
const std::string nodeName = uri.substr(0, nodeNameSeparator);
const std::string remainingUri = uri.substr(nodeNameSeparator + 1);
SceneGraphNode* node = sceneGraphNode("DataSurfaces");
SceneGraphNode* node = sceneGraphNode("iSWA");
if(node){
std::shared_ptr<ISWACygnet> ds = static_cast <ISWAManager*>(node->renderable())->dataSurface(nodeName);
if(ds){
return ds->property(remainingUri);
std::shared_ptr<ISWACygnet> cygnet = static_cast <ISWAManager*>(node->renderable())->dataSurface(nodeName);
if(cygnet){
return cygnet->property(remainingUri);
}
}