a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-09-28 03:06:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into miami

Browse source
This commit is contained in:
Sergeanur 2020-07-29 15:35:25 +03:00
parent acdc52116e e13d80a4eb
commit 86cc86ac12
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/Game.cpp
View file

@ -156,9 +156,9 @@ CGame::InitialiseOnceBeforeRW(void)
#ifdef PS2_MATFX #ifdef PS2_MATFX
void ReplaceMatFxCallback(); void ReplaceMatFxCallback();
#endif // PS2_MATFX #endif // PS2_MATFX
#ifdef DUAL_PASS_RENDERING #ifdef PS2_ALPHA_TEST
void ReplaceAtomicPipeCallback(); void ReplaceAtomicPipeCallback();
#endif // DUAL_PASS_RENDERING #endif // PS2_ALPHA_TEST
#endif // !LIBRW #endif // !LIBRW
bool bool
@ -215,9 +215,9 @@ CGame::InitialiseRenderWare(void)
#ifdef PS2_MATFX #ifdef PS2_MATFX
ReplaceMatFxCallback(); ReplaceMatFxCallback();
#endif // PS2_MATFX #endif // PS2_MATFX
#ifdef DUAL_PASS_RENDERING #ifdef PS2_ALPHA_TEST
ReplaceAtomicPipeCallback(); ReplaceAtomicPipeCallback();
#endif // DUAL_PASS_RENDERING #endif // PS2_ALPHA_TEST
#endif // LIBRW #endif // LIBRW
CFont::Initialise(); CFont::Initialise();

2
src/core/config.h
View file

@ -214,7 +214,7 @@ enum Config {
#define ASPECT_RATIO_SCALE // Not just makes everything scale with aspect ratio, also adds support for all aspect ratios #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 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 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 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 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 //#define NO_ISLAND_LOADING // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU

2
src/rw/RwHelper.cpp
View file

@ -11,7 +11,7 @@
RtCharset *debugCharset; RtCharset *debugCharset;
#endif #endif
#ifdef DUAL_PASS_RENDERING #ifdef PS2_ALPHA_TEST
bool gPS2alphaTest = true; bool gPS2alphaTest = true;
#else #else
bool gPS2alphaTest = false; bool gPS2alphaTest = false;

4
src/rw/RwDualPass.cpp → src/rw/RwPS2AlphaTest.cpp
View file

@ -2,7 +2,7 @@
#define WITHD3D #define WITHD3D
#include "common.h" #include "common.h"
#ifdef DUAL_PASS_RENDERING #ifdef PS2_ALPHA_TEST
#include "rwcore.h" #include "rwcore.h"
extern "C" { extern "C" {
@ -242,6 +242,6 @@ ReplaceAtomicPipeCallback()
_rxD3D8DualPassRenderCallback); _rxD3D8DualPassRenderCallback);
} }
#endif // DUAL_PASS_RENDERING #endif // PS2_ALPHA_TEST
#endif // !LIBRW #endif // !LIBRW