🏗️ Fixed a few more issues with pre-post keyframes

Author: SnaveSutit

src/systems/animationRenderer.ts

@@ -170,7 +170,6 @@ export function getFrame(
 			case 'bone': {
 				matrix = getNodeMatrix(outlinerNode, node.base_scale)
 				// Only add the frame if the matrix has changed.
-				// NOTE - Disabled because it causes issues with vanilla interpolation.
 				if (lastFrame && lastFrame.matrix.equals(matrix)) continue
 				// Inherit instant interpolation from parent
 				if (node.parent && node.parent !== 'root') {
@@ -188,6 +187,11 @@ export function getFrame(
 					interpolation = 'step'
 				} else if (prevKeyframe?.data_points.length === 2) {
 					interpolation = 'pre-post'
+					updatePreview(animation, time + 0.001)
+					const postMatrix = getNodeMatrix(outlinerNode, node.base_scale)
+					console.warn('pre-post', matrix.equals(postMatrix), matrix, postMatrix)
+					matrix = postMatrix
+					updatePreview(animation, time)
 				}
 
 				lastFrameCache.set(uuid, { matrix, keyframe })

src/systems/datapackCompiler/animation.mcb

@@ -393,9 +393,9 @@ dir <%export_namespace%> {
 												<%%
 													const last = global.lastActiveFrame[node.uuid]
 													global.isStepInterpolation = !!(last?.interpolation === 'step')
-													global.lastActiveFrame[node.uuid] = node
+													global.lastActiveFrame[node.uuid] = global.transform
 												%%>
-												IF (node.interpolation === 'pre-post' || global.isStepInterpolation) {
+												IF (global.transform.interpolation === 'pre-post' || global.isStepInterpolation) {
 													$data merge entity $(<%node.type + '_' + node.safe_name%>) { \
 															transformation: <%matrixToNbtFloatArray(global.transform.matrix).toString()%>, \
 															start_interpolation: -1, \
@@ -703,9 +703,6 @@ dir <%export_namespace%> {
 				{'export_namespace': '<%export_namespace%>', 'function_path': 'animated_java:<%export_namespace%>/apply_default_pose'}
 		REPEAT (Object.values(rig.nodes)) as node {
 			IF (['bone', 'text_display', 'item_display', 'block_display'].includes(node.type)) {
-				<%%
-					console.log(node)
-				%%>
 				execute on passengers if entity @s[tag=aj.<%export_namespace%>.bone.<%node.safe_name%>] run \
 					data merge entity @s {transformation: <%matrixToNbtFloatArray(node.default_transform.matrix).toString()%>, start_interpolation: 0}
 			}