summaryrefslogtreecommitdiffstats
path: root/src/core/main.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-22 00:12:31 +0100
committerGitHub <noreply@github.com>2020-11-22 00:12:31 +0100
commitb9b7d5ac2110227327d950625e79aa400eaf3e47 (patch)
tree00b457d72d5abda01475944b8f5f9994c357360c /src/core/main.cpp
parentReorganize CPed functions into their original cpp files (diff)
parentneo screen droplets (diff)
downloadre3-b9b7d5ac2110227327d950625e79aa400eaf3e47.tar
re3-b9b7d5ac2110227327d950625e79aa400eaf3e47.tar.gz
re3-b9b7d5ac2110227327d950625e79aa400eaf3e47.tar.bz2
re3-b9b7d5ac2110227327d950625e79aa400eaf3e47.tar.lz
re3-b9b7d5ac2110227327d950625e79aa400eaf3e47.tar.xz
re3-b9b7d5ac2110227327d950625e79aa400eaf3e47.tar.zst
re3-b9b7d5ac2110227327d950625e79aa400eaf3e47.zip
Diffstat (limited to 'src/core/main.cpp')
-rw-r--r--src/core/main.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 5786fb4e..fb88ca75 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -68,7 +68,9 @@
#include "Clock.h"
#include "Occlusion.h"
#include "Ropes.h"
+#include "postfx.h"
#include "custompipes.h"
+#include "screendroplets.h"
GlobalScene Scene;
@@ -402,6 +404,9 @@ Initialise3D(void *param)
#ifdef EXTENDED_PIPELINES
CustomPipes::CustomPipeInit(); // need Scene.world for this
#endif
+#ifdef SCREEN_DROPLETS
+ ScreenDroplets::InitDraw();
+#endif
return ret;
}
@@ -411,6 +416,9 @@ Initialise3D(void *param)
static void
Terminate3D(void)
{
+#ifdef SCREEN_DROPLETS
+ ScreenDroplets::Shutdown();
+#endif
#ifdef EXTENDED_PIPELINES
CustomPipes::CustomPipeShutdown();
#endif
@@ -1246,10 +1254,17 @@ Idle(void *arg)
RenderDebugShit();
RenderEffects();
- tbStartTimer(0, "RenderMotionBlur");
if((TheCamera.m_BlurType == MOTION_BLUR_NONE || TheCamera.m_BlurType == MOTION_BLUR_LIGHT_SCENE) &&
TheCamera.m_ScreenReductionPercentage > 0.0f)
TheCamera.SetMotionBlurAlpha(150);
+
+#ifdef SCREEN_DROPLETS
+ CPostFX::GetBackBuffer(Scene.camera);
+ ScreenDroplets::Process();
+ ScreenDroplets::Render();
+#endif
+
+ tbStartTimer(0, "RenderMotionBlur");
TheCamera.RenderMotionBlur();
tbEndTimer("RenderMotionBlur");