mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-10 21:49:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Emil Axelsson
2018-03-26 14:02:36 +02:00
parent 349d2f4084
commit 0899c499f0
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,6 +250,10 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
program.setUniform("dInverseModelTransformMatrix", inverseModelMatrix);
program.setUniform("dModelTransformMatrix", _modelTransform);
glm::vec3 camPosModelCoords = inverseModelMatrix *
glm::dvec4(renderData.camera.eyePositionVec3(), 1.0);
program.setUniform("camPosModelCoords", camPosModelCoords);
glm::dmat4 eyeToModel =
inverseModelMatrix *
@@ -323,7 +327,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
glm::dmat4 eyeToWorldTransform =
glm::inverse(renderData.camera.combinedViewMatrix());
program.setUniform("eyeToWorld", glm::mat4(eyeToWorldTransform));
program.setUniform("eyeToWorld", eyeToWorldTransform);
double lt;
glm::dvec3 sunPosWorld = SpiceManager::ref().targetPosition(

31
modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
View File

@@ -90,10 +90,12 @@ uniform dmat4 dModelTransformMatrix;
//uniform dmat4 dSGCTEyeToOSWorldTransformMatrix;
uniform mat4 eyeToModel;
uniform mat4 eyeToWorld;
uniform dmat4 eyeToWorld;
uniform mat4 clipToModel;
uniform mat4 tempTransform;
uniform vec3 camPosModelCoords;
uniform dvec3 dCamRigPos;
uniform dvec3 dCampos;
uniform dvec3 sunDirectionObj;
@@ -246,9 +248,7 @@ bool dAtmosphereIntersection(const dvec3 planetPosition, const dRay ray, const d
* This method avoids matrices multiplications
* wherever is possible.
*/
void dCalculateRayRenderableGlobe(in int mssaSample, out dRay ray,
out dvec4 planetPositionObjectCoords,
out dvec4 cameraPositionInObject) {
void dCalculateRayRenderableGlobe(in int mssaSample, out dRay ray) {
// ======================================
// ======= Avoiding Some Matrices =======
@@ -257,28 +257,18 @@ void dCalculateRayRenderableGlobe(in int mssaSample, out dRay ray,
msaaSamplePatter[mssaSample+1]);
dvec4 clipCoords = dvec4(interpolatedNDCPos.xy + samplePos, 1.0, 1.0);
// Clip to World
dvec4 offsetWorldCoords = tempTransform * clipCoords;
dvec4 worldCoords = dvec4(dvec3(offsetWorldCoords) + dCampos, 1.0);
// World to Object
dvec4 objectCoords = dInverseModelTransformMatrix * worldCoords;
//objectCoords = dmat4(eyeToModel) * sgctEyeCoords;
//objectCoords = dmat4(clipToModel) * clipCoords;
// Planet Position in Object Space
// JCC: Applying the inverse of the model transformation on the object postion in World
// space results in imprecision.
planetPositionObjectCoords = dvec4(0.0, 0.0, 0.0, 1.0);
//planetPositionObjectCoords = dInverseModelTransformMatrix * dvec4(dObjpos.xyz, 1.0);
// Camera Position in Object Space
cameraPositionInObject = dInverseModelTransformMatrix * dvec4(dCampos, 1.0);
// ============================
// ====== Building Ray ========
// Ray in object space (in KM)
ray.origin = cameraPositionInObject * dvec4(0.001, 0.001, 0.001, 1.0);
ray.direction = dvec4(normalize(objectCoords.xyz - cameraPositionInObject.xyz), 0.0);
ray.origin = vec4(camPosModelCoords, 1.0) * dvec4(0.001, 0.001, 0.001, 1.0);
ray.direction = dvec4(normalize(objectCoords.xyz - camPosModelCoords.xyz), 0.0);
}
/*
@@ -584,12 +574,11 @@ void main() {
// Ray in object space
dRay ray;
dvec4 planetPositionObjectCoords = dvec4(0.0);
dvec4 cameraPositionInObject = dvec4(0.0);
dvec4 planetPositionObjectCoords = dvec4(0.0, 0.0, 0.0, 1.0);
dvec4 cameraPositionInObject = dvec4(camPosModelCoords, 1.0);
// Get the ray from camera to atm in object space
dCalculateRayRenderableGlobe(i, ray, planetPositionObjectCoords,
cameraPositionInObject);
dCalculateRayRenderableGlobe(i, ray);
bool insideATM = false;
double offset = 0.0;