mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 04:20:00 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
9673ecddad
|
@ -3218,7 +3218,7 @@ CCamera::GetLookDirection(void)
|
||||||
Cams[ActiveCam].Mode == CCam::MODE_BEHINDBOAT ||
|
Cams[ActiveCam].Mode == CCam::MODE_BEHINDBOAT ||
|
||||||
Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED)
|
Cams[ActiveCam].Mode == CCam::MODE_FOLLOWPED)
|
||||||
return Cams[ActiveCam].DirectionWasLooking;
|
return Cams[ActiveCam].DirectionWasLooking;
|
||||||
return LOOKING_FORWARD;;
|
return LOOKING_FORWARD;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -22,8 +22,8 @@ CSprite::CalcHorizonCoors(void)
|
||||||
bool
|
bool
|
||||||
CSprite::CalcScreenCoors(const RwV3d &in, RwV3d *out, float *outw, float *outh, bool farclip)
|
CSprite::CalcScreenCoors(const RwV3d &in, RwV3d *out, float *outw, float *outh, bool farclip)
|
||||||
{
|
{
|
||||||
CVector viewvec = TheCamera.m_viewMatrix * *(CVector*)∈
|
CVector viewvec = TheCamera.m_viewMatrix * in;
|
||||||
*out = *(RwV3d*)&viewvec;
|
*out = viewvec;
|
||||||
if(out->z <= CDraw::GetNearClipZ() + 1.0f) return false;
|
if(out->z <= CDraw::GetNearClipZ() + 1.0f) return false;
|
||||||
if(out->z >= CDraw::GetFarClipZ() && farclip) return false;
|
if(out->z >= CDraw::GetFarClipZ() && farclip) return false;
|
||||||
float recip = 1.0f/out->z;
|
float recip = 1.0f/out->z;
|
||||||
|
|
|
@ -36,7 +36,14 @@ enum eCarPositions
|
||||||
CAR_POS_TAILLIGHTS,
|
CAR_POS_TAILLIGHTS,
|
||||||
CAR_POS_FRONTSEAT,
|
CAR_POS_FRONTSEAT,
|
||||||
CAR_POS_BACKSEAT,
|
CAR_POS_BACKSEAT,
|
||||||
CAR_POS_EXHAUST = 9,
|
// these are unused so we don't know the actual values
|
||||||
|
CAR_POS_REVERSELIGHTS,
|
||||||
|
CAR_POS_BRAKELIGHTS,
|
||||||
|
CAR_POS_INDICATORS_FRONT,
|
||||||
|
CAR_POS_INDICATORS_BACK,
|
||||||
|
CAR_POS_STEERWHEEL,
|
||||||
|
//
|
||||||
|
CAR_POS_EXHAUST
|
||||||
};
|
};
|
||||||
|
|
||||||
// These are used for all the wheel arrays
|
// These are used for all the wheel arrays
|
||||||
|
|
Loading…
Reference in a new issue