✨ Update plugin compiler to support modern element rotation format

Author: SnaveSutit

schemas/example-plugin-blueprint.json

@@ -96,6 +96,96 @@
 						}
 					},
 					"display_rotation": [90.0, 20.0, 0.0]
+				},
+				{
+					"from": [0.0, 0.0, 0.0],
+					"to": [1.0, 1.0, 1.0],
+					"rotation": {
+						"x": 0,
+						"y": 0,
+						"z": 0,
+						"origin": [0, 0, 0],
+						"rescale": false
+					},
+					"faces": {
+						"north": {
+							"uv": [0, 0, 16, 16],
+							"texture_provider": { "type": "texture", "texture": "custom_texture" }
+						},
+						"east": {
+							"uv": [0, 0, 16, 16],
+							"texture_provider": {
+								"type": "texture",
+								"texture": "reference_texture"
+							}
+						},
+						"south": {
+							"uv": [0, 0, 16, 16],
+							"texture_provider": { "type": "texture", "texture": "custom_texture" },
+							"rotation": 90
+						},
+						"west": {
+							"uv": [0, 0, 16, 16],
+							"texture_provider": {
+								"type": "texture",
+								"texture": "reference_texture"
+							}
+						},
+						"up": {
+							"uv": [0, 0, 16, 16],
+							"texture_provider": { "type": "texture", "texture": "custom_texture" }
+						},
+						"down": {
+							"uv": [0, 0, 16, 16],
+							"texture_provider": {
+								"type": "texture_palette",
+								"texture_palette": "default_palette"
+							}
+						}
+					},
+					"display_rotation": [90.0, 20.0, 0.0]
+				},
+				{
+					"from": [0.0, 0.0, 0.0],
+					"to": [1.0, 1.0, 1.0],
+					"rotation": [0, 0, 0],
+					"faces": {
+						"north": {
+							"uv": [0, 0, 16, 16],
+							"texture_provider": { "type": "texture", "texture": "custom_texture" }
+						},
+						"east": {
+							"uv": [0, 0, 16, 16],
+							"texture_provider": {
+								"type": "texture",
+								"texture": "reference_texture"
+							}
+						},
+						"south": {
+							"uv": [0, 0, 16, 16],
+							"texture_provider": { "type": "texture", "texture": "custom_texture" },
+							"rotation": 90
+						},
+						"west": {
+							"uv": [0, 0, 16, 16],
+							"texture_provider": {
+								"type": "texture",
+								"texture": "reference_texture"
+							}
+						},
+						"up": {
+							"uv": [0, 0, 16, 16],
+							"texture_provider": { "type": "texture", "texture": "custom_texture" }
+						},
+						"down": {
+							"uv": [0, 0, 16, 16],
+							"texture_provider": {
+								"type": "texture_palette",
+								"texture_palette": "default_palette"
+							}
+						}
+					},
+					"display_rotation": [90.0, 20.0, 0.0]
 				}
 			]
 		},

schemas/plugin-blueprint.schema.json

@@ -319,20 +319,49 @@
 					"$ref": "#/definitions/vector3"
 				},
 				"rotation": {
-					"type": "object",
-					"required": ["angle", "axis", "origin"],
-					"properties": {
-						"angle": {
-							"type": "number"
+					"oneOf": [
+						{
+							"type": "object",
+							"required": ["angle", "axis", "origin"],
+							"properties": {
+								"angle": {
+									"type": "number"
+								},
+								"axis": {
+									"type": "string",
+									"enum": ["x", "y", "z"]
+								},
+								"origin": {
+									"$ref": "#/definitions/vector3"
+								}
+							}
 						},
-						"axis": {
-							"type": "string",
-							"enum": ["x", "y", "z"]
+						{
+							"type": "object",
+							"required": ["x", "y", "z", "origin"],
+							"properties": {
+								"x": {
+									"type": "number"
+								},
+								"y": {
+									"type": "number"
+								},
+								"z": {
+									"type": "number"
+								},
+								"origin": {
+									"$ref": "#/definitions/vector3"
+								},
+								"rescale": {
+									"type": "boolean",
+									"default": false
+								}
+							}
 						},
-						"origin": {
+						{
 							"$ref": "#/definitions/vector3"
 						}
-					}
+					]
 				},
 				"shade": {
 					"type": "boolean",

src/systems/pluginCompiler.ts

@@ -67,12 +67,21 @@ type BoneElementFaces = Partial<
 	Record<'north' | 'east' | 'south' | 'west' | 'up' | 'down', BoneElementFace>
 >
 
-interface BoneElementRotation {
-	angle: number
-	axis: 'x' | 'y' | 'z'
-	origin: ArrayVector3
-	rescale?: boolean
-}
+type BoneElementRotation =
+	| {
+			x: number
+			y: number
+			z: number
+			origin: ArrayVector3
+			rescale?: boolean
+	  }
+	| {
+			angle: number
+			axis: 'y' | 'x' | 'z'
+			origin: ArrayVector3
+			rescale?: boolean
+	  }
+	| ArrayVector3
 
 interface BoneElement {
 	from: ArrayVector3
@@ -331,15 +340,7 @@ function serializeBoneElements(
 			;(faces as any)[dir] = serializedFace
 		}
 
-		const rotation: BoneElementRotation =
-			el.rotation && !Array.isArray(el.rotation)
-				? {
-						angle: el.rotation.angle,
-						axis: el.rotation.axis as BoneElementRotation['axis'],
-						origin: el.rotation.origin as ArrayVector3,
-						rescale: (el.rotation as any).rescale,
-					}
-				: { angle: 0, axis: 'y', origin: [0, 0, 0] }
+		const rotation = el.rotation ?? { angle: 0, axis: 'y', origin: [0, 0, 0] }
 
 		return scrubUndefined({
 			from: el.from as ArrayVector3,
@@ -509,6 +510,7 @@ function serializeAnimation(options: {
 }): PluginAnimation {
 	const { animation, nodeUuidToId } = options
 
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	const loop_mode: LoopMode =
 		animation.loop_mode === 'loop'
 			? { type: 'loop', loop_delay: String(animation.loop_delay ?? 0) }
@@ -518,6 +520,7 @@ function serializeAnimation(options: {
 
 	const maxTime = animation.frames.at(-1)?.time ?? 0
 
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	const node_keyframes: NonNullable<PluginAnimation['node_keyframes']> = {}
 
 	for (const frame of animation.frames) {
@@ -563,6 +566,7 @@ function serializeAnimation(options: {
 		}
 	}
 
+	// eslint-disable-next-line @typescript-eslint/naming-convention
 	let global_keyframes: NonNullable<PluginAnimation['global_keyframes']> | undefined
 
 	// map the baked variant for each frame into the texture keyframes