a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 08:00:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:GTAmodding/re3

Browse source
This commit is contained in:
aap 2020-05-09 09:50:08 +02:00
parent 3f09ec0744 d686f587cc
commit 633c2a7aeb
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Cam.cpp
View file

@ -25,8 +25,6 @@
#include "Camera.h"
#include "DMAudio.h"
const float DefaultFOV = 70.0f; // beta: 80.0f
bool PrintDebugCode = false;
int16 DebugCamMode;

2
src/core/Camera.h
View file

@ -40,6 +40,8 @@ enum
#define DEFAULT_CAR_ZOOM_VALUE_2 (1.9f)
#define DEFAULT_CAR_ZOOM_VALUE_3 (3.9f)
const float DefaultFOV = 70.0f; // beta: 80.0f
class CCam
{
public:

12
src/render/Sprite.cpp
View file

@ -29,13 +29,17 @@ CSprite::CalcScreenCoors(const RwV3d &in, RwV3d *out, float *outw, float *outh,
float recip = 1.0f/out->z;
out->x *= SCREEN_WIDTH * recip;
out->y *= SCREEN_HEIGHT * recip;
// What is this? size?
*outw = 70.0f/CDraw::GetFOV() * SCREEN_WIDTH * recip;
#ifdef ASPECT_RATIO_SCALE
*outh = 70.0f/CDraw::GetFOV() / (DEFAULT_ASPECT_RATIO / SCREEN_ASPECT_RATIO) * SCREEN_HEIGHT * recip;
float fov = CDraw::ConvertFOV(DefaultFOV);
#else
*outh = 70.0f/CDraw::GetFOV() * SCREEN_HEIGHT * recip;
const float fov = DefaultFOV;
#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;
}