From 2e2e08f32db040c3b3957b7c899aeec8555af5b0 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Tue, 13 Mar 2018 17:33:13 -0500 Subject: [PATCH] terrain file I/O and opengl rendering cleanup --- Engine/source/terrain/glsl/terrFeatureGLSL.cpp | 3 --- Engine/source/terrain/terrFile.cpp | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Engine/source/terrain/glsl/terrFeatureGLSL.cpp b/Engine/source/terrain/glsl/terrFeatureGLSL.cpp index 4492ca01b..2acd40871 100644 --- a/Engine/source/terrain/glsl/terrFeatureGLSL.cpp +++ b/Engine/source/terrain/glsl/terrFeatureGLSL.cpp @@ -569,9 +569,6 @@ void TerrainDetailMapFeatGLSL::processPix( Vector &component // amount so that it fades out with the layer blending. if ( fd.features.hasFeature( MFT_TerrainParallaxMap, detailIndex ) ) { - // Get the rest of our inputs. - Var *normalMap = _getNormalMapTex(); - // Call the library function to do the rest. if (fd.features.hasFeature(MFT_IsBC3nm, detailIndex)) { diff --git a/Engine/source/terrain/terrFile.cpp b/Engine/source/terrain/terrFile.cpp index 3a639d0b0..1ae32dc73 100644 --- a/Engine/source/terrain/terrFile.cpp +++ b/Engine/source/terrain/terrFile.cpp @@ -110,11 +110,11 @@ void TerrainFile::_buildGridMap() mGridMap.compact(); // Assign memory from the pool to each grid level. - TerrainSquare *sq = mGridMapPool.address(); + TerrainSquare *grid = mGridMapPool.address(); for ( S32 i = mGridLevels; i >= 0; i-- ) { - mGridMap[i] = sq; - sq += 1 << ( 2 * ( mGridLevels - i ) ); + mGridMap[i] = grid; + grid += 1 << ( 2 * ( mGridLevels - i ) ); } for( S32 i = mGridLevels; i >= 0; i-- )