Use operator = instead of TransCopy

Author: slipher

src/engine/qcommon/q_math.cpp

@@ -3199,12 +3199,6 @@ void TransInit( transform_t *t )
 	t->scale = 1.0f;
 }
 
-// copy a transform
-void TransCopy( const transform_t *in, transform_t *out )
-{
-	memcpy( out, in, sizeof( transform_t ) );
-}
-
 // apply a transform to a point
 void TransformPoint( const transform_t *t, const vec3_t in, vec3_t out )
 {
@@ -3334,7 +3328,7 @@ void TransAddTranslation( const vec3_t vec, transform_t *t )
 void TransCombine( const transform_t *a, const transform_t *b,
                    transform_t *out )
 {
-	TransCopy( a, out );
+	*out = *a;
 
 	TransAddRotationQuat( b->rot, out );
 	TransAddScale( b->scale, out );
@@ -3345,15 +3339,15 @@ void TransCombine( const transform_t *a, const transform_t *b,
 void TransInverse( const transform_t *in, transform_t *out )
 {
 	quat_t inverse;
-	static transform_t tmp; // static for proper alignment in QVMs
+	transform_t tmp;
 
 	TransInit( &tmp );
 	VectorNegate( in->trans, tmp.trans );
 	TransAddScale( 1.0f / in->scale, &tmp );
 	QuatCopy( in->rot, inverse );
 	QuatInverse( inverse );
 	TransAddRotationQuat( inverse, &tmp );
-	TransCopy( &tmp, out );
+	*out = tmp;
 }
 
 // lerp between transforms

src/engine/qcommon/q_shared.h

@@ -1274,10 +1274,6 @@ inline vec_t VectorNormalize2( const vec3_t v, vec3_t out )
 		t->sseRot = u;
 		t->sseTransScale = u;
 	}
-	inline void TransCopy( const transform_t *in, transform_t *out ) {
-		out->sseRot = in->sseRot;
-		out->sseTransScale = in->sseTransScale;
-	}
 	inline void TransformPoint(
 			const transform_t *t, const vec3_t in, vec3_t out ) {
 		__m128 ts = t->sseTransScale;
@@ -1426,7 +1422,6 @@ inline vec_t VectorNormalize2( const vec3_t v, vec3_t out )
 #else
 	// The non-SSE variants are in q_math.cpp file.
 	void TransInit( transform_t *t );
-	void TransCopy( const transform_t *in, transform_t *out );
 
 	void TransformPoint( const transform_t *t, const vec3_t in, vec3_t out );
 	void TransformPointInverse( const transform_t *t, const vec3_t in, vec3_t out );

src/engine/renderer/tr_animation.cpp

@@ -1497,7 +1497,7 @@ int RE_BlendSkeleton( refSkeleton_t *skel, const refSkeleton_t *blend, float fra
 		TransAddWeight( frac, &blend->bones[ i ].t, &trans );
 		TransEndLerp( &trans );
 
-		TransCopy( &trans, &skel->bones[ i ].t );
+		skel->bones[ i ].t = trans;
 	}
 
 	// calculate a bounding box in the current coordinate system

src/engine/renderer/tr_surface.cpp

@@ -1002,7 +1002,7 @@ static void Tess_SurfaceMD5( md5Surface_t *srf )
 		for ( ; bone < lastBone; bone++,
 			modelBone++ )
 		{
-			TransCopy( &modelBone->joint, bone );
+			*bone = modelBone->joint;
 			TransInsScale( modelScale, bone );
 		}
 	}
@@ -1149,7 +1149,7 @@ void Tess_SurfaceIQM( srfIQModel_t *surf ) {
 		for ( ; bone < lastBone; bone++,
 			modelJoint++ )
 		{
-			TransCopy( modelJoint, bone );
+			*bone = *modelJoint;
 			TransInsScale( modelScale, bone );
 		}
 	}
@@ -1491,7 +1491,7 @@ static void Tess_SurfaceVBOMD5Mesh( srfVBOMD5Mesh_t *srf )
 		for ( ; bone < lastBone; bone++,
 			modelBone++ )
 		{
-			TransCopy( &modelBone->joint, bone );
+			*bone = modelBone->joint;
 			TransInsScale( modelScale, bone );
 		}
 	}

src/shared/client/cg_api.cpp

@@ -528,7 +528,7 @@ int trap_R_BlendSkeleton( refSkeleton_t *skel, const refSkeleton_t *blend, float
         TransAddWeight( frac, &blend->bones[ i ].t, &trans );
         TransEndLerp( &trans );
 
-        TransCopy( &trans, &skel->bones[ i ].t );
+        skel->bones[ i ].t = trans;
     }
 
     // calculate a bounding box in the current coordinate system