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

merge

Browse Source
This commit is contained in:
Jonathan Bosson
2017-04-13 16:27:29 -06:00
parent 47535e38f9 a71f4974fe
commit c682c0f6b1
194 changed files with 4798 additions and 2060 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scene/atmosphereearth/atmosphereearth.mod
+6 -6
View File
@@ -30,15 +30,15 @@ return {
Source1 = {
Name = "Sun",
-- All radius in meters
Radius = {696.3, 6}
Radius = 696.3E6
},
--Source2 = { Name = "Monolith", Radius = {0.01, 6} },
--Source2 = { Name = "Monolith", Radius = 0.01E6 },
Caster1 = {
Name = "Moon",
-- All radius in meters
Radius = {1.737, 6}
Radius = 1.737E6
},
--Caster2 = { Name = "Independency Day Ship", Radius = {0.0, 0.0} }
--Caster2 = { Name = "Independency Day Ship", Radius = 0 }
},
Textures = {
Type = "simple",
@@ -127,7 +127,7 @@ return {
Parent = "Earth",
Renderable = {
Type = "RenderablePlane",
Size = {3.0, 11.0},
Size = 3.0E11.0,
Origin = "Center",
Billboard = true,
Texture = "textures/marker.png",
@@ -145,7 +145,7 @@ return {
-- Renderable = {
-- Type = "RenderablePlane",
-- Billboard = true,
-- Size = { 6.371, 6 },
-- Size = 6.371E6,
-- Texture = "textures/graph.jpg",
-- Atmosphere = {
-- Type = "Nishita", -- for example, values missing etc etc
data/scene/default.scene
+2 -1
View File
@@ -11,7 +11,6 @@ function preInitialization()
openspace.time.setTime(openspace.time.currentWallTime())
dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))
end
function postInitialization()
@@ -28,6 +27,8 @@ function postInitialization()
openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.55)
openspace.setPropertyValue("MilkyWay.renderable.segments", 50)
openspace.addVirtualProperty("BoolProperty", "Show Trails", "*Trail.renderable.enabled", true, nil, nil)
openspace.resetCameraDirection()
openspace.printInfo("Done setting default values")
data/scene/earth/earth.mod
+2 -2
View File
@@ -34,7 +34,7 @@ return {
Body = "EARTH",
Geometry = {
Type = "SimpleSphere",
Radius = { 6.371, 6 },
Radius = 6.371E6,
Segments = 100
},
Textures = {
@@ -88,7 +88,7 @@ return {
Parent = "Earth",
Renderable = {
Type = "RenderablePlane",
Size = {3.0, 11.0},
Size = 3.0E11,
Origin = "Center",
Billboard = true,
Texture = "textures/marker.png",
data/scene/jupiter/callisto/callisto.mod
+1 -1
View File
@@ -9,7 +9,7 @@ return {
Body = "CALLISTO",
Geometry = {
Type = "SimpleSphere",
Radius = { 2.631, 6},
Radius = 2.631E6,
Segments = 100
},
Textures = {
data/scene/jupiter/europa/europa.mod
+1 -1
View File
@@ -9,7 +9,7 @@ return {
Body = "EUROPA",
Geometry = {
Type = "SimpleSphere",
Radius = { 1.561, 6},
Radius = 1.561E6,
Segments = 100
},
Textures = {
data/scene/jupiter/ganymede/ganymede.mod
+1 -1
View File
@@ -9,7 +9,7 @@ return {
Body = "JUPITER BARYCENTER",
Geometry = {
Type = "SimpleSphere",
Radius = { 2.631, 6},
Radius = 2.631E6,
Segments = 100
},
Textures = {
data/scene/jupiter/io/io.mod
+1 -1
View File
@@ -9,7 +9,7 @@ return {
Body = "IO",
Geometry = {
Type = "SimpleSphere",
Radius = { 1.8213, 6 },
Radius = 1.8213E6,
Segments = 100
},
Textures = {
data/scene/jupiter/jupiter/jupiter.mod
+1 -1
View File
@@ -22,7 +22,7 @@ return {
Body = "JUPITER BARYCENTER",
Geometry = {
Type = "SimpleSphere",
Radius = { 0.71492, 8 },
Radius = 0.71492E8,
Segments = 200
},
Textures = {
data/scene/lodglobes/earth/earth.mod
+8 -3
View File
@@ -56,13 +56,14 @@ return {
SegmentsPerPatch = 64,
Layers = {
ColorLayers = {
{
Name = "ESRI VIIRS Combo",
Type = "ByLevel",
LevelTileProviders = {
{
MaxLevel = 7,
TileProvider = { FilePath = "map_service_configs/GIBS/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml", },
MaxLevel = 3,
TileProvider = { Type = "Temporal", FilePath = "map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml", },
},
{
MaxLevel = 22,
@@ -75,6 +76,10 @@ return {
FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms",
Name = "ESRI",
},
{
Name = "ESRI Imagery World 2D",
FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms",
},
{
Name = "ESRI Imagery World",
FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms"
@@ -172,7 +177,7 @@ return {
Name = "Terrain tileset",
FilePath = "map_service_configs/ESRI/TERRAIN.wms",
Enabled = true,
MinimumPixelSize = 64,
TilePixelSize = 64,
DoPreProcessing = true,
},
},
data/scene/lodglobes/jupiter/callisto/callisto.mod
+1 -1
View File
@@ -32,7 +32,7 @@ return {
Name = "Callisto Texture",
FilePath = "textures/callisto.jpg",
Enabled = true,
MinimumPixelSize = 112,
TilePixelSize = 112,
},
},
GrayScaleLayers = { },
data/scene/lodglobes/jupiter/europa/europa.mod
+1 -1
View File
@@ -32,7 +32,7 @@ return {
Name = "Europa Texture",
FilePath = "textures/europa.jpg",
Enabled = true,
MinimumPixelSize = 256,
TilePixelSize = 256,
},
},
GrayScaleLayers = { },
data/scene/lodglobes/jupiter/ganymede/ganymede.mod
+1 -1
View File
@@ -32,7 +32,7 @@ return {
Name = "Ganymede Texture",
FilePath = "textures/ganymede.jpg",
Enabled = true,
MinimumPixelSize = 112,
TilePixelSize = 112,
},
},
GrayScaleLayers = { },
data/scene/lodglobes/mars/map_service_configs/Utah/Mola_Elevation.xml
+1
View File
@@ -12,6 +12,7 @@
<TileLevel>6</TileLevel>
<YOrigin>top</YOrigin>
</DataWindow>
<DataType>Int16</DataType>
<Projection>GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</Projection>
<BlockSizeX>360</BlockSizeX>
<BlockSizeY>360</BlockSizeY>
data/scene/lodglobes/mars/mars.mod
+59 -34
View File
@@ -32,20 +32,36 @@ return {
Type = "RenderableGlobe",
Radii = marsEllipsoid,
CameraMinHeight = 10,
SegmentsPerPatch = 90,
-- Allows camera to go down 10000 meters below the reference ellipsoid
InteractionDepthBelowEllipsoid = 10000, -- Useful when having negative height map values
SegmentsPerPatch = 64,
Layers = {
ColorLayers = {
{
Name = "Viking combo",
Type = "ByLevel",
LevelTileProviders = {
{
MaxLevel = 3,
TileProvider = { FilePath = "textures/mars.jpg", },
},
{
MaxLevel = 22,
TileProvider = { FilePath = "map_service_configs/MARS_Viking_MDIM21.xml" },
},
},
Enabled = true,
},
-- {
-- Type = "SingleImage",
-- Name = "Debug Tiles",
-- FilePath = "../../debugglobe/textures/test_tile.png",
-- },
{
Name = "MARS_Viking",
FilePath = "map_service_configs/MARS_Viking_MDIM21.xml",
Enabled = true,
},
--{
-- Name = "MARS_Viking",
-- FilePath = "map_service_configs/MARS_Viking_MDIM21.xml",
-- Enabled = true,
--},
{
Name = "MOLA Pseudo Color",
FilePath = "map_service_configs/Utah/MolaPseudoColor.xml",
@@ -66,16 +82,22 @@ return {
{
Name = "CTX Mosaic [Europe]",
FilePath = "map_service_configs/CTX_Mosaic.xml",
Enabled = true,
}, {
--Enabled = true,
},
{
Name = "CTX Mosaic [Utah]",
FilePath = "map_service_configs/Utah/CTX_Mosaic.xml",
},
{
Name = "West Candor Chasma",
FilePath = "map_datasets/CTX/West_Candor_Chasma_longlat_global.vrt",
--Enabled = true,
},
{
Name = "Layered Rock Outcrops in Southwest Candor Chasma",
FilePath = "map_datasets/HiRISE/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_Texture.vrt",
},
{
--[[{
Name = "Themis IR Day",
FilePath = "map_service_configs/Utah/ThemisIRDay.xml",
},
@@ -83,12 +105,7 @@ return {
Name = "Themis IR Night",
FilePath = "map_service_configs/Utah/ThemisIRNight.xml",
},
--[[
{
Name = "West Candor Chasma",
FilePath = "map_datasets/CTX/West_Candor_Chasma_longlat_global.vrt",
--Enabled = true,
},
{
Name = "MER_Meridianni_Endeavor_Basemap_25cm",
FilePath = "map_datasets/Basemap/MER_Meridianni_Endeavor_Basemap_25cm.vrt",
@@ -115,41 +132,49 @@ return {
},
HeightLayers = {
{
Name = "Mola Elevation",
Name = "Mola Elevation [Europe]",
FilePath = "map_service_configs/Mola_Elevation.xml",
Enabled = true,
MinimumPixelSize = 90,
TilePixelSize = 90,
DoPreProcessing = true,
},
--[[
{
Name = "Mola Elevation [Utah]",
FilePath = "map_service_configs/Utah/Mola_Elevation.xml",
Enabled = false,
TilePixelSize = 90,
DoPreProcessing = true,
},
{
Name = "Mola Elevation CTX",
FilePath = "map_service_configs/Utah/MolaCTX_Elevation.xml",
-- Enabled = true,
MinimumPixelSize = 90,
TilePixelSize = 90,
DoPreProcessing = true,
},
},]]
{
Name = "Layered Rock Outcrops in Southwest Candor Chasma",
FilePath = "map_datasets/HiRISE/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_Heightmap.vrt",
MinimumPixelSize = 90,
DoPreProcessing = true,
},
--[[
{
Name = "Mola Elevation",
FilePath = "map_service_configs/Mars_MGS_MOLA_DEM.xml",
Enabled = true,
MinimumPixelSize = 64,
DoPreProcessing = true,
},
--]]
--[[ {
Name = "West Candor Chasma",
FilePath = "map_datasets/CTX/West_Candor_Chasma_DEM_longlat_global.vrt",
--Enabled = true,
MinimumPixelSize = 90,
DoPreProcessing = true,
},
{
Name = "Layered Rock Outcrops in Southwest Candor Chasma",
FilePath = "map_datasets/HiRISE/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_Heightmap.vrt",
TilePixelSize = 90,
DoPreProcessing = true,
},
--[[
{
Name = "West Candor Chasma",
FilePath = "map_datasets/CTX/West_Candor_Chasma_DEM_longlat_global.vrt",
--Enabled = true,
TilePixelSize = 90,
DoPreProcessing = true,
},]]
--[[
{
Name = "Part of Area Traversed by the Mars Exploration Rover",
FilePath = "map_datasets/HiRISE/Part_of_Area_Traversed_by_the_Mars_Exploration_Rover_Heightmap.vrt",
data/scene/lodglobes/mercury/lodmercury.mod
+1 -1
View File
@@ -42,7 +42,7 @@ return {
Name = "Simple Texture",
FilePath = "textures/mercury.jpg",
Enabled = true,
MinimumPixelSize = 256,
TilePixelSize = 256,
},
{
Name = "Messenger_Mosaic",
data/scene/lodglobes/moon/map_service_configs/Utah/LolaDem.wms
+1
View File
@@ -12,6 +12,7 @@
<TileLevel>7</TileLevel>
<YOrigin>top</YOrigin>
</DataWindow>
<DataType>Int16</DataType>
<Projection>GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</Projection>
<BlockSizeX>360</BlockSizeX>
<BlockSizeY>360</BlockSizeY>
data/scene/lodglobes/moon/moon.mod
+6 -2
View File
@@ -20,8 +20,9 @@ return {
Type = "RenderableGlobe",
Radii = {1738140, 1738140, 1735970}, -- Moons's radius
CameraMinHeight = 300,
InteractionDepthBelowEllipsoid = 5000, -- Useful when having negative height map values
SegmentsPerPatch = 64,
-- Allows camera to go down 10000 meters below the reference ellipsoid
InteractionDepthBelowEllipsoid = 10000, -- Useful when having negative height map values
Layers = {
ColorLayers = {
@@ -63,10 +64,13 @@ return {
FilePath = "map_service_configs/OnMoonHeight.xml",
Enabled = true,
DoPreProcessing = true,
TileSize = 64,
},
{
Name = "LolaDem",
FilePath = "map_service_configs/Utah/LolaDem.wms"
FilePath = "map_service_configs/Utah/LolaDem.wms",
DoPreProcessing = true,
TileSize = 64,
}
},
},
data/scene/lodglobes/neptune/neptune.mod
+1 -1
View File
@@ -40,7 +40,7 @@ return {
Name = "Texture",
FilePath = "textures/neptune.jpg",
Enabled = true,
MinimumPixelSize = 256,
TilePixelSize = 256,
},
},
GrayScaleLayers = { },
data/scene/lodglobes/saturn/saturn.mod
+1 -1
View File
@@ -40,7 +40,7 @@ return {
Name = "Saturn Texture",
FilePath = "textures/saturn.jpg",
Enabled = true,
MinimumPixelSize = 256,
TilePixelSize = 256,
},
},
GrayScaleLayers = { },
data/scene/lodglobes/uranus/uranus.mod
+1 -1
View File
@@ -40,7 +40,7 @@ return {
Name = "Texture",
FilePath = "textures/uranus.jpg",
Enabled = true,
MinimumPixelSize = 256,
TilePixelSize = 256,
},
},
GrayScaleLayers = { },
data/scene/lodglobes/venus/venus.mod
+1 -1
View File
@@ -45,7 +45,7 @@ return {
Name = "Venus Texture",
FilePath = "textures/venus.jpg",
Enabled = true,
MinimumPixelSize = 256,
TilePixelSize = 256,
},
},
GrayScaleLayers = { },
data/scene/mars/mars.mod
+1 -1
View File
@@ -22,7 +22,7 @@ return {
Body = "MARS BARYCENTER",
Geometry = {
Type = "SimpleSphere",
Radius = { 6.390, 6 },
Radius = 6.390E6,
Segments = 100
},
Textures = {
data/scene/mercury/mercury.mod
+1 -3
View File
@@ -1,5 +1,3 @@
MercuryRadius = 2.4397E6;
return {
-- Mercury barycenter module
{
@@ -24,7 +22,7 @@ return {
Body = "MERCURY",
Geometry = {
Type = "SimpleSphere",
Radius = {MercuryRadius, 1.0},
Radius = 2.4397E6,
Segments = 100
},
Textures = {
data/scene/missions/dawn/ceres/ceres.mod
+1 -1
View File
@@ -10,7 +10,7 @@ return {
Body = "CERES",
Geometry = {
Type = "SimpleSphere",
Radius = { 6.390, 5 },
Radius = 6.390E5,
Segments = 100
},
Textures = {
data/scene/missions/newhorizons/jupiter/callisto/callisto.mod
+2 -2
View File
@@ -9,7 +9,7 @@ return {
Body = "CALLISTO",
Geometry = {
Type = "SimpleSphere",
Radius = { 1.8213, 6 },
Radius = 1.8213E6,
Segments = 100
},
Textures = {
@@ -58,7 +58,7 @@ return {
Parent = "Callisto",
Renderable = {
Type = "RenderablePlane",
Size = {1.0, 7.4},
Size = 1.0E7.4,
Origin = "Center",
Billboard = true,
Texture = "textures/Callisto-Text.png",
data/scene/missions/newhorizons/jupiter/europa/europa.mod
+2 -2
View File
@@ -9,7 +9,7 @@ return {
Body = "EUROPA",
Geometry = {
Type = "SimpleSphere",
Radius = { 1.8213, 6 },
Radius = 1.8213E6,
Segments = 100
},
Textures = {
@@ -58,7 +58,7 @@ return {
Parent = "Europa",
Renderable = {
Type = "RenderablePlane",
Size = {1.0, 7.4},
Size = 1.0E7.4,
Origin = "Center",
Billboard = true,
Texture = "textures/Europa-Text.png",
data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod
+2 -2
View File
@@ -9,7 +9,7 @@ return {
Body = "GANYMEDE",
Geometry = {
Type = "SimpleSphere",
Radius = { 1.8213, 6 },
Radius = 1.8213E6,
Segments = 100
},
Textures = {
@@ -58,7 +58,7 @@ return {
Parent = "Ganymede",
Renderable = {
Type = "RenderablePlane",
Size = {1.0, 7.4},
Size = 1.0E7.4,
Origin = "Center",
Billboard = true,
Texture = "textures/Ganymede-Text.png",
data/scene/missions/newhorizons/jupiter/io/io.mod
+1 -1
View File
@@ -9,7 +9,7 @@ return {
Body = "IO",
Geometry = {
Type = "SimpleSphere",
Radius = { 1.8213, 6 },
Radius = 1.8213E6,
Segments = 100
},
Textures = {
data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod
+2 -2
View File
@@ -22,7 +22,7 @@ return {
Body = "JUPITER",
Geometry = {
Type = "SimpleSphere",
Radius = { 0.71492, 8 },
Radius = 0.71492E8,
Segments = 200,
},
Textures = {
@@ -101,7 +101,7 @@ return {
Parent = "JupiterProjection",
Renderable = {
Type = "RenderablePlane",
Size = {1.0, 7.5},
Size = 1.0E7.5,
Origin = "Center",
Billboard = true,
Texture = "textures/Jupiter-text.png",
data/scene/missions/newhorizons/pluto/charon/charon.mod
+2 -2
View File
@@ -24,7 +24,7 @@ return {
Type = "RenderablePlanetProjection",
Geometry = {
Type = "SimpleSphere",
Radius = { 6.035 , 5 },
Radius = 6.035E5,
Segments = 100
},
Textures = {
@@ -72,7 +72,7 @@ return {
Parent = "Charon",
Renderable = {
Type = "RenderablePlane",
Size = {1.0, 6.3},
Size = 1.0E6.3,
Origin = "Center",
Billboard = true,
Texture = "textures/Charon-Text.png",
data/scene/missions/newhorizons/pluto/hydra/hydra.mod
+1 -1
View File
@@ -46,7 +46,7 @@ return {
Parent = "Hydra",
Renderable = {
Type = "RenderablePlane",
Size = {1.0, 6.3},
Size = 1.0E6.3,
Origin = "Center",
Billboard = true,
Texture = "textures/Hydra-Text.png"
data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod
+1 -1
View File
@@ -46,7 +46,7 @@ return {
Parent = "Kerberos",
Renderable = {
Type = "RenderablePlane",
Size = {1.0, 6.3},
Size = 1.0E6.3,
Origin = "Center",
Billboard = true,
Texture = "textures/Kerberos-Text.png"
data/scene/missions/newhorizons/pluto/nix/nix.mod
+2 -2
View File
@@ -19,7 +19,7 @@ return {
Body = "NIX",
Geometry = {
Type = "SimpleSphere",
Radius = { 0.45 , 5 },
Radius = 0.45E5,
Segments = 100
},
Textures = {
@@ -46,7 +46,7 @@ return {
Parent = "Nix",
Renderable = {
Type = "RenderablePlane",
Size = {1.0, 6.3},
Size = 1.0E6.3,
Origin = "Center",
Billboard = true,
Texture = "textures/Nix-Text.png"
data/scene/missions/newhorizons/pluto/pluto/pluto.mod
+3 -3
View File
@@ -38,7 +38,7 @@ return {
Type = "RenderablePlanetProjection",
Geometry = {
Type = "SimpleSphere",
Radius = { 1.173 , 6 },
Radius = 1.173E6,
Segments = 100
},
Textures = {
@@ -173,7 +173,7 @@ return {
Renderable = {
Type = "RenderablePlane",
Billboard = true,
Size = { 5, 4 },
Size = 5E4,
Texture = "textures/barycenter.png",
Atmosphere = {
Type = "Nishita", -- for example, values missing etc etc
@@ -187,7 +187,7 @@ return {
Parent = "Pluto",
Renderable = {
Type = "RenderablePlane",
Size = {1.0, 6.3},
Size = 1.0E6.3,
Origin = "Center",
Billboard = true,
Texture = "textures/Pluto-Text.png",
data/scene/missions/newhorizons/pluto/styx/styx.mod
+2 -2
View File
@@ -19,7 +19,7 @@ return {
Body = "STYX",
Geometry = {
Type = "SimpleSphere",
Radius = { 0.75 , 4 },
Radius = 0.75E4,
Segments = 100
},
Textures = {
@@ -46,7 +46,7 @@ return {
Parent = "Styx",
Renderable = {
Type = "RenderablePlane",
Size = {1.0, 6.3},
Size = 1.0E6.3,
Origin = "Center",
Billboard = true,
Texture = "textures/Styx-Text.png",
data/scene/moon/moon.mod
+3 -3
View File
@@ -9,17 +9,17 @@ return {
Body = "MOON",
Geometry = {
Type = "SimpleSphere",
Radius = { 1.737, 6},
Radius = 1.737E6,
Segments = 100
},
Shadow_Group = {
Source1 = {
Name = "Sun",
Radius = {696.3, 6}
Radius = 696.3E6
},
Caster1 = {
Name = "Earth",
Radius = {6.371, 6}
Radius = 6.371E6
},
},
Textures = {
data/scene/neptune/neptune.mod
+1 -1
View File
@@ -23,7 +23,7 @@ return {
Body = "NEPTUNE BARYCENTER",
Geometry = {
Type = "SimpleSphere",
Radius = { 2.4622 , 7 },
Radius = 2.4622E7,
Segments = 100
},
Textures = {
data/scene/pluto/pluto.mod
+2 -2
View File
@@ -25,7 +25,7 @@ return {
Body = "PLUTO",
Geometry = {
Type = "SimpleSphere",
Radius = { 1.173 , 6 },
Radius = 1.173E6,
Segments = 100
},
Textures = {
@@ -61,7 +61,7 @@ return {
Body = "CHARON",
Geometry = {
Type = "SimpleSphere",
Radius = { 6.035 , 5 },
Radius = 6.035E5,
Segments = 100
},
Textures = {
data/scene/saturn/dione/dione.mod
+1 -1
View File
@@ -8,7 +8,7 @@ return {
Body = "DIONE",
Geometry = {
Type = "SimpleSphere",
Radius = { 0.563, 3 },
Radius = 0.563E3,
Segments = 50
},
Textures = {
data/scene/saturn/enceladus/enceladus.mod
+1 -1
View File
@@ -8,7 +8,7 @@ return {
Body = "ENCELADUS",
Geometry = {
Type = "SimpleSphere",
Radius = { 0.257, 3 },
Radius = 0.257E3,
Segments = 50
},
Textures = {
data/scene/saturn/iapetus/iapetus.mod
+1 -1
View File
@@ -8,7 +8,7 @@ return {
Body = "IAPETUS",
Geometry = {
Type = "SimpleSphere",
Radius = { 0.746, 3 },
Radius = 0.746E3,
Segments = 50
},
Textures = {
data/scene/saturn/mimas/mimas.mod
+1 -1
View File
@@ -8,7 +8,7 @@ return {
Body = "MIMAS",
Geometry = {
Type = "SimpleSphere",
Radius = { 0.28, 3 },
Radius = 0.28E3,
Segments = 50
},
Textures = {
data/scene/saturn/rhea/rhea.mod
+1 -1
View File
@@ -8,7 +8,7 @@ return {
Body = "RHEA",
Geometry = {
Type = "SimpleSphere",
Radius = { 0.765, 3 },
Radius = 0.765E3,
Segments = 50
},
Textures = {
data/scene/saturn/saturn/saturn.mod
+1 -4
View File
@@ -1,6 +1,3 @@
SaturnRadius = 5.8232E7;
return {
-- Saturn barycenter module
{
@@ -26,7 +23,7 @@ return {
Body = "SATURN BARYCENTER",
Geometry = {
Type = "SimpleSphere",
Radius = {SaturnRadius, 0},
Radius = 5.8232E7,
Segments = 100
},
Textures = {
data/scene/saturn/tethys/tethys.mod
+1 -1
View File
@@ -8,7 +8,7 @@ return {
Body = "TETHYS",
Geometry = {
Type = "SimpleSphere",
Radius = { 0.538, 3 },
Radius = 0.538E3,
Segments = 50
},
Textures = {
data/scene/saturn/titan/titan.mod
+1 -1
View File
@@ -8,7 +8,7 @@ return {
Body = "TITAN",
Geometry = {
Type = "SimpleSphere",
Radius = { 0.2575, 4 },
Radius = 0.2575E4,
Segments = 50
},
Textures = {
data/scene/sun/sun.mod
+4 -3
View File
@@ -20,7 +20,8 @@ return {
Body = "SUN",
Geometry = {
Type = "SimpleSphere",
Radius = { 2.783200, 9 },
--Radius = 2.783200E9,
Radius = 6.957E8,
Segments = 100
},
Textures = {
@@ -49,7 +50,7 @@ return {
Parent = "SolarSystemBarycenter",
Renderable = {
Type = "RenderablePlane",
Size = {1.3, 10.5},
Size = 1.3*10^10.5,
Origin = "Center",
Billboard = true,
Texture = "textures/sun-glare.png",
@@ -70,7 +71,7 @@ return {
Parent = "Sun",
Renderable = {
Type = "RenderablePlane",
Size = {3.0, 11.0},
Size = 3.0E11,
Origin = "Center",
Billboard = true,
Texture = "textures/marker.png",
data/scene/uranus/uranus.mod
+1 -1
View File
@@ -23,7 +23,7 @@ return {
Body = "URANUS BARYCENTER",
Geometry = {
Type = "SimpleSphere",
Radius = { 2.5362 , 7 },
Radius = 2.5362E7,
Segments = 100
},
Textures = {
data/scene/venus/venus.mod
+1 -1
View File
@@ -23,7 +23,7 @@ return {
Body = "VENUS",
Geometry = {
Type = "SimpleSphere",
Radius = { 3.760, 6 },
Radius = 3.760E6,
Segments = 100
},
Textures = {