mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-15 12:09:02 +00:00
Code Issues Projects Releases Wiki Activity

animviewer fixes

Browse source
This commit is contained in:
aap 2020-12-03 11:30:46 +01:00
parent a37ce3ee9f
commit 0d166081ad
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/AnimViewer.cpp
View file

@ -101,6 +101,9 @@ CAnimViewer::Initialise(void) {
CStreaming::LoadAllRequestedModels(false); CStreaming::LoadAllRequestedModels(false);
CRenderer::Init(); CRenderer::Init();
CVehicleModelInfo::LoadVehicleColours(); CVehicleModelInfo::LoadVehicleColours();
#ifdef FIX_BUGS
CVehicleModelInfo::LoadEnvironmentMaps();
#endif
CAnimManager::LoadAnimFiles(); CAnimManager::LoadAnimFiles();
CWorld::PlayerInFocus = 0; CWorld::PlayerInFocus = 0;
CWeapon::InitialiseWeapons(); CWeapon::InitialiseWeapons();
@ -310,7 +313,12 @@ CAnimViewer::Update(void)
if (pTarget->IsVehicle() || pTarget->IsPed() || pTarget->IsObject()) { if (pTarget->IsVehicle() || pTarget->IsPed() || pTarget->IsObject()) {
((CPhysical*)pTarget)->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f); ((CPhysical*)pTarget)->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
} }
#ifdef FIX_BUGS
// so we don't end up in the water
pTarget->GetMatrix().GetPosition().z = 10.0f;
#else
pTarget->GetMatrix().GetPosition().z = 0.0f; pTarget->GetMatrix().GetPosition().z = 0.0f;
#endif
if (modelInfo->GetModelType() == MITYPE_PED) { if (modelInfo->GetModelType() == MITYPE_PED) {
((CPed*)pTarget)->bKindaStayInSamePlace = true; ((CPed*)pTarget)->bKindaStayInSamePlace = true;

6
src/core/Cam.cpp
View file

@ -4125,6 +4125,12 @@ CCam::Process_ModelView(const CVector &CameraTarget, float, float, float)
Distance += CPad::GetPad(0)->GetLeftStickY()/1000.0f; Distance += CPad::GetPad(0)->GetLeftStickY()/1000.0f;
else else
Distance += CPad::GetPad(0)->GetLeftStickY() * ((Distance - 10.0f)/20.0f + 1.0f) / 1000.0f; Distance += CPad::GetPad(0)->GetLeftStickY() * ((Distance - 10.0f)/20.0f + 1.0f) / 1000.0f;
#ifdef IMPROVED_CAMERA
if(CPad::GetPad(0)->GetLeftMouse()){
Distance += DEGTORAD(CPad::GetPad(0)->GetMouseY()/2.0f);
Angle += DEGTORAD(CPad::GetPad(0)->GetMouseX()/2.0f);
}
#endif
if(Distance < 1.5f) if(Distance < 1.5f)
Distance = 1.5f; Distance = 1.5f;