X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=transform.c;h=66628f6e25c4aaf1c7ead69c622116d42665be9a;hp=b8db4c359e3f52b9e9d8ca5cb52a2167e72193cd;hb=a8e147ca855a521a60e4d1304d4a87fc164e6ec7;hpb=8dcce44300385b12c46d494c06aadcfa35a8bc14

diff --git a/transform.c b/transform.c
index b8db4c35..66628f6e 100644
--- a/transform.c
+++ b/transform.c
@@ -1,146 +1,88 @@
-// LordHavoc: transform code for purposes of transpoly, wallpoly, etc
 
 #include "quakedef.h"
 
-vec3_t softwaretransform_x;
-vec3_t softwaretransform_y;
-vec3_t softwaretransform_z;
-vec_t softwaretransform_scale;
-vec3_t softwaretransform_offset;
+vec_t softwaretransform_rotatematrix[3][4];
+vec_t softwaretransform_matrix[3][4];
+vec_t softwaretransform_invmatrix[3][4];
+int softwaretransform_complexity;
 
-// set to different transform code depending on complexity of transform
-void (*softwaretransform) (vec3_t in, vec3_t out);
-
-// the real deal
-void softwaretransform_dorotatescaletranslate (vec3_t in, vec3_t out)
+vec_t softwaretransform_identitymatrix[3][4] =
 {
-	out[0] = (in[0] * softwaretransform_x[0] + in[1] * softwaretransform_y[0] + in[2] * softwaretransform_z[0]) * softwaretransform_scale + softwaretransform_offset[0];
-	out[1] = (in[0] * softwaretransform_x[1] + in[1] * softwaretransform_y[1] + in[2] * softwaretransform_z[1]) * softwaretransform_scale + softwaretransform_offset[1];
-	out[2] = (in[0] * softwaretransform_x[2] + in[1] * softwaretransform_y[2] + in[2] * softwaretransform_z[2]) * softwaretransform_scale + softwaretransform_offset[2];
-}
+	{1, 0, 0, 0},
+	{0, 1, 0, 0},
+	{0, 0, 1, 0}
+};
 
-void softwaretransform_doscaletranslate (vec3_t in, vec3_t out)
+void softwaretransformidentity(void)
 {
-	out[0] = in[0] * softwaretransform_scale + softwaretransform_offset[0];
-	out[1] = in[1] * softwaretransform_scale + softwaretransform_offset[1];
-	out[2] = in[2] * softwaretransform_scale + softwaretransform_offset[2];
+	memcpy(softwaretransform_rotatematrix, softwaretransform_identitymatrix, sizeof(vec_t[3][4]));
+	memcpy(softwaretransform_matrix      , softwaretransform_identitymatrix, sizeof(vec_t[3][4]));
+	memcpy(softwaretransform_invmatrix   , softwaretransform_identitymatrix, sizeof(vec_t[3][4]));
+	softwaretransform_complexity = 0;
 }
 
-void softwaretransform_dorotatetranslate (vec3_t in, vec3_t out)
+void softwaretransformset (vec3_t origin, vec3_t angles, vec_t scale)
 {
-	out[0] = (in[0] * softwaretransform_x[0] + in[1] * softwaretransform_y[0] + in[2] * softwaretransform_z[0]) + softwaretransform_offset[0];
-	out[1] = (in[0] * softwaretransform_x[1] + in[1] * softwaretransform_y[1] + in[2] * softwaretransform_z[1]) + softwaretransform_offset[1];
-	out[2] = (in[0] * softwaretransform_x[2] + in[1] * softwaretransform_y[2] + in[2] * softwaretransform_z[2]) + softwaretransform_offset[2];
-}
+	float invscale;
+	invscale = 1.0f / scale;
+	if (scale == 0)
+		Host_Error("softwaretransformset: 0 scale\n");
 
-void softwaretransform_dotranslate (vec3_t in, vec3_t out)
-{
-	out[0] = in[0] + softwaretransform_offset[0];
-	out[1] = in[1] + softwaretransform_offset[1];
-	out[2] = in[2] + softwaretransform_offset[2];
-}
+	AngleMatrix(angles, origin, softwaretransform_rotatematrix);
 
-void softwaretransform_dorotatescale (vec3_t in, vec3_t out)
-{
-	out[0] = (in[0] * softwaretransform_x[0] + in[1] * softwaretransform_y[0] + in[2] * softwaretransform_z[0]) * softwaretransform_scale;
-	out[1] = (in[0] * softwaretransform_x[1] + in[1] * softwaretransform_y[1] + in[2] * softwaretransform_z[1]) * softwaretransform_scale;
-	out[2] = (in[0] * softwaretransform_x[2] + in[1] * softwaretransform_y[2] + in[2] * softwaretransform_z[2]) * softwaretransform_scale;
-}
-
-void softwaretransform_doscale (vec3_t in, vec3_t out)
-{
-	out[0] = in[0] * softwaretransform_scale + softwaretransform_offset[0];
-	out[1] = in[1] * softwaretransform_scale + softwaretransform_offset[1];
-	out[2] = in[2] * softwaretransform_scale + softwaretransform_offset[2];
-}
+	softwaretransform_matrix[0][0] = softwaretransform_rotatematrix[0][0] * scale;
+	softwaretransform_matrix[0][1] = softwaretransform_rotatematrix[0][1] * scale;
+	softwaretransform_matrix[0][2] = softwaretransform_rotatematrix[0][2] * scale;
+	softwaretransform_matrix[1][0] = softwaretransform_rotatematrix[1][0] * scale;
+	softwaretransform_matrix[1][1] = softwaretransform_rotatematrix[1][1] * scale;
+	softwaretransform_matrix[1][2] = softwaretransform_rotatematrix[1][2] * scale;
+	softwaretransform_matrix[2][0] = softwaretransform_rotatematrix[2][0] * scale;
+	softwaretransform_matrix[2][1] = softwaretransform_rotatematrix[2][1] * scale;
+	softwaretransform_matrix[2][2] = softwaretransform_rotatematrix[2][2] * scale;
+	softwaretransform_matrix[0][3] = softwaretransform_rotatematrix[0][3];
+	softwaretransform_matrix[1][3] = softwaretransform_rotatematrix[1][3];
+	softwaretransform_matrix[2][3] = softwaretransform_rotatematrix[2][3];
 
-void softwaretransform_dorotate (vec3_t in, vec3_t out)
-{
-	out[0] = (in[0] * softwaretransform_x[0] + in[1] * softwaretransform_y[0] + in[2] * softwaretransform_z[0]);
-	out[1] = (in[0] * softwaretransform_x[1] + in[1] * softwaretransform_y[1] + in[2] * softwaretransform_z[1]);
-	out[2] = (in[0] * softwaretransform_x[2] + in[1] * softwaretransform_y[2] + in[2] * softwaretransform_z[2]);
-}
+	softwaretransform_invmatrix[0][0] = softwaretransform_rotatematrix[0][0] * invscale;
+	softwaretransform_invmatrix[0][1] = softwaretransform_rotatematrix[1][0] * invscale;
+	softwaretransform_invmatrix[0][2] = softwaretransform_rotatematrix[2][0] * invscale;
+	softwaretransform_invmatrix[1][0] = softwaretransform_rotatematrix[0][1] * invscale;
+	softwaretransform_invmatrix[1][1] = softwaretransform_rotatematrix[1][1] * invscale;
+	softwaretransform_invmatrix[1][2] = softwaretransform_rotatematrix[2][1] * invscale;
+	softwaretransform_invmatrix[2][0] = softwaretransform_rotatematrix[0][2] * invscale;
+	softwaretransform_invmatrix[2][1] = softwaretransform_rotatematrix[1][2] * invscale;
+	softwaretransform_invmatrix[2][2] = softwaretransform_rotatematrix[2][2] * invscale;
+	softwaretransform_invmatrix[0][3] = softwaretransform_rotatematrix[0][3];
+	softwaretransform_invmatrix[1][3] = softwaretransform_rotatematrix[1][3];
+	softwaretransform_invmatrix[2][3] = softwaretransform_rotatematrix[2][3];
 
-void softwaretransform_docopy (vec3_t in, vec3_t out)
-{
-	out[0] = in[0];
-	out[1] = in[1];
-	out[2] = in[2];
+	// choose transform mode
+	if (softwaretransform_matrix[0][0] != 1 || softwaretransform_matrix[0][1] != 0 || softwaretransform_matrix[0][2] != 0
+	 || softwaretransform_matrix[1][0] != 0 || softwaretransform_matrix[1][1] != 1 || softwaretransform_matrix[1][2] != 0
+	 || softwaretransform_matrix[2][0] != 0 || softwaretransform_matrix[2][1] != 0 || softwaretransform_matrix[2][2] != 1)
+	 	softwaretransform_complexity = 2;
+	else if (softwaretransform_matrix[0][3] != 0 || softwaretransform_matrix[1][3] != 0 || softwaretransform_matrix[2][3] != 0)
+		softwaretransform_complexity = 1;
+	else
+		softwaretransform_complexity = 0;
 }
 
-// to save time on transforms, choose the appropriate function
-void softwaretransform_classify()
+void softwaretransformforentity (entity_render_t *r)
 {
-	if (softwaretransform_offset[0] != 0 || softwaretransform_offset[1] != 0 || softwaretransform_offset[2] != 0)
+	vec3_t angles;
+	if (r->model->type == mod_brush)
 	{
-		if (softwaretransform_scale != 1)
-		{
-			if (softwaretransform_x[0] != 1 || softwaretransform_x[1] != 0 || softwaretransform_x[2] != 0 ||
-				softwaretransform_y[0] != 0 || softwaretransform_y[1] != 1 || softwaretransform_y[2] != 0 ||
-				softwaretransform_z[0] != 0 || softwaretransform_z[1] != 0 || softwaretransform_z[2] != 1)
-				softwaretransform = &softwaretransform_dorotatescaletranslate;
-			else
-				softwaretransform = &softwaretransform_doscaletranslate;
-		}
-		else
-		{
-			if (softwaretransform_x[0] != 1 || softwaretransform_x[1] != 0 || softwaretransform_x[2] != 0 ||
-				softwaretransform_y[0] != 0 || softwaretransform_y[1] != 1 || softwaretransform_y[2] != 0 ||
-				softwaretransform_z[0] != 0 || softwaretransform_z[1] != 0 || softwaretransform_z[2] != 1)
-				softwaretransform = &softwaretransform_dorotatetranslate;
-			else
-				softwaretransform = &softwaretransform_dotranslate;
-		}
+		angles[0] = r->angles[0];
+		angles[1] = r->angles[1];
+		angles[2] = r->angles[2];
+		softwaretransformset(r->origin, angles, r->scale);
 	}
 	else
 	{
-		if (softwaretransform_scale != 1)
-		{
-			if (softwaretransform_x[0] != 1 || softwaretransform_x[1] != 0 || softwaretransform_x[2] != 0 ||
-				softwaretransform_y[0] != 0 || softwaretransform_y[1] != 1 || softwaretransform_y[2] != 0 ||
-				softwaretransform_z[0] != 0 || softwaretransform_z[1] != 0 || softwaretransform_z[2] != 1)
-				softwaretransform = &softwaretransform_dorotatescale;
-			else
-				softwaretransform = &softwaretransform_doscale;
-		}
-		else
-		{
-			if (softwaretransform_x[0] != 1 || softwaretransform_x[1] != 0 || softwaretransform_x[2] != 0 ||
-				softwaretransform_y[0] != 0 || softwaretransform_y[1] != 1 || softwaretransform_y[2] != 0 ||
-				softwaretransform_z[0] != 0 || softwaretransform_z[1] != 0 || softwaretransform_z[2] != 1)
-				softwaretransform = &softwaretransform_dorotate;
-			else
-				softwaretransform = &softwaretransform_docopy;
-		}
+		angles[0] = -r->angles[0];
+		angles[1] = r->angles[1];
+		angles[2] = r->angles[2];
+		softwaretransformset(r->origin, angles, r->scale);
 	}
 }
 
-void softwaretransformidentity ()
-{
-	softwaretransform_offset[0] = softwaretransform_offset[1] = softwaretransform_offset[2] = softwaretransform_x[1] = softwaretransform_x[2] = softwaretransform_y[0] = softwaretransform_y[2] = softwaretransform_z[0] = softwaretransform_z[1] = 0;
-	softwaretransform_x[0] = softwaretransform_y[1] = softwaretransform_z[2] = 1;
-	softwaretransform_scale = 1;
-	// we know what it is
-	softwaretransform = &softwaretransform_docopy;
-}
-
-void softwaretransformset (vec3_t origin, vec3_t angles, vec_t scale)
-{
-	VectorCopy(origin, softwaretransform_offset);
-	AngleVectors(angles, softwaretransform_x, softwaretransform_y, softwaretransform_z);
-	softwaretransform_y[0] = -softwaretransform_y[0];
-	softwaretransform_y[1] = -softwaretransform_y[1];
-	softwaretransform_y[2] = -softwaretransform_y[2];
-	softwaretransform_scale = scale;
-	// choose best transform code
-	softwaretransform_classify();
-}
-
-void softwaretransformforentity (entity_t *e)
-{
-	vec3_t angles;
-	angles[0] = -e->angles[0];
-	angles[1] = e->angles[1];
-	angles[2] = e->angles[2];
-	softwaretransformset(e->origin, angles, e->scale);
-}