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

Untabify and start cleanup

Browse Source
This commit is contained in:
Emma Broman
2020-08-25 16:19:43 +02:00
parent 993be1b504
commit 9fac7fbd83
12 changed files with 1132 additions and 1181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/exoplanets/rendering/renderableorbitdisc.cpp
+3 -3
View File
@@ -219,9 +219,9 @@ void RenderableOrbitdisc::deinitializeGL() {
void RenderableOrbitdisc::render(const RenderData& data, RendererTasks&) {
_shader->activate();
glm::dmat4 modelTransform =
glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
glm::dmat4(data.modelTransform.rotation) *
glm::dmat4 modelTransform =
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::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;