mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 12:30:00 +00:00
Fix corona scaling
This commit is contained in:
parent
e0b3418e65
commit
e917cd1f46
|
@ -25,8 +25,6 @@
|
||||||
#include "Camera.h"
|
#include "Camera.h"
|
||||||
#include "DMAudio.h"
|
#include "DMAudio.h"
|
||||||
|
|
||||||
const float DefaultFOV = 70.0f; // beta: 80.0f
|
|
||||||
|
|
||||||
bool PrintDebugCode = false;
|
bool PrintDebugCode = false;
|
||||||
int16 DebugCamMode;
|
int16 DebugCamMode;
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,8 @@ enum
|
||||||
#define DEFAULT_CAR_ZOOM_VALUE_2 (1.9f)
|
#define DEFAULT_CAR_ZOOM_VALUE_2 (1.9f)
|
||||||
#define DEFAULT_CAR_ZOOM_VALUE_3 (3.9f)
|
#define DEFAULT_CAR_ZOOM_VALUE_3 (3.9f)
|
||||||
|
|
||||||
|
const float DefaultFOV = 70.0f; // beta: 80.0f
|
||||||
|
|
||||||
class CCam
|
class CCam
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -29,13 +29,17 @@ CSprite::CalcScreenCoors(const RwV3d &in, RwV3d *out, float *outw, float *outh,
|
||||||
float recip = 1.0f/out->z;
|
float recip = 1.0f/out->z;
|
||||||
out->x *= SCREEN_WIDTH * recip;
|
out->x *= SCREEN_WIDTH * recip;
|
||||||
out->y *= SCREEN_HEIGHT * recip;
|
out->y *= SCREEN_HEIGHT * recip;
|
||||||
// What is this? size?
|
|
||||||
*outw = 70.0f/CDraw::GetFOV() * SCREEN_WIDTH * recip;
|
|
||||||
#ifdef ASPECT_RATIO_SCALE
|
#ifdef ASPECT_RATIO_SCALE
|
||||||
*outh = 70.0f/CDraw::GetFOV() / (DEFAULT_ASPECT_RATIO / SCREEN_ASPECT_RATIO) * SCREEN_HEIGHT * recip;
|
float fov = CDraw::ConvertFOV(DefaultFOV);
|
||||||
#else
|
#else
|
||||||
*outh = 70.0f/CDraw::GetFOV() * SCREEN_HEIGHT * recip;
|
const float fov = DefaultFOV;
|
||||||
#endif
|
#endif
|
||||||
|
// this is used to scale correctly if you zoom in with sniper rifle
|
||||||
|
float fovScale = fov / CDraw::GetFOV();
|
||||||
|
|
||||||
|
*outw = fovScale * SCREEN_SCALE_AR(recip) * SCREEN_WIDTH;
|
||||||
|
*outh = fovScale * recip * SCREEN_HEIGHT;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue