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
23 // Update the depth info with near and far (same for stereo)23 // Update the depth info with near and far (same for stereo)
24 auto nearZ = args->getViewFrustum().getNearClip();24 auto nearZ = args->getViewFrustum().getNearClip();
25 auto farZ = args->getViewFrustum().getFarClip();25 auto farZ = args->getViewFrustum().getFarClip();
26 _frameTransformBuffer.edit<FrameTransform>().depthInfo = glm::vec4(nearZ*farZ, farZ - nearZ, -farZ, 0.0f);
27 26
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;
29 31
30 //_parametersBuffer.edit<Parameters>()._ditheringInfo.y += 0.25f;32 //_parametersBuffer.edit<Parameters>()._ditheringInfo.y += 0.25f;
31 33
32 Transform cameraTransform;34 Transform cameraTransform;
33 args->getViewFrustum().evalViewTransform(cameraTransform);35 args->getViewFrustum().evalViewTransform(cameraTransform);
34 cameraTransform.getMatrix(_frameTransformBuffer.edit<FrameTransform>().invView);36 cameraTransform.getMatrix(frameTransformBuffer.invView);
37 cameraTransform.getInverseMatrix(frameTransformBuffer.view);
35 38
36 // Running in stero ?39 // Running in stero ?
37 bool isStereo = args->_context->isStereo();40 bool isStereo = args->_context->isStereo();
@@ -39,10 +42,9 @@ void DeferredFrameTransform::update(RenderArgs* args) { · 1 unmodified line
39 // Eval the mono projection42 // Eval the mono projection
40 mat4 monoProjMat;43 mat4 monoProjMat;
41 args->getViewFrustum().evalProjectionMatrix(monoProjMat);44 args->getViewFrustum().evalProjectionMatrix(monoProjMat);
42 _frameTransformBuffer.edit<FrameTransform>().projection[0] = monoProjMat;45 frameTransformBuffer.projection[0] = monoProjMat;
43 _frameTransformBuffer.edit<FrameTransform>().stereoInfo = glm::vec4(0.0f, (float)args->_viewport.z, 0.0f, 0.0f);46 frameTransformBuffer.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);47 frameTransformBuffer.invpixelInfo = glm::vec4(1.0f / args->_viewport.z, 1.0f / args->_viewport.w, 0.0f, 0.0f);
45
46 } else {48 } else {
47 49
48 mat4 projMats[2];50 mat4 projMats[2];
@@ -53,11 +55,11 @@ void DeferredFrameTransform::update(RenderArgs* args) { · 4 unmodified lines
53 for (int i = 0; i < 2; i++) {55 for (int i = 0; i < 2; i++) {
54 // Compose the mono Eye space to Stereo clip space Projection Matrix56 // Compose the mono Eye space to Stereo clip space Projection Matrix
55 auto sideViewMat = projMats[i] * eyeViews[i];57 auto sideViewMat = projMats[i] * eyeViews[i];
56 _frameTransformBuffer.edit<FrameTransform>().projection[i] = sideViewMat;58 frameTransformBuffer.projection[i] = sideViewMat;
57 }59 }
58 60
59 _frameTransformBuffer.edit<FrameTransform>().stereoInfo = glm::vec4(1.0f, (float)(args->_viewport.z >> 1), 0.0f, 1.0f);61 frameTransformBuffer.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);62 frameTransformBuffer.invpixelInfo = glm::vec4(1.0f / (float)(args->_viewport.z >> 1), 1.0f / args->_viewport.w, 0.0f, 0.0f);
61 63
62 }64 }
63}65}

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