🚧 Added transformation to AnimationNodes

- Simplified `pos`, `rot`, and `scale` on `IAnimationNodes`.

Author: SnaveSutit

schemas/jsonExport.schema.json

@@ -197,6 +197,7 @@
 			}
 		},
 		"vec3": { "type": "array", "items": { "type": "number" }, "minItems": 3, "maxItems": 3 },
+		"vec4": { "type": "array", "items": { "type": "number" }, "minItems": 4, "maxItems": 4 },
 		"vanillaModel": {
 			"type": "object",
 			"required": ["textures", "elements", "display"],
@@ -306,6 +307,11 @@
 					"minItems": 16,
 					"maxItems": 16
 				},
+				"transformation": {
+					"translation": { "$ref": "#/definitions/vec3" },
+					"left_rotation": { "$ref": "#/definitions/vec4" },
+					"scale": { "$ref": "#/definitions/vec3" }
+				},
 				"pos": { "$ref": "#/definitions/vec3" },
 				"rot": { "$ref": "#/definitions/vec3" },
 				"scale": { "$ref": "#/definitions/vec3" },

src/systems/animated_java.mcb

@@ -378,8 +378,6 @@ dir <%export_namespace%> {
 												global.isStepInterpolation = !!(last?.interpolation === 'step')
 												global.lastActiveFrame[node.uuid] = node
 											%%>
-											# It's actually faster to use an on passeners call that checks tag immediately
-											# than to spread it into a function that runs a bunch of tag checks on each bone.
 											IF (node.interpolation === 'pre-post' || global.isStepInterpolation) {
 												$data merge entity $(<%node.type + '_' + node.name%>) { \
 														transformation: <%matrixToNbtFloatArray(node.matrix).toString()%>, \
@@ -396,24 +394,23 @@ dir <%export_namespace%> {
 										} ELSE IF (node.type === 'locator') {
 											IF (rig.nodeMap[node.uuid]?.config?.use_entity || rig.nodeMap[node.uuid]?.config?.ticking_commands) {
 												<%%
-													global.rot = getRotationFromQuaternion(node.rot)
 													global.merged.locators[node.name] = {
-														posx: node.pos.x,
-														posy: node.pos.y,
-														posz: node.pos.z,
-														rotx: global.rot.x,
-														roty: global.rot.y
+														posx: node.pos[0],
+														posy: node.pos[1],
+														posz: node.pos[2],
+														rotx: node.rot[0],
+														roty: node.rot[1]
 													}
 												%%>
 											}
 											IF (node.commands) {
 												execute on vehicle <%node.execute_condition ? node.execute_condition.trim() + ' ' : ''%>positioned \
-														^<%roundTo(node.pos.x, 10)%> \
-														^<%roundTo(node.pos.y, 10)%> \
-														^<%roundTo(node.pos.z, 10)%> \
+														^<%roundTo(node.pos[0], 10)%> \
+														^<%roundTo(node.pos[1], 10)%> \
+														^<%roundTo(node.pos[2], 10)%> \
 													rotated \
-														~<%roundTo(node.rot.x, 10)%> \
-														~<%roundTo(node.rot.y, 10)%> \
+														~<%roundTo(node.rot[0], 10)%> \
+														~<%roundTo(node.rot[1], 10)%> \
 												run {
 													<%%
 														emit.mcb(node.commands)
@@ -423,13 +420,12 @@ dir <%export_namespace%> {
 										} ELSE IF (node.type === 'camera') {
 											IF (rig.nodeMap[node.uuid]) {
 												<%%
-													global.rot = getRotationFromQuaternion(node.rot)
 													global.merged.cameras[node.name] = {
-														posx: node.pos.x,
-														posy: node.pos.y,
-														posz: node.pos.z,
-														rotx: global.rot.x,
-														roty: global.rot.y
+														posx: node.pos[0],
+														posy: node.pos[1],
+														posz: node.pos[2],
+														rotx: node.rot[0],
+														roty: node.rot[1]
 													}
 												%%>
 											}

src/systems/animationRenderer.ts

@@ -9,7 +9,7 @@ import { TextDisplay } from '../outliner/textDisplay'
 import { VanillaBlockDisplay } from '../outliner/vanillaBlockDisplay'
 import { VanillaItemDisplay } from '../outliner/vanillaItemDisplay'
 import { toSafeFuntionName } from '../util/minecraftUtil'
-import { roundToNth } from '../util/misc'
+import { eulerFromQuaternion, roundToNth } from '../util/misc'
 import { AnyRenderedNode, IRenderedRig } from './rigRenderer'
 import * as crypto from 'crypto'
 
@@ -29,10 +29,6 @@ function getNodeMatrix(node: OutlinerElement, scale: number) {
 	matrixWorld.setPosition(pos)
 
 	const scaleVec = new THREE.Vector3().setScalar(scale)
-	// Hacky way to force the matrix to update in-game
-	// scaleVec.x += Math.random() * 0.00001
-	// scaleVec.y += Math.random() * 0.00001
-	// scaleVec.z += Math.random() * 0.00001
 	matrixWorld.scale(scaleVec)
 
 	if (node instanceof TextDisplay) {
@@ -44,15 +40,28 @@ function getNodeMatrix(node: OutlinerElement, scale: number) {
 	return matrixWorld
 }
 
+function getDecomposedTransformation(matrix: THREE.Matrix4) {
+	const translation = new THREE.Vector3()
+	const left_rotation = new THREE.Quaternion()
+	const scale = new THREE.Vector3()
+	matrix.decompose(translation, left_rotation, scale)
+	return { translation, left_rotation, scale }
+}
+
 export interface IAnimationNode {
 	type: 'bone' | 'camera' | 'locator' | 'text_display' | 'item_display' | 'block_display'
 	name: string
 	uuid: string
 	node?: Group | NullObject | Locator | OutlinerElement | TextDisplay
 	matrix: THREE.Matrix4
-	pos: THREE.Vector3
-	rot: THREE.Quaternion
-	scale: THREE.Vector3
+	transformation: {
+		translation: THREE.Vector3
+		left_rotation: THREE.Quaternion
+		scale: THREE.Vector3
+	}
+	pos: ArrayVector3
+	rot: ArrayVector3
+	scale: ArrayVector3
 	interpolation?: 'step' | 'pre-post'
 	/**
 	 * Commands is only set for locator nodes
@@ -190,16 +199,18 @@ export function getAnimationNodes(
 		const rot = new THREE.Quaternion()
 		const scale = new THREE.Vector3()
 		matrix.decompose(pos, rot, scale)
+		const decomposed = getDecomposedTransformation(matrix)
 
 		nodes.push({
 			type: node.type,
 			name: node.name,
 			uuid,
 			node: node.node,
 			matrix,
-			pos,
-			rot,
-			scale,
+			transformation: decomposed,
+			pos: [pos.x, pos.y, pos.z],
+			rot: eulerFromQuaternion(rot).toArray(),
+			scale: [scale.x, scale.y, scale.z],
 			interpolation,
 			commands,
 			execute_condition: executeCondition,
@@ -291,9 +302,9 @@ export function hashAnimations(animations: IRenderedAnimation[]) {
 			hash.update(';' + frame.time.toString())
 			for (const node of frame.nodes) {
 				hash.update(';' + node.uuid)
-				hash.update(';' + node.pos.toArray().join(';'))
-				hash.update(';' + node.rot.toArray().join(';'))
-				hash.update(';' + node.scale.toArray().join(';'))
+				hash.update(';' + node.pos.join(';'))
+				hash.update(';' + node.rot.join(';'))
+				hash.update(';' + node.scale.join(';'))
 				node.interpolation && hash.update(';' + node.interpolation)
 				if (node.commands) hash.update(';' + node.commands)
 				if (node.execute_condition) hash.update(';' + node.execute_condition)

src/systems/datapackCompiler.ts

@@ -11,6 +11,7 @@ import {
 	matrixToNbtFloatArray,
 	replacePathPart,
 	sortObjectKeys,
+	transformationToNbt,
 	zip,
 } from './util'
 import { BoneConfig, TextDisplayConfig } from '../nodeConfigs'
@@ -23,7 +24,7 @@ import {
 } from '../util/minecraftUtil'
 import { JsonText } from './minecraft/jsonText'
 import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../interface/exportProgressDialog'
-import { getRotationFromQuaternion, roundTo } from '../util/misc'
+import { eulerFromQuaternion, roundTo } from '../util/misc'
 import { setTimeout } from 'timers'
 
 const BONE_TYPES = ['bone', 'text_display', 'item_display', 'block_display']
@@ -467,13 +468,12 @@ function createPassengerStorage(rig: IRenderedRig) {
 		switch (node.type) {
 			case 'locator':
 			case 'camera': {
-				const rot = getRotationFromQuaternion(node.rot)
 				const data = new NbtCompound()
-					.set('posx', new NbtFloat(node.pos.x))
-					.set('posy', new NbtFloat(node.pos.y))
-					.set('posz', new NbtFloat(node.pos.z))
-					.set('rotx', new NbtFloat(Math.radToDeg(rot.x)))
-					.set('roty', new NbtFloat(Math.radToDeg(rot.y)))
+					.set('posx', new NbtFloat(node.pos[0]))
+					.set('posy', new NbtFloat(node.pos[1]))
+					.set('posz', new NbtFloat(node.pos[2]))
+					.set('rotx', new NbtFloat(Math.radToDeg(node.rot[0])))
+					.set('roty', new NbtFloat(Math.radToDeg(node.rot[1])))
 				if (
 					node.type === 'locator' &&
 					(rig.nodeMap[node.uuid].node as Locator).config.use_entity
@@ -605,6 +605,7 @@ export async function compileDataPack(options: {
 		TELLRAW,
 		custom_summon_commands: aj.summon_commands,
 		matrixToNbtFloatArray,
+		transformationToNbt,
 		use_storage_for_animation: aj.use_storage_for_animation,
 		animationStorage: createAnimationStorage(animations),
 		rigHash,
@@ -613,7 +614,7 @@ export async function compileDataPack(options: {
 		BoneConfig,
 		roundTo,
 		nodeSorter,
-		getRotationFromQuaternion,
+		getRotationFromQuaternion: eulerFromQuaternion,
 	}
 	console.log('Compiler Variables:', variables)
 

src/systems/jsonExporter.ts

@@ -14,8 +14,13 @@ import type {
 	IRenderedRig,
 } from './rigRenderer'
 
-type ExportedAnimationNode = Omit<IAnimationNode, 'node' | 'matrix' | 'pos' | 'rot' | 'scale'> & {
+type ExportedAnimationNode = Omit<IAnimationNode, 'node' | 'matrix' | 'transformation'> & {
 	matrix: number[]
+	transformation: {
+		translation: ArrayVector3
+		left_rotation: ArrayVector4
+		scale: ArrayVector3
+	}
 	pos: ArrayVector3
 	rot: ArrayVector3
 	scale: ArrayVector3
@@ -191,9 +196,14 @@ function serailizeAnimationNode(node: IAnimationNode): ExportedAnimationNode {
 		name: node.name,
 		uuid: node.uuid,
 		matrix: node.matrix.elements,
-		pos: [node.pos.x, node.pos.y, node.pos.z],
-		rot: [node.rot.x, node.rot.y, node.rot.z],
-		scale: [node.scale.x, node.scale.y, node.scale.z],
+		transformation: {
+			translation: node.transformation.translation.toArray(),
+			left_rotation: node.transformation.left_rotation.toArray() as ArrayVector4,
+			scale: node.transformation.scale.toArray(),
+		},
+		pos: node.pos,
+		rot: node.rot,
+		scale: node.scale,
 		interpolation: node.interpolation,
 		commands: node.commands,
 		execute_condition: node.execute_condition,

src/systems/util.ts

@@ -1,4 +1,4 @@
-import { NbtFloat, NbtList } from 'deepslate/lib/nbt'
+import { NbtCompound, NbtFloat, NbtList } from 'deepslate/lib/nbt'
 import {
 	AsyncZipOptions,
 	AsyncZippable,
@@ -7,6 +7,7 @@ import {
 	type AsyncUnzipOptions,
 	type Unzipped,
 } from 'fflate/browser'
+import { IAnimationNode } from './animationRenderer'
 
 export function arrayToNbtFloatArray(array: number[]) {
 	return new NbtList(array.map(v => new NbtFloat(v)))
@@ -17,6 +18,14 @@ export function matrixToNbtFloatArray(matrix: THREE.Matrix4) {
 	return arrayToNbtFloatArray(matrixArray)
 }
 
+export function transformationToNbt(transformation: IAnimationNode['transformation']): NbtCompound {
+	const compound = new NbtCompound()
+	compound.set('translation', arrayToNbtFloatArray(transformation.translation.toArray()))
+	compound.set('left_rotation', arrayToNbtFloatArray(transformation.left_rotation.toArray()))
+	compound.set('scale', arrayToNbtFloatArray(transformation.scale.toArray()))
+	return compound
+}
+
 export function replacePathPart(path: string, oldPart: string, newPart: string) {
 	return path
 		.split(PathModule.sep)

src/util/misc.ts

@@ -103,7 +103,7 @@ export function detectCircularReferences(obj: any): boolean {
 	}
 }
 
-export function getRotationFromQuaternion(q: THREE.Quaternion) {
+export function eulerFromQuaternion(q: THREE.Quaternion) {
 	const euler = new THREE.Euler().setFromQuaternion(q, 'YXZ')
 	const rot = new THREE.Vector3(euler.x, euler.y, euler.z).multiplyScalar(180 / Math.PI)
 	rot.x *= -1

test_blueprints/armor_stand.ajblueprint

@@ -1,7 +1,7 @@
 {
 	"meta": {
 		"format": "animated_java_blueprint",
-		"format_version": "0.5.7",
+		"format_version": "0.5.8",
 		"uuid": "167b27cd-b559-3f13-a97c-0841fe21f1d1",
 		"save_location": "D:\\github-repos\\animated-java\\animated-java\\test_blueprints\\armor_stand.ajblueprint",
 		"last_used_export_namespace": "armor_stand"
@@ -11,7 +11,7 @@
 		"show_bounding_box": false,
 		"auto_bounding_box": true,
 		"bounding_box": [95, 32],
-		"enable_plugin_mode": false,
+		"enable_plugin_mode": true,
 		"resource_pack_export_mode": "raw",
 		"data_pack_export_mode": "raw",
 		"display_item": "minecraft:white_dye",
@@ -27,7 +27,7 @@
 		"interpolation_duration": 1,
 		"teleportation_duration": 1,
 		"use_storage_for_animation": false,
-		"baked_animations": false,
+		"baked_animations": true,
 		"json_file": "D:\\github-repos\\animated-java\\animated-java\\dist\\test.json",
 		"custom_summon_commands": ""
 	},