mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 23:09:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Enable RenderablePlanetProjection to have a selection of possible targets and change and hotload them at runtime

Browse Source 
Makke RenderablePlanetProjection work if no base texture is loaded
This commit is contained in:
Alexander Bock
2017-12-23 20:24:19 +01:00
parent 0e96632586
commit e74801b490
5 changed files with 194 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/assets/scene/solarsystem/missions/newhorizons/charon.asset
+8 -9
View File
@@ -12,13 +12,6 @@ local textures = asset.syncedResource({
Version = 3
})
-- local charon_image = textures .. "/NH_Charon_mosaic_8192.png"
local charon_image = textures .. "/NH_Charon_mosaic.png"
-- local charon_height = textures .. "/NH_Charon_DTM_8192.png"
local charon_height = textures .. "/NH_Charon_DTM.png"
local charonRadius = 6.035E5
local Charon = {
@@ -43,8 +36,14 @@ local Charon = {
Radius = charonRadius,
Segments = 350
},
ColorTexture = charon_image,
HeightTexture = charon_height,
ColorTexturePaths = {
textures .. "/NH_Charon_mosaic.png",
textures .. "/NH_Charon_mosaic_8192.png"
},
HeightTexturePaths = {
textures .. "/NH_Charon_DTM.png",
textures .. "/NH_Charon_DTM_8192.png"
},
Projection = {
Observer = "NEW HORIZONS",
Target = "CHARON",
data/assets/scene/solarsystem/missions/newhorizons/pluto.asset
+10 -11
View File
@@ -35,15 +35,6 @@ local images = asset.syncedResource({
local plutoRadius = 1.173E6
-- local pluto_image = textures .. "/NH_Pluto_mosaic_8192.png"
-- local pluto_image = textures .. "/NH_Pluto_mosaic_16384.png"
-- local pluto_image = textures .. "/pmap_cyl_k201.jpg"
local pluto_image = textures .. "/pmap_cyl_k201_4096.jpg"
local pluto_height = textures .. "/NH_Pluto_DTM_8192.png"
-- local pluto_height = textures .. "/NH_Pluto_DTM_16384.png"
local Pluto = {
Name = "Pluto",
Parent = transforms.PlutoBarycenter.Name,
@@ -68,8 +59,16 @@ local Pluto = {
Radius = plutoRadius,
Segments = 400
},
ColorTexture = pluto_image,
HeightTexture = pluto_height,
ColorTexturePaths = {
textures .. "/NH_Pluto_mosaic_16384.png",
textures .. "/NH_Pluto_mosaic_8192.png",
textures .. "/pmap_cyl_k201.jpg",
textures .. "/pmap_cyl_k201_4096.jpg"
},
HeightTexturePaths = {
textures .. "/NH_Pluto_DTM_16384.png",
textures .. "/NH_Pluto_DTM_8192.png"
},
MeridianShift = true,
Projection = {
Sequence = images,