phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes a fix about a fix on the waterManager. Fixes #1891

Browse Source 
This was SVN commit r13411.
This commit is contained in:
wraitii 2013-05-21 08:55:49 +00:00
parent 346df43a43
commit 136f1891c1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/renderer/WaterManager.cpp
View File

@ -396,6 +396,8 @@ void WaterManager::CreateSuperfancyInfo(CSimulation2* simulation)
m_FoamFactor[j*mapSize + i] = foamAmount;
}
}
delete[] waveForceHQ;
// TODO: The rest should be cleaned up
@ -430,10 +432,13 @@ void WaterManager::CreateSuperfancyInfo(CSimulation2* simulation)
{
waterPosition += CVector2D(i*size+xx,j*size+yy);
waterTexel++;
avnormal += terrain->CalcExactNormal( (i*size+xx)*4.0f,(j*size+yy)*4.0f);
}
avnormal += terrain->CalcExactNormal( (i*size+xx)*4.0f,(j*size+yy)*4.0f);
}
}
if (landTexel < size/2)
continue;
landPosition /= landTexel;
waterPosition /= waterTexel;
@ -441,8 +446,6 @@ void WaterManager::CreateSuperfancyInfo(CSimulation2* simulation)
avnormal.Normalize();
avnormal[1] = 0.0f;
if (landTexel < size/2)
continue;
// this should help ensure that the shore is pretty flat.
if (avnormal.Length() <= 0.2f)
continue;