mirror of
https://github.com/GTAmodding/re3.git
synced 2025-07-13 23:44:09 +00:00
Merge branch 'miami' into lcs
# Conflicts: # README.md # premake5.lua # src/audio/MusicManager.cpp # src/core/main.cpp # src/core/re3.cpp # src/extras/postfx.cpp # src/render/Font.cpp
This commit is contained in:
commit
f6910d35f7
42 changed files with 801 additions and 283 deletions
|
@ -6,6 +6,7 @@
|
|||
#include <d3d8caps.h>
|
||||
#endif
|
||||
|
||||
#include "main.h"
|
||||
#include "General.h"
|
||||
#include "RwHelper.h"
|
||||
#include "Camera.h"
|
||||
|
@ -333,6 +334,7 @@ CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, u
|
|||
#ifdef EXTENDED_COLOURFILTER
|
||||
CPostFX::Render(cam, red, green, blue, blur, type, bluralpha);
|
||||
#else
|
||||
PUSH_RENDERGROUP("CMBlur::MotionBlurRender");
|
||||
RwRGBA color = { (RwUInt8)red, (RwUInt8)green, (RwUInt8)blue, (RwUInt8)blur };
|
||||
#ifdef GTA_PS2
|
||||
if( pFrontBuffer )
|
||||
|
@ -348,6 +350,7 @@ CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, u
|
|||
RwRasterPopContext();
|
||||
}
|
||||
#endif
|
||||
POP_RENDERGROUP();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue