diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset index 349ad80572..0fe0283e1e 100644 --- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset +++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset @@ -50,6 +50,7 @@ local Apollo15 = { Renderable = { Type = "RenderableModel", GeometryFile = models .. "/ApolloCSM.osmodel", + ModelScale = 0.0001, LightSources = { { Type = "SceneGraphLightSource", diff --git a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset index 19a8084f4e..448df1dd70 100644 --- a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset +++ b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset @@ -38,11 +38,6 @@ local Apollo8LaunchModel = { End = "1968 DEC 22" }, Transform = { - Scale = { - Type = "StaticScale", - -- The scale of the model is in cm; OpenSpace is in m - Scale = 0.01 - }, Rotation = { Type = "StaticRotation", Rotation = {0.0, 0.0, -3.1415 / 2} @@ -51,6 +46,7 @@ local Apollo8LaunchModel = { Renderable = { Type = "RenderableModel", GeometryFile = models .. "/ApolloCSM.osmodel", + ModelScale = 0.0001, LightSources = { { Type = "SceneGraphLightSource", diff --git a/data/assets/scene/solarsystem/missions/apollo/8/model.asset b/data/assets/scene/solarsystem/missions/apollo/8/model.asset index 4399deb973..30d2e70a15 100644 --- a/data/assets/scene/solarsystem/missions/apollo/8/model.asset +++ b/data/assets/scene/solarsystem/missions/apollo/8/model.asset @@ -50,11 +50,6 @@ local Apollo8Model = { End = "1968 DEC 28" }, Transform = { - Scale = { - Type = "StaticScale", - -- The scale of the model is in cm; OpenSpace is in m - Scale = 0.01 - }, Rotation = { Type = "StaticRotation", Rotation = {0.0, 0.0, -3.1415 / 2} @@ -63,6 +58,7 @@ local Apollo8Model = { Renderable = { Type = "RenderableModel", GeometryFile = models .. "/ApolloCSM.osmodel", + ModelScale = 0.0001, LightSources = { { Type = "SceneGraphLightSource", diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index 9b33abab36..0668183742 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -335,7 +335,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary) distanceUnit = DistanceUnit::Kilometer; break; - // Weired units + // Weird units case Parameters::ScaleUnit::Thou: distanceUnit = DistanceUnit::Thou; break;