.

Author: VReaperV

src/engine/renderer/tr_animation.cpp

@@ -1468,6 +1468,7 @@ int RE_BuildSkeleton( refSkeleton_t *skel, qhandle_t hAnim, int startFrame, int
 	}
 
 	// FIXME: clear existing bones and bounds?
+	skel->numBones = 0;
 	return false;
 }
 

src/engine/renderer/tr_main.cpp

@@ -2102,12 +2102,48 @@ void R_AddEntitySurfaces()
 							break;
 
 						case modtype_t::MOD_MD5:
-							Log::Warn( "%i %s: %i", ent->e.animationHandle, R_GetAnimationByHandle( ent->e.animationHandle )->name, ent->e.startFrame );
+							/* Log::Warn("%i %s: old: %i-%i %f new: %i-%i %f | %f %f", ent->e.animationHandle,
+								R_GetAnimationByHandle( ent->e.animationHandle )->name, ent->e.startFrame,
+								ent->e.endFrame, ent->e.lerp, ent->e.startFrame2, ent->e.endFrame2, ent->e.lerp2,
+								ent->e.blendLerp, ent->e.scale ); */
+							if ( ent->e.scale == 0 ) {
+								ent->e.scale = 1;
+							}
+							RE_BuildSkeleton( &ent->e.skeleton, ent->e.animationHandle, ent->e.startFrame, ent->e.endFrame,
+								ent->e.lerp, ent->e.clearOrigin );
+							ent->e.skeleton.scale = ent->e.scale;
+							if ( ent->e.blendLerp > 0.0 || true ) {
+								refSkeleton_t skel;
+								RE_BuildSkeleton( &skel, ent->e.animationHandle2, ent->e.startFrame2, ent->e.endFrame2,
+									ent->e.lerp2, ent->e.clearOrigin2 );
+								RE_BlendSkeleton( &ent->e.skeleton, &skel, ent->e.blendLerp );
+							}
+							// ent->e.skeleton.type = refSkeletonType_t::SK_ABSOLUTE;
 							R_AddMD5Surfaces( ent );
 							break;
 
 						case modtype_t::MOD_IQM:
-							Log::Warn( "%i %s: %i", ent->e.animationHandle, R_GetAnimationByHandle( ent->e.animationHandle )->name, ent->e.startFrame );
+							/* Log::Warn("%i %s: old: %i-%i %f new: %i-%i %f | %f %f", ent->e.animationHandle,
+								R_GetAnimationByHandle( ent->e.animationHandle )->name, ent->e.startFrame,
+								ent->e.endFrame, ent->e.lerp, ent->e.startFrame2, ent->e.endFrame2, ent->e.lerp2,
+								ent->e.blendLerp, ent->e.scale ); */
+							if ( ent->e.scale == 0 ) {
+								ent->e.scale = 1;
+							}
+							if ( ent->e.animationHandle == 0 ) {
+								ent->e.animationHandle = ent->e.animationHandle2;
+							}
+							ent->e.skeleton.scale = ent->e.scale;
+							RE_BuildSkeleton( &ent->e.skeleton, ent->e.animationHandle, ent->e.startFrame, ent->e.endFrame,
+								ent->e.lerp, ent->e.clearOrigin );
+							// ent->e.blendLerp = 1 - ent->e.blendLerp;
+							if ( ent->e.blendLerp > 0.0 || true ) {
+								refSkeleton_t skel;
+								RE_BuildSkeleton( &skel, ent->e.animationHandle2, ent->e.startFrame2, ent->e.endFrame2,
+									ent->e.lerp2, ent->e.clearOrigin2 );
+								RE_BlendSkeleton( &ent->e.skeleton, &skel, ent->e.blendLerp );
+							}
+							// ent->e.skeleton.type = refSkeletonType_t::SK_ABSOLUTE;
 							R_AddIQMSurfaces( ent );
 							break;
 

src/engine/renderer/tr_types.h

@@ -214,11 +214,12 @@ struct refEntity_t
 	qhandle_t animationHandle;
 	int startFrame;
 	int endFrame;
-	int lerp;
+	float lerp;
 	int clearOrigin;
+	qhandle_t animationHandle2;
 	int startFrame2;
 	int endFrame2;
-	int lerp2;
+	float lerp2;
 	int clearOrigin2;
 	float blendLerp;
 	float scale;