X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_alias.c;h=aeb512e99f07f4c1114085fd4f576ffff988606f;hb=3356797550466b320ca897b33e6972ac6d15cefc;hp=3da3b6202a0a54ee372fc1f50929af611d44b498;hpb=d7c17c4c4c664441f27f7d6d3466dd5da5cce801;p=xonotic%2Fdarkplaces.git

diff --git a/model_alias.c b/model_alias.c
index 3da3b620..aeb512e9 100644
--- a/model_alias.c
+++ b/model_alias.c
@@ -94,37 +94,37 @@ void Mod_Skeletal_BuildTransforms(const dp_model_t * RESTRICT model, const frame
 		for (i = 0;i < model->num_bones;i++)
 		{
 			// blend by transform each quaternion/translation into a dual-quaternion first, then blending
-			const short * RESTRICT pose7s = model->data_poses7s + 7 * (frameblend[0].subframe * model->num_bones + i);
-			float lerp = frameblend[0].lerp,
-				tx = pose7s[0], ty = pose7s[1], tz = pose7s[2],
-				rx = pose7s[3] * lerp,
-				ry = pose7s[4] * lerp,
-				rz = pose7s[5] * lerp,
-				rw = pose7s[6] * lerp,
-				dx = tx*rw + ty*rz - tz*ry,
-				dy = -tx*rz + ty*rw + tz*rx,
-				dz = tx*ry - ty*rx + tz*rw,
-				dw = -tx*rx - ty*ry - tz*rz,
+			const short * RESTRICT firstpose7s = model->data_poses7s + 7 * (frameblend[0].subframe * model->num_bones + i);
+			float firstlerp = frameblend[0].lerp,
+				firsttx = firstpose7s[0], firstty = firstpose7s[1], firsttz = firstpose7s[2],
+				rx = firstpose7s[3] * firstlerp,
+				ry = firstpose7s[4] * firstlerp,
+				rz = firstpose7s[5] * firstlerp,
+				rw = firstpose7s[6] * firstlerp,
+				dx = firsttx*rw + firstty*rz - firsttz*ry,
+				dy = -firsttx*rz + firstty*rw + firsttz*rx,
+				dz = firsttx*ry - firstty*rx + firsttz*rw,
+				dw = -firsttx*rx - firstty*ry - firsttz*rz,
 				scale, sx, sy, sz, sw;
 			for (blends = 1;blends < MAX_FRAMEBLENDS && frameblend[blends].lerp > 0;blends++)
 			{
-				const short * RESTRICT pose7s = model->data_poses7s + 7 * (frameblend[blends].subframe * model->num_bones + i);
-				float lerp = frameblend[blends].lerp,
-					tx = pose7s[0], ty = pose7s[1], tz = pose7s[2],
-					qx = pose7s[3], qy = pose7s[4], qz = pose7s[5], qw = pose7s[6];
-				if(rx*qx + ry*qy + rz*qz + rw*qw < 0) lerp = -lerp;
-				qx *= lerp;
-				qy *= lerp;
-				qz *= lerp;
-				qw *= lerp;
+				const short * RESTRICT blendpose7s = model->data_poses7s + 7 * (frameblend[blends].subframe * model->num_bones + i);
+				float blendlerp = frameblend[blends].lerp,
+					blendtx = blendpose7s[0], blendty = blendpose7s[1], blendtz = blendpose7s[2],
+					qx = blendpose7s[3], qy = blendpose7s[4], qz = blendpose7s[5], qw = blendpose7s[6];
+				if(rx*qx + ry*qy + rz*qz + rw*qw < 0) blendlerp = -blendlerp;
+				qx *= blendlerp;
+				qy *= blendlerp;
+				qz *= blendlerp;
+				qw *= blendlerp;
 				rx += qx;
 				ry += qy;
 				rz += qz;
 				rw += qw;
-				dx += tx*qw + ty*qz - tz*qy;
-				dy += -tx*qz + ty*qw + tz*qx;
-				dz += tx*qy - ty*qx + tz*qw;
-				dw += -tx*qx - ty*qy - tz*qz;
+				dx += blendtx*qw + blendty*qz - blendtz*qy;
+				dy += -blendtx*qz + blendty*qw + blendtz*qx;
+				dz += blendtx*qy - blendty*qx + blendtz*qw;
+				dw += -blendtx*qx - blendty*qy - blendtz*qz;
 			}
 			// generate a matrix from the dual-quaternion, implicitly normalizing it in the process
 			scale = 1.0f / (rx*rx + ry*ry + rz*rz + rw*rw);
@@ -922,6 +922,7 @@ static void Mod_BuildAliasSkinFromSkinFrame(texture_t *texture, skinframe_t *ski
 	//texture->textureflags = 0;
 
 	texture->basematerialflags = MATERIALFLAG_WALL;
+	texture->basealpha = 1.0f;
 	if (texture->currentskinframe->hasalpha)
 		texture->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
 	texture->currentmaterialflags = texture->basematerialflags;