mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-29 15:29:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

solve merge conflict

Browse Source
This commit is contained in:
Michael Nilsson
2016-05-24 14:10:37 -04:00
parent 8633bc8522 e3c1093310
commit 8f6bc7d418
21 changed files with 495 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/cdflist.txt
+5
View File
@@ -0,0 +1,5 @@
../../GM_CDF/3d__var_1_e20000101-000000-000.out.cdf 2000-01-01T00:00:00.00
../../GM_CDF/3d__var_1_e20000101-003000-000.out.cdf 2000-01-01T00:30:00.00
../../GM_CDF/3d__var_1_e20000101-010000-000.out.cdf 2000-01-01T01:00:00.00
../../GM_CDF/3d__var_1_e20000101-013000-000.out.cdf 2000-01-01T01:30:00.00
../../GM_CDF/3d__var_1_e20000101-020000-000.out.cdf 2000-01-01T02:00:00.00
data/scene/default.scene
+3 -3
View File
@@ -30,9 +30,9 @@ function postInitialization()
openspace.printInfo("Done setting default values")
openspace.iswa.addCygnet(0,"x", "Kameleon");
openspace.iswa.addCygnet(0,"y", "Kameleon");
openspace.iswa.addCygnet(0,"z", "Kameleon");
--openspace.iswa.addCygnet(0,"x", "Kameleon");
--openspace.iswa.addCygnet(0,"y", "Kameleon");
--openspace.iswa.addCygnet(0,"z", "Kameleon");
--openspace.iswa.addCygnet(-4,"Data");