X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=view.c;h=72d812bb1bf9752fbf2f511862ee9fb4df15d7c4;hb=49a0d411fae28787e20dc45a4906722a5e51b7bc;hp=da9d6b1d7571a219be5581b4236dabb6e95d801a;hpb=7bf091f4601b1cc917f7beb971cad4a4cc537de4;p=xonotic%2Fdarkplaces.git

diff --git a/view.c b/view.c
index da9d6b1d..72d812bb 100644
--- a/view.c
+++ b/view.c
@@ -77,6 +77,9 @@ cvar_t chase_stevie = {0, "chase_stevie", "0", "chase cam view from above (used
 cvar_t v_deathtilt = {0, "v_deathtilt", "1", "whether to use sideways view when dead"};
 cvar_t v_deathtiltangle = {0, "v_deathtiltangle", "80", "what roll angle to use when tilting the view while dead"};
 
+// Prophecy camera pitchangle by Alexander "motorsep" Zubov
+cvar_t chase_pitchangle = {CVAR_SAVE, "chase_pitchangle", "55", "chase cam pitch angle"};
+
 float	v_dmg_time, v_dmg_roll, v_dmg_pitch;
 
 
@@ -239,6 +242,7 @@ void V_ParseDamage (void)
 	cl.faceanimtime = cl.time + 0.2;		// put sbar face into pain frame
 
 	cl.cshifts[CSHIFT_DAMAGE].percent += 3*count;
+	cl.cshifts[CSHIFT_DAMAGE].alphafade = 150;
 	if (cl.cshifts[CSHIFT_DAMAGE].percent < 0)
 		cl.cshifts[CSHIFT_DAMAGE].percent = 0;
 	if (cl.cshifts[CSHIFT_DAMAGE].percent > 150)
@@ -300,10 +304,30 @@ When you run over an item, the server sends this command
 */
 static void V_BonusFlash_f (void)
 {
-	cl.cshifts[CSHIFT_BONUS].destcolor[0] = 215;
-	cl.cshifts[CSHIFT_BONUS].destcolor[1] = 186;
-	cl.cshifts[CSHIFT_BONUS].destcolor[2] = 69;
-	cl.cshifts[CSHIFT_BONUS].percent = 50;
+	if(Cmd_Argc() == 1)
+	{
+		cl.cshifts[CSHIFT_BONUS].destcolor[0] = 215;
+		cl.cshifts[CSHIFT_BONUS].destcolor[1] = 186;
+		cl.cshifts[CSHIFT_BONUS].destcolor[2] = 69;
+		cl.cshifts[CSHIFT_BONUS].percent = 50;
+		cl.cshifts[CSHIFT_BONUS].alphafade = 100;
+	}
+	else if(Cmd_Argc() >= 4 && Cmd_Argc() <= 6)
+	{
+		cl.cshifts[CSHIFT_BONUS].destcolor[0] = atof(Cmd_Argv(1)) * 255;
+		cl.cshifts[CSHIFT_BONUS].destcolor[1] = atof(Cmd_Argv(2)) * 255;
+		cl.cshifts[CSHIFT_BONUS].destcolor[2] = atof(Cmd_Argv(3)) * 255;
+		if(Cmd_Argc() >= 5)
+			cl.cshifts[CSHIFT_BONUS].percent = atof(Cmd_Argv(4)) * 255; // yes, these are HEXADECIMAL percent ;)
+		else
+			cl.cshifts[CSHIFT_BONUS].percent = 50;
+		if(Cmd_Argc() >= 6)
+			cl.cshifts[CSHIFT_BONUS].alphafade = atof(Cmd_Argv(5)) * 255;
+		else
+			cl.cshifts[CSHIFT_BONUS].alphafade = 100;
+	}
+	else
+		Con_Printf("usage:\nbf, or bf R G B [A [alphafade]]\n");
 }
 
 /*
@@ -333,6 +357,10 @@ void V_CalcRefdef (void)
 {
 	entity_t *ent;
 	float vieworg[3], gunorg[3], viewangles[3], smoothtime;
+// begin of chase camera bounding box size for proper collisions by Alexander Zubov
+	vec3_t camboxmins = {-3, -3, -3};
+	vec3_t camboxmaxs = {3, 3, 3};
+// end of chase camera bounding box size for proper collisions by Alexander Zubov
 	trace_t trace;
 	VectorClear(gunorg);
 	viewmodelmatrix = identitymatrix;
@@ -383,16 +411,17 @@ void V_CalcRefdef (void)
 			// TODO: add a cvar to disable this
 			viewangles[PITCH] += cl.qw_weaponkick;
 
+			// apply the viewofs (even if chasecam is used)
+			vieworg[2] += cl.stats[STAT_VIEWHEIGHT];
+
 			if (chase_active.value)
 			{
-				// observing entity from third person
-				vec_t camback, camup, dist, forward[3], chase_dest[3];
+				// observing entity from third person. Added "campitch" by Alexander "motorsep" Zubov
+				vec_t camback, camup, dist, campitch, forward[3], chase_dest[3];
 
 				camback = chase_back.value;
 				camup = chase_up.value;
-
-				// this + 22 is to match view_ofs for compatibility with older versions
-				camup += 22;
+				campitch = chase_pitchangle.value;
 
 				AngleVectors(viewangles, forward, NULL, NULL);
 
@@ -411,11 +440,12 @@ void V_CalcRefdef (void)
 					chase_dest[2] = vieworg[2] - forward[2] * camback + up[2] * camup;
 #if 0
 					//trace = CL_Move(vieworg, eyeboxmins, eyeboxmaxs, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
-					trace = CL_Move(vieworg, vec3_origin, vec3_origin, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
+					trace = CL_Move(vieworg, camboxmins, camboxmaxs, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
 					VectorCopy(trace.endpos, vieworg);
 					vieworg[2] -= 8;
 #else
-					trace = CL_Move(vieworg, vec3_origin, vec3_origin, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
+					// trace from first person view location to our chosen third person view location
+					trace = CL_Move(vieworg, camboxmins, camboxmaxs, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
 					VectorCopy(trace.endpos, bestvieworg);
 					offset[2] = 0;
 					for (offset[0] = -16;offset[0] <= 16;offset[0] += 8)
@@ -426,7 +456,7 @@ void V_CalcRefdef (void)
 							chase_dest[0] = vieworg[0] - forward[0] * camback + up[0] * camup + offset[0];
 							chase_dest[1] = vieworg[1] - forward[1] * camback + up[1] * camup + offset[1];
 							chase_dest[2] = vieworg[2] - forward[2] * camback + up[2] * camup + offset[2];
-							trace = CL_Move(vieworg, vec3_origin, vec3_origin, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
+							trace = CL_Move(vieworg, camboxmins, camboxmaxs, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
 							if (bestvieworg[2] > trace.endpos[2])
 								bestvieworg[2] = trace.endpos[2];
 						}
@@ -434,7 +464,7 @@ void V_CalcRefdef (void)
 					bestvieworg[2] -= 8;
 					VectorCopy(bestvieworg, vieworg);
 #endif
-					viewangles[PITCH] = 90;
+					viewangles[PITCH] = campitch;
 				}
 				else
 				{
@@ -470,7 +500,6 @@ void V_CalcRefdef (void)
 				}
 				// origin
 				VectorAdd(vieworg, cl.punchvector, vieworg);
-				vieworg[2] += cl.stats[STAT_VIEWHEIGHT];
 				if (cl.stats[STAT_HEALTH] > 0)
 				{
 					double xyspeed, bob;
@@ -559,11 +588,11 @@ void V_FadeViewFlashs(void)
 	if (cl.time <= cl.oldtime)
 		return;
 	// drop the damage value
-	cl.cshifts[CSHIFT_DAMAGE].percent -= (cl.time - cl.oldtime)*150;
+	cl.cshifts[CSHIFT_DAMAGE].percent -= (cl.time - cl.oldtime)*cl.cshifts[CSHIFT_DAMAGE].alphafade;
 	if (cl.cshifts[CSHIFT_DAMAGE].percent <= 0)
 		cl.cshifts[CSHIFT_DAMAGE].percent = 0;
 	// drop the bonus value
-	cl.cshifts[CSHIFT_BONUS].percent -= (cl.time - cl.oldtime)*100;
+	cl.cshifts[CSHIFT_BONUS].percent -= (cl.time - cl.oldtime)*cl.cshifts[CSHIFT_BONUS].alphafade;
 	if (cl.cshifts[CSHIFT_BONUS].percent <= 0)
 		cl.cshifts[CSHIFT_BONUS].percent = 0;
 }
@@ -690,7 +719,7 @@ V_Init
 void V_Init (void)
 {
 	Cmd_AddCommand ("v_cshift", V_cshift_f, "sets tint color of view");
-	Cmd_AddCommand ("bf", V_BonusFlash_f, "briefly flashes a bright color tint on view (used when items are picked up)");
+	Cmd_AddCommand ("bf", V_BonusFlash_f, "briefly flashes a bright color tint on view (used when items are picked up); optionally takes R G B [A [alphafade]] arguments to specify how the flash looks");
 	Cmd_AddCommand ("centerview", V_StartPitchDrift, "gradually recenter view (stop looking up/down)");
 
 	Cvar_RegisterVariable (&v_centermove);
@@ -728,6 +757,7 @@ void V_Init (void)
 	Cvar_RegisterVariable (&chase_up);
 	Cvar_RegisterVariable (&chase_active);
 	Cvar_RegisterVariable (&chase_overhead);
+	Cvar_RegisterVariable (&chase_pitchangle);
 	if (gamemode == GAME_GOODVSBAD2)
 		Cvar_RegisterVariable (&chase_stevie);