summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-06-29 12:12:52 +0200
committeraap <aap@papnet.eu>2020-06-29 12:12:52 +0200
commitb072cbca93e9a0bded032fc79c678308d6875a58 (patch)
treeca894c7f6f214f4ff05eb44037e6d2a0a342a04d
parentUpdate MemoryCard.cpp (diff)
downloadre3-b072cbca93e9a0bded032fc79c678308d6875a58.tar
re3-b072cbca93e9a0bded032fc79c678308d6875a58.tar.gz
re3-b072cbca93e9a0bded032fc79c678308d6875a58.tar.bz2
re3-b072cbca93e9a0bded032fc79c678308d6875a58.tar.lz
re3-b072cbca93e9a0bded032fc79c678308d6875a58.tar.xz
re3-b072cbca93e9a0bded032fc79c678308d6875a58.tar.zst
re3-b072cbca93e9a0bded032fc79c678308d6875a58.zip
-rw-r--r--src/render/MBlur.cpp12
-rw-r--r--src/render/MBlur.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/src/render/MBlur.cpp b/src/render/MBlur.cpp
index 0ab9e8df..f2b94848 100644
--- a/src/render/MBlur.cpp
+++ b/src/render/MBlur.cpp
@@ -188,31 +188,31 @@ CMBlur::CreateImmediateModeData(RwCamera *cam, RwRect *rect)
}
void
-CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 addalpha)
+CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 bluralpha)
{
RwRGBA color = { (RwUInt8)red, (RwUInt8)green, (RwUInt8)blue, (RwUInt8)blur };
#ifdef GTA_PS2
if( pFrontBuffer )
- OverlayRender(cam, pFrontBuffer, color, type, addalpha);
+ OverlayRender(cam, pFrontBuffer, color, type, bluralpha);
#else
if(BlurOn){
if(pFrontBuffer){
if(ms_bJustInitialised)
ms_bJustInitialised = false;
else
- OverlayRender(cam, pFrontBuffer, color, type, addalpha);
+ OverlayRender(cam, pFrontBuffer, color, type, bluralpha);
}
RwRasterPushContext(pFrontBuffer);
RwRasterRenderFast(RwCameraGetRaster(cam), 0, 0);
RwRasterPopContext();
}else{
- OverlayRender(cam, nil, color, type, addalpha);
+ OverlayRender(cam, nil, color, type, bluralpha);
}
#endif
}
void
-CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, uint32 addalpha)
+CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, int32 bluralpha)
{
int r, g, b, a;
@@ -281,7 +281,7 @@ CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type,
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, Vertex, 4, Index, 6);
- a = addalpha/2;
+ a = bluralpha/2;
if(a < 30)
a = 30;
diff --git a/src/render/MBlur.h b/src/render/MBlur.h
index 157f2882..e2e5d38c 100644
--- a/src/render/MBlur.h
+++ b/src/render/MBlur.h
@@ -12,6 +12,6 @@ public:
static RwBool MotionBlurOpen(RwCamera *cam);
static RwBool MotionBlurClose(void);
static void CreateImmediateModeData(RwCamera *cam, RwRect *rect);
- static void MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 addalpha);
- static void OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, uint32 bluralpha);
+ static void MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 bluralpha);
+ static void OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, int32 bluralpha);
};