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

Preparing branch for merging with stereo

Browse Source
This commit is contained in:
Jonathas Costa
2018-03-14 14:20:12 -04:00
parent 968cbef474
commit 9558d58cee
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/atmosphere/rendering/atmospheredeferredcaster.cpp
View File

@@ -192,7 +192,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
_modelTransform * glm::dvec4(0.0, 0.0, 0.0, 1.0)
);
double distance = glm::distance(tPlanetPosWorld, renderData.camera.positionVec3());
double distance = glm::distance(tPlanetPosWorld, renderData.camera.eyePositionVec3());
if (distance > DISTANCE_CULLING) {
program.setUniform("cullAtmosphere", 1);
}
@@ -268,7 +268,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
glm::dmat4 dInverseCameraRotationToSgctEyeTransform = glm::mat4_cast(
static_cast<glm::dquat>(renderData.camera.rotationQuaternion())
) * dSgctEye2OSEye;
) * glm::inverse(renderData.camera.viewScaleMatrix()) * dSgctEye2OSEye;
glm::dmat4 dInverseSGCTEyeToTmpRotTransformMatrix =
@@ -289,7 +289,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
dInverseCameraRotationToSgctEyeTransform);
program.setUniform(_uniformCache2.dObjpos, glm::dvec4(renderData.position.dvec3(), 1.0));
program.setUniform(_uniformCache2.dCampos, renderData.camera.positionVec3());
program.setUniform(_uniformCache2.dCampos, renderData.camera.eyePositionVec3());
glm::dvec4 camPosObjCoords = inverseModelMatrix * glm::dvec4(renderData.camera.positionVec3(), 1.0);
program.setUniform(_uniformCache2.dCamPosObj, camPosObjCoords);
@@ -308,7 +308,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
// Sun following camera position
if (_sunFollowingCameraEnabled) {
sunPosObj = inverseModelMatrix * glm::dvec4(
renderData.camera.positionVec3(),
renderData.camera.eyePositionVec3(),
1.0
);
}