1 files changed, 222 insertions, 0 deletions

diff --git a/src/animation/FrameUpdate.cpp b/src/animation/FrameUpdate.cpp
index faeea709..a085fd4b 100644
--- a/src/animation/FrameUpdate.cpp
+++ b/src/animation/FrameUpdate.cpp
@@ -19,6 +19,9 @@ void FrameUpdateCallBackSkinned(AnimBlendFrameData *frame, void *arg);
 void FrameUpdateCallBackWithVelocityExtractionSkinned(AnimBlendFrameData *frame, void *arg);
 void FrameUpdateCallBackWith3dVelocityExtractionSkinned(AnimBlendFrameData *frame, void *arg);
 
+void FrameUpdateCallBackNonSkinnedCompressed(AnimBlendFrameData *frame, void *arg);
+void FrameUpdateCallBackSkinnedCompressed(AnimBlendFrameData *frame, void *arg);
+
 void
 FrameUpdateCallBackNonSkinned(AnimBlendFrameData *frame, void *arg)
 {
@@ -446,3 +449,222 @@ FrameUpdateCallBackOffscreen(AnimBlendFrameData *frame, void *arg)
 	if(frame->flag & AnimBlendFrameData::VELOCITY_EXTRACTION && gpAnimBlendClump->velocity)
 		FrameUpdateCallBackWithVelocityExtractionSkinned(frame, arg);
 }
+
+
+void
+FrameUpdateCallBackNonSkinnedCompressed(AnimBlendFrameData *frame, void *arg)
+{
+	CVector vec, pos(0.0f, 0.0f, 0.0f);
+	CQuaternion q, rot(0.0f, 0.0f, 0.0f, 0.0f);
+	float totalBlendAmount = 0.0f;
+	CVector trans(0.0f, 0.0f, 0.0f);
+	CVector cur(0.0f, 0.0f, 0.0f);
+	CVector end(0.0f, 0.0f, 0.0f);
+	bool looped = false;
+	RwMatrix *mat = RwFrameGetMatrix(frame->frame);
+	CAnimBlendNode **node;
+	AnimBlendFrameUpdateData *updateData = (AnimBlendFrameUpdateData*)arg;
+
+	if(frame->flag & AnimBlendFrameData::VELOCITY_EXTRACTION &&
+	   gpAnimBlendClump->velocity){
+		if(updateData->foobar)
+			for(node = updateData->nodes; *node; node++)
+				if((*node)->sequence && (*node)->association->IsPartial())
+					totalBlendAmount += (*node)->association->blendAmount;
+
+		for(node = updateData->nodes; *node; node++)
+			if((*node)->sequence && (*node)->sequence->HasTranslation()){
+				if((*node)->association->HasTranslation()){
+					(*node)->GetCurrentTranslationCompressed(vec, 1.0f-totalBlendAmount);
+					cur += vec;
+				}
+			}
+
+		for(node = updateData->nodes; *node; node++){
+			if((*node)->sequence){
+				bool nodelooped = (*node)->UpdateCompressed(vec, q, 1.0f-totalBlendAmount);
+#ifdef FIX_BUGS
+				if(DotProduct(rot, q) < 0.0f)
+					rot -= q;
+				else
+#endif
+					rot += q;
+				if((*node)->sequence->HasTranslation()){
+					pos += vec;
+					if((*node)->association->HasTranslation()){
+						trans += vec;
+						looped |= nodelooped;
+						if(nodelooped){
+							(*node)->GetEndTranslationCompressed(vec, 1.0f-totalBlendAmount);
+							end += vec;
+						}
+					}
+				}
+			}
+			++*node;
+		}
+
+		if((frame->flag & AnimBlendFrameData::IGNORE_ROTATION) == 0){
+			RwMatrixSetIdentity(mat);
+			rot.Normalise();
+			rot.Get(mat);
+		}
+
+		if((frame->flag & AnimBlendFrameData::IGNORE_TRANSLATION) == 0){
+			*gpAnimBlendClump->velocity = trans - cur;
+			if(looped)
+				*gpAnimBlendClump->velocity += end;
+			mat->pos.x = (pos - trans).x + frame->resetPos.x;
+			mat->pos.y = (pos - trans).y + frame->resetPos.y;
+			mat->pos.z = (pos - trans).z + frame->resetPos.z;
+		}
+		RwMatrixUpdate(mat);
+	}else{
+		if(updateData->foobar)
+			for(node = updateData->nodes; *node; node++)
+				if((*node)->sequence && (*node)->association->IsPartial())
+					totalBlendAmount += (*node)->association->blendAmount;
+
+		for(node = updateData->nodes; *node; node++){
+			if((*node)->sequence){
+				(*node)->UpdateCompressed(vec, q, 1.0f-totalBlendAmount);
+				if((*node)->sequence->HasTranslation())
+					pos += vec;
+#ifdef FIX_BUGS
+				if(DotProduct(rot, q) < 0.0f)
+					rot -= q;
+				else
+#endif
+					rot += q;
+			}
+			++*node;
+		}
+
+		if((frame->flag & AnimBlendFrameData::IGNORE_ROTATION) == 0){
+			RwMatrixSetIdentity(mat);
+			rot.Normalise();
+			rot.Get(mat);
+		}
+
+		if((frame->flag & AnimBlendFrameData::IGNORE_TRANSLATION) == 0){
+			mat->pos.x = pos.x;
+			mat->pos.y = pos.y;
+			mat->pos.z = pos.z;
+			mat->pos.x += frame->resetPos.x;
+			mat->pos.y += frame->resetPos.y;
+			mat->pos.z += frame->resetPos.z;
+		}
+		RwMatrixUpdate(mat);
+	}
+}
+
+void
+FrameUpdateCallBackSkinnedCompressed(AnimBlendFrameData *frame, void *arg)
+{
+	CVector vec, pos(0.0f, 0.0f, 0.0f);
+	CQuaternion q, rot(0.0f, 0.0f, 0.0f, 0.0f);
+	float totalBlendAmount = 0.0f;
+	CVector trans(0.0f, 0.0f, 0.0f);
+	CVector cur(0.0f, 0.0f, 0.0f);
+	CVector end(0.0f, 0.0f, 0.0f);
+	bool looped = false;
+	RpHAnimStdInterpFrame *xform = frame->hanimFrame;
+	CAnimBlendNode **node;
+	AnimBlendFrameUpdateData *updateData = (AnimBlendFrameUpdateData*)arg;
+
+	if(frame->flag & AnimBlendFrameData::VELOCITY_EXTRACTION &&
+	   gpAnimBlendClump->velocity){
+		if(updateData->foobar)
+			for(node = updateData->nodes; *node; node++)
+				if((*node)->sequence && (*node)->association->IsPartial())
+					totalBlendAmount += (*node)->association->blendAmount;
+
+		for(node = updateData->nodes; *node; node++)
+			if((*node)->sequence && (*node)->sequence->HasTranslation()){
+				if((*node)->association->HasTranslation()){
+					(*node)->GetCurrentTranslationCompressed(vec, 1.0f-totalBlendAmount);
+					cur += vec;
+				}
+			}
+
+		for(node = updateData->nodes; *node; node++){
+			if((*node)->sequence){
+				bool nodelooped = (*node)->UpdateCompressed(vec, q, 1.0f-totalBlendAmount);
+#ifdef FIX_BUGS
+				if(DotProduct(rot, q) < 0.0f)
+					rot -= q;
+				else
+#endif
+					rot += q;
+				if((*node)->sequence->HasTranslation()){
+					pos += vec;
+					if((*node)->association->HasTranslation()){
+						trans += vec;
+						looped |= nodelooped;
+						if(nodelooped){
+							(*node)->GetEndTranslationCompressed(vec, 1.0f-totalBlendAmount);
+							end += vec;
+						}
+					}
+				}
+			}
+			++*node;
+		}
+
+		if((frame->flag & AnimBlendFrameData::IGNORE_ROTATION) == 0){
+			rot.Normalise();
+			xform->q.imag.x = rot.x;
+			xform->q.imag.y = rot.y;
+			xform->q.imag.z = rot.z;
+			xform->q.real = rot.w;
+		}
+
+		if((frame->flag & AnimBlendFrameData::IGNORE_TRANSLATION) == 0){
+			*gpAnimBlendClump->velocity = trans - cur;
+			if(looped)
+				*gpAnimBlendClump->velocity += end;
+			xform->t.x = (pos - trans).x + frame->resetPos.x;
+			xform->t.y = (pos - trans).y + frame->resetPos.y;
+			xform->t.z = (pos - trans).z + frame->resetPos.z;
+		}
+	}else{
+		float transBlendAmount = 0.0f;
+
+		if(updateData->foobar)
+			for(node = updateData->nodes; *node; node++)
+				if((*node)->sequence && (*node)->association->IsPartial())
+					totalBlendAmount += (*node)->association->blendAmount;
+
+		for(node = updateData->nodes; *node; node++){
+			if((*node)->sequence){
+				(*node)->UpdateCompressed(vec, q, 1.0f-totalBlendAmount);
+				if((*node)->sequence->HasTranslation()){
+					pos += vec;
+					transBlendAmount += (*node)->association->blendAmount;
+				}
+				if(DotProduct(rot, q) < 0.0f)
+					rot -= q;
+				else
+					rot += q;
+			}
+			++*node;
+		}
+
+		if((frame->flag & AnimBlendFrameData::IGNORE_ROTATION) == 0){
+			rot.Normalise();
+			xform->q.imag.x = rot.x;
+			xform->q.imag.y = rot.y;
+			xform->q.imag.z = rot.z;
+			xform->q.real = rot.w;
+		}
+
+		if((frame->flag & AnimBlendFrameData::IGNORE_TRANSLATION) == 0){
+			xform->t.x = transBlendAmount*pos.x;
+			xform->t.y = transBlendAmount*pos.y;
+			xform->t.z = transBlendAmount*pos.z;
+			xform->t.x += (1.0f-transBlendAmount)*frame->resetPos.x;
+			xform->t.y += (1.0f-transBlendAmount)*frame->resetPos.y;
+			xform->t.z += (1.0f-transBlendAmount)*frame->resetPos.z;
+		}
+	}
+}