History

Intoducing the bluring as a separate Job reusable and the first version of curvature

samcake committed 10 years ago

Commit 75a5f6b1 parent 8d9057020 files · +606 −114Browse files

Showing the changes to libraries/render-utils/src/DeferredFrameTransform.cpp (1 of 20 files). Show all

Unified · Split

libraries/render-utils/src/DeferredFrameTransform.cpp+12−10
@@ -23,15 +23,18 @@ void DeferredFrameTransform::update(RenderArgs* args) { · 22 unmodified lines
2323 // Update the depth info with near and far (same for stereo)
2424 auto nearZ = args->getViewFrustum().getNearClip();
2525 auto farZ = args->getViewFrustum().getFarClip();
26− _frameTransformBuffer.edit<FrameTransform>().depthInfo = glm::vec4(nearZ*farZ, farZ - nearZ, -farZ, 0.0f);
2726
28− _frameTransformBuffer.edit<FrameTransform>().pixelInfo = args->_viewport;
27+ auto& frameTransformBuffer = _frameTransformBuffer.edit<FrameTransform>();
28+ frameTransformBuffer.depthInfo = glm::vec4(nearZ*farZ, farZ - nearZ, -farZ, 0.0f);
29+
30+ frameTransformBuffer.pixelInfo = args->_viewport;
2931
3032 //_parametersBuffer.edit<Parameters>()._ditheringInfo.y += 0.25f;
3133
3234 Transform cameraTransform;
3335 args->getViewFrustum().evalViewTransform(cameraTransform);
34− cameraTransform.getMatrix(_frameTransformBuffer.edit<FrameTransform>().invView);
36+ cameraTransform.getMatrix(frameTransformBuffer.invView);
37+ cameraTransform.getInverseMatrix(frameTransformBuffer.view);
3538
3639 // Running in stero ?
3740 bool isStereo = args->_context->isStereo();
@@ -39,10 +42,9 @@ void DeferredFrameTransform::update(RenderArgs* args) { · 1 unmodified line
3942 // Eval the mono projection
4043 mat4 monoProjMat;
4144 args->getViewFrustum().evalProjectionMatrix(monoProjMat);
42− _frameTransformBuffer.edit<FrameTransform>().projection[0] = monoProjMat;
43− _frameTransformBuffer.edit<FrameTransform>().stereoInfo = glm::vec4(0.0f, (float)args->_viewport.z, 0.0f, 0.0f);
44− _frameTransformBuffer.edit<FrameTransform>().invpixelInfo = glm::vec4(1.0f / args->_viewport.z, 1.0f / args->_viewport.w, 0.0f, 0.0f);
45−
45+ frameTransformBuffer.projection[0] = monoProjMat;
46+ frameTransformBuffer.stereoInfo = glm::vec4(0.0f, (float)args->_viewport.z, 0.0f, 0.0f);
47+ frameTransformBuffer.invpixelInfo = glm::vec4(1.0f / args->_viewport.z, 1.0f / args->_viewport.w, 0.0f, 0.0f);
4648 } else {
4749
4850 mat4 projMats[2];
@@ -53,11 +55,11 @@ void DeferredFrameTransform::update(RenderArgs* args) { · 4 unmodified lines
5355 for (int i = 0; i < 2; i++) {
5456 // Compose the mono Eye space to Stereo clip space Projection Matrix
5557 auto sideViewMat = projMats[i] * eyeViews[i];
56− _frameTransformBuffer.edit<FrameTransform>().projection[i] = sideViewMat;
58+ frameTransformBuffer.projection[i] = sideViewMat;
5759 }
5860
59− _frameTransformBuffer.edit<FrameTransform>().stereoInfo = glm::vec4(1.0f, (float)(args->_viewport.z >> 1), 0.0f, 1.0f);
60− _frameTransformBuffer.edit<FrameTransform>().invpixelInfo = glm::vec4(1.0f / (float)(args->_viewport.z >> 1), 1.0f / args->_viewport.w, 0.0f, 0.0f);
61+ frameTransformBuffer.stereoInfo = glm::vec4(1.0f, (float)(args->_viewport.z >> 1), 0.0f, 1.0f);
62+ frameTransformBuffer.invpixelInfo = glm::vec4(1.0f / (float)(args->_viewport.z >> 1), 1.0f / args->_viewport.w, 0.0f, 0.0f);
6163
6264 }
6365 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t