mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-03 02:48:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/loadingscreen-refactor

Browse Source
This commit is contained in:
Alexander Bock
2017-11-09 22:49:07 -06:00
committed by GitHub
parent 0015cbb6f6 afa1d6d33e
commit 7e4bb0b2c6
246 changed files with 4256 additions and 983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/space/rendering/renderablestars.cpp
View File

@@ -321,7 +321,7 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
// @Check overwriting the scaling from the camera; error as parsec->meter conversion
// is done twice? ---abock
glm::vec2 scaling = glm::vec2(1, -19);
glm::vec2 scaling = glm::vec2(1, -19);
glm::mat4 modelMatrix = glm::mat4(1.0);
glm::mat4 viewMatrix = data.camera.viewMatrix();