diff options
author | aap <aap@papnet.eu> | 2019-06-17 10:30:02 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-06-17 22:40:15 +0200 |
commit | b5fba778c4a307f0a5721c9b3b0efb38be96634b (patch) | |
tree | 9fe0738d1d6dcf4677aac12e1efadff18887f7b4 /src/render | |
parent | Merge pull request #20 from gennariarmando/master (diff) | |
download | re3-b5fba778c4a307f0a5721c9b3b0efb38be96634b.tar re3-b5fba778c4a307f0a5721c9b3b0efb38be96634b.tar.gz re3-b5fba778c4a307f0a5721c9b3b0efb38be96634b.tar.bz2 re3-b5fba778c4a307f0a5721c9b3b0efb38be96634b.tar.lz re3-b5fba778c4a307f0a5721c9b3b0efb38be96634b.tar.xz re3-b5fba778c4a307f0a5721c9b3b0efb38be96634b.tar.zst re3-b5fba778c4a307f0a5721c9b3b0efb38be96634b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/render/2dEffect.h | 28 | ||||
-rw-r--r-- | src/render/Coronas.cpp | 1 | ||||
-rw-r--r-- | src/render/ParticleMgr.cpp | 1 | ||||
-rw-r--r-- | src/render/PointLights.cpp | 1 | ||||
-rw-r--r-- | src/render/Renderer.cpp | 1 | ||||
-rw-r--r-- | src/render/Sprite.cpp | 1 | ||||
-rw-r--r-- | src/render/Sprite2d.cpp | 1 |
7 files changed, 27 insertions, 7 deletions
diff --git a/src/render/2dEffect.h b/src/render/2dEffect.h index 6cba85d1..780d9b4f 100644 --- a/src/render/2dEffect.h +++ b/src/render/2dEffect.h @@ -1,3 +1,9 @@ +enum { + EFFECT_LIGHT, + EFFECT_PARTICLE, + EFFECT_ATTRACTOR +}; + class C2dEffect { public: @@ -7,26 +13,26 @@ public: float size; float innerRange; uint8 flash; - uint8 wet; - uint8 flare; - uint8 shadowIntens; - uint8 flag; + uint8 roadReflection; + uint8 flareType; + uint8 shadowIntensity; + uint8 flags; RwTexture *corona; RwTexture *shadow; }; struct Particle { int particleType; - float dir[3]; + CVector dir; float scale; }; struct Attractor { CVector dir; - uint8 flag; + uint8 flags; uint8 probability; }; CVector pos; - RwRGBA col; + CRGBA col; uint8 type; union { Light light; @@ -35,5 +41,13 @@ public: }; C2dEffect(void) {} + void Shutdown(void){ + if(type == 0){ // TODO: enum + if(light.corona) + RwTextureDestroy(light.corona); + if(light.shadow) + RwTextureDestroy(light.shadow); + } + } }; static_assert(sizeof(C2dEffect) == 0x34, "C2dEffect: error"); diff --git a/src/render/Coronas.cpp b/src/render/Coronas.cpp index 5947a77f..64053007 100644 --- a/src/render/Coronas.cpp +++ b/src/render/Coronas.cpp @@ -1,5 +1,6 @@ #include "common.h" #include "patcher.h" +#include "main.h" #include "General.h" #include "TxdStore.h" #include "Camera.h" diff --git a/src/render/ParticleMgr.cpp b/src/render/ParticleMgr.cpp index 15370b47..440ea9cb 100644 --- a/src/render/ParticleMgr.cpp +++ b/src/render/ParticleMgr.cpp @@ -1,5 +1,6 @@ #include "common.h" #include "patcher.h" +#include "main.h" #include "FileMgr.h" #include "ParticleMgr.h" diff --git a/src/render/PointLights.cpp b/src/render/PointLights.cpp index 0eb41821..2b840314 100644 --- a/src/render/PointLights.cpp +++ b/src/render/PointLights.cpp @@ -1,5 +1,6 @@ #include "common.h" #include "patcher.h" +#include "main.h" #include "Lights.h" #include "Camera.h" #include "Weather.h" diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index 5a27ab32..bd16922c 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -1,5 +1,6 @@ #include "common.h" #include "patcher.h" +#include "main.h" #include "Lights.h" #include "ModelInfo.h" #include "Treadable.h" diff --git a/src/render/Sprite.cpp b/src/render/Sprite.cpp index 92c3e8a6..57a8a22f 100644 --- a/src/render/Sprite.cpp +++ b/src/render/Sprite.cpp @@ -1,5 +1,6 @@ #include "common.h" #include "patcher.h" +#include "main.h" #include "Draw.h" #include "Camera.h" #include "Sprite.h" diff --git a/src/render/Sprite2d.cpp b/src/render/Sprite2d.cpp index 3dc1d989..4ed27fa1 100644 --- a/src/render/Sprite2d.cpp +++ b/src/render/Sprite2d.cpp @@ -1,5 +1,6 @@ #include "common.h" #include "patcher.h" +#include "main.h" #include "Draw.h" #include "Camera.h" #include "Sprite2d.h" |