mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-24 02:50:01 +00:00
use water color and new water texture
This commit is contained in:
parent
f5c0bf3b60
commit
dbbf390983
|
@ -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]; }
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue