From 416381eadd386d71ef8490db697e52e8daab42e3 Mon Sep 17 00:00:00 2001 From: Arohdin Date: Wed, 12 Apr 2023 16:29:29 +0200 Subject: [PATCH] Removed some duplicate properties and merged some others --- data/assets/scene/digitaluniverse/exoplanets.asset | 1 - .../solarsystem/missions/apollo/17/bouldersstation6.asset | 4 +--- .../scene/solarsystem/missions/apollo/insignias_map.asset | 1 - .../earth/noaa-sos/land/earthquake-1980_1995_quakes.asset | 1 - .../planets/earth/noaa-sos/land/land_cover-slideshow.asset | 5 ++--- .../planets/earth/noaa-sos/land/surface_temperature.asset | 1 - .../planets/earth/noaa-sos/oceans/marine_impacts.asset | 1 - data/assets/scene/solarsystem/planets/venus/venus.asset | 5 ----- 8 files changed, 3 insertions(+), 16 deletions(-) diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset index a863a257ee..16aa60ba80 100644 --- a/data/assets/scene/digitaluniverse/exoplanets.asset +++ b/data/assets/scene/digitaluniverse/exoplanets.asset @@ -26,7 +26,6 @@ local object = { }, Color = { 1.0, 1.0, 1.0 }, Opacity = 1.0, - ScaleFactor = 10.0, Texture = textures .. "target-blue.png", File = speck .. "expl.speck", Unit = "pc", diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset index bfabdbbf01..af9d40e5e8 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset @@ -39,9 +39,7 @@ local Station6Frag1Model = { Latitude = 20.2903, Altitude = -2562.6, UseHeightmap = false - } - }, - Transform = { + }, Scale = { Type = "StaticScale", Scale = 0.1 diff --git a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset index 71b3372e23..789196f510 100644 --- a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset +++ b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset @@ -14,7 +14,6 @@ local landingData = { { Identifier = "Apollo11", Name = "Apollo 11", - Name = "Apollo 11", Texture = "apollo11.png", LunarModule = { 0.67409, 23.47298, 0.0 } }, diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset index 8546c329ff..3a6e50c5fe 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset @@ -63,7 +63,6 @@ local quakebar_combined = { Name = Name .. " (Combined)", Enabled = asset.enabled, Type = "ScreenSpaceImageLocal", - Enabled = false, TexturePath = syncedDirectory .. "quakebar_combined.png", FaceCamera = false, Scale = 0.6, diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset index d2cb3939b5..c5d3f7987d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset @@ -40,10 +40,9 @@ function create_label(number) return { Identifier = Identifier .. "-" .. number, Name = Name .. " (" .. number .. ")", - Enabled = asset.enabled, - Type = "ScreenSpaceImageLocal", + Enabled = asset.enabled, + Type = "ScreenSpaceImageLocal", TexturePath = labelsDestination .. "lcc_" .. number .. ".jpg", - Enabled = false, FaceCamera = false, CartesianPosition = { 0.75, 0.0, -2.0 } } diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset index 32cb8d89ab..bf21b23763 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset @@ -37,7 +37,6 @@ local colorbar = { Enabled = asset.enabled, Type = "ScreenSpaceImageLocal", TexturePath = syncedDirectory .. "colorbar.png", - Enabled = false, FaceCamera = false, Scale = 0.07, CartesianPosition = { 1.0, 0.0, -2.0 } diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset index b166bd5fc2..16461856f1 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset @@ -47,7 +47,6 @@ local colorbar_human_impact = { Enabled = asset.enabled, Type = "ScreenSpaceImageLocal", TexturePath = syncedDirectory .. "HumanImpactColorbar.png", - Enabled = false, FaceCamera = false, CartesianPosition = { 0.0, -0.5, -2.0 } } diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index 4ec5f82398..fcb985804a 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -22,11 +22,6 @@ local Venus = { Type = "SpiceRotation", SourceFrame = "IAU_VENUS", DestinationFrame = "GALACTIC" - }, - Translation = { - Type = "SpiceTranslation", - Target = "VENUS", - Observer = "VENUS BARYCENTER" } }, Renderable = {