diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-12 19:23:03 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-12 19:23:03 +0200 |
| commit | 180a1dc42b4d6fc70e5c3e4fc06b217419d71371 (patch) | |
| tree | 03d9aee00bd8cc625737079fd0c7201c5dc37674 /src/core | |
| parent | garages fix (diff) | |
| parent | little fixes to CClouds; disabled object clipping for SA cam (diff) | |
| download | re3-180a1dc42b4d6fc70e5c3e4fc06b217419d71371.tar re3-180a1dc42b4d6fc70e5c3e4fc06b217419d71371.tar.gz re3-180a1dc42b4d6fc70e5c3e4fc06b217419d71371.tar.bz2 re3-180a1dc42b4d6fc70e5c3e4fc06b217419d71371.tar.lz re3-180a1dc42b4d6fc70e5c3e4fc06b217419d71371.tar.xz re3-180a1dc42b4d6fc70e5c3e4fc06b217419d71371.tar.zst re3-180a1dc42b4d6fc70e5c3e4fc06b217419d71371.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Cam.cpp | 4 | ||||
| -rw-r--r-- | src/core/main.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp index 21569647..8cd44f6f 100644 --- a/src/core/Cam.cpp +++ b/src/core/Cam.cpp @@ -5099,7 +5099,7 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation, CColPoint foundCol; CEntity* foundEnt; CWorld::pIgnoreEntity = CamTargetEntity; - if (CWorld::ProcessLineOfSight(TargetCoors, Source, foundCol, foundEnt, true, dontCollideWithCars < 0.1f, false, true, false, true, false)) { + if (CWorld::ProcessLineOfSight(TargetCoors, Source, foundCol, foundEnt, true, dontCollideWithCars < 0.1f, false, false, false, true, false)) { float obstacleTargetDist = (TargetCoors - foundCol.point).Magnitude(); float obstacleCamDist = newDistance - obstacleTargetDist; if (!foundEnt->IsPed() || obstacleCamDist <= 1.0f) { @@ -5108,7 +5108,7 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation, RwCameraSetNearClipPlane(Scene.camera, Max(0.05f, obstacleTargetDist - 0.3f)); } } else { - if (!CWorld::ProcessLineOfSight(foundCol.point, Source, foundCol, foundEnt, true, dontCollideWithCars < 0.1f, false, true, false, true, false)) { + if (!CWorld::ProcessLineOfSight(foundCol.point, Source, foundCol, foundEnt, true, dontCollideWithCars < 0.1f, false, false, false, true, false)) { float lessClip = obstacleCamDist - 0.35f; if (lessClip <= DEFAULT_NEAR) RwCameraSetNearClipPlane(Scene.camera, lessClip); diff --git a/src/core/main.cpp b/src/core/main.cpp index d6af0b2a..bcd6202e 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -263,6 +263,9 @@ DoFade(void) void DoRWStuffEndOfFrame(void) { +char buf[100]; +sprintf(buf, "timestep: %f %f", CTimer::GetTimeStep(), CTimer::GetTimeStepInMilliseconds()); +CDebug::PrintAt(buf, 10, 10); CDebug::DisplayScreenStrings(); // custom CDebug::DebugDisplayTextBuffer(); FlushObrsPrintfs(); |