mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 19:50:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix malformed mod files

Browse Source
This commit is contained in:
Emil Axelsson
2017-04-25 18:24:30 +02:00
parent 755d984667
commit 28c82341bf
12 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scene/missions/newhorizons/jupiter/callisto/callisto.mod
View File

@@ -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",

2
data/scene/missions/newhorizons/jupiter/europa/europa.mod
View File

@@ -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",

2
data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod
View File

@@ -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",

2
data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod
View File

@@ -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",

4
data/scene/missions/newhorizons/newhorizonsfov/newhorizonsfov.mod
View File

@@ -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"
},
}

2
data/scene/missions/newhorizons/pluto/charon/charon.mod
View File

@@ -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",

2
data/scene/missions/newhorizons/pluto/hydra/hydra.mod
View File

@@ -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"

2
data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod
View File

@@ -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"

2
data/scene/missions/newhorizons/pluto/nix/nix.mod
View File

@@ -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"

2
data/scene/missions/newhorizons/pluto/pluto/pluto.mod
View File

@@ -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",

2
data/scene/missions/newhorizons/pluto/styx/styx.mod
View File

@@ -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",

4
modules/newhorizons/rendering/renderableplanetprojection.cpp
View File

@@ -175,9 +175,9 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary&
_shiftMeridianBy180 = dictionary.value<bool>(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);