🚧Implement #242 & #240

- Reduced complexity of keyframe data.

Author: SnaveSutit

schemas/pluginJson.schema.json

@@ -222,6 +222,12 @@
 		},
 		"vec2": { "type": "array", "items": { "type": "number" }, "minItems": 2, "maxItems": 2 },
 		"vec3": { "type": "array", "items": { "type": "number" }, "minItems": 3, "maxItems": 3 },
+		"vec3String": {
+			"type": "array",
+			"items": { "type": "string" },
+			"minItems": 3,
+			"maxItems": 3
+		},
 		"vec4": { "type": "array", "items": { "type": "number" }, "minItems": 4, "maxItems": 4 },
 		"vanillaModel": {
 			"type": "object",
@@ -652,73 +658,72 @@
 		},
 		"keyframe": {
 			"type": "object",
-			"required": ["time", "uuid", "channel", "data_points", "interpolation", "easing"],
+			"required": ["time", "channel"],
 			"properties": {
 				"time": { "type": "number" },
-				"uuid": { "type": "string" },
-				"channel": { "type": "string" },
-				"data_points": {
-					"type": "array",
-					"items": { "$ref": "#/definitions/keyframeDataPoint" }
-				},
-				"interpolation": {
-					"type": "string",
-					"enum": ["linear", "bezier", "catmullrom", "step"]
+				"channel": { "type": "string" }
+			},
+			"oneOf": [
+				{
+					"required": ["value", "interpolation"],
+					"properties": {
+						"channel": { "enum": ["position", "rotation", "scale"] },
+						"value": { "$ref": "#/definitions/vec3String" },
+						"post": { "$ref": "#/definitions/vec3String" },
+						"interpolation": {
+							"oneOf": [
+								{
+									"type": "object",
+									"properties": {
+										"type": { "const": "linear" },
+										"easing": { "$ref": "#/definitions/easing" },
+										"easingArgs": {
+											"type": "array",
+											"items": { "type": "number" }
+										}
+									}
+								},
+								{
+									"type": "object",
+									"properties": {
+										"type": { "const": "bezier" }
+									}
+								},
+								{
+									"type": "object",
+									"properties": {
+										"type": { "const": "catmullrom" }
+									}
+								},
+								{
+									"type": "object",
+									"properties": {
+										"type": { "const": "step" }
+									}
+								}
+							]
+						}
+					}
 				},
-				"easing": {
-					"type": "string",
-					"enum": [
-						"linear",
-						"step",
-						"easeInQuad",
-						"easeOutQuad",
-						"easeInOutQuad",
-						"easeInCubic",
-						"easeOutCubic",
-						"easeInOutCubic",
-						"easeInQuart",
-						"easeOutQuart",
-						"easeInOutQuart",
-						"easeInQuint",
-						"easeOutQuint",
-						"easeInOutQuint",
-						"easeInSine",
-						"easeOutSine",
-						"easeInOutSine",
-						"easeInExpo",
-						"easeOutExpo",
-						"easeInOutExpo",
-						"easeInCirc",
-						"easeOutCirc",
-						"easeInOutCirc",
-						"easeInBack",
-						"easeOutBack",
-						"easeInOutBack",
-						"easeInElastic",
-						"easeOutElastic",
-						"easeInOutElastic",
-						"easeInBounce",
-						"easeOutBounce",
-						"easeInOutBounce"
-					]
+				{
+					"required": ["variant"],
+					"properties": {
+						"channel": { "const": "variant" },
+						"variant": { "type": "string" },
+						"execute_condition": { "type": "string" }
+					}
 				},
-				"easingArgs": {
-					"type": "array",
-					"items": { "type": "number" }
+				{
+					"required": ["commands"],
+					"properties": {
+						"channel": { "const": "commands" },
+						"commands": { "type": "string" },
+						"execute_condition": { "type": "string" },
+						"repeat": { "type": "boolean" },
+						"repeat_frequency": { "type": "number", "min": 1 }
+					}
 				}
-			}
-		},
-		"keyframeDataPoint": {
-			"type": "object",
-			"properties": {
-				"x": { "type": "string" },
-				"y": { "type": "string" },
-				"z": { "type": "string" },
-				"commands": { "type": "string" },
-				"execute_condition": { "type": "string" },
-				"repeat": { "type": "boolean" },
-				"repeat_frequency": { "type": "number", "min": 1 }
-			}
+			]
 		},
 		"variant": {
 			"type": "object",
@@ -754,6 +759,43 @@
 					"description": "Whether or not this variant is the default variant."
 				}
 			}
+		},
+		"easing": {
+			"type": "string",
+			"enum": [
+				"linear",
+				"step",
+				"easeInQuad",
+				"easeOutQuad",
+				"easeInOutQuad",
+				"easeInCubic",
+				"easeOutCubic",
+				"easeInOutCubic",
+				"easeInQuart",
+				"easeOutQuart",
+				"easeInOutQuart",
+				"easeInQuint",
+				"easeOutQuint",
+				"easeInOutQuint",
+				"easeInSine",
+				"easeOutSine",
+				"easeInOutSine",
+				"easeInExpo",
+				"easeOutExpo",
+				"easeInOutExpo",
+				"easeInCirc",
+				"easeOutCirc",
+				"easeInOutCirc",
+				"easeInBack",
+				"easeOutBack",
+				"easeInOutBack",
+				"easeInElastic",
+				"easeOutElastic",
+				"easeInOutElastic",
+				"easeInBounce",
+				"easeOutBounce",
+				"easeInOutBounce"
+			]
 		}
 	}
 }

src/systems/jsonCompiler.ts

@@ -4,6 +4,13 @@
 
 import type { IBlueprintBoneConfigJSON, IBlueprintVariantJSON } from '../blueprintFormat'
 import { type defaultValues } from '../blueprintSettings'
+import {
+	getKeyframeCommands,
+	getKeyframeExecuteCondition,
+	getKeyframeRepeat,
+	getKeyframeRepeatFrequency,
+	getKeyframeVariant,
+} from '../mods/customKeyframesMod'
 import { EasingKey } from '../util/easing'
 import { resolvePath } from '../util/fileUtil'
 import { detectCircularReferences, scrubUndefined } from '../util/misc'
@@ -46,20 +53,38 @@ type ExportedBakedAnimation = Omit<IRenderedAnimation, 'uuid' | 'frames' | 'incl
 	frames: ExportedAnimationFrame[]
 	includedNodes: string[]
 }
-type ExportedAnimator = Array<{
-	uuid: string
+type ExportedKeyframe = {
 	time: number
 	channel: string
-	data_points: KeyframeDataPoint[]
-	interpolation: 'linear' | 'bezier' | 'catmullrom' | 'step'
-	bezier_linked?: boolean
-	bezier_left_time?: ArrayVector3
-	bezier_left_value?: ArrayVector3
-	bezier_right_time?: ArrayVector3
-	bezier_right_value?: ArrayVector3
-	easing: EasingKey
-	easingArgs?: number[]
-}>
+	value?: [string, string, string]
+	post?: [string, string, string]
+	interpolation?:
+		| {
+				type: 'linear'
+				easing: EasingKey
+				easingArgs?: number[]
+		  }
+		| {
+				type: 'bezier'
+				bezier_linked?: boolean
+				bezier_left_time?: ArrayVector3
+				bezier_left_value?: ArrayVector3
+				bezier_right_time?: ArrayVector3
+				bezier_right_value?: ArrayVector3
+		  }
+		| {
+				type: 'catmullrom'
+		  }
+		| {
+				type: 'step'
+		  }
+	commands?: string
+	variant?: string
+	execute_condition?: string
+	repeat?: boolean
+	repeat_frequency?: number
+}
+type ExportedAnimator = ExportedKeyframe[]
 type ExportedDynamicAnimation = {
 	name: string
 	loop_mode: 'once' | 'hold' | 'loop'
@@ -113,6 +138,67 @@ export interface IExportedJSON {
 	animations: Record<string, ExportedBakedAnimation> | Record<string, ExportedDynamicAnimation>
 }
 
+function serailizeKeyframe(kf: _Keyframe): ExportedKeyframe {
+	const json = {
+		time: kf.time,
+		channel: kf.channel,
+		commands: getKeyframeCommands(kf),
+		variant: getKeyframeVariant(kf),
+		execute_condition: getKeyframeExecuteCondition(kf),
+		repeat: getKeyframeRepeat(kf),
+		repeat_frequency: getKeyframeRepeatFrequency(kf),
+	} as ExportedKeyframe
+
+	switch (json.channel) {
+		case 'variant':
+		case 'commands':
+			break
+		default: {
+			json.value = [
+				kf.get('x', 0).toString(),
+				kf.get('y', 0).toString(),
+				kf.get('z', 0).toString(),
+			]
+			json.interpolation = { type: kf.interpolation } as any
+		}
+	}
+
+	if (json.interpolation) {
+		switch (json.interpolation.type) {
+			case 'linear': {
+				json.interpolation.easing = kf.easing!
+				if (kf.easingArgs?.length) json.interpolation.easingArgs = kf.easingArgs
+				break
+			}
+			case 'bezier': {
+				json.interpolation.bezier_linked = kf.bezier_linked
+				json.interpolation.bezier_left_time = kf.bezier_left_time.slice() as ArrayVector3
+				json.interpolation.bezier_left_value = kf.bezier_left_value.slice() as ArrayVector3
+				json.interpolation.bezier_right_time = kf.bezier_right_time.slice() as ArrayVector3
+				json.interpolation.bezier_right_value =
+					kf.bezier_right_value.slice() as ArrayVector3
+				break
+			}
+			case 'catmullrom': {
+				break
+			}
+			case 'step': {
+				break
+			}
+		}
+	}
+
+	if (kf.data_points.length === 2) {
+		json.post = [
+			kf.get('x', 1).toString(),
+			kf.get('y', 1).toString(),
+			kf.get('z', 1).toString(),
+		]
+	}
+
+	return json
+}
+
 export function exportJSON(options: {
 	rig: IRenderedRig
 	animations: IRenderedAnimation[]
@@ -195,36 +281,9 @@ export function exportJSON(options: {
 				animators: {},
 			}
 			for (const [uuid, animator] of Object.entries(animation.animators)) {
-				const keyframes = animator.keyframes.map(kf => {
-					const keyframeJSON: any = kf.getUndoCopy(true)
-					delete keyframeJSON.color
-					if (
-						Array.isArray(keyframeJSON.easingArgs) &&
-						keyframeJSON.easingArgs.length === 0
-					) {
-						delete keyframeJSON.easingArgs
-					}
-					if (keyframeJSON.data_points?.length) {
-						const isCustomChannel = ['commands', 'variant'].includes(kf.channel)
-						for (const dp of keyframeJSON.data_points) {
-							if (isCustomChannel) {
-								delete dp.x
-								delete dp.y
-								delete dp.z
-								continue
-							}
-							if (dp.x !== undefined) dp.x = String(dp.x)
-							if (dp.y !== undefined) dp.y = String(dp.y)
-							if (dp.z !== undefined) dp.z = String(dp.z)
-						}
-					}
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-					return keyframeJSON
-				})
 				// Only include animators with keyframes
-				if (keyframes.length > 0) {
-					animJSON.animators[uuid] = keyframes
-				}
+				if (animator.keyframes.length === 0) continue
+				animJSON.animators[uuid] = animator.keyframes.map(serailizeKeyframe)
 			}
 			json.animations[animation.uuid] = animJSON
 		}

test_blueprints/armor_stand.ajblueprint

@@ -3033,7 +3033,7 @@
 			"override": false,
 			"length": 0.8,
 			"snapping": 20,
-			"selected": false,
+			"selected": true,
 			"saved": false,
 			"path": "",
 			"anim_time_update": "",