mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-15 10:09:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/jwst-update

Browse Source
This commit is contained in:
Malin E
2022-03-07 15:16:25 +01:00
parent e30e9ee4cc 235e37d2e6
commit 49ed676144
180 changed files with 3153 additions and 1493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -586,10 +586,7 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
glm::dmat4(data.modelTransform.rotation) *
glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)) *
glm::scale(
glm::dmat4(_modelTransform.value()),
glm::dvec3(_modelScale) // Model scale unit
);
glm::scale(_modelTransform.value(), glm::dvec3(_modelScale));
const glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() *
modelTransform;