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

Updated names in atmosphere code.

Browse Source
This commit is contained in:
Jonathas Costa
2018-03-16 15:01:34 -04:00
parent 7b99519ec4
commit 39855e1512
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,27 +255,27 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
glm::dmat4 dInverseProjection = glm::inverse(
glm::dmat4(renderData.camera.projectionMatrix()));
glm::dmat4 dInverseCameraRotationToSgctEyeTransform = glm::mat4_cast(
glm::dmat4 dInverseSGCTEyeToTmpRotTransformMatrix = glm::mat4_cast(
static_cast<glm::dquat>(renderData.camera.rotationQuaternion())
) * glm::inverse(renderData.camera.viewScaleMatrix()) * dSgctEye2OSEye;
glm::dmat4 dInverseSGCTEyeToTmpRotTransformMatrix =
dInverseCameraRotationToSgctEyeTransform * dInverseProjection;
glm::dmat4 dInverseProjectionToTmpRotTransformMatrix =
dInverseSGCTEyeToTmpRotTransformMatrix * dInverseProjection;
double *mSource = (double*)glm::value_ptr(dInverseSGCTEyeToTmpRotTransformMatrix);
double *mSource = (double*)glm::value_ptr(dInverseProjectionToTmpRotTransformMatrix);
mSource[12] += renderData.camera.positionVec3().x;
mSource[13] += renderData.camera.positionVec3().y;
mSource[14] += renderData.camera.positionVec3().z;
mSource[15] = 1.0;
glm::dmat4 inverseWholeMatrixPipeline = inverseModelMatrix *
dInverseSGCTEyeToTmpRotTransformMatrix;
dInverseProjectionToTmpRotTransformMatrix;
program.setUniform(_uniformCache2.dInverseSgctProjectionToModelTransformMatrix,
inverseWholeMatrixPipeline);
program.setUniform(_uniformCache2.dInverseSGCTEyeToTmpRotTransformMatrix,
dInverseCameraRotationToSgctEyeTransform);
dInverseSGCTEyeToTmpRotTransformMatrix);
program.setUniform(_uniformCache2.dObjpos, glm::dvec4(renderData.position.dvec3(), 1.0));
program.setUniform(_uniformCache2.dCampos, renderData.camera.eyePositionVec3());