From b4ec681821cd062d4fd2e576d0a2f4dfc4e70e93 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Fri, 6 May 2016 13:51:57 +0200 Subject: [PATCH] Fix mod files for new directory structure --- .gitignore | 8 ++++++++ data/scene/jupiter/ganymede/ganymede.mod | 1 + data/scene/rosetta/67P/67P.mod | 4 ++-- data/scene/rosetta/rosetta/rosetta.mod | 8 ++++---- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7a38ab36b2..a8232dc899 100644 --- a/.gitignore +++ b/.gitignore @@ -123,3 +123,11 @@ data/spice/jup260.bsp data/scene/newhorizons/pluto/plutoprojection/images data/spice/nh_kernels/ data/scene/jupiter/jupiter/textures/Jupiter-text.png +data/scene/jupiter/callisto/textures/callisto.jpg +data/scene/jupiter/europa/textures/europa.jpg +data/scene/jupiter/ganymede/textures/ganymede.jpg +data/scene/jupiter/io/textures/io.jpg +data/scene/milkyway-eso/textures/eso0932a_blend.png +data/scene/stars-denver/denver_colorbv.cmap +data/scene/stars-denver/speck/stars.speck +data/scene/stars-denver/textures/halo.png diff --git a/data/scene/jupiter/ganymede/ganymede.mod b/data/scene/jupiter/ganymede/ganymede.mod index 9daaf1e584..64c91a5dd6 100644 --- a/data/scene/jupiter/ganymede/ganymede.mod +++ b/data/scene/jupiter/ganymede/ganymede.mod @@ -6,6 +6,7 @@ return { Renderable = { Type = "RenderablePlanet", Frame = "IAU_GANYMEDE", -- should exist. + Body = "JUPITER BARYCENTER", Geometry = { Type = "SimpleSphere", Radius = { 2.631, 6}, diff --git a/data/scene/rosetta/67P/67P.mod b/data/scene/rosetta/67P/67P.mod index 0624cf2bcd..15ae90a251 100644 --- a/data/scene/rosetta/67P/67P.mod +++ b/data/scene/rosetta/67P/67P.mod @@ -9,7 +9,7 @@ return { Body = "CHURYUMOV-GERASIMENKO", Geometry = { Type = "MultiModelGeometry", - GeometryFile = "${OPENSPACE_DATA}/scene/67P/obj/67P_rotated_5_130.obj", + GeometryFile = "obj/67P_rotated_5_130.obj", Magnification = 0, }, Textures = { @@ -23,7 +23,7 @@ return { Destination = "GALACTIC" }, Projection = { - Sequence = "${OPENSPACE_DATA}/scene/67P/rosettaimages", + Sequence = "rosettaimages", SequenceType = "image-sequence", Observer = "ROSETTA", Target = "CHURYUMOV-GERASIMENKO", diff --git a/data/scene/rosetta/rosetta/rosetta.mod b/data/scene/rosetta/rosetta/rosetta.mod index f92eb81a80..6c5499bc47 100644 --- a/data/scene/rosetta/rosetta/rosetta.mod +++ b/data/scene/rosetta/rosetta/rosetta.mod @@ -8,12 +8,12 @@ return { Body = "ROSETTA", Geometry = { Type = "MultiModelGeometry", - GeometryFile = "${OPENSPACE_DATA}/scene/rosetta/obj/mainbodyros.obj", + GeometryFile = "obj/mainbodyros.obj", Magnification = 1, }, Textures = { Type = "simple", - Color = "textures/pluto.jpg", + Color = "textures/gray.png", }, Rotation = { Source = "ROS_SPACECRAFT", @@ -116,7 +116,7 @@ return { Geometry = { Type = "MultiModelGeometry", Magnification = 1, - GeometryFile = "${OPENSPACE_DATA}/scene/rosetta/obj/solarpanelleft.obj", + GeometryFile = "obj/solarpanelleft.obj", }, Textures = { Type = "simple", @@ -139,7 +139,7 @@ return { Body = "ROSETTA", Geometry = { Type = "MultiModelGeometry", - GeometryFile = "${OPENSPACE_DATA}/scene/rosetta/obj/solarpanelright.obj", + GeometryFile = "obj/solarpanelright.obj", Magnification = 1, }, Textures = {