diff --git a/data/scene/missions/newhorizons/jupiter/callisto/callisto.mod b/data/scene/missions/newhorizons/jupiter/callisto/callisto.mod index 8ebe7a4081..c99c354d59 100644 --- a/data/scene/missions/newhorizons/jupiter/callisto/callisto.mod +++ b/data/scene/missions/newhorizons/jupiter/callisto/callisto.mod @@ -58,7 +58,7 @@ return { Parent = "Callisto", Renderable = { Type = "RenderablePlane", - Size = 1.0E7.4, + Size = 10^7.4, Origin = "Center", Billboard = true, Texture = "textures/Callisto-Text.png", diff --git a/data/scene/missions/newhorizons/jupiter/europa/europa.mod b/data/scene/missions/newhorizons/jupiter/europa/europa.mod index 5f806496e9..21e07a2703 100644 --- a/data/scene/missions/newhorizons/jupiter/europa/europa.mod +++ b/data/scene/missions/newhorizons/jupiter/europa/europa.mod @@ -58,7 +58,7 @@ return { Parent = "Europa", Renderable = { Type = "RenderablePlane", - Size = 1.0E7.4, + Size = 10^7.4, Origin = "Center", Billboard = true, Texture = "textures/Europa-Text.png", diff --git a/data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod b/data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod index a7881254eb..5fa473d332 100644 --- a/data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod +++ b/data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod @@ -58,7 +58,7 @@ return { Parent = "Ganymede", Renderable = { Type = "RenderablePlane", - Size = 1.0E7.4, + Size = 10^7.4, Origin = "Center", Billboard = true, Texture = "textures/Ganymede-Text.png", diff --git a/data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod b/data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod index 82762acf21..17f3a6afea 100644 --- a/data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod +++ b/data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod @@ -101,7 +101,7 @@ return { Parent = "JupiterProjection", Renderable = { Type = "RenderablePlane", - Size = 1.0E7.5, + Size = 10^7.5, Origin = "Center", Billboard = true, Texture = "textures/Jupiter-text.png", diff --git a/data/scene/missions/newhorizons/newhorizonsfov/newhorizonsfov.mod b/data/scene/missions/newhorizons/newhorizonsfov/newhorizonsfov.mod index 7fdccdf6cc..7ece77d4e9 100644 --- a/data/scene/missions/newhorizons/newhorizonsfov/newhorizonsfov.mod +++ b/data/scene/missions/newhorizons/newhorizonsfov/newhorizonsfov.mod @@ -295,9 +295,9 @@ return { Type = "RenderableCrawlingLine", Source = "NH_REX", Target = "EARTH", - -- Body = "NEW HORIZONS", + -- Body = "NEW HORIZONS", Frame = "GALACTIC", - RGB = { 1.0, 0.7, 0.0 }, + Color = { 1.0, 0.7, 0.0 }, Instrument = "NH_REX" }, } diff --git a/data/scene/missions/newhorizons/pluto/charon/charon.mod b/data/scene/missions/newhorizons/pluto/charon/charon.mod index 2d50c40e44..7cc7544f84 100644 --- a/data/scene/missions/newhorizons/pluto/charon/charon.mod +++ b/data/scene/missions/newhorizons/pluto/charon/charon.mod @@ -72,7 +72,7 @@ return { Parent = "Charon", Renderable = { Type = "RenderablePlane", - Size = 1.0E6.3, + Size = 10^6.3, Origin = "Center", Billboard = true, Texture = "textures/Charon-Text.png", diff --git a/data/scene/missions/newhorizons/pluto/hydra/hydra.mod b/data/scene/missions/newhorizons/pluto/hydra/hydra.mod index 09950fc602..dbffd9a8a2 100644 --- a/data/scene/missions/newhorizons/pluto/hydra/hydra.mod +++ b/data/scene/missions/newhorizons/pluto/hydra/hydra.mod @@ -46,7 +46,7 @@ return { Parent = "Hydra", Renderable = { Type = "RenderablePlane", - Size = 1.0E6.3, + Size = 10.0^6.3, Origin = "Center", Billboard = true, Texture = "textures/Hydra-Text.png" diff --git a/data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod b/data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod index e415ce3cbd..5710783747 100644 --- a/data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod +++ b/data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod @@ -46,7 +46,7 @@ return { Parent = "Kerberos", Renderable = { Type = "RenderablePlane", - Size = 1.0E6.3, + Size = 10^6.3, Origin = "Center", Billboard = true, Texture = "textures/Kerberos-Text.png" diff --git a/data/scene/missions/newhorizons/pluto/nix/nix.mod b/data/scene/missions/newhorizons/pluto/nix/nix.mod index 1ef3484e3b..8a4373431c 100644 --- a/data/scene/missions/newhorizons/pluto/nix/nix.mod +++ b/data/scene/missions/newhorizons/pluto/nix/nix.mod @@ -46,7 +46,7 @@ return { Parent = "Nix", Renderable = { Type = "RenderablePlane", - Size = 1.0E6.3, + Size = 10^6.3, Origin = "Center", Billboard = true, Texture = "textures/Nix-Text.png" diff --git a/data/scene/missions/newhorizons/pluto/pluto/pluto.mod b/data/scene/missions/newhorizons/pluto/pluto/pluto.mod index 53f1773f3e..6709f03fdb 100644 --- a/data/scene/missions/newhorizons/pluto/pluto/pluto.mod +++ b/data/scene/missions/newhorizons/pluto/pluto/pluto.mod @@ -187,7 +187,7 @@ return { Parent = "Pluto", Renderable = { Type = "RenderablePlane", - Size = 1.0E6.3, + Size = 10^6.3, Origin = "Center", Billboard = true, Texture = "textures/Pluto-Text.png", diff --git a/data/scene/missions/newhorizons/pluto/styx/styx.mod b/data/scene/missions/newhorizons/pluto/styx/styx.mod index ab914cddb9..8637601452 100644 --- a/data/scene/missions/newhorizons/pluto/styx/styx.mod +++ b/data/scene/missions/newhorizons/pluto/styx/styx.mod @@ -46,7 +46,7 @@ return { Parent = "Styx", Renderable = { Type = "RenderablePlane", - Size = 1.0E6.3, + Size = 10^6.3, Origin = "Center", Billboard = true, Texture = "textures/Styx-Text.png", diff --git a/modules/newhorizons/rendering/renderableplanetprojection.cpp b/modules/newhorizons/rendering/renderableplanetprojection.cpp index 6e81de5e49..54b7a0f910 100644 --- a/modules/newhorizons/rendering/renderableplanetprojection.cpp +++ b/modules/newhorizons/rendering/renderableplanetprojection.cpp @@ -175,9 +175,9 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary& _shiftMeridianBy180 = dictionary.value(keyMeridianShift); } - glm::vec2 radius = glm::vec2(1.0, 9.0); + float radius = std::pow(10.0, 9.0); dictionary.getValue(keyRadius, radius); - setBoundingSphere(radius[0] * std::pow(10, radius[1])); + setBoundingSphere(radius); addPropertySubOwner(_geometry.get()); addPropertySubOwner(_projectionComponent);