From 1906a08f7220cb90d136b0a0e4d2e18e0c7ef5eb Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Tue, 24 Nov 2020 15:18:39 +0100
Subject: [PATCH] cam fix; forgot some shaders

---
 src/animation/AnimBlendSequence.h          |  2 --
 src/core/Camera.cpp                        |  5 ++++-
 src/extras/shaders/Makefile                |  3 ++-
 src/extras/shaders/im2d_UV2_gl.inc         | 23 ++++++++++++++++++++++
 src/extras/shaders/screenDroplet_fs_gl.inc | 20 +++++++++++++++++++
 5 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 src/extras/shaders/im2d_UV2_gl.inc
 create mode 100644 src/extras/shaders/screenDroplet_fs_gl.inc

diff --git a/src/animation/AnimBlendSequence.h b/src/animation/AnimBlendSequence.h
index 6d8c98aa..759a12ea 100644
--- a/src/animation/AnimBlendSequence.h
+++ b/src/animation/AnimBlendSequence.h
@@ -24,9 +24,7 @@ public:
 	int32 type;
 	char name[24];
 	int32 numFrames;
-#ifdef PED_SKIN
 	int16 boneTag;
-#endif
 	void *keyFrames;
 	void *keyFramesCompressed;
 
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 2fa81d24..68771f64 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -1008,7 +1008,8 @@ CCamera::CamControl(void)
 			ReqMode = CCam::MODE_FOLLOWPED;
 
 			// Check 1st person mode
-			if(m_bLookingAtPlayer && pTargetEntity->IsPed() && !m_WideScreenOn && !Cams[0].Using3rdPersonMouseCam()
+			if((m_bLookingAtPlayer || m_bEnable1rstPersonCamCntrlsScript) && pTargetEntity->IsPed() &&
+			   (!m_WideScreenOn || m_bEnable1rstPersonCamCntrlsScript) && !Cams[0].Using3rdPersonMouseCam()
 #ifdef FREE_CAM
 			   && !CCamera::bFreeCam
 #endif
@@ -1024,6 +1025,8 @@ CCamera::CamControl(void)
 					   CPad::GetPad(0)->GetCross() || CPad::GetPad(0)->GetCircle() ||
 					   CTimer::GetTimeInMilliseconds() - m_uiFirstPersonCamLastInputTime > 2850.0f){
 						m_bFirstPersonBeingUsed = false;
+					}else if(CPad::GetPad(0)->TargetJustDown()){
+						m_bFirstPersonBeingUsed = false;
 						m_bJustJumpedOutOf1stPersonBecauseOfTarget = true;
 					}
 				}
diff --git a/src/extras/shaders/Makefile b/src/extras/shaders/Makefile
index 09a60420..5089e16a 100644
--- a/src/extras/shaders/Makefile
+++ b/src/extras/shaders/Makefile
@@ -2,7 +2,8 @@ all: im2d_gl.inc simple_fs_gl.inc default_UV2_gl.inc \
 	colourfilterVC_fs_gl.inc contrast_fs_gl.inc \
 	neoRim_gl.inc neoRimSkin_gl.inc \
 	neoWorldVC_fs_gl.inc neoGloss_vs_gl.inc neoGloss_fs_gl.inc \
-	neoVehicle_vs_gl.inc neoVehicle_fs_gl.inc
+	neoVehicle_vs_gl.inc neoVehicle_fs_gl.inc \
+	im2d_UV2_gl.inc screenDroplet_fs_gl.inc
 
 im2d_gl.inc: im2d.vert
 	(echo 'const char *im2d_vert_src =';\
diff --git a/src/extras/shaders/im2d_UV2_gl.inc b/src/extras/shaders/im2d_UV2_gl.inc
new file mode 100644
index 00000000..3feb2bc1
--- /dev/null
+++ b/src/extras/shaders/im2d_UV2_gl.inc
@@ -0,0 +1,23 @@
+const char *im2d_UV2_vert_src =
+"uniform vec4 u_xform;\n"
+
+"VSIN(ATTRIB_POS)	vec4 in_pos;\n"
+
+"VSOUT vec4 v_color;\n"
+"VSOUT vec2 v_tex0;\n"
+"VSOUT vec2 v_tex1;\n"
+"VSOUT float v_fog;\n"
+
+"void\n"
+"main(void)\n"
+"{\n"
+"	gl_Position = in_pos;\n"
+"	gl_Position.w = 1.0;\n"
+"	gl_Position.xy = gl_Position.xy * u_xform.xy + u_xform.zw;\n"
+"	v_fog = DoFog(gl_Position.z);\n"
+"	gl_Position.xyz *= gl_Position.w;\n"
+"	v_color = in_color;\n"
+"	v_tex0 = in_tex0;\n"
+"	v_tex1 = in_tex1;\n"
+"}\n"
+;
diff --git a/src/extras/shaders/screenDroplet_fs_gl.inc b/src/extras/shaders/screenDroplet_fs_gl.inc
new file mode 100644
index 00000000..dd393b02
--- /dev/null
+++ b/src/extras/shaders/screenDroplet_fs_gl.inc
@@ -0,0 +1,20 @@
+const char *screenDroplet_frag_src =
+"uniform sampler2D tex0;\n"
+"uniform sampler2D tex1;\n"
+
+"FSIN vec4 v_color;\n"
+"FSIN vec2 v_tex0;\n"
+"FSIN vec2 v_tex1;\n"
+"FSIN float v_fog;\n"
+
+"void\n"
+"main(void)\n"
+"{\n"
+"	vec4 color;\n"
+"	color = v_color*texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y));\n"
+"	color *= texture(tex1, vec2(v_tex1.x, 1.0-v_tex1.y));\n"
+
+"	FRAGCOLOR(color);\n"
+"}\n"
+
+;