From e13d80a4ebfdaa89de3ad2eb6dc9ec6fbc1d3132 Mon Sep 17 00:00:00 2001 From: aap Date: Wed, 29 Jul 2020 14:31:34 +0200 Subject: [PATCH] rename shit --- src/core/Game.cpp | 8 ++++---- src/core/config.h | 2 +- src/rw/RwHelper.cpp | 2 +- src/rw/{RwDualPass.cpp => RwPS2AlphaTest.cpp} | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename src/rw/{RwDualPass.cpp => RwPS2AlphaTest.cpp} (99%) diff --git a/src/core/Game.cpp b/src/core/Game.cpp index 2c9e784c..82e6992d 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -153,9 +153,9 @@ CGame::InitialiseOnceBeforeRW(void) #ifdef PS2_MATFX void ReplaceMatFxCallback(); #endif // PS2_MATFX -#ifdef DUAL_PASS_RENDERING +#ifdef PS2_ALPHA_TEST void ReplaceAtomicPipeCallback(); -#endif // DUAL_PASS_RENDERING +#endif // PS2_ALPHA_TEST #endif // !LIBRW bool @@ -212,9 +212,9 @@ CGame::InitialiseRenderWare(void) #ifdef PS2_MATFX ReplaceMatFxCallback(); #endif // PS2_MATFX -#ifdef DUAL_PASS_RENDERING +#ifdef PS2_ALPHA_TEST ReplaceAtomicPipeCallback(); -#endif // DUAL_PASS_RENDERING +#endif // PS2_ALPHA_TEST #endif // LIBRW CFont::Initialise(); diff --git a/src/core/config.h b/src/core/config.h index 9dfbad03..94a35782 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -198,7 +198,7 @@ enum Config { #define ASPECT_RATIO_SCALE // Not just makes everything scale with aspect ratio, also adds support for all aspect ratios #define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch) #define USE_TXD_CDIMAGE // generate and load textures from txd.img -#define DUAL_PASS_RENDERING // dual pass rendering from SkyGfx +#define PS2_ALPHA_TEST // emulate ps2 alpha test #define IMPROVED_VIDEOMODE // save and load videomode parameters instead of a magic number #define DISABLE_LOADING_SCREEN // disable the loading screen which vastly improves the loading time //#define NO_ISLAND_LOADING // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp index 08a8fca4..f568532a 100644 --- a/src/rw/RwHelper.cpp +++ b/src/rw/RwHelper.cpp @@ -11,7 +11,7 @@ RtCharset *debugCharset; #endif -#ifdef DUAL_PASS_RENDERING +#ifdef PS2_ALPHA_TEST bool gPS2alphaTest = true; #else bool gPS2alphaTest = false; diff --git a/src/rw/RwDualPass.cpp b/src/rw/RwPS2AlphaTest.cpp similarity index 99% rename from src/rw/RwDualPass.cpp rename to src/rw/RwPS2AlphaTest.cpp index c8ebb8ad..c0d68355 100644 --- a/src/rw/RwDualPass.cpp +++ b/src/rw/RwPS2AlphaTest.cpp @@ -2,7 +2,7 @@ #define WITHD3D #include "common.h" -#ifdef DUAL_PASS_RENDERING +#ifdef PS2_ALPHA_TEST #include "rwcore.h" extern "C" { @@ -242,6 +242,6 @@ ReplaceAtomicPipeCallback() _rxD3D8DualPassRenderCallback); } -#endif // DUAL_PASS_RENDERING +#endif // PS2_ALPHA_TEST #endif // !LIBRW \ No newline at end of file