🚧 Fix #225

I found a way to avoid overwriting the `Preview.raycast` method, which should make selecting custom elements much more stable now.

Author: SnaveSutit

src/index.ts

@@ -36,7 +36,7 @@ import './mods/modelFormatConvertToMod'
 import './mods/modelFormatMod'
 import './mods/molangMod'
 import './mods/panelMod'
-import './mods/previewRaycastMod'
+// import './mods/previewRaycastMod'
 import './mods/projectSettingsActionOverride'
 import './mods/saveAllAnimationsActionMod'
 import './mods/saveProjectActionMod'

src/outliner/resizableOutlinerElement.ts

@@ -115,6 +115,7 @@ new Property(ResizableOutlinerElement, 'string', 'visibility', { default: true }
 export const PREVIEW_CONTROLLER = new NodePreviewController(ResizableOutlinerElement, {
 	setup(el: ResizableOutlinerElement) {
 		const mesh = new THREE.Mesh()
+		mesh.isElement = true
 		mesh.fix_rotation = new THREE.Euler(0, 0, 0, 'ZYX')
 		mesh.fix_rotation.x = Math.degToRad(el.rotation[0])
 		mesh.fix_rotation.y = Math.degToRad(el.rotation[1])

src/outliner/textDisplay.ts

@@ -326,27 +326,40 @@ export class TextDisplay extends ResizableOutlinerElement {
 		const font = await getVanillaFont()
 		// Hide the geo while rendering
 
-		const { mesh, outline } = await font.generateTextMesh({
+		const { mesh: newMesh, outline } = await font.generateTextMesh({
 			jsonText,
 			maxLineWidth: this.lineWidth,
 			backgroundColor: this.backgroundColor,
 			backgroundAlpha: this.backgroundAlpha,
 			shadow: this.shadow,
 			alignment: this.align,
 		})
-		mesh.name = this.uuid + '_text'
-		const previousMesh = this.mesh.children.find(v => v.name === mesh.name)
+		newMesh.name = this.uuid + '_text'
+		const previousMesh = this.mesh.children.find(v => v.name === newMesh.name)
 		if (previousMesh) this.mesh.remove(previousMesh)
-		this.mesh.add(mesh)
+
+		const mesh = this.mesh as THREE.Mesh
+		mesh.name = this.uuid
+		mesh.geometry = (newMesh.children[0] as THREE.Mesh).geometry.clone()
+		mesh.geometry.translate(
+			newMesh.children[0].position.x,
+			newMesh.children[0].position.y,
+			newMesh.children[0].position.z
+		)
+		mesh.geometry.rotateY(Math.PI)
+		mesh.geometry.scale(newMesh.scale.x, newMesh.scale.y, newMesh.scale.z)
+		mesh.material = Canvas.transparentMaterial
+
+		mesh.add(newMesh)
 
 		outline.name = this.uuid + '_outline'
 		outline.visible = this.selected
-		this.mesh.outline = outline
-		const previousOutline = this.mesh.children.find(v => v.name === outline.name)
-		if (previousOutline) this.mesh.remove(previousOutline)
-		this.mesh.add(outline)
-		this.mesh.visible = this.visibility
-		return mesh
+		mesh.outline = outline
+		const previousOutline = mesh.children.find(v => v.name === outline.name)
+		if (previousOutline) mesh.remove(previousOutline)
+		mesh.add(outline)
+		mesh.visible = this.visibility
+		return newMesh
 	}
 }
 new Property(TextDisplay, 'string', 'text', { default: '"Hello World!"' })

src/outliner/vanillaBlockDisplay.ts

@@ -229,16 +229,21 @@ export const PREVIEW_CONTROLLER = new NodePreviewController(VanillaBlockDisplay,
 			.then(result => {
 				if (!result?.mesh) return
 
-				el.mesh.clear()
+				const mesh = el.mesh as THREE.Mesh
+				mesh.name = el.uuid
+				mesh.material = Canvas.wireframeMaterial
+				mesh.geometry = result.boundingBox
+
+				mesh.clear()
 				result.outline.name = el.uuid + '_outline'
 				result.outline.visible = el.selected
-				el.mesh.outline = result.outline
-				el.mesh.add(result.mesh)
-				el.mesh.add(result.outline)
+				mesh.outline = result.outline
+				mesh.add(result.mesh)
+				mesh.add(result.outline)
 
 				el.preview_controller.updateHighlight(el)
 				el.preview_controller.updateTransform(el)
-				el.mesh.visible = el.visibility
+				mesh.visible = el.visibility
 				TickUpdates.selection = true
 
 				el.ready = true

src/outliner/vanillaItemDisplay.ts

@@ -227,15 +227,18 @@ export const PREVIEW_CONTROLLER = new NodePreviewController(VanillaItemDisplay,
 		void getItemModel(el.item)
 			.then(result => {
 				if (!result) return
-
-				el.mesh.clear()
-				el.mesh.add(result.mesh)
-				el.mesh.add(result.outline)
-				el.mesh.outline = result.outline
+				const mesh = el.mesh as THREE.Mesh
+				mesh.name = el.uuid
+				mesh.geometry = result.boundingBox
+				mesh.material = Canvas.wireframeMaterial
+				mesh.clear()
+				mesh.add(result.mesh)
+				mesh.add(result.outline)
+				mesh.outline = result.outline
 
 				el.preview_controller.updateHighlight(el)
 				el.preview_controller.updateTransform(el)
-				el.mesh.visible = el.visibility
+				mesh.visible = el.visibility
 				TickUpdates.selection = true
 
 				el.ready = true

src/systems/minecraft/blockModelManager.ts

@@ -17,7 +17,12 @@ import {
 } from './model'
 import { TEXTURE_FRAG_SHADER, TEXTURE_VERT_SHADER } from './textureShaders'
 
-type BlockModelMesh = { mesh: THREE.Mesh; outline: THREE.LineSegments; isBlock: true }
+type BlockModelMesh = {
+	mesh: THREE.Mesh
+	outline: THREE.LineSegments
+	boundingBox: THREE.BufferGeometry
+	isBlock: true
+}
 
 const LOADER = new THREE.TextureLoader()
 const BLOCK_MODEL_CACHE = new Map<string, BlockModelMesh>()
@@ -59,6 +64,7 @@ export async function getBlockModel(block: string): Promise<BlockModelMesh | und
 	result = {
 		mesh: result.mesh.clone(true),
 		outline: result.outline.clone(true),
+		boundingBox: result.boundingBox.clone(),
 		isBlock: true,
 	}
 	for (const child of result.mesh.children as THREE.Mesh[]) {
@@ -112,6 +118,7 @@ async function generateModelMesh(
 	}
 
 	const mesh: THREE.Mesh = new THREE.Mesh()
+	const boundingBoxes: THREE.BufferGeometry[] = []
 	const outlineGeos: THREE.BufferGeometry[] = []
 
 	for (const element of model.elements) {
@@ -334,6 +341,7 @@ async function generateModelMesh(
 		geometry.setAttribute('uv', new THREE.Float32BufferAttribute(uvs, 2))
 		geometry.attributes.uv.needsUpdate = true
 
+		boundingBoxes.push(geometry.clone())
 		const outlineGeo = new THREE.EdgesGeometry(geometry)
 		outlineGeos.push(outlineGeo)
 		const elementMesh = new THREE.Mesh(geometry, materials)
@@ -342,12 +350,13 @@ async function generateModelMesh(
 
 	const outlineGeo = mergeGeometries(outlineGeos)!
 	const outline = new THREE.LineSegments(outlineGeo, Canvas.outlineMaterial)
+	const boundingBox = mergeGeometries(boundingBoxes)!
 
 	outline.no_export = true
 	outline.renderOrder = 2
 	outline.frustumCulled = false
 
-	return { mesh, outline, isBlock: true }
+	return { mesh, outline, boundingBox, isBlock: true }
 }
 
 const TEXTURE_CACHE = new Map<string, THREE.Texture>()
@@ -423,6 +432,7 @@ export async function parseBlockState(block: IParsedBlock): Promise<BlockModelMe
 	} else if (blockstate.multipart) {
 		// throw new Error(`Multipart block states are not supported yet`)
 		const mesh = new THREE.Mesh()
+		const boundingBoxes: THREE.BufferGeometry[] = []
 		const outlines: THREE.BufferGeometry[] = []
 		for (const c of blockstate.multipart) {
 			const result = await parseMultipartCase(block, c)
@@ -433,6 +443,10 @@ export async function parseBlockState(block: IParsedBlock): Promise<BlockModelMe
 				newChild.rotateY(result.mesh.rotation.y)
 				newChild.rotateX(result.mesh.rotation.x)
 				mesh.add(newChild)
+				const boundingBox = result.boundingBox.clone()
+				boundingBox.rotateY(result.mesh.rotation.y)
+				boundingBox.rotateX(result.mesh.rotation.x)
+				boundingBoxes.push(boundingBox)
 			}
 			const outlineGeo = result.outline.geometry.clone()
 			outlineGeo.rotateY(result.mesh.rotation.y)
@@ -448,12 +462,13 @@ export async function parseBlockState(block: IParsedBlock): Promise<BlockModelMe
 
 		const outlineGeo = mergeGeometries(outlines)!
 		const outline = new THREE.LineSegments(outlineGeo, Canvas.outlineMaterial)
+		const boundingBox = mergeGeometries(boundingBoxes)!
 
 		outline.no_export = true
 		outline.renderOrder = 2
 		outline.frustumCulled = false
 
-		return { mesh, outline, isBlock: true }
+		return { mesh, outline, boundingBox, isBlock: true }
 	}
 
 	throw new Error(`Unsupported block state '${block.resourceLocation}'`)

src/systems/minecraft/itemModelManager.ts

@@ -5,7 +5,12 @@ import { parseBlockModel } from './blockModelManager'
 import { IItemModel } from './model'
 import { TEXTURE_FRAG_SHADER, TEXTURE_VERT_SHADER } from './textureShaders'
 
-type ItemModelMesh = { mesh: THREE.Mesh; outline: THREE.LineSegments; isBlock?: boolean }
+type ItemModelMesh = {
+	mesh: THREE.Mesh
+	outline: THREE.LineSegments
+	boundingBox: THREE.BufferGeometry
+	isBlock?: boolean
+}
 
 const LOADER = new THREE.TextureLoader()
 const ITEM_MODEL_CACHE = new Map<string, ItemModelMesh>()
@@ -22,6 +27,7 @@ export async function getItemModel(item: string): Promise<ItemModelMesh | undefi
 	result = {
 		mesh: result.mesh.clone(true),
 		outline: result.outline.clone(true),
+		boundingBox: result.boundingBox.clone(),
 		isBlock: result.isBlock,
 	}
 
@@ -81,6 +87,7 @@ async function parseItemModel(location: string, childModel?: IItemModel): Promis
 
 async function generateItemMesh(location: string, model: IItemModel): Promise<ItemModelMesh> {
 	const masterMesh = new THREE.Mesh()
+	const boundingBoxes: THREE.BufferGeometry[] = []
 	const outlineGeos: THREE.BufferGeometry[] = []
 
 	for (const textureResourceLoc of Object.values(model.textures)) {
@@ -267,14 +274,16 @@ async function generateItemMesh(location: string, model: IItemModel): Promise<It
 			new THREE.BufferAttribute(new Float32Array(outlineVerts), 3)
 		)
 		outlineGeos.push(outlineGeo)
+		boundingBoxes.push(mesh.geometry.clone())
 		masterMesh.add(mesh)
 	}
 
 	const outlineGeo = mergeGeometries(outlineGeos)
+	const boundingBox = mergeGeometries(boundingBoxes)!
 	const outline = new THREE.LineSegments(
 		new THREE.EdgesGeometry(outlineGeo as THREE.BufferGeometry),
 		Canvas.outlineMaterial
 	)
 
-	return { mesh: masterMesh, outline }
+	return { mesh: masterMesh, outline, boundingBox }
 }

test_blueprints/blockstates.ajblueprint

@@ -323,6 +323,23 @@
 			"align": "center",
 			"uuid": "e1a16324-658b-a9af-1095-ca2a83c80595",
 			"type": "animated_java:vanilla_block_display"
+		},
+		{
+			"name": "text_display",
+			"position": [0, 27, 0],
+			"rotation": [0, 0, 0],
+			"scale": [1, 1, 1],
+			"visibility": true,
+			"item": "minecraft:diamond",
+			"config": {},
+			"block": "minecraft:stone",
+			"text": "\"My House!\"",
+			"lineWidth": 200,
+			"backgroundColor": "#000000",
+			"backgroundAlpha": 0.25098,
+			"align": "center",
+			"uuid": "3988627b-b0c6-8a09-9d3f-230adeb648f8",
+			"type": "animated_java:text_display"
 		}
 	],
 	"outliner": [
@@ -342,7 +359,8 @@
 		"dea933e7-4568-aae1-86c4-f761f5d0f2e2",
 		"42bafea5-d05a-8106-0db4-0d1b0067a68e",
 		"e1a16324-658b-a9af-1095-ca2a83c80595",
-		"215cf9b7-1949-5e9b-b7b1-a35f59e58b2d"
+		"215cf9b7-1949-5e9b-b7b1-a35f59e58b2d",
+		"3988627b-b0c6-8a09-9d3f-230adeb648f8"
 	],
 	"textures": [],
 	"variants": {
@@ -351,7 +369,8 @@
 			"display_name": "Default",
 			"uuid": "c79ede10-67d7-8730-033c-de43ab658b53",
 			"texture_map": {},
-			"excluded_nodes": []
+			"excluded_nodes": [],
+			"is_default": true
 		},
 		"list": []
 	},