mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-11-26 19:14:15 +01:00
camerapickup ps2 code
This commit is contained in:
parent
83810168ee
commit
556a6df401
@ -623,6 +623,34 @@ CPickups::Update()
|
|||||||
if (CReplay::IsPlayingBack())
|
if (CReplay::IsPlayingBack())
|
||||||
return;
|
return;
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef CAMERA_PICKUP
|
||||||
|
if ( bPickUpcamActivated ) // taken from PS2
|
||||||
|
{
|
||||||
|
float dist = (FindPlayerCoors() - StaticCamCoors).Magnitude2D();
|
||||||
|
float mult;
|
||||||
|
if ( dist < 10.0f )
|
||||||
|
mult = 1.0f - (dist / 10.0f );
|
||||||
|
else
|
||||||
|
mult = 0.0f;
|
||||||
|
|
||||||
|
CVector pos = StaticCamCoors;
|
||||||
|
pos.z += (pPlayerVehicle->GetColModel()->boundingBox.GetSize().z + 2.0f) * mult;
|
||||||
|
|
||||||
|
if ( (CTimer::GetTimeInMilliseconds() - StaticCamStartTime) > 750 )
|
||||||
|
{
|
||||||
|
TheCamera.SetCamPositionForFixedMode(pos, CVector(0.0f, 0.0f, 0.0f));
|
||||||
|
TheCamera.TakeControl(FindPlayerVehicle(), CCam::MODE_FIXED, JUMP_CUT, CAMCONTROL_SCRIPT);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( FindPlayerVehicle() != pPlayerVehicle
|
||||||
|
|| (FindPlayerCoors() - StaticCamCoors).Magnitude() > 40.0f
|
||||||
|
|| ((CTimer::GetTimeInMilliseconds() - StaticCamStartTime) > 60000) )
|
||||||
|
{
|
||||||
|
TheCamera.RestoreWithJumpCut();
|
||||||
|
bPickUpcamActivated = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
#define PICKUPS_FRAME_SPAN (6)
|
#define PICKUPS_FRAME_SPAN (6)
|
||||||
#ifdef FIX_BUGS
|
#ifdef FIX_BUGS
|
||||||
for (uint32 i = NUMGENERALPICKUPS * (CTimer::GetFrameCounter() % PICKUPS_FRAME_SPAN) / PICKUPS_FRAME_SPAN; i < NUMGENERALPICKUPS * (CTimer::GetFrameCounter() % PICKUPS_FRAME_SPAN + 1) / PICKUPS_FRAME_SPAN; i++) {
|
for (uint32 i = NUMGENERALPICKUPS * (CTimer::GetFrameCounter() % PICKUPS_FRAME_SPAN) / PICKUPS_FRAME_SPAN; i < NUMGENERALPICKUPS * (CTimer::GetFrameCounter() % PICKUPS_FRAME_SPAN + 1) / PICKUPS_FRAME_SPAN; i++) {
|
||||||
|
@ -226,6 +226,7 @@ enum Config {
|
|||||||
|
|
||||||
// Pickups
|
// Pickups
|
||||||
//#define MONEY_MESSAGES
|
//#define MONEY_MESSAGES
|
||||||
|
#define CAMERA_PICKUP
|
||||||
|
|
||||||
// Peds
|
// Peds
|
||||||
#define ANIMATE_PED_COL_MODEL
|
#define ANIMATE_PED_COL_MODEL
|
||||||
|
Loading…
Reference in New Issue
Block a user