mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 04:30:00 +00:00
added GTA_SCENE_EDIT
This commit is contained in:
parent
c0ca3c7a3e
commit
fda58fb1df
|
@ -1,7 +1,7 @@
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
#include "SceneEdit.h"
|
#include "SceneEdit.h"
|
||||||
|
#ifdef GTA_SCENE_EDIT
|
||||||
#include "Automobile.h"
|
#include "Automobile.h"
|
||||||
#include "Camera.h"
|
#include "Camera.h"
|
||||||
#include "CarCtrl.h"
|
#include "CarCtrl.h"
|
||||||
|
@ -1096,3 +1096,4 @@ bool CSceneEdit::SelectWeapon(void)
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#ifdef GTA_SCENE_EDIT
|
||||||
class CPed;
|
class CPed;
|
||||||
class CVehicle;
|
class CVehicle;
|
||||||
|
|
||||||
|
@ -93,3 +93,4 @@ public:
|
||||||
static void SelectVehicle(void);
|
static void SelectVehicle(void);
|
||||||
static bool SelectWeapon(void);
|
static bool SelectWeapon(void);
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
|
@ -263,9 +263,11 @@ CCam::Process(void)
|
||||||
case MODE_FIGHT_CAM_RUNABOUT:
|
case MODE_FIGHT_CAM_RUNABOUT:
|
||||||
Process_1rstPersonPedOnPC(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
|
Process_1rstPersonPedOnPC(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
|
||||||
break;
|
break;
|
||||||
|
#ifdef GTA_SCENE_EDIT
|
||||||
case MODE_EDITOR:
|
case MODE_EDITOR:
|
||||||
Process_Editor(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
|
Process_Editor(CameraTarget, TargetOrientation, SpeedVar, TargetSpeedVar);
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
Source = CVector(0.0f, 0.0f, 0.0f);
|
Source = CVector(0.0f, 0.0f, 0.0f);
|
||||||
Front = CVector(0.0f, 1.0f, 0.0f);
|
Front = CVector(0.0f, 1.0f, 0.0f);
|
||||||
|
@ -3919,6 +3921,7 @@ CCam::Process_Debug(const CVector&, float, float, float)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef GTA_SCENE_EDIT
|
||||||
void
|
void
|
||||||
CCam::Process_Editor(const CVector&, float, float, float)
|
CCam::Process_Editor(const CVector&, float, float, float)
|
||||||
{
|
{
|
||||||
|
@ -3935,7 +3938,6 @@ CCam::Process_Editor(const CVector&, float, float, float)
|
||||||
FOV = DefaultFOV;
|
FOV = DefaultFOV;
|
||||||
Alpha += DEGTORAD(CPad::GetPad(1)->GetLeftStickY()) / 50.0f;
|
Alpha += DEGTORAD(CPad::GetPad(1)->GetLeftStickY()) / 50.0f;
|
||||||
Beta += DEGTORAD(CPad::GetPad(1)->GetLeftStickX()*1.5f) / 19.0f;
|
Beta += DEGTORAD(CPad::GetPad(1)->GetLeftStickX()*1.5f) / 19.0f;
|
||||||
|
|
||||||
if(CamTargetEntity && CSceneEdit::m_bCameraFollowActor){
|
if(CamTargetEntity && CSceneEdit::m_bCameraFollowActor){
|
||||||
TargetCoors = CamTargetEntity->GetPosition();
|
TargetCoors = CamTargetEntity->GetPosition();
|
||||||
}else if(CSceneEdit::m_bRecording){
|
}else if(CSceneEdit::m_bRecording){
|
||||||
|
@ -3997,6 +3999,7 @@ CCam::Process_Editor(const CVector&, float, float, float)
|
||||||
sprintf(str, "Look@: %f, Look@: %f, Look@: %f ", Front.x + Source.x, Front.y + Source.y, Front.z + Source.z);
|
sprintf(str, "Look@: %f, Look@: %f, Look@: %f ", Front.x + Source.x, Front.y + Source.y, Front.z + Source.z);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void
|
void
|
||||||
CCam::Process_ModelView(const CVector &CameraTarget, float, float, float)
|
CCam::Process_ModelView(const CVector &CameraTarget, float, float, float)
|
||||||
|
|
|
@ -1576,8 +1576,10 @@ CCamera::CamControl(void)
|
||||||
switchByJumpCut = true;
|
switchByJumpCut = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#ifdef GTA_SCENE_EDIT
|
||||||
if(CSceneEdit::m_bEditOn)
|
if(CSceneEdit::m_bEditOn)
|
||||||
ReqMode = CCam::MODE_EDITOR;
|
ReqMode = CCam::MODE_EDITOR;
|
||||||
|
#endif
|
||||||
|
|
||||||
if((m_uiTransitionState == 0 || switchByJumpCut) && ReqMode != Cams[ActiveCam].Mode){
|
if((m_uiTransitionState == 0 || switchByJumpCut) && ReqMode != Cams[ActiveCam].Mode){
|
||||||
if(switchByJumpCut){
|
if(switchByJumpCut){
|
||||||
|
|
|
@ -213,7 +213,9 @@ public:
|
||||||
void PrintMode(void);
|
void PrintMode(void);
|
||||||
|
|
||||||
void Process_Debug(const CVector&, float, float, float);
|
void Process_Debug(const CVector&, float, float, float);
|
||||||
|
#ifdef GTA_SCENE_EDIT
|
||||||
void Process_Editor(const CVector&, float, float, float);
|
void Process_Editor(const CVector&, float, float, float);
|
||||||
|
#endif
|
||||||
void Process_ModelView(const CVector &CameraTarget, float, float, float);
|
void Process_ModelView(const CVector &CameraTarget, float, float, float);
|
||||||
void Process_FollowPed(const CVector &CameraTarget, float TargetOrientation, float, float);
|
void Process_FollowPed(const CVector &CameraTarget, float TargetOrientation, float, float);
|
||||||
void Process_FollowPedWithMouse(const CVector &CameraTarget, float TargetOrientation, float, float);
|
void Process_FollowPedWithMouse(const CVector &CameraTarget, float TargetOrientation, float, float);
|
||||||
|
|
|
@ -525,7 +525,7 @@ bool CGame::Initialise(const char* datFile)
|
||||||
CAntennas::Init();
|
CAntennas::Init();
|
||||||
CGlass::Init();
|
CGlass::Init();
|
||||||
gPhoneInfo.Initialise();
|
gPhoneInfo.Initialise();
|
||||||
#ifndef GTA_PS2 // TODO: define for this
|
#ifdef GTA_SCENE_EDIT
|
||||||
CSceneEdit::Initialise();
|
CSceneEdit::Initialise();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -976,7 +976,7 @@ void CGame::Process(void)
|
||||||
CSkidmarks::Update();
|
CSkidmarks::Update();
|
||||||
CAntennas::Update();
|
CAntennas::Update();
|
||||||
CGlass::Update();
|
CGlass::Update();
|
||||||
#ifndef GTA_PS2 // TODO: define
|
#ifdef GTA_SCENE_EDIT
|
||||||
CSceneEdit::Update();
|
CSceneEdit::Update();
|
||||||
#endif
|
#endif
|
||||||
CEventList::Update();
|
CEventList::Update();
|
||||||
|
|
|
@ -197,6 +197,7 @@ enum Config {
|
||||||
# define PS2_MATFX
|
# define PS2_MATFX
|
||||||
# endif
|
# endif
|
||||||
# define GTA_REPLAY
|
# define GTA_REPLAY
|
||||||
|
# define GTA_SCENE_EDIT
|
||||||
#elif defined GTA_XBOX
|
#elif defined GTA_XBOX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1160,9 +1160,11 @@ Render2dStuff(void)
|
||||||
|
|
||||||
MusicManager.DisplayRadioStationName();
|
MusicManager.DisplayRadioStationName();
|
||||||
TheConsole.Display();
|
TheConsole.Display();
|
||||||
|
#ifdef GTA_SCENE_EDIT
|
||||||
if(CSceneEdit::m_bEditOn)
|
if(CSceneEdit::m_bEditOn)
|
||||||
CSceneEdit::Draw();
|
CSceneEdit::Draw();
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
CHud::Draw();
|
CHud::Draw();
|
||||||
CUserDisplay::OnscnTimer.ProcessForDisplay();
|
CUserDisplay::OnscnTimer.ProcessForDisplay();
|
||||||
CMessages::Display();
|
CMessages::Display();
|
||||||
|
|
|
@ -580,7 +580,9 @@ DebugMenuPopulate(void)
|
||||||
DebugMenuAddVarBool8("Debug", "Disable zone cull", &gbDisableZoneCull, nil);
|
DebugMenuAddVarBool8("Debug", "Disable zone cull", &gbDisableZoneCull, nil);
|
||||||
|
|
||||||
DebugMenuAddVarBool8("Debug", "pad 1 -> pad 2", &CPad::m_bMapPadOneToPadTwo, nil);
|
DebugMenuAddVarBool8("Debug", "pad 1 -> pad 2", &CPad::m_bMapPadOneToPadTwo, nil);
|
||||||
|
#ifdef GTA_SCENE_EDIT
|
||||||
DebugMenuAddVarBool8("Debug", "Edit on", &CSceneEdit::m_bEditOn, nil);
|
DebugMenuAddVarBool8("Debug", "Edit on", &CSceneEdit::m_bEditOn, nil);
|
||||||
|
#endif
|
||||||
#ifdef MENU_MAP
|
#ifdef MENU_MAP
|
||||||
DebugMenuAddCmd("Debug", "Teleport to map waypoint", TeleportToWaypoint);
|
DebugMenuAddCmd("Debug", "Teleport to map waypoint", TeleportToWaypoint);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue