summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-08 16:49:19 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-08 16:49:19 +0200
commit1ef8d61f36d78dbe87eddb8554f23d99d42e084b (patch)
tree9ff7a75f2af4b54e79b299d70a43debcb58546ec
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
parentFix water UV on high FPS and inverted free camera (diff)
downloadre3-1ef8d61f36d78dbe87eddb8554f23d99d42e084b.tar
re3-1ef8d61f36d78dbe87eddb8554f23d99d42e084b.tar.gz
re3-1ef8d61f36d78dbe87eddb8554f23d99d42e084b.tar.bz2
re3-1ef8d61f36d78dbe87eddb8554f23d99d42e084b.tar.lz
re3-1ef8d61f36d78dbe87eddb8554f23d99d42e084b.tar.xz
re3-1ef8d61f36d78dbe87eddb8554f23d99d42e084b.tar.zst
re3-1ef8d61f36d78dbe87eddb8554f23d99d42e084b.zip
-rw-r--r--src/core/Cam.cpp2
-rw-r--r--src/core/Timer.h5
-rw-r--r--src/render/WaterLevel.cpp5
3 files changed, 11 insertions, 1 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index 2a147350..3d229e7e 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -4489,7 +4489,7 @@ CCam::Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrient
*/
{
LookLeftRight = -CPad::GetPad(0)->LookAroundLeftRight();
- LookUpDown = CPad::GetPad(0)->LookAroundUpDown();
+ LookUpDown = -CPad::GetPad(0)->LookAroundUpDown();
}
float AlphaOffset, BetaOffset;
if(UseMouse){
diff --git a/src/core/Timer.h b/src/core/Timer.h
index 00a11409..004cda4d 100644
--- a/src/core/Timer.h
+++ b/src/core/Timer.h
@@ -56,6 +56,11 @@ public:
friend bool GenericLoad(void);
friend bool GenericSave(int file);
+
+#ifdef FIX_BUGS
+ static float GetDefaultTimeStep(void) { return 5.0f / 3.0f; }
+ static float GetTimeStepFix(void) { return GetTimeStep() / GetDefaultTimeStep(); }
+#endif
};
#ifdef FIX_BUGS
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 7e26654c..66debd68 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -349,8 +349,13 @@ CWaterLevel::RenderWater()
if ( !CTimer::GetIsPaused() )
{
+#ifdef FIX_BUGS
+ TEXTURE_ADDU += (CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV) * CTimer::GetTimeStepFix();
+ TEXTURE_ADDV += (CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV) * CTimer::GetTimeStepFix();
+#else
TEXTURE_ADDU += CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV;
TEXTURE_ADDV += CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV;
+#endif
}
if ( TEXTURE_ADDU >= 1.0f )