mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-27 18:25:28 +00:00
Code Issues Projects Releases Wiki Activity

use water color and new water texture

Browse source
This commit is contained in:
aap 2020-05-07 13:38:14 +02:00
parent f5c0bf3b60
commit dbbf390983
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/render/Timecycle.h
View file

@ -173,6 +173,11 @@ public:
static int GetFogBlue(void) { return m_nCurrentFogColourBlue; } static int GetFogBlue(void) { return m_nCurrentFogColourBlue; }
static int GetFogReduction(void) { return m_FogReduction; } static int GetFogReduction(void) { return m_FogReduction; }
static int GetWaterRed(void) { return m_fCurrentWaterRed; }
static int GetWaterGreen(void) { return m_fCurrentWaterGreen; }
static int GetWaterBlue(void) { return m_fCurrentWaterBlue; }
static int GetWaterAlpha(void) { return m_fCurrentWaterAlpha; }
static void Initialise(void); static void Initialise(void);
static void Update(void); static void Update(void);
static CVector &GetSunPosition(void) { return m_VectorToSun[m_CurrentStoredValue]; } static CVector &GetSunPosition(void) { return m_VectorToSun[m_CurrentStoredValue]; }

13
src/render/WaterLevel.cpp
View file

@ -36,9 +36,6 @@ RpAtomic *CWaterLevel::ms_pWavyAtomic;
RpGeometry *CWaterLevel::apGeomArray[8]; RpGeometry *CWaterLevel::apGeomArray[8];
int16 CWaterLevel::nGeomUsed; int16 CWaterLevel::nGeomUsed;
//RwTexture *gpWaterTex;
//RwRaster *gpWaterRaster;
RwTexture *gpWaterTex; RwTexture *gpWaterTex;
RwRaster *gpWaterRaster; RwRaster *gpWaterRaster;
@ -84,7 +81,7 @@ CWaterLevel::Initialise(char *pWaterDat)
CTxdStore::SetCurrentTxd(slot); CTxdStore::SetCurrentTxd(slot);
if ( gpWaterTex == NULL ) if ( gpWaterTex == NULL )
gpWaterTex = RwTextureRead("water_old", NULL); gpWaterTex = RwTextureRead("waterclear256", NULL);
gpWaterRaster = RwTextureGetRaster(gpWaterTex); gpWaterRaster = RwTextureGetRaster(gpWaterTex);
CTxdStore::PopCurrentTxd(); CTxdStore::PopCurrentTxd();
@ -364,10 +361,10 @@ CWaterLevel::RenderWater()
WavesCalculatedThisFrame = false; WavesCalculatedThisFrame = false;
RwRGBA color = { 0, 0, 0, 255 }; RwRGBA color = { 0, 0, 0, 255 };
color.red = uint32((CTimeCycle::GetDirectionalRed() * 0.5f + CTimeCycle::GetAmbientRed() ) * 255.0f); color.red = CTimeCycle::GetWaterRed();
color.green = uint32((CTimeCycle::GetDirectionalGreen() * 0.5f + CTimeCycle::GetAmbientGreen()) * 255.0f); color.green = CTimeCycle::GetWaterGreen();
color.blue = uint32((CTimeCycle::GetDirectionalBlue() * 0.5f + CTimeCycle::GetAmbientBlue() ) * 255.0f); color.blue = CTimeCycle::GetWaterBlue();
TempBufferVerticesStored = 0; TempBufferVerticesStored = 0;
TempBufferIndicesStored = 0; TempBufferIndicesStored = 0;