💔 Broken attempts at fixing things

TODO.md

@@ -51,7 +51,8 @@
     - [ ] Add an option to switch the display entity between item and block display.
     - [ ] Figure out a way to allow the user to scale the model of a bone with a display item set.
 - [ ] Add Variants to the UndoSystem (Blocked by vanilla Blockbench not supporting custom undo actions)
-- [x] Add a bone config option to replace the bone's display item with a custom item.
+- [ ] Add vanilla item displays
+    - [x] Create a custom element type for item displays.
     - [ ] Add rendering for vanilla item models.
         - [x] Parent model inheritance
         - [x] item/generated
@@ -73,10 +74,14 @@
                 - [ ] template_skull
                 - [ ] trident_in_hand
                 - [ ] trident_throwing
+- [ ] Add vanilla block displays
+    - [x] Create a custom element type for block displays.
     - [ ] Add rendering for vanilla block models.
+        - [ ] Use Blockstates to select models.
         - [x] Parent model inheritance
         - [x] block/block
         - [ ] Edge Cases go here
+            - [ ] 
 - [ ] Locator rotation support
 
 # Data Pack Compiler
@@ -97,6 +102,8 @@
 - [ ] Figure out how cameras will work.
 - [ ] Check for references to non-existant functions in merged function tags, and remove them.
 - [ ] Apply variant keyframes in animations.
+- [ ] Add support for vanilla item displays.
+- [ ] Add support for vanilla block displays.
 
 # Resource Pack
 

package.json

@@ -3,7 +3,7 @@
 	"name": "animated_java",
 	"title": "Animated Java",
 	"version": "1.0.0",
-	"min_blockbench_version": "4.9.4",
+	"min_blockbench_version": "4.10.0",
 	"author": {
 		"name": "Titus Evans (SnaveSutit)",
 		"email": "snavesutit@gmail.com",

src/blockbenchTypeMods.d.ts

@@ -22,6 +22,7 @@ declare module 'three' {
 		isVanillaItemModel?: boolean
 		isVanillaBlockModel?: boolean
 		isTextDisplayText?: boolean
+		fix_scale?: THREE.Vector3
 	}
 }
 
@@ -106,6 +107,8 @@ declare global {
 			BLUEPRINT_FORMAT: typeof BLUEPRINT_FORMAT
 			BLUEPRINT_CODEC: typeof BLUEPRINT_CODEC
 			TextDisplay: typeof TextDisplay
+			VanillaItemDisplay: typeof VanillaItemDisplay
+			VanillaBlockDisplay: typeof VanillaBlockDisplay
 		}
 	}
 }

src/blueprintFormat.ts

@@ -601,11 +601,12 @@ export function saveBlueprint() {
 export function updateRotationLock() {
 	if (!isCurrentFormat()) return
 	BLUEPRINT_FORMAT.rotation_limit = !(
-		Group.selected || !!AnimatedJava.API.TextDisplay.selected.length
-	)
-	BLUEPRINT_FORMAT.rotation_snap = !(
-		Group.selected || !!AnimatedJava.API.TextDisplay.selected.length
+		Group.selected ||
+		!!AnimatedJava.API.TextDisplay.selected.length ||
+		!!AnimatedJava.API.VanillaItemDisplay.selected.length ||
+		!!AnimatedJava.API.VanillaBlockDisplay.selected.length
 	)
+	BLUEPRINT_FORMAT.rotation_snap = BLUEPRINT_FORMAT.rotation_limit
 }
 
 export function disableRotationLock() {

src/index.ts

@@ -28,7 +28,6 @@ import './mods/elementToolbarsMod'
 import './mods/exportOverActionMod'
 import './mods/groupContextMenuMod'
 import './mods/groupNameMod'
-import './mods/groupPreviewControllerMod'
 import './mods/keyframeMod'
 import './mods/locatorAnimatorMod'
 import './mods/locatorContextMenuMod'
@@ -43,6 +42,7 @@ import './mods/saveAllAnimationsActionMod'
 import './mods/saveProjectActionMod'
 import './mods/saveProjectAsActionMod'
 import './mods/variantPreviewCubeFaceMod'
+import './mods/animatorShowDefaultPoseMod'
 // Outliner
 import './outliner/textDisplay'
 import './outliner/vanillaItemDisplay'
@@ -71,6 +71,7 @@ import { getVanillaFont } from './systems/minecraft/fontManager'
 import * as itemModelManager from './systems/minecraft/itemModelManager'
 import * as blockModelManager from './systems/minecraft/blockModelManager'
 import { VanillaItemDisplay } from './outliner/vanillaItemDisplay'
+import { VanillaBlockDisplay } from './outliner/vanillaBlockDisplay'
 
 // Show loading popup
 void showLoadingPopup().then(async () => {
@@ -110,6 +111,7 @@ globalThis.AnimatedJava = {
 		itemModelManager,
 		blockModelManager,
 		VanillaItemDisplay,
+		VanillaBlockDisplay,
 	},
 }
 

src/mods/animatorShowDefaultPoseMod.ts

@@ -0,0 +1,40 @@
+import { isCurrentFormat } from '../blueprintFormat'
+import { PACKAGE } from '../constants'
+import { createBlockbenchMod } from '../util/moddingTools'
+
+createBlockbenchMod(
+	`${PACKAGE.name}:animatorShowDefaultPose`,
+	{
+		originalShowDefaultPose: Animator.showDefaultPose,
+	},
+	context => {
+		Animator.showDefaultPose = function (noMatrixUpdate?: boolean) {
+			if (isCurrentFormat()) {
+				const elements = [...Group.all, ...Outliner.elements]
+				for (const node of elements) {
+					// @ts-expect-error
+					if (!node.constructor.animator) continue
+					const mesh = node.mesh as THREE.Mesh
+					if (mesh.fix_rotation) mesh.rotation.copy(mesh.fix_rotation as THREE.Euler)
+					if (mesh.fix_position) mesh.position.copy(mesh.fix_position as THREE.Vector3)
+					if (
+						// @ts-expect-error
+						node.constructor.animator.prototype.channels &&
+						// @ts-expect-error
+						node.constructor.animator.prototype.channels.scale
+					) {
+						mesh.scale.x = mesh.scale.y = mesh.scale.z = 1
+					}
+				}
+				if (!noMatrixUpdate) scene.updateMatrixWorld()
+			} else {
+				return context.originalShowDefaultPose(noMatrixUpdate)
+			}
+		}
+
+		return context
+	},
+	context => {
+		Animator.showDefaultPose = context.originalShowDefaultPose
+	}
+)

src/mods/previewRaycastMod.ts

@@ -34,12 +34,6 @@ createBlockbenchMod(
 			if ((!isClick && !isHover) || Transformer.dragging) return raycast(event)
 			convertTouchEvent(event)
 
-			if (isHover) {
-				for (const group of Group.all) {
-					Group.preview_controller.updateHighlight(group)
-				}
-			}
-
 			const canvasOffset = $(this.canvas).offset()!
 			this.mouse.x = ((event.clientX - canvasOffset.left) / this.width) * 2 - 1
 			this.mouse.y = -((event.clientY - canvasOffset.top) / this.height) * 2 + 1

src/outliner/textDisplay.ts

@@ -364,8 +364,9 @@ OutlinerElement.registerType(TextDisplay, TextDisplay.type)
 export const PREVIEW_CONTROLLER = new NodePreviewController(TextDisplay, {
 	setup(el: TextDisplay) {
 		const textMesh = new THREE.Mesh(new THREE.PlaneGeometry(0, 0))
-		textMesh.fix_rotation = new THREE.Euler(0, 0, 0, 'ZYX')
-		textMesh.fix_position = new THREE.Vector3(0, 0, 0)
+		textMesh.fix_rotation = new THREE.Euler(...el.rotation, 'ZYX')
+		textMesh.fix_position = new THREE.Vector3(...el.position)
+		textMesh.fix_scale = new THREE.Vector3(...el.scale)
 		// Minecraft's transparency is funky 😭
 		textMesh.renderOrder = -1
 
@@ -401,9 +402,20 @@ export const PREVIEW_CONTROLLER = new NodePreviewController(TextDisplay, {
 		void el.updateText()
 	},
 	updateTransform(el: TextDisplay) {
-		NodePreviewController.prototype.updateTransform.call(this, el)
+		NodePreviewController.prototype.updateTransform.call(PREVIEW_CONTROLLER, el)
 		if (el.mesh.fix_position) {
 			el.mesh.fix_position.set(...el.position)
+			if (el.parent instanceof Group) {
+				el.mesh.fix_position.x -= el.parent.origin[0]
+				el.mesh.fix_position.y -= el.parent.origin[1]
+				el.mesh.fix_position.z -= el.parent.origin[2]
+			}
+		}
+		if (el.mesh.fix_rotation) {
+			el.mesh.fix_rotation.set(...el.rotation)
+		}
+		if (el.mesh.fix_scale) {
+			el.mesh.fix_scale.set(...el.scale)
 		}
 	},
 })
@@ -500,6 +512,62 @@ class TextDisplayAnimator extends BoneAnimator {
 		this.getElement()
 		return !!(this.element && this.element.mesh)
 	}
+
+	displayRotation(arr: ArrayVector3 | ArrayVector4, multiplier = 1) {
+		const bone = this.getElement().mesh
+
+		if (bone.fix_rotation) {
+			bone.rotation.copy(bone.fix_rotation as THREE.Euler)
+		}
+
+		if (arr) {
+			if (arr.length === 4) {
+				const added_rotation = new THREE.Euler().setFromQuaternion(
+					new THREE.Quaternion().fromArray(arr),
+					'ZYX'
+				)
+				bone.rotation.x -= added_rotation.x * multiplier
+				bone.rotation.y -= added_rotation.y * multiplier
+				bone.rotation.z += added_rotation.z * multiplier
+			} else {
+				bone.rotation.x += Math.degToRad(-arr[0]) * multiplier
+				bone.rotation.y += Math.degToRad(-arr[1]) * multiplier
+				bone.rotation.z += Math.degToRad(arr[2]) * multiplier
+			}
+		}
+		if (this.rotation_global) {
+			const quat = bone.parent?.getWorldQuaternion(Reusable.quat1)
+			if (!quat) return this
+			quat.invert()
+			bone.quaternion.premultiply(quat)
+		}
+		return this
+	}
+
+	displayPosition(arr: ArrayVector3, multiplier = 1) {
+		const bone = this.getElement().mesh
+		if (bone.fix_position) {
+			bone.position.copy(bone.fix_position as THREE.Vector3)
+		}
+		if (arr) {
+			bone.position.x -= arr[0] * multiplier
+			bone.position.y += arr[1] * multiplier
+			bone.position.z += arr[2] * multiplier
+		}
+		return this
+	}
+
+	displayScale(arr: ArrayVector3, multiplier = 1) {
+		if (!arr) return this
+		const bone = this.getElement().mesh
+		if (bone.fix_scale) {
+			bone.scale.copy(bone.fix_scale)
+		}
+		bone.scale.x *= 1 + (arr[0] - 1) * multiplier || 0.00001
+		bone.scale.y *= 1 + (arr[1] - 1) * multiplier || 0.00001
+		bone.scale.z *= 1 + (arr[2] - 1) * multiplier || 0.00001
+		return this
+	}
 }
 TextDisplayAnimator.prototype.type = TextDisplay.type
 TextDisplay.animator = TextDisplayAnimator as any