From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 18 Oct 2008 15:48:43 +0000 (+0000)
Subject: cvar mod_alias_supporttagscale to be able to turn off scaling of attached entities... 
X-Git-Tag: xonotic-v0.1.0preview~2056
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99d41010da293938cc3e84dbe8d15191517d3a3d;p=xonotic%2Fdarkplaces.git

cvar mod_alias_supporttagscale to be able to turn off scaling of attached entities by the attachment tag matrix (fixes problems with zmodel generated zyms)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8532 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/model_alias.c b/model_alias.c
index f6b6f687..23c22e2c 100644
--- a/model_alias.c
+++ b/model_alias.c
@@ -28,6 +28,7 @@ cvar_t r_skeletal_debugbonevalue = {0, "r_skeletal_debugbonevalue", "100", "deve
 cvar_t r_skeletal_debugtranslatex = {0, "r_skeletal_debugtranslatex", "1", "development cvar for testing skeletal model code"};
 cvar_t r_skeletal_debugtranslatey = {0, "r_skeletal_debugtranslatey", "1", "development cvar for testing skeletal model code"};
 cvar_t r_skeletal_debugtranslatez = {0, "r_skeletal_debugtranslatez", "1", "development cvar for testing skeletal model code"};
+cvar_t mod_alias_supporttagscale = {0, "mod_alias_supporttagscale", "1", "support scaling factors in bone/tag attachment matrices as supported by MD3"};
 
 float mod_md3_sin[320];
 
@@ -40,6 +41,7 @@ void Mod_AliasInit (void)
 	Cvar_RegisterVariable(&r_skeletal_debugtranslatex);
 	Cvar_RegisterVariable(&r_skeletal_debugtranslatey);
 	Cvar_RegisterVariable(&r_skeletal_debugtranslatez);
+	Cvar_RegisterVariable(&mod_alias_supporttagscale);
 	for (i = 0;i < 320;i++)
 		mod_md3_sin[i] = sin(i * M_PI * 2.0f / 256.0);
 }
@@ -423,6 +425,10 @@ int Mod_Alias_GetTagMatrix(const dp_model_t *model, int poseframe, int tagindex,
 			return 6;
 		Matrix4x4_FromArray12FloatGL(outmatrix, model->data_tags[poseframe * model->num_tags + tagindex].matrixgl);
 	}
+
+	if(!mod_alias_supporttagscale.integer)
+		Matrix4x4_Normalize3(outmatrix, outmatrix);
+
 	return 0;
 }