X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=mathlib.c;h=60a1a29dd781a5e506888895dafefe75963a5a7e;hb=ae83ea5c8eadb87c0255bc97b5fe455ca7f55301;hp=22112734e2fa59565c8c14459e3a5110677ee689;hpb=ff46d6ff516fda192c5adc55a5c9b82007545bd2;p=xonotic%2Fdarkplaces.git

diff --git a/mathlib.c b/mathlib.c
index 22112734..60a1a29d 100644
--- a/mathlib.c
+++ b/mathlib.c
@@ -343,7 +343,7 @@ void BoxPlaneCorners(const vec3_t emins, const vec3_t emaxs, const mplane_t *p,
 	case 5: outnear[0] = emins[0];outnear[1] = emaxs[1];outnear[2] = emins[2];outfar[0] = emaxs[0];outfar[1] = emins[1];outfar[2] = emaxs[2];break;
 	case 6: outnear[0] = emaxs[0];outnear[1] = emins[1];outnear[2] = emins[2];outfar[0] = emins[0];outfar[1] = emaxs[1];outfar[2] = emaxs[2];break;
 	case 7: outnear[0] = emins[0];outnear[1] = emins[1];outnear[2] = emins[2];outfar[0] = emaxs[0];outfar[1] = emaxs[1];outfar[2] = emaxs[2];break;
-	}                                                                                                                      
+	}
 }
 
 void BoxPlaneCorners_Separate(const vec3_t emins, const vec3_t emaxs, const vec3_t normal, vec3_t outnear, vec3_t outfar)
@@ -359,7 +359,7 @@ void BoxPlaneCorners_Separate(const vec3_t emins, const vec3_t emaxs, const vec3
 	case 5: outnear[0] = emins[0];outnear[1] = emaxs[1];outnear[2] = emins[2];outfar[0] = emaxs[0];outfar[1] = emins[1];outfar[2] = emaxs[2];break;
 	case 6: outnear[0] = emaxs[0];outnear[1] = emins[1];outnear[2] = emins[2];outfar[0] = emins[0];outfar[1] = emaxs[1];outfar[2] = emaxs[2];break;
 	case 7: outnear[0] = emins[0];outnear[1] = emins[1];outnear[2] = emins[2];outfar[0] = emaxs[0];outfar[1] = emaxs[1];outfar[2] = emaxs[2];break;
-	}                                                                                                                      
+	}
 }
 
 void BoxPlaneCornerDistances(const vec3_t emins, const vec3_t emaxs, const mplane_t *p, vec_t *outneardist, vec_t *outfardist)
@@ -418,20 +418,38 @@ void AngleVectors (const vec3_t angles, vec3_t forward, vec3_t right, vec3_t up)
 	}
 	if (right || up)
 	{
-		angle = angles[ROLL] * (M_PI*2 / 360);
-		sr = sin(angle);
-		cr = cos(angle);
-		if (right)
+		if (angles[ROLL])
 		{
-			right[0] = -1*(sr*sp*cy+cr*-sy);
-			right[1] = -1*(sr*sp*sy+cr*cy);
-			right[2] = -1*(sr*cp);
+			angle = angles[ROLL] * (M_PI*2 / 360);
+			sr = sin(angle);
+			cr = cos(angle);
+			if (right)
+			{
+				right[0] = -1*(sr*sp*cy+cr*-sy);
+				right[1] = -1*(sr*sp*sy+cr*cy);
+				right[2] = -1*(sr*cp);
+			}
+			if (up)
+			{
+				up[0] = (cr*sp*cy+-sr*-sy);
+				up[1] = (cr*sp*sy+-sr*cy);
+				up[2] = cr*cp;
+			}
 		}
-		if (up)
+		else
 		{
-			up[0] = (cr*sp*cy+-sr*-sy);
-			up[1] = (cr*sp*sy+-sr*cy);
-			up[2] = cr*cp;
+			if (right)
+			{
+				right[0] = sy;
+				right[1] = -cy;
+				right[2] = 0;
+			}
+			if (up)
+			{
+				up[0] = (sp*cy);
+				up[1] = (sp*sy);
+				up[2] = cp;
+			}
 		}
 	}
 }
@@ -454,20 +472,38 @@ void AngleVectorsFLU (const vec3_t angles, vec3_t forward, vec3_t left, vec3_t u
 	}
 	if (left || up)
 	{
-		angle = angles[ROLL] * (M_PI*2 / 360);
-		sr = sin(angle);
-		cr = cos(angle);
-		if (left)
+		if (angles[ROLL])
 		{
-			left[0] = sr*sp*cy+cr*-sy;
-			left[1] = sr*sp*sy+cr*cy;
-			left[2] = sr*cp;
+			angle = angles[ROLL] * (M_PI*2 / 360);
+			sr = sin(angle);
+			cr = cos(angle);
+			if (left)
+			{
+				left[0] = sr*sp*cy+cr*-sy;
+				left[1] = sr*sp*sy+cr*cy;
+				left[2] = sr*cp;
+			}
+			if (up)
+			{
+				up[0] = cr*sp*cy+-sr*-sy;
+				up[1] = cr*sp*sy+-sr*cy;
+				up[2] = cr*cp;
+			}
 		}
-		if (up)
+		else
 		{
-			up[0] = cr*sp*cy+-sr*-sy;
-			up[1] = cr*sp*sy+-sr*cy;
-			up[2] = cr*cp;
+			if (left)
+			{
+				left[0] = -sy;
+				left[1] = cy;
+				left[2] = 0;
+			}
+			if (up)
+			{
+				up[0] = sp*cy;
+				up[1] = sp*sy;
+				up[2] = cp;
+			}
 		}
 	}
 }
@@ -621,3 +657,16 @@ int Math_atov(const char *s, vec3_t out)
 	return i;
 }
 
+void BoxFromPoints(vec3_t mins, vec3_t maxs, int numpoints, vec_t *point3f)
+{
+	int i;
+	VectorCopy(point3f, mins);
+	VectorCopy(point3f, maxs);
+	for (i = 1, point3f += 3;i < numpoints;i++, point3f += 3)
+	{
+		mins[0] = min(mins[0], point3f[0]);maxs[0] = max(maxs[0], point3f[0]);
+		mins[1] = min(mins[1], point3f[1]);maxs[1] = max(maxs[1], point3f[1]);
+		mins[2] = min(mins[2], point3f[2]);maxs[2] = max(maxs[2], point3f[2]);
+	}
+}
+