diff options
| author | Jason Maskell <[email protected]> | 2016-05-19 15:51:45 +0200 |
|---|---|---|
| committer | Jason Maskell <[email protected]> | 2016-05-19 15:51:45 +0200 |
| commit | b352eb55361a8b92f7cef224db990c00318afeff (patch) | |
| tree | aee2120d1772898cd240ba059f46437b25216119 /sample/d3d11/terrain.cpp | |
| parent | Lots more conversion work done, not quite compiling yet. Paranoia commit. (diff) | |
| download | waveworks_archive-b352eb55361a8b92f7cef224db990c00318afeff.tar.xz waveworks_archive-b352eb55361a8b92f7cef224db990c00318afeff.zip | |
Sample now compiles cleanly, doesn't run yet due to media path issues.
Diffstat (limited to 'sample/d3d11/terrain.cpp')
| -rw-r--r-- | sample/d3d11/terrain.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sample/d3d11/terrain.cpp b/sample/d3d11/terrain.cpp index d8ce061..d52059b 100644 --- a/sample/d3d11/terrain.cpp +++ b/sample/d3d11/terrain.cpp @@ -677,7 +677,7 @@ void CTerrain::CreateTerrain() temp_layerdef_map_texture_pixels[(j*terrain_layerdef_map_texture_size+i)*4+3]=0; } - mv=bilinear_interpolation(x-ix,z-iz,normal[ix][iz].y,normal[ix+1][iz].y,normal[ix+1][iz+1][1],normal[ix][iz+1].y); + mv=bilinear_interpolation(x-ix,z-iz,normal[ix][iz].y,normal[ix+1][iz].y,normal[ix+1][iz+1].y,normal[ix][iz+1].y); if((mv<terrain_slope_grass_start)&&(rm>terrain_height_sand_end)) { @@ -958,6 +958,8 @@ HRESULT CTerrain::LoadTextures() V_RETURN(DXUTFindDXSDKMediaFileCch(path, MAX_PATH, TEXT("foam.dds"))); V_RETURN(DirectX::CreateDDSTextureFromFile(pDevice, static_cast<const wchar_t *>(path), &pD3D11Resource, &foam_diffuse_textureSRV)); SAFE_RELEASE(pD3D11Resource); + + return S_OK; } @@ -1455,6 +1457,7 @@ void CTerrain::SetupRefractionView(CFirstPersonCamera *cam) pEffect->GetVariableByName("g_HalfSpaceCullSign")->AsScalar()->SetFloat(-1.0f); pEffect->GetVariableByName("g_HalfSpaceCullPosition")->AsScalar()->SetFloat(terrain_minheight); } + void CTerrain::SetupLightView(CFirstPersonCamera *cam) { |