Merge branch 'master' into project/b612-asteroid-uncertainty

This commit is contained in:
Malin E
2023-10-25 13:30:58 +02:00
766 changed files with 1744 additions and 1432 deletions

View File

@@ -4,7 +4,21 @@ about: Create a report to help us improve
title: ''
labels: 'Type: Bug'
assignees: ''
body:
- type: dropdown
id: version
attributes:
label: Version
description: What version of OpenSpace are you running?
options:
- master branch
- 0.19.2
- 0.19.1
- 0.19.0
- 0.18.2
- 0.18.1
- 0.18.0
default: 0
---
**Describe the bug**

View File

@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
local modelFolder = asset.syncedResource({
local modelFolder = asset.resource({
Name = "Scale Model Arc de Triomphe",
Type = "HttpSynchronization",
Identifier = "scale_model_arc_de_triomphe",

View File

@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
local modelFolder = asset.syncedResource({
local modelFolder = asset.resource({
Name = "Scale Model Big Ben",
Type = "HttpSynchronization",
Identifier = "scale_model_big_ben",

View File

@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
local modelFolder = asset.syncedResource({
local modelFolder = asset.resource({
Name = "Scale Burj Khalifa",
Type = "UrlSynchronization",
Identifier = "scale_model_burj_khalifa",

View File

@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
local modelFolder = asset.syncedResource({
local modelFolder = asset.resource({
Name = "Scale Eiffel Tower",
Type = "HttpSynchronization",
Identifier = "scale_model_eiffel_tower",

View File

@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
local modelFolder = asset.syncedResource({
local modelFolder = asset.resource({
Name = "Scale Empire State Building",
Type = "HttpSynchronization",
Identifier = "scale_model_empire_state",

View File

@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
local modelFolder = asset.syncedResource({
local modelFolder = asset.resource({
Name = "Scale Gateway Arch",
Type = "HttpSynchronization",
Identifier = "scale_model_gateway_arch",

View File

@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
local modelFolder = asset.syncedResource({
local modelFolder = asset.resource({
Name = "Scale Golden Gate Bridge",
Type = "HttpSynchronization",
Identifier = "scale_model_golden_gate_bridge",

View File

@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
local modelFolder = asset.syncedResource({
local modelFolder = asset.resource({
Name = "Scale Kuala Lumpur Tower",
Type = "HttpSynchronization",
Identifier = "scale_model_kuala_lumpur_tower",

View File

@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
local modelFolder = asset.syncedResource({
local modelFolder = asset.resource({
Name = "Scale Rose Bowl",
Type = "HttpSynchronization",
Identifier = "scale_model_rose_bowl",

View File

@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
local modelFolder = asset.syncedResource({
local modelFolder = asset.resource({
Name = "Scale School Bus",
Type = "HttpSynchronization",
Identifier = "scale_model_school_bus",

View File

@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
local modelFolder = asset.syncedResource({
local modelFolder = asset.resource({
Name = "Scale Model Scientist",
Type = "HttpSynchronization",
Identifier = "scale_model_scientist",

View File

@@ -3,7 +3,7 @@ local sunAsset = asset.require("scene/solarsystem/sun/sun")
local modelFolder = asset.syncedResource({
local modelFolder = asset.resource({
Name = "Scale Model Statue of Liberty",
Type = "HttpSynchronization",
Identifier = "scale_model_statue_of_liberty",

View File

@@ -3,7 +3,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
local model = asset.syncedResource({
local model = asset.resource({
Name = "Animated Box",
Type = "HttpSynchronization",
Identifier = "animated_box",

View File

@@ -3,7 +3,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
local model = asset.syncedResource({
local model = asset.resource({
Name = "Animated Box",
Type = "HttpSynchronization",
Identifier = "animated_box",

View File

@@ -1,7 +1,6 @@
local Angle = {
Type = "DashboardItemAngle",
Identifier = "Angle",
GuiName = "Angle",
ReferenceType = "Node",
ReferenceNodeName = "Earth",
DestinationType = "Node",
@@ -10,8 +9,7 @@ local Angle = {
local Date = {
Type = "DashboardItemDate",
Identifier = "Date",
GuiName = "Date"
Identifier = "Date"
}
local SimulationIncrement = {
@@ -22,14 +20,12 @@ local SimulationIncrement = {
local Distance = {
Type = "DashboardItemDistance",
Identifier = "Distance",
GuiName = "Distance"
Identifier = "Distance"
}
local Framerate = {
Type = "DashboardItemFramerate",
Identifier = "Framerate",
GuiName = "Framerate"
Identifier = "Framerate"
}
local ParallelConnection = {
@@ -40,18 +36,79 @@ local ParallelConnection = {
local Mission = {
Type = "DashboardItemMission",
Identifier = "Mission",
GuiName = "Mission"
Identifier = "Mission"
}
local PropertyValue = {
Type = "DashboardItemPropertyValue",
Identifier = "asd",
GuiName = "adasd",
Identifier = "DashbaordItemPropertyValue",
URI = "Scene.Earth.Renderable.Enabled",
DisplayString = "Earth is enabled: {}"
}
local PropertyValueFloat = {
Type = "DashboardItemPropertyValue",
Identifier = "DashbaordItemPropertyValue_Float",
URI = "Scene.Earth.Renderable.TargetLodScaleFactor",
DisplayString = "Earth LOD is {:.5f}"
}
local PropertyValueDouble = {
Type = "DashboardItemPropertyValue",
Identifier = "DashbaordItemPropertyValue_Double",
URI = "NavigationHandler.PathNavigator.ArrivalDistanceFactor",
DisplayString = "Arrival Distance Factor is {:.8f}"
}
local PropertyValueInt = {
Type = "DashboardItemPropertyValue",
Identifier = "DashbaordItemPropertyValue_Int",
URI = "LuaConsole.HistoryLength",
DisplayString = "History length is {}"
}
local PropertyValueUInt = {
Type = "DashboardItemPropertyValue",
Identifier = "DashboardItemPropertyValue_UInt",
URI = "Modules.Globebrowsing.TileCacheSize",
DisplayString = "Tile Cache Size is {}"
}
local PropertyValueDVec3 = {
Type = "DashboardItemPropertyValue",
Identifier = "DashboardItemPropertyValue_DVec3",
URI = "Scene.SolarSystemBarycenter.Transform.Transform",
DisplayString = "SSB Transform is: ({}, {}, {})"
}
local PropertyValueIVec2 = {
Type = "DashboardItemPropertyValue",
Identifier = "DashboardItemPropertyValue_IVec2",
URI = "Scene.SolarSystemBarycenter.Renderable.ScreenSpacePosition",
DisplayString = "Random ScreenSpace Position: ({}, {})"
}
local PropertyValueVec2 = {
Type = "DashboardItemPropertyValue",
Identifier = "DashboardItemPropertyValue_Vec2",
URI = "Scene.EarthAtmosphere.Renderable.AtmosphereDimmingSunsetAngle",
DisplayString = "Sunset Angle is ({}, {})"
}
local PropertyValueVec3 = {
Type = "DashboardItemPropertyValue",
Identifier = "DashboardItemPropertyValue_Vec3",
URI = "RenderEngine.GlobalRotation",
DisplayString = "Global Rotation is ({}, {}, {})"
}
local PropertyValueVec4 = {
Type = "DashboardItemPropertyValue",
Identifier = "DashboardItemPropertyValue_Vec4",
URI = "LuaConsole.BackgroundColor",
DisplayString = "Background Coolor is ({}, {}, {}, {})"
}
local ElapsedTime = {
Type = "DashboardItemElapsedTime",
Identifier = "ElapsedTime",
@@ -73,6 +130,15 @@ asset.onInitialize(function()
openspace.dashboard.addDashboardItem(ParallelConnection)
openspace.dashboard.addDashboardItem(Mission)
openspace.dashboard.addDashboardItem(PropertyValue)
openspace.dashboard.addDashboardItem(PropertyValueFloat)
openspace.dashboard.addDashboardItem(PropertyValueDouble)
openspace.dashboard.addDashboardItem(PropertyValueInt)
openspace.dashboard.addDashboardItem(PropertyValueUInt)
openspace.dashboard.addDashboardItem(PropertyValueDVec3)
openspace.dashboard.addDashboardItem(PropertyValueIVec2)
openspace.dashboard.addDashboardItem(PropertyValueVec2)
openspace.dashboard.addDashboardItem(PropertyValueVec3)
openspace.dashboard.addDashboardItem(PropertyValueVec4)
openspace.dashboard.addDashboardItem(ElapsedTime)
openspace.dashboard.addDashboardItem(InputState)
end)
@@ -80,6 +146,15 @@ end)
asset.onDeinitialize(function()
openspace.dashboard.removeDashboardItem(InputState)
openspace.dashboard.removeDashboardItem(ElapsedTime)
openspace.dashboard.removeDashboardItem(PropertyValueVec4)
openspace.dashboard.removeDashboardItem(PropertyValueVec3)
openspace.dashboard.removeDashboardItem(PropertyValueVec2)
openspace.dashboard.removeDashboardItem(PropertyValueIVec2)
openspace.dashboard.removeDashboardItem(PropertyValueDVec3)
openspace.dashboard.removeDashboardItem(PropertyValueUInt)
openspace.dashboard.removeDashboardItem(PropertyValueInt)
openspace.dashboard.removeDashboardItem(PropertyValueDouble)
openspace.dashboard.removeDashboardItem(PropertyValueFloat)
openspace.dashboard.removeDashboardItem(PropertyValue)
openspace.dashboard.removeDashboardItem(Mission)
openspace.dashboard.removeDashboardItem(ParallelConnection)
@@ -98,6 +173,15 @@ asset.export(Framerate)
asset.export(ParallelConnection)
asset.export(Mission)
asset.export(PropertyValue)
asset.export(PropertyValueFloat)
asset.export(PropertyValueDouble)
asset.export(PropertyValueInt)
asset.export(PropertyValueUInt)
asset.export(PropertyValueDVec3)
asset.export(PropertyValueIVec2)
asset.export(PropertyValueVec2)
asset.export(PropertyValueVec3)
asset.export(PropertyValueVec4)
asset.export(ElapsedTime)
asset.export(InputState)

View File

@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
local data = asset.syncedResource({
local data = asset.resource({
Name = "Milkyway Volume Data",
Type = "HttpSynchronization",
Identifier = "milkyway_volume_data",
@@ -30,7 +30,7 @@ local MilkyWayVolume = {
AbsorptionMultiply = 200,
EmissionMultiply = 250,
Rotation = { math.pi, 3.1248, 4.45741 },
RaycastingShader = asset.localResource("galaxyraycast2.glsl"),
RaycastingShader = asset.resource("galaxyraycast2.glsl"),
Volume = {
Type = "Volume",
Filename = data .. "MilkyWayRGBAVolume1024x1024x128.raw",

View File

@@ -3,7 +3,7 @@ local sun = asset.require("scene/solarsystem/sun/sun")
local data = asset.syncedResource({
local data = asset.resource({
Name = "GeoJSON Example Africa",
Type = "UrlSynchronization",
Identifier = "geojson_example_polygon_extruded_africa",

View File

@@ -2,7 +2,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
local data = asset.syncedResource({
local data = asset.resource({
Name = "GeoJSON Example Lines",
Type = "UrlSynchronization",
Identifier = "geojson_example_lines",

View File

@@ -2,7 +2,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
local data = asset.syncedResource({
local data = asset.resource({
Name = "GeoJSON Example Polygon Multiple",
Type = "UrlSynchronization",
Identifier = "geojson_example_polygon_multiple",

View File

@@ -2,7 +2,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
local data = asset.syncedResource({
local data = asset.resource({
Name = "GeoJSON Example Outfacing",
Type = "UrlSynchronization",
Identifier = "geojson_example_points",

View File

@@ -2,7 +2,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
local data = asset.syncedResource({
local data = asset.resource({
Name = "GeoJSON Example Outfacing",
Type = "UrlSynchronization",
Identifier = "geojson_example_points",

View File

@@ -2,7 +2,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
local data = asset.syncedResource({
local data = asset.resource({
Name = "GeoJSON Example Polygon with holes",
Type = "UrlSynchronization",
Identifier = "geojson_example_polygon_with_holes",

View File

@@ -2,7 +2,7 @@ local mars = asset.require("scene/solarsystem/planets/mars/mars")
local data = asset.syncedResource({
local data = asset.resource({
Name = "GeoJSON Example Path Perseverance",
Type = "UrlSynchronization",
Identifier = "geojson_example_path_perseverance",

View File

@@ -2,7 +2,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
local data = asset.syncedResource({
local data = asset.resource({
Name = "GeoJSON Example Toronto Neighborhoods",
Type = "UrlSynchronization",
Identifier = "geojson_example_toronto_neighborhoods",

View File

@@ -3,7 +3,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
local models = asset.syncedResource({
local models = asset.resource({
Name = "New Horizons Model",
Type = "HttpSynchronization",
Identifier = "newhorizons_model",

View File

@@ -3,7 +3,7 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth")
local models = asset.syncedResource({
local models = asset.resource({
Name = "New Horizons Model",
Type = "HttpSynchronization",
Identifier = "newhorizons_model",

View File

@@ -3,7 +3,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
local model = asset.syncedResource({
local model = asset.resource({
Name = "Animated Box",
Type = "HttpSynchronization",
Identifier = "animated_box",
@@ -27,8 +27,8 @@ local Model = {
-- (malej 2023-MAY-22) Note that PerformShading should be false in this example,
-- these example shaders dont't contain any light calculations
PerformShading = false,
VertexShader = asset.localResource("model_vs.glsl"),
FragmentShader = asset.localResource("model_fs.glsl"),
VertexShader = asset.resource("model_vs.glsl"),
FragmentShader = asset.resource("model_fs.glsl"),
EnableAnimation = true,
AnimationStartTime = "2023 05 11 00:00:00",
AnimationTimeScale = "Second",

View File

@@ -2,7 +2,7 @@ local globe = asset.require("scene/solarsystem/planets/earth/earth")
local path = asset.syncedResource({
local path = asset.resource({
Name = "Earth Textures Climate",
Type = "HttpSynchronization",
Identifier = "earth_textures_climate",

View File

@@ -1,11 +1,11 @@
asset.syncedResource({
asset.resource({
Name = "Example Single",
Type = "UrlSynchronization",
Identifier = "example_single",
Url = "http://celestrak.com/NORAD/elements/geo.txt"
})
asset.syncedResource({
asset.resource({
Name = "Example Multiple",
Type = "UrlSynchronization",
Identifier = "example_multiple",
@@ -15,7 +15,7 @@ asset.syncedResource({
}
})
asset.syncedResource({
asset.resource({
Name = "Example Large",
Type = "UrlSynchronization",
Identifier = "example_large",
@@ -23,7 +23,7 @@ asset.syncedResource({
Override = true
})
asset.syncedResource({
asset.resource({
Name = "Example Medium",
Type = "UrlSynchronization",
Identifier = "example_medium",
@@ -34,7 +34,7 @@ asset.syncedResource({
-- Load a resource without hashing, meaning that the bare directory name will be
-- used for the downloaded file. If UseHash is true, the hash of the URL is appended
-- to the directory name to produce a unique directory under all circumstances
asset.syncedResource({
asset.resource({
Name = "Example No Hash",
Type = "UrlSynchronization",
Identifier = "no_hash",

View File

@@ -10,7 +10,7 @@ local Layer = {
Identifier = "GlobeVideoLoopExample",
Enabled = true,
Type = "VideoTileProvider",
Video = asset.localResource("examplevideo.mp4"),
Video = asset.resource("examplevideo.mp4"),
}

View File

@@ -18,7 +18,7 @@ local Plane = {
Type = "RenderableVideoPlane",
MirrorBackside = true,
Size = 3E7,
Video = asset.localResource("examplevideo.mp4"),
Video = asset.resource("examplevideo.mp4"),
},
GUI = {
Name = "Video Plane Example",

View File

@@ -5,7 +5,7 @@ local ScreenSpace = {
Identifier = "ScreenSpaceVideoExample",
Type = "ScreenSpaceVideo",
Name = "Screen Space Video Example",
Video = asset.localResource("examplevideo.mp4")
Video = asset.resource("examplevideo.mp4")
}

View File

@@ -7,7 +7,7 @@ local Sphere = {
Type = "RenderableVideoSphere",
Size = 100.0,
Segments = 80,
Video = asset.localResource("examplevideo.mp4"),
Video = asset.resource("examplevideo.mp4"),
Orientation = "Both"
},
GUI = {

View File

@@ -9,7 +9,7 @@ local Layer = {
Name = "Stretched Video Example",
Identifier = "StretchedVideoExample",
Type = "VideoTileLayer",
Video = asset.localResource("examplevideo.mp4"),
Video = asset.resource("examplevideo.mp4"),
StartTime = "2023 01 29 20:00:00",
EndTime = "2023 01 29 21:00:00",
PlaybackMode = "MapToSimulationTime",

View File

@@ -19,8 +19,8 @@ local Volume = {
},
Renderable = {
Type = "RenderableTimeVaryingVolume",
SourceDirectory = asset.localResource("cartesian"),
TransferFunction = asset.localResource("../transferfunction.txt"),
SourceDirectory = asset.resource("cartesian"),
TransferFunction = asset.resource("../transferfunction.txt"),
StepSize = 0.01,
MinValue = 0,
MaxValue = 1,

View File

@@ -13,8 +13,8 @@ local Volume = {
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Type = "RenderableTimeVaryingVolume",
SourceDirectory = asset.localResource("cartesiansequence"),
TransferFunction = asset.localResource("../transferfunction.txt"),
SourceDirectory = asset.resource("cartesiansequence"),
TransferFunction = asset.resource("../transferfunction.txt"),
StepSize = 0.01,
MinValue = 0,
MaxValue = 1,

View File

@@ -19,8 +19,8 @@ local Volume = {
},
Renderable = {
Type = "RenderableTimeVaryingVolume",
SourceDirectory = asset.localResource("spherical"),
TransferFunction = asset.localResource("../transferfunction.txt"),
SourceDirectory = asset.resource("spherical"),
TransferFunction = asset.resource("../transferfunction.txt"),
StepSize = 0.01,
MinValue = 0,
MaxValue = 1,

View File

@@ -2,7 +2,7 @@ local bookmarkHelper = asset.require("util/generate_bookmarks")
local dataProvider = "http://data.openspaceproject.com/files/bookmarks/v1/bookmarks.csv"
local bookmarksCSV = asset.syncedResource({
local bookmarksCSV = asset.resource({
Identifier = "openspace_bookmarks",
Name = "OpenSpace Bookmarks",
Type = "UrlSynchronization",

View File

@@ -1,4 +1,4 @@
asset.syncedResource({
asset.resource({
Type = "UrlSynchronization",
Name = "Icons",
Identifier = "planet_icons",
@@ -20,7 +20,7 @@ asset.syncedResource({
UseHash = false
})
asset.syncedResource({
asset.resource({
Type = "UrlSynchronization",
Name = "Stories",
Identifier = "story_images",
@@ -35,7 +35,7 @@ asset.syncedResource({
UseHash = false
})
asset.syncedResource({
asset.resource({
Type = "UrlSynchronization",
Name = "Instructions",
Identifier = "images",

View File

@@ -1,11 +1,11 @@
local dataPath = asset.syncedResource({
local dataPath = asset.resource({
Name = "Exoplanet Data Files",
Type = "HttpSynchronization",
Identifier = "exoplanets_data",
Version = 5
})
local colormaps = asset.syncedResource({
local colormaps = asset.resource({
Name = "Stars Color Table",
Type = "HttpSynchronization",
Identifier = "stars_colormap",

View File

@@ -4,14 +4,14 @@ local habitableZoneTextures = asset.require(
local sunTextures = asset.syncedResource({
local sunTextures = asset.resource({
Type = "HttpSynchronization",
Name = "Sun textures",
Identifier = "sun_textures",
Version = 4
})
local texturesPath = asset.syncedResource({
local texturesPath = asset.resource({
Name = "Exoplanet Textures",
Type = "HttpSynchronization",
Identifier = "exoplanets_textures",

View File

@@ -1,6 +1,6 @@
local transforms = asset.require("scene/solarsystem/sun/transforms")
local imageFolder = asset.syncedResource({
local imageFolder = asset.resource({
Name = "Hover Circle Image",
Type = "HttpSynchronization",
Identifier = "misc_ring_image",

View File

@@ -2,7 +2,7 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Cardinal Directions Textures",
Type = "HttpSynchronization",
Identifier = "cardinal_directions_textures",

View File

@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Ecliptic Band Textures",
Type = "HttpSynchronization",
Identifier = "ecliptic_band_textures",

View File

@@ -2,7 +2,7 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Light Pollution Textures",
Type = "HttpSynchronization",
Identifier = "light_pollution_textures",

View File

@@ -6,7 +6,7 @@ local saturn = asset.require("scene/solarsystem/planets/saturn/transforms")
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Night Sky Planet Textures",
Type = "HttpSynchronization",
Identifier = "night_sky_planet_textures",

View File

@@ -2,7 +2,7 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth")
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Zenith Textures",
Type = "HttpSynchronization",
Identifier = "zenith_textures",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "2dF Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_2dF_textures",
Version = 2
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "2dF Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_2dF_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "2MASS Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_2mass_textures",
Version = 2
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "2MASS Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_2mass_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "6dF Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_6dF_textures",
Version = 2
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "6dF Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_6dF_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Abell Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_abell_textures",
Version = 2
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Abell Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_abell_speck",

View File

@@ -1,4 +1,4 @@
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Alternate Star Labels Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_alternatestarlabels_speck",

View File

@@ -1,11 +1,11 @@
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Background Radiation Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_backgroundradiation_speck",
Version = 1
})
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Background Radiation Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_backgroundradiation_textures",

View File

@@ -1,4 +1,4 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Background Radiation Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_backgroundradiation_textures",

View File

@@ -1,4 +1,4 @@
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Clusters Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_clusters_speck",

View File

@@ -1,4 +1,4 @@
local data = asset.syncedResource({
local data = asset.resource({
Name = "Constellation Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_constellations_data",

View File

@@ -2,7 +2,7 @@ local constellations_helper = asset.require("util/constellations_helper")
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Constellation Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_constellations_data",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Deep Sky Objects Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_deepsky_textures",
Version = 2
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Deep Sky Objects Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_deepsky_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Brown Dwarf Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_dwarfs_textures",
Version = 1
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Brown Dwarf Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_dwarfs_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Exoplanets Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_exoplanets_textures",
Version = 1
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Exoplanets Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_exoplanets_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Exoplanets Candidates Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_exoplanets_candidates_textures",
Version = 1
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Exoplanets Candidates Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_exoplanets_candidates_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Globular Clusters Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_globularclusters_textures",
Version = 1
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Globular Clusters Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_globularclusters_speck",

View File

@@ -3,7 +3,7 @@ local earthTransforms = asset.require("scene/solarsystem/planets/earth/transform
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Grids Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_grids_speck",

View File

@@ -1,4 +1,4 @@
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Galaxy Groups Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_groups_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "HII Regions Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_h2regions_textures",
Version = 1
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "HII Regions Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_h2regions_speck",

View File

@@ -1,18 +1,18 @@
local circle = asset.syncedResource({
local circle = asset.resource({
Name = "Circle",
Type = "HttpSynchronization",
Identifier = "circle_image",
Version = 1
})
local HUDFSpeck = asset.syncedResource({
local HUDFSpeck = asset.resource({
Name = "HUDF Speck",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_hudf_speck",
Version = 1
})
local ColorMap = asset.syncedResource({
local ColorMap = asset.resource({
Name = "HUDF color map",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_hudf_textures",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Local Dwarfs Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_localdwarfs_textures",
Version = 1
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Local Dwarfs Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_localdwarfs_speck",

View File

@@ -1,11 +1,11 @@
local planeTextures = asset.syncedResource({
local planeTextures = asset.resource({
Name = "Milky Way Plane Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_milkyway_textures",
Version = 2
})
local planeSpeck = asset.syncedResource({
local planeSpeck = asset.resource({
Name = "Milky Way Plane Speck",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_milkyway_speck",

View File

@@ -1,11 +1,11 @@
local planeTextures = asset.syncedResource({
local planeTextures = asset.resource({
Name = "Milky Way Plane Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_milkyway_textures",
Version = 2
})
local planeSpeck = asset.syncedResource({
local planeSpeck = asset.resource({
Name = "Milky Way Plane Speck",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_milkyway_speck",

View File

@@ -1,4 +1,4 @@
local homespeck = asset.syncedResource({
local homespeck = asset.resource({
Name = "Home Speck File",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_home_speck",

View File

@@ -1,4 +1,4 @@
local sphereTextures = asset.syncedResource({
local sphereTextures = asset.resource({
Name = "Milky Way Sphere Textures",
Type = "HttpSynchronization",
Identifier = "milkyway_textures",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "OB Associations Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_obassociations_textures",
Version = 1
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "OB Associations Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_obassociations_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Open Clusters Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_openclusters_textures",
Version = 1
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Open Clusters Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_openclusters_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Planetary Nebulae Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_planetarynebulae_textures",
Version = 1
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Planetary Nebulae Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_planetarynebulae_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Pulsars Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_pulsars_textures",
Version = 1
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Pulsars Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_pulsars_speck",

View File

@@ -1,18 +1,18 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Quasars Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_quasars_textures",
Version = 2
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Quasars Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_quasars_speck",
Version = 2
})
local colormaps = asset.syncedResource({
local colormaps = asset.resource({
Name = "Quasars Colormap",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_quasars_colormap",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Sloan Digital Sky Survey Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_sloandss_textures",
Version = 2
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Sloan Digital Sky Survey Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_sloandss_speck",

View File

@@ -1,4 +1,4 @@
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Star Labels Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_starlabels_speck",

View File

@@ -3,7 +3,7 @@ local earth_transforms = asset.require("scene/solarsystem/planets/earth/transfor
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Grids Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_starorbits_speck",

View File

@@ -1,25 +1,25 @@
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Stars Speck Files",
Type = "HttpSynchronization",
Identifier = "stars_du",
Version = 5
})
local sunspeck = asset.syncedResource({
local sunspeck = asset.resource({
Name = "Stars Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_sunstar_speck",
Version = 1
})
local colormaps = asset.syncedResource({
local colormaps = asset.resource({
Name = "Stars Color Table",
Type = "HttpSynchronization",
Identifier = "stars_colormap",
Version = 3
})
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Stars Textures",
Type = "HttpSynchronization",
Identifier = "stars_textures",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Galaxy Superclusters Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_superclusters_textures",
Version = 2
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Galaxy Superclusters Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_superclusters_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Supernova Remnants Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_supernovaremnants_textures",
Version = 1
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Supernova Remnants Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_supernovaremnants_speck",

View File

@@ -1,11 +1,11 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Tully Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_tully_textures",
Version = 3
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Tully Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_tully_speck",

View File

@@ -1,4 +1,4 @@
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Voids Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_voids_speck",

View File

@@ -1,17 +1,17 @@
local constellationsCSV = asset.localResource("constellation_data.csv")
local constellationsCSV = asset.resource("constellation_data.csv")
local transforms = asset.require("scene/solarsystem/sun/transforms")
local constellations_helper = asset.require("util/constellations_helper")
local images = asset.syncedResource({
local images = asset.resource({
Name = "Constellation Images",
Type = "HttpSynchronization",
Identifier = "constellation_images",
Version = 4
})
local data = asset.syncedResource({
local data = asset.resource({
Name = "Constellation Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_constellations_data",

View File

@@ -1,18 +1,18 @@
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Apogee Speck Files",
Type = "HttpSynchronization",
Identifier = "gaia_apogee",
Version = 1
})
local colormaps = asset.syncedResource({
local colormaps = asset.resource({
Name = "Stars Color Table",
Type = "HttpSynchronization",
Identifier = "stars_colormap",
Version = 3
})
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Stars Textures",
Type = "HttpSynchronization",
Identifier = "stars_textures",

View File

@@ -1,7 +1,7 @@
-- Download a dataset of 618 million stars (28 GB), already preprocessed and stored in a binary octree.
-- The octree was generated from the full DR2 by filtering away all stars with a parallax error higher than 0.5
-- Max Star Per Node = 50,000 and max distance = 500kpc
local gaia618Destination = asset.syncedResource({
local gaia618Destination = asset.resource({
Name = "Gaia DR2 618M Octree",
Type = "HttpSynchronization",
Identifier = "gaia_stars_618M_octree",
@@ -14,7 +14,7 @@ local gaia618DestinationExtracted = gaia618Destination .. "data"
-- Download the full DR2 dataset with 24 values per star (preprocessed with theReadFitsTask (gaia_read.task) into 8 binary files).
-- From these files new subsets can be created with the ConstructOctreeTask (gaia_octree.task).
-- Total size of download is 151 GB.
local gaiaFull = asset.syncedResource({
local gaiaFull = asset.resource({
Name = "Gaia DR2 Full Raw",
Type = "HttpSynchronization",
Identifier = "gaia_stars_dr2_raw",

View File

@@ -6,21 +6,21 @@ end
-- Download a preprocessed binary octree of Radial Velocity subset values per star
-- (preprocessed into 8 binary files).
local starsFolder = asset.syncedResource({
local starsFolder = asset.resource({
Name = "Gaia Stars RV",
Type = "HttpSynchronization",
Identifier = "gaia_stars_rv_octree",
Version = 1
})
local colormaps = asset.syncedResource({
local colormaps = asset.resource({
Name = "Stars Color Table",
Type = "HttpSynchronization",
Identifier = "stars_colormap",
Version = 3
})
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Stars Textures",
Type = "HttpSynchronization",
Identifier = "stars_textures",

View File

@@ -1,18 +1,18 @@
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Galah Speck Files",
Type = "HttpSynchronization",
Identifier = "gaia_galah",
Version = 1
})
local colormaps = asset.syncedResource({
local colormaps = asset.resource({
Name = "Stars Color Table",
Type = "HttpSynchronization",
Identifier = "stars_colormap",
Version = 3
})
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Stars Textures",
Type = "HttpSynchronization",
Identifier = "stars_textures",

View File

@@ -1,4 +1,4 @@
local texturesPath = asset.syncedResource({
local texturesPath = asset.resource({
Name = "Habitable Zone Textures",
Type = "HttpSynchronization",
Identifier = "habitable_zone_textures",

View File

@@ -1,4 +1,4 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "ESO Milky Way Textures",
Type = "HttpSynchronization",
Identifier = "milkyway-eso_textures",

View File

@@ -2,7 +2,7 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
local data = asset.syncedResource({
local data = asset.resource({
Name = "Milkyway Volume Data",
Type = "HttpSynchronization",
Identifier = "milkyway_volume_data",

View File

@@ -2,7 +2,7 @@ local transforms = asset.require("./transforms")
local sync = asset.syncedResource({
local sync = asset.resource({
Name = "Orion Nebula Star Cluster",
Type = "HttpSynchronization",
Identifier = "orion_nebula_star_cluster",

View File

@@ -3,7 +3,7 @@ local transforms = asset.require("./transforms")
local sync = asset.syncedResource({
local sync = asset.resource({
Name = "Orion Nebula Model",
Type = "HttpSynchronization",
Identifier = "orion_nebula_model",

View File

@@ -1,18 +1,18 @@
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Stars Textures",
Type = "HttpSynchronization",
Identifier = "stars-denver_textures",
Version = 1
})
local speck = asset.syncedResource({
local speck = asset.resource({
Name = "Stars Speck Files",
Type = "HttpSynchronization",
Identifier = "stars-denver_speck",
Version = 1
})
local colorLUT = asset.syncedResource({
local colorLUT = asset.resource({
Name = "Stars Color Table",
Type = "HttpSynchronization",
Identifier = "stars-denver_colormap",

View File

@@ -1,4 +1,4 @@
local kernels = asset.syncedResource({
local kernels = asset.resource({
Name = "Ceres Kernels",
Type = "HttpSynchronization",
Identifier = "ceres_kernels",

View File

@@ -6,7 +6,7 @@ local Layer = {
Identifier = "LAMO_Sweden",
Name = "LAMO [Sweden]",
Enabled = asset.enabled,
FilePath = asset.localResource("lamo.wms")
FilePath = asset.resource("lamo.wms")
}

View File

@@ -2,7 +2,7 @@ local globe = asset.require("../../ceres")
local textures = asset.syncedResource({
local textures = asset.resource({
Name = "Ceres Textures",
Type = "HttpSynchronization",
Identifier = "ceres_textures",

Some files were not shown because too many files have changed in this diff Show More