diff options
author | aap <aap@papnet.eu> | 2020-08-09 13:17:48 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-08-09 13:17:48 +0200 |
commit | b02c7cdc442af117659df6cd5fc39f9184279c0d (patch) | |
tree | 4456a84f1cc8e8023ac8a6456cb1126da02560a2 /src/render/Coronas.h | |
parent | Merge pull request #682 from Fire-Head/miami (diff) | |
download | re3-b02c7cdc442af117659df6cd5fc39f9184279c0d.tar re3-b02c7cdc442af117659df6cd5fc39f9184279c0d.tar.gz re3-b02c7cdc442af117659df6cd5fc39f9184279c0d.tar.bz2 re3-b02c7cdc442af117659df6cd5fc39f9184279c0d.tar.lz re3-b02c7cdc442af117659df6cd5fc39f9184279c0d.tar.xz re3-b02c7cdc442af117659df6cd5fc39f9184279c0d.tar.zst re3-b02c7cdc442af117659df6cd5fc39f9184279c0d.zip |
Diffstat (limited to 'src/render/Coronas.h')
-rw-r--r-- | src/render/Coronas.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/render/Coronas.h b/src/render/Coronas.h index cb4e8583..45f027d8 100644 --- a/src/render/Coronas.h +++ b/src/render/Coronas.h @@ -4,19 +4,21 @@ extern RwTexture *gpCoronaTexture[9]; struct CRegisteredCorona { + CVector coors; uint32 id; uint32 lastLOScheck; RwTexture *texture; + float size; + float someAngle; + float drawDist; + float nearDist; + float heightAboveRoad; uint8 red; uint8 green; uint8 blue; uint8 alpha; // alpha when fully visible uint8 fadeAlpha; // actual value used for rendering, faded - CVector coors; - float size; - float someAngle; bool registeredThisFrame; - float drawDist; int8 flareType; int8 reflection; @@ -25,12 +27,11 @@ struct CRegisteredCorona uint8 firstUpdate : 1; uint8 drawStreak : 1; uint8 sightClear : 1; + uint8 useNearDist : 1; + uint8 renderReflection : 1; - bool renderReflection; - float heightAboveRoad; - - float prevX[6]; - float prevY[6]; + int16 prevX[6]; + int16 prevY[6]; uint8 prevRed[6]; uint8 prevGreen[6]; uint8 prevBlue[6]; @@ -39,7 +40,7 @@ struct CRegisteredCorona void Update(void); }; -VALIDATE_SIZE(CRegisteredCorona, 0x80); +VALIDATE_SIZE(CRegisteredCorona, 0x68); class CCoronas { @@ -91,13 +92,14 @@ public: static void RegisterCorona(uint32 id, uint8 red, uint8 green, uint8 blue, uint8 alpha, const CVector &coors, float size, float drawDist, RwTexture *tex, int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle, - bool longDist = false, float nearClip = 1.5f); + bool useNearDist = false, float nearDist = 1.5f); static void RegisterCorona(uint32 id, uint8 red, uint8 green, uint8 blue, uint8 alpha, const CVector &coors, float size, float drawDist, uint8 type, int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle, - bool longDist = false, float nearClip = 1.5f); + bool useNearDist = false, float nearDist = 1.5f); static void UpdateCoronaCoors(uint32 id, const CVector &coors, float drawDist, float someAngle); static void Render(void); static void RenderReflections(void); + static void RenderSunReflection(void); static void DoSunAndMoon(void); }; |