summaryrefslogtreecommitdiffstats
path: root/src/render/WaterLevel.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-07 13:38:14 +0200
committeraap <aap@papnet.eu>2020-05-07 13:38:14 +0200
commitdbbf39098327261d2e29424156789232e5e85517 (patch)
tree13d8b4f79a50527f6bf80f230028c321852c1db3 /src/render/WaterLevel.cpp
parentMerge branch 'miami' of github.com:GTAmodding/re3 into miami (diff)
downloadre3-dbbf39098327261d2e29424156789232e5e85517.tar
re3-dbbf39098327261d2e29424156789232e5e85517.tar.gz
re3-dbbf39098327261d2e29424156789232e5e85517.tar.bz2
re3-dbbf39098327261d2e29424156789232e5e85517.tar.lz
re3-dbbf39098327261d2e29424156789232e5e85517.tar.xz
re3-dbbf39098327261d2e29424156789232e5e85517.tar.zst
re3-dbbf39098327261d2e29424156789232e5e85517.zip
Diffstat (limited to 'src/render/WaterLevel.cpp')
-rw-r--r--src/render/WaterLevel.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 37ae1dfa..7e26654c 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -36,9 +36,6 @@ RpAtomic *CWaterLevel::ms_pWavyAtomic;
RpGeometry *CWaterLevel::apGeomArray[8];
int16 CWaterLevel::nGeomUsed;
-//RwTexture *gpWaterTex;
-//RwRaster *gpWaterRaster;
-
RwTexture *gpWaterTex;
RwRaster *gpWaterRaster;
@@ -84,7 +81,7 @@ CWaterLevel::Initialise(char *pWaterDat)
CTxdStore::SetCurrentTxd(slot);
if ( gpWaterTex == NULL )
- gpWaterTex = RwTextureRead("water_old", NULL);
+ gpWaterTex = RwTextureRead("waterclear256", NULL);
gpWaterRaster = RwTextureGetRaster(gpWaterTex);
CTxdStore::PopCurrentTxd();
@@ -364,10 +361,10 @@ CWaterLevel::RenderWater()
WavesCalculatedThisFrame = false;
RwRGBA color = { 0, 0, 0, 255 };
-
- color.red = uint32((CTimeCycle::GetDirectionalRed() * 0.5f + CTimeCycle::GetAmbientRed() ) * 255.0f);
- color.green = uint32((CTimeCycle::GetDirectionalGreen() * 0.5f + CTimeCycle::GetAmbientGreen()) * 255.0f);
- color.blue = uint32((CTimeCycle::GetDirectionalBlue() * 0.5f + CTimeCycle::GetAmbientBlue() ) * 255.0f);
+
+ color.red = CTimeCycle::GetWaterRed();
+ color.green = CTimeCycle::GetWaterGreen();
+ color.blue = CTimeCycle::GetWaterBlue();
TempBufferVerticesStored = 0;
TempBufferIndicesStored = 0;