mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-05 10:59:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/osirisrex

Browse Source
This commit is contained in:
Kalle Bladin
2016-08-19 12:33:49 -04:00
parent 9daccf4e99 adf02bd5f6
commit d042f6c4be
26 changed files with 568 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scene/newhorizons/pluto/charon/charon.data
+1 -1
View File
@@ -1,5 +1,5 @@
return {
FileRequest = {
{ Identifier = "charon_textures", Destination = "textures", Version = 1 }
{ Identifier = "charon_textures", Destination = "textures", Version = 2 }
},
}
data/scene/newhorizons/pluto/pluto/pluto.data
+2 -2
View File
@@ -1,8 +1,8 @@
return {
FileRequest = {
{ Identifier = "newhorizons_plutoencounter_pluto_assets", Destination = "assets", Version = 1 },
{ Identifier = "newhorizons_plutoencounter_pluto_textures", Destination = "textures", Version = 3 },
{ Identifier = "pluto_textures", Destination = "textures", Version = 2 },
{ Identifier = "newhorizons_plutoencounter_pluto_textures", Destination = "textures", Version = 4 },
{ Identifier = "pluto_textures", Destination = "textures", Version = 4 },
{ Identifier = "newhorizons_plutoencounter_pluto_images", Destination = "images", Version = 1 }
},
}
data/scene/pluto/pluto.data
+1 -1
View File
@@ -1,6 +1,6 @@
return {
FileRequest = {
{ Identifier = "charon_textures", Destination = "textures", Version = 1 },
{ Identifier = "pluto_textures", Destination = "textures", Version = 2 }
{ Identifier = "pluto_textures", Destination = "textures", Version = 4 }
}
}
data/scene/rosetta.scene
+2
View File
@@ -31,6 +31,8 @@ function postInitialization()
openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.55)
openspace.setPropertyValue("MilkyWay.renderable.segments", 50)
openspace.setPropertyValue('67P.renderable.performShading', false);
openspace.printInfo("Done setting default values")
end
data/scene/rosetta/67P/67P.mod
+1
View File
@@ -28,6 +28,7 @@ return {
Observer = "ROSETTA",
Target = "CHURYUMOV-GERASIMENKO",
Aberration = "NONE",
TextureMap = true
},
DataInputTranslation = {
Instrument = {
data/scene/rosetta/rosetta/RosettaKernels_New.torrent
BIN
View File
Binary file not shown.
data/scene/rosetta/rosetta/rosetta.data
+2 -1
View File
@@ -4,6 +4,7 @@ return {
{ Identifier = "rosetta_textures", Destination = "textures", Version = 1 }
},
TorrentFiles = {
{ File = "RosettaKernels.torrent", Destination = "${SPICE}" }
{ File = "RosettaKernels.torrent", Destination = "${SPICE}" },
{ File = "RosettaKernels_New.torrent", Destination = "${SPICE}" }
}
}