summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-06-29 12:12:43 +0200
committeraap <aap@papnet.eu>2020-06-29 12:12:43 +0200
commit94ce376a767221eac19d8c9cf6d86f387aca1088 (patch)
tree6790a27ecc72d59fe2b2e3a18de86ee32559ea9c /src
parentMerge remote-tracking branch 'origin/master' into miami (diff)
downloadre3-94ce376a767221eac19d8c9cf6d86f387aca1088.tar
re3-94ce376a767221eac19d8c9cf6d86f387aca1088.tar.gz
re3-94ce376a767221eac19d8c9cf6d86f387aca1088.tar.bz2
re3-94ce376a767221eac19d8c9cf6d86f387aca1088.tar.lz
re3-94ce376a767221eac19d8c9cf6d86f387aca1088.tar.xz
re3-94ce376a767221eac19d8c9cf6d86f387aca1088.tar.zst
re3-94ce376a767221eac19d8c9cf6d86f387aca1088.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/Camera.h6
-rw-r--r--src/core/config.h1
-rw-r--r--src/render/MBlur.cpp8
-rw-r--r--src/render/MBlur.h4
4 files changed, 6 insertions, 13 deletions
diff --git a/src/core/Camera.h b/src/core/Camera.h
index f9a138b9..ff74931c 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -413,12 +413,9 @@ public:
float CarZoomValueSmooth;
float DistanceToWater;
-#ifndef PS2_CAM_TRANSITION
float FOVDuringInter;
-#endif
float LODDistMultiplier;
float GenerationDistMultiplier;
-#ifndef PS2_CAM_TRANSITION
float m_fAlphaSpeedAtStartInter;
float m_fAlphaWhenInterPol;
float m_fAlphaDuringInterPol;
@@ -429,7 +426,6 @@ public:
float m_fFOVSpeedAtStartInter;
float m_fStartingBetaForInterPol;
float m_fStartingAlphaForInterPol;
-#endif
float m_PedOrientForBehindOrInFront;
float m_CameraAverageSpeed;
float m_CameraSpeedSoFar;
@@ -492,11 +488,9 @@ public:
CVector m_vecUpWhenInterPol;
CVector m_vecClearGeometryVec;
CVector m_vecGameCamPos;
-#ifndef PS2_CAM_TRANSITION
CVector SourceDuringInter;
CVector TargetDuringInter;
CVector UpDuringInter;
-#endif
RwCamera *m_pRwCamera;
CEntity *pTargetEntity;
CCamPathSplines m_arrPathArray[MAX_NUM_OF_SPLINETYPES];
diff --git a/src/core/config.h b/src/core/config.h
index 9bac9cdb..7ba1a6fd 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -284,6 +284,5 @@ enum Config {
#define CANCELLABLE_CAR_ENTER
// Camera
-//#define PS2_CAM_TRANSITION // old way of transitioning between cam modes
#define IMPROVED_CAMERA // Better Debug cam, and maybe more in the future
#define FREE_CAM // Rotating cam
diff --git a/src/render/MBlur.cpp b/src/render/MBlur.cpp
index a953afd6..e7e2e74c 100644
--- a/src/render/MBlur.cpp
+++ b/src/render/MBlur.cpp
@@ -228,17 +228,17 @@ CMBlur::CreateImmediateModeData(RwCamera *cam, RwRect *rect)
}
void
-CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 alpha)
+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(ms_bJustInitialised)
ms_bJustInitialised = false;
else
- OverlayRender(cam, pFrontBuffer, color, type, alpha);
+ OverlayRender(cam, pFrontBuffer, color, type, bluralpha);
if(BlurOn){
RwRasterPushContext(pFrontBuffer);
RwRasterRenderFast(RwCameraGetRaster(cam), 0, 0);
@@ -248,7 +248,7 @@ CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, u
}
void
-CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, int32 alpha)
+CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, int32 bluralpha)
{
int r, g, b, a;
diff --git a/src/render/MBlur.h b/src/render/MBlur.h
index 13dbea1f..c2572256 100644
--- a/src/render/MBlur.h
+++ b/src/render/MBlur.h
@@ -23,8 +23,8 @@ 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 alpha);
- static void OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, int32 alpha);
+ 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);
static void SetDrunkBlur(float drunkness);
static void ClearDrunkBlur();