mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 11:18:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/loadingscreen-refactor

Browse Source 
# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp
This commit is contained in:
Alexander Bock
2017-11-09 10:51:56 -05:00
parent dc85ee6cd7 ca7053d8f2
commit 88cf7926ae
37 changed files with 1002 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+10 -3
View File
@@ -250,14 +250,21 @@ void RenderableModelProjection::render(const RenderData& data, RendererTasks&) {
glm::dmat4(data.modelTransform.rotation) * // Rotation
glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)); // Scale
glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
glm::vec3 directionToSun = glm::normalize(_sunPosition.vec3() - glm::vec3(bodyPosition));
glm::vec3 directionToSunViewSpace = glm::mat3(data.camera.combinedViewMatrix()) * directionToSun;
glm::vec3 directionToSun = glm::normalize(
_sunPosition.vec3() - glm::vec3(bodyPosition)
);
glm::vec3 directionToSunViewSpace = glm::mat3(
data.camera.combinedViewMatrix()
) * directionToSun;
_programObject->setUniform("_performShading", _performShading);
_programObject->setUniform("directionToSunViewSpace", directionToSunViewSpace);
_programObject->setUniform("modelViewTransform", glm::mat4(modelViewTransform));
_programObject->setUniform("projectionTransform", data.camera.projectionMatrix());
_programObject->setUniform("_projectionFading", _projectionComponent.projectionFading());
_programObject->setUniform(
"_projectionFading",
_projectionComponent.projectionFading()
);
_geometry->setUniforms(*_programObject);