mirror of
https://github.com/halpz/re3.git
synced 2025-07-26 00:02:45 +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:
@ -7,6 +7,7 @@
|
||||
#error "Need librw for EXTENDED_COLOURFILTER"
|
||||
#endif
|
||||
|
||||
#include "main.h"
|
||||
#include "RwHelper.h"
|
||||
#include "Camera.h"
|
||||
#include "MBlur.h"
|
||||
@ -407,6 +408,8 @@ CPostFX::GetBackBuffer(RwCamera *cam)
|
||||
void
|
||||
CPostFX::Render(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 bluralpha)
|
||||
{
|
||||
PUSH_RENDERGROUP("CPostFX::Render");
|
||||
|
||||
// LCS PS2 blur is drawn in three passes:
|
||||
// blend frame with current frame 3 times to blur a bit
|
||||
// blend one more time with colour filter
|
||||
@ -475,6 +478,8 @@ CPostFX::Render(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blu
|
||||
bJustInitialised = false;
|
||||
}else
|
||||
bJustInitialised = true;
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
int CPostFX::PrevRed[NUMAVERAGE], CPostFX::AvgRed;
|
||||
|
Reference in New Issue
Block a user