mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix faulty type for RenderableModel ModelTransform property input

Browse Source 
from asset dictionary
This commit is contained in:
Emma Broman
2023-05-22 17:07:28 +02:00
parent 0490e94350
commit 12d37d92a6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/base/rendering/renderablemodel.cpp
View File

@@ -257,7 +257,7 @@ namespace {
std::optional<bool> enableFaceCulling;
// [[codegen::verbatim(ModelTransformInfo.description)]]
std::optional<glm::dmat3x3> modelTransform;
std::optional<glm::dmat4x4> modelTransform;
// [[codegen::verbatim(RotationVecInfo.description)]]
std::optional<glm::dvec3> 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)