a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-07-01 04:53:47 +00:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
aap 2020-06-29 12:12:43 +02:00
parent b26eec5daf
commit 94ce376a76
4 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/Camera.h
View file

@ -413,12 +413,9 @@ public:
float CarZoomValueSmooth; float CarZoomValueSmooth;
float DistanceToWater; float DistanceToWater;
#ifndef PS2_CAM_TRANSITION
float FOVDuringInter; float FOVDuringInter;
#endif
float LODDistMultiplier; float LODDistMultiplier;
float GenerationDistMultiplier; float GenerationDistMultiplier;
#ifndef PS2_CAM_TRANSITION
float m_fAlphaSpeedAtStartInter; float m_fAlphaSpeedAtStartInter;
float m_fAlphaWhenInterPol; float m_fAlphaWhenInterPol;
float m_fAlphaDuringInterPol; float m_fAlphaDuringInterPol;
@ -429,7 +426,6 @@ public:
float m_fFOVSpeedAtStartInter; float m_fFOVSpeedAtStartInter;
float m_fStartingBetaForInterPol; float m_fStartingBetaForInterPol;
float m_fStartingAlphaForInterPol; float m_fStartingAlphaForInterPol;
#endif
float m_PedOrientForBehindOrInFront; float m_PedOrientForBehindOrInFront;
float m_CameraAverageSpeed; float m_CameraAverageSpeed;
float m_CameraSpeedSoFar; float m_CameraSpeedSoFar;
@ -492,11 +488,9 @@ public:
CVector m_vecUpWhenInterPol; CVector m_vecUpWhenInterPol;
CVector m_vecClearGeometryVec; CVector m_vecClearGeometryVec;
CVector m_vecGameCamPos; CVector m_vecGameCamPos;
#ifndef PS2_CAM_TRANSITION
CVector SourceDuringInter; CVector SourceDuringInter;
CVector TargetDuringInter; CVector TargetDuringInter;
CVector UpDuringInter; CVector UpDuringInter;
#endif
RwCamera *m_pRwCamera; RwCamera *m_pRwCamera;
CEntity *pTargetEntity; CEntity *pTargetEntity;
CCamPathSplines m_arrPathArray[MAX_NUM_OF_SPLINETYPES]; CCamPathSplines m_arrPathArray[MAX_NUM_OF_SPLINETYPES];

1
src/core/config.h
View file

@ -284,6 +284,5 @@ enum Config {
#define CANCELLABLE_CAR_ENTER #define CANCELLABLE_CAR_ENTER
// Camera // 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 IMPROVED_CAMERA // Better Debug cam, and maybe more in the future
#define FREE_CAM // Rotating cam #define FREE_CAM // Rotating cam

8
src/render/MBlur.cpp
View file

@ -228,17 +228,17 @@ CMBlur::CreateImmediateModeData(RwCamera *cam, RwRect *rect)
} }
void 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 }; RwRGBA color = { (RwUInt8)red, (RwUInt8)green, (RwUInt8)blue, (RwUInt8)blur };
#ifdef GTA_PS2 #ifdef GTA_PS2
if( pFrontBuffer ) if( pFrontBuffer )
OverlayRender(cam, pFrontBuffer, color, type, addalpha); OverlayRender(cam, pFrontBuffer, color, type, bluralpha);
#else #else
if(ms_bJustInitialised) if(ms_bJustInitialised)
ms_bJustInitialised = false; ms_bJustInitialised = false;
else else
OverlayRender(cam, pFrontBuffer, color, type, alpha); OverlayRender(cam, pFrontBuffer, color, type, bluralpha);
if(BlurOn){ if(BlurOn){
RwRasterPushContext(pFrontBuffer); RwRasterPushContext(pFrontBuffer);
RwRasterRenderFast(RwCameraGetRaster(cam), 0, 0); RwRasterRenderFast(RwCameraGetRaster(cam), 0, 0);
@ -248,7 +248,7 @@ CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, u
} }
void 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; int r, g, b, a;

4
src/render/MBlur.h
View file

@ -23,8 +23,8 @@ public:
static RwBool MotionBlurOpen(RwCamera *cam); static RwBool MotionBlurOpen(RwCamera *cam);
static RwBool MotionBlurClose(void); static RwBool MotionBlurClose(void);
static void CreateImmediateModeData(RwCamera *cam, RwRect *rect); 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 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 alpha); static void OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, int32 bluralpha);
static void SetDrunkBlur(float drunkness); static void SetDrunkBlur(float drunkness);
static void ClearDrunkBlur(); static void ClearDrunkBlur();