diff options
| author | Miles Macklin <[email protected]> | 2018-03-19 15:10:24 +1300 |
|---|---|---|
| committer | Miles Macklin <[email protected]> | 2018-03-19 15:10:24 +1300 |
| commit | 8ee05c79ae1748ef132a12e4fb0af284899faec6 (patch) | |
| tree | 82bd5aa1892e28ce7886b6cfeafe66a47ff38e67 /demo/d3d/renderParamsD3D.cpp | |
| parent | Flex 1.2 (beta 2) (diff) | |
| download | flex-8ee05c79ae1748ef132a12e4fb0af284899faec6.tar.xz flex-8ee05c79ae1748ef132a12e4fb0af284899faec6.zip | |
Flex 1.2.0 release
Diffstat (limited to 'demo/d3d/renderParamsD3D.cpp')
| -rw-r--r-- | demo/d3d/renderParamsD3D.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/demo/d3d/renderParamsD3D.cpp b/demo/d3d/renderParamsD3D.cpp index 22962ba..3ea8961 100644 --- a/demo/d3d/renderParamsD3D.cpp +++ b/demo/d3d/renderParamsD3D.cpp @@ -73,6 +73,7 @@ Matrix44 RenderParamsUtilD3D::convertGLToD3DProjection(const Matrix44& proj) /* static */void RenderParamsUtilD3D::calcFluidConstantBuffer(const FluidDrawParamsD3D& params, Hlsl::FluidShaderConst& constBuf) { constBuf.modelViewProjection = (Hlsl::float4x4&)(XMMatrixMultiply(XMMatrixMultiply(params.model, params.view), params.projection)); + constBuf.modelView = (Hlsl::float4x4&)XMMatrixMultiply(params.model, params.view); constBuf.projection = (Hlsl::float4x4&)params.projection; constBuf.inverseModelView = (Hlsl::float4x4&)XMMatrixInverse(nullptr, XMMatrixMultiply(params.model, params.view)); constBuf.inverseProjection = (Hlsl::float4x4&)XMMatrixInverse(nullptr, params.projection); @@ -85,6 +86,8 @@ Matrix44 RenderParamsUtilD3D::convertGLToD3DProjection(const Matrix44& proj) constBuf.blurScale = params.blurScale; constBuf.blurFalloff = params.blurFalloff; constBuf.debug = params.debug; + + constBuf.pointRadius = params.pointRadius; } /* static */void RenderParamsUtilD3D::calcDiffuseConstantBuffer(const DiffuseDrawParamsD3D& params, Hlsl::DiffuseShaderConst& constBuf) |