mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Substantial speed-up of the foam generation code.

Browse Source 
Remove waves for now as they were unsatisfactory.
Removes "shininess" as a water parameter as it was basically useless.
Add a button in Atlas to recompute water parameters so you can now see
fog in Atlas.

Fixes #1743, #1803 (invalid)
Refs #1875, #2114, #48.

This was SVN commit r14514.
This commit is contained in:
wraitii
2014-01-05 16:15:20 +00:00
parent d56595c802
commit 15ec863aec
17 changed files with 145 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/components/CCmpWaterManager.cpp
+18 -1
View File
@@ -26,6 +26,8 @@
#include "renderer/WaterManager.h"
#include "simulation2/MessageTypes.h"
#include "tools/atlas/GameInterface/GameLoop.h"
class CCmpWaterManager : public ICmpWaterManager
{
public:
@@ -81,7 +83,9 @@ public:
case MT_TerrainChanged:
{
// Tell the renderer to redraw the map.
if (CRenderer::IsInitialised())
// TODO: sometimes atlas glitches out.
// I've added a button to recompute on demand but that's not extremely nice.
if (CRenderer::IsInitialised() && !g_AtlasGameLoop->running)
{
const CMessageTerrainChanged& msgData = static_cast<const CMessageTerrainChanged&> (msg);
g_Renderer.GetWaterManager()->m_NeedInfoUpdate = true;
@@ -97,6 +101,19 @@ public:
}
}
virtual void RecomputeWaterData()
{
ssize_t mapSize = GetSimContext().GetTerrain().GetVerticesPerSide();
g_Renderer.GetWaterManager()->m_NeedInfoUpdate = true;
g_Renderer.GetWaterManager()->m_updatei0 = 0;
g_Renderer.GetWaterManager()->m_updatej0 = 0;
g_Renderer.GetWaterManager()->m_updatei1 = mapSize-1;
g_Renderer.GetWaterManager()->m_updatej1 = mapSize-1;
// Tell the terrain it'll need to recompute its cached render data
GetSimContext().GetTerrain().MakeDirty(RENDERDATA_UPDATE_VERTICES);
}
virtual void SetWaterLevel(entity_pos_t h)
{
m_WaterHeight = h;