From b352eb55361a8b92f7cef224db990c00318afeff Mon Sep 17 00:00:00 2001 From: Jason Maskell Date: Thu, 19 May 2016 15:51:45 +0200 Subject: Sample now compiles cleanly, doesn't run yet due to media path issues. --- sample/d3d11/ocean_surface.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sample/d3d11/ocean_surface.cpp') diff --git a/sample/d3d11/ocean_surface.cpp b/sample/d3d11/ocean_surface.cpp index ed88415..4bd0dc6 100644 --- a/sample/d3d11/ocean_surface.cpp +++ b/sample/d3d11/ocean_surface.cpp @@ -298,7 +298,11 @@ void OceanSurface::renderShaded( ID3D11DeviceContext* pDC, // Apply data tex SRV XMMATRIX topDownMatrix; pDistanceFieldModule->GetWorldToTopDownTextureMatrix( topDownMatrix ); - m_pOceanFX->GetVariableByName("g_WorldToTopDownTextureMatrix")->AsMatrix()->SetMatrix( &topDownMatrix._11 ); + + XMFLOAT4X4 tdmStore; + XMStoreFloat4x4(&tdmStore, topDownMatrix); + + m_pOceanFX->GetVariableByName("g_WorldToTopDownTextureMatrix")->AsMatrix()->SetMatrix( (FLOAT*)&tdmStore ); m_pOceanFX->GetVariableByName("g_GerstnerSteepness")->AsScalar()->SetFloat( steepness ); m_pOceanFX->GetVariableByName("g_BaseGerstnerAmplitude")->AsScalar()->SetFloat( amplitude ); -- cgit v1.2.3