From 6a2460a87604e33ab6bf2b17b0bb2bcc2b97755f Mon Sep 17 00:00:00 2001 From: Jonathas Costa Date: Wed, 16 Mar 2016 09:13:31 -0400 Subject: [PATCH] Changes in scene configuration for the new multi-geometry loader. --- data/scene/rosetta/rosetta.mod | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/scene/rosetta/rosetta.mod b/data/scene/rosetta/rosetta.mod index e47a7b71dd..f92eb81a80 100644 --- a/data/scene/rosetta/rosetta.mod +++ b/data/scene/rosetta/rosetta.mod @@ -7,8 +7,8 @@ return { Type = "RenderableModel", Body = "ROSETTA", Geometry = { - Type = "WavefrontGeometry", - ObjFile = "${OPENSPACE_DATA}/scene/rosetta/obj/Rosettafromstl.obj", + Type = "MultiModelGeometry", + GeometryFile = "${OPENSPACE_DATA}/scene/rosetta/obj/mainbodyros.obj", Magnification = 1, }, Textures = { @@ -114,9 +114,9 @@ return { Type = "RenderableModel", Body = "ROSETTA", Geometry = { - Type = "WavefrontGeometry", + Type = "MultiModelGeometry", Magnification = 1, - ObjFile = "${OPENSPACE_DATA}/scene/rosetta/obj/solarpanelleft.obj", + GeometryFile = "${OPENSPACE_DATA}/scene/rosetta/obj/solarpanelleft.obj", }, Textures = { Type = "simple", @@ -138,8 +138,8 @@ return { Type = "RenderableModel", Body = "ROSETTA", Geometry = { - Type = "WavefrontGeometry", - ObjFile = "${OPENSPACE_DATA}/scene/rosetta/obj/solarpanelright.obj", + Type = "MultiModelGeometry", + GeometryFile = "${OPENSPACE_DATA}/scene/rosetta/obj/solarpanelright.obj", Magnification = 1, }, Textures = { @@ -215,4 +215,4 @@ return { }, } -} \ No newline at end of file +}