From 12d37d92a6280b111bd7d0f546dbbcc19124cfa9 Mon Sep 17 00:00:00 2001 From: Emma Broman Date: Mon, 22 May 2023 17:07:28 +0200 Subject: [PATCH] Fix faulty type for RenderableModel ModelTransform property input from asset dictionary --- modules/base/rendering/renderablemodel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index 5ae6b87264..6435377370 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -257,7 +257,7 @@ namespace { std::optional enableFaceCulling; // [[codegen::verbatim(ModelTransformInfo.description)]] - std::optional modelTransform; + std::optional modelTransform; // [[codegen::verbatim(RotationVecInfo.description)]] std::optional rotationVector; @@ -299,9 +299,9 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary) , _enableFaceCulling(EnableFaceCullingInfo, true) , _modelTransform( ModelTransformInfo, - glm::dmat3(1.0), - glm::dmat3(-1.0), - glm::dmat3(1.0) + glm::dmat4(1.0), + glm::dmat4(-1.0), + glm::dmat4(1.0) ) , _rotationVec(RotationVecInfo, glm::dvec3(0.0), glm::dvec3(0.0), glm::dvec3(360.0)) , _enableDepthTest(EnableDepthTestInfo, true)