From 30f7396ec1288afa07ff0d124e8f521dad451e58 Mon Sep 17 00:00:00 2001 From: Malin Ejdbo Date: Wed, 11 Aug 2021 10:15:44 +0200 Subject: [PATCH 1/3] Update Ghoul with new .osmodel file format --- ext/ghoul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ghoul b/ext/ghoul index 57e96a6a8d..3eb44e96f1 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 57e96a6a8d10003eb22aaa471de8eec60d89df2c +Subproject commit 3eb44e96f13da362d0703bbaa95ef22c32a3ddfe From 54e4b4cbbe66b0850197d0732e2249c2e1375acc Mon Sep 17 00:00:00 2001 From: Malin Ejdbo Date: Wed, 11 Aug 2021 10:16:22 +0200 Subject: [PATCH 2/3] Update models to the new .osmodel format --- .../scene/solarsystem/missions/apollo/csm_model.asset | 2 +- data/assets/scene/solarsystem/missions/jwst/jwst.asset | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/assets/scene/solarsystem/missions/apollo/csm_model.asset b/data/assets/scene/solarsystem/missions/apollo/csm_model.asset index fb8c6b2165..68ce09e62c 100644 --- a/data/assets/scene/solarsystem/missions/apollo/csm_model.asset +++ b/data/assets/scene/solarsystem/missions/apollo/csm_model.asset @@ -2,7 +2,7 @@ local models = asset.syncedResource({ Name = "Apollo Models", Type = "HttpSynchronization", Identifier = "apollo_models", - Version = 3 + Version = 4 }) asset.export('models', models) diff --git a/data/assets/scene/solarsystem/missions/jwst/jwst.asset b/data/assets/scene/solarsystem/missions/jwst/jwst.asset index ebaf97a6a5..c45ae37a90 100644 --- a/data/assets/scene/solarsystem/missions/jwst/jwst.asset +++ b/data/assets/scene/solarsystem/missions/jwst/jwst.asset @@ -23,7 +23,7 @@ local model = asset.syncedResource({ Name = "JWST Model", Type = "HttpSynchronization", Identifier = "jwst_model", - Version = 1 + Version = 2 }) local band = asset.syncedResource({ @@ -111,7 +111,7 @@ local JWSTModel = { }, Renderable = { Type = "RenderableModel", - GeometryFile = model .. "/JWSTFBX.osmodel", + GeometryFile = model .. "/JWST.osmodel", ModelScale = "Foot", InvertModelScale = true, EnableAnimation = true, @@ -240,7 +240,7 @@ local JWSTLaunchModel = { }, Renderable = { Type = "RenderableModel", - GeometryFile = model .. "/JWSTFBX.osmodel", + GeometryFile = model .. "/JWST.osmodel", ModelScale = "Foot", InvertModelScale = true, EnableAnimation = true, From ae1c9290016e6ab9f10ea575a0fdbf9c39967c23 Mon Sep 17 00:00:00 2001 From: Malin Ejdbo Date: Wed, 11 Aug 2021 13:00:15 +0200 Subject: [PATCH 3/3] Update Ghoul --- ext/ghoul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ghoul b/ext/ghoul index 3eb44e96f1..1febcfdee2 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 3eb44e96f13da362d0703bbaa95ef22c32a3ddfe +Subproject commit 1febcfdee2bf453e9485d72092d0ae1c0db2b1b0