diff options
author | aap <aap@papnet.eu> | 2020-11-23 09:38:51 +0100 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-11-23 09:38:51 +0100 |
commit | b6da31cfaa021559939ed596d18a27f4db6acebc (patch) | |
tree | da2cd477961d1e40202b037c045fd879a3189abf | |
parent | Merge pull request #827 from aap/master (diff) | |
download | re3-b6da31cfaa021559939ed596d18a27f4db6acebc.tar re3-b6da31cfaa021559939ed596d18a27f4db6acebc.tar.gz re3-b6da31cfaa021559939ed596d18a27f4db6acebc.tar.bz2 re3-b6da31cfaa021559939ed596d18a27f4db6acebc.tar.lz re3-b6da31cfaa021559939ed596d18a27f4db6acebc.tar.xz re3-b6da31cfaa021559939ed596d18a27f4db6acebc.tar.zst re3-b6da31cfaa021559939ed596d18a27f4db6acebc.zip |
-rw-r--r-- | src/rw/Lights.cpp | 41 | ||||
-rw-r--r-- | src/rw/Lights.h | 2 |
2 files changed, 43 insertions, 0 deletions
diff --git a/src/rw/Lights.cpp b/src/rw/Lights.cpp index 5a253854..b3cef6d4 100644 --- a/src/rw/Lights.cpp +++ b/src/rw/Lights.cpp @@ -3,6 +3,7 @@ #include <rpworld.h> #include "Lights.h" +#include "Timer.h" #include "Timecycle.h" #include "Coronas.h" #include "Weather.h" @@ -248,6 +249,46 @@ SetAmbientAndDirectionalColours(float f) RpLightSetColor(pDirect, &DirectionalLightColour); } +// unused +void +SetFlashyColours(float f) +{ + if(CTimer::GetTimeInMilliseconds() & 0x100){ + AmbientLightColour.red = 1.0f; + AmbientLightColour.green = 1.0f; + AmbientLightColour.blue = 1.0f; + + DirectionalLightColour.red = DirectionalLightColourForFrame.red; + DirectionalLightColour.green = DirectionalLightColourForFrame.green; + DirectionalLightColour.blue = DirectionalLightColourForFrame.blue; + + RpLightSetColor(pAmbient, &AmbientLightColour); + RpLightSetColor(pDirect, &DirectionalLightColour); + }else{ + SetAmbientAndDirectionalColours(f * 0.75f); + } +} + +// unused +void +SetFlashyColours_Mild(float f) +{ + if(CTimer::GetTimeInMilliseconds() & 0x100){ + AmbientLightColour.red = 0.65f; + AmbientLightColour.green = 0.65f; + AmbientLightColour.blue = 0.65f; + + DirectionalLightColour.red = DirectionalLightColourForFrame.red; + DirectionalLightColour.green = DirectionalLightColourForFrame.green; + DirectionalLightColour.blue = DirectionalLightColourForFrame.blue; + + RpLightSetColor(pAmbient, &AmbientLightColour); + RpLightSetColor(pDirect, &DirectionalLightColour); + }else{ + SetAmbientAndDirectionalColours(f * 0.9f); + } +} + void SetBrightMarkerColours(float f) { diff --git a/src/rw/Lights.h b/src/rw/Lights.h index b296816b..5057f1d0 100644 --- a/src/rw/Lights.h +++ b/src/rw/Lights.h @@ -14,6 +14,8 @@ void WorldReplaceScorchedLightsWithNormal(RpWorld *world); void AddAnExtraDirectionalLight(RpWorld *world, float dirx, float diry, float dirz, float red, float green, float blue); void RemoveExtraDirectionalLights(RpWorld *world); void SetAmbientAndDirectionalColours(float f); +void SetFlashyColours(float f); +void SetFlashyColours_Mild(float f); void SetBrightMarkerColours(float f); void ReSetAmbientAndDirectionalColours(void); void DeActivateDirectional(void); |