🚧 node.scale -> node.baseScale

Author: SnaveSutit

schemas/pluginJson.schema.json

@@ -405,7 +405,7 @@
 							"resourceLocation",
 							"boundingBox",
 							"configs",
-							"scale"
+							"baseScale"
 						],
 						"properties": {
 							"modelPath": { "type": "string" },
@@ -419,7 +419,10 @@
 									"max": { "$ref": "#/definitions/vec3" }
 								}
 							},
-							"scale": { "type": "number" },
+							"baseScale": {
+								"type": "number",
+								"description": "The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit."
+							},
 							"configs": {
 								"type": "object",
 								"patternProperties": {
@@ -475,7 +478,7 @@
 							"backgroundColor",
 							"backgroundAlpha",
 							"align",
-							"scale",
+							"baseScale",
 							"config"
 						],
 						"properties": {
@@ -487,7 +490,10 @@
 								"type": "string",
 								"enum": ["left", "center", "right"]
 							},
-							"scale": { "type": "number" },
+							"baseScale": {
+								"type": "number",
+								"description": "The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit."
+							},
 							"config": {
 								"$ref": "#/definitions/boneConfig"
 							}
@@ -501,10 +507,13 @@
 						}
 					},
 					"then": {
-						"required": ["config", "block", "scale"],
+						"required": ["config", "block", "baseScale"],
 						"properties": {
 							"block": { "type": "string" },
-							"scale": { "type": "number" },
+							"baseScale": {
+								"type": "number",
+								"description": "The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit."
+							},
 							"config": {
 								"$ref": "#/definitions/boneConfig"
 							}
@@ -518,10 +527,13 @@
 						}
 					},
 					"then": {
-						"required": ["config", "item", "scale"],
+						"required": ["config", "item", "baseScale"],
 						"properties": {
 							"item": { "type": "string" },
-							"scale": { "type": "number" },
+							"baseScale": {
+								"type": "number",
+								"description": "The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit."
+							},
 							"config": {
 								"$ref": "#/definitions/boneConfig"
 							}

src/systems/animationRenderer.ts

@@ -163,7 +163,7 @@ export function getNodeTransforms(
 			case 'item_display':
 			case 'block_display':
 			case 'bone': {
-				matrix = getNodeMatrix(node.node, node.scale)
+				matrix = getNodeMatrix(node.node, node.baseScale)
 				// Only add the frame if the matrix has changed.
 				// NOTE - Disabled because it causes issues with vanilla interpolation.
 				if (lastFrame && lastFrame.matrix.equals(matrix)) continue

src/systems/rigRenderer.ts

@@ -90,7 +90,10 @@ export interface IRenderedNodes {
 		modelPath: string
 		resourceLocation: string
 		boundingBox: THREE.Box3
-		scale: number
+		/**
+		 * The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit.
+		 */
+		baseScale: number
 		configs: {
 			default?: IBlueprintBoneConfigJSON
 			variants: Record<string, IBlueprintBoneConfigJSON>
@@ -121,21 +124,30 @@ export interface IRenderedNodes {
 		align: Alignment
 		shadow: boolean
 		seeThrough: boolean
-		scale: number
+		/**
+		 * The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit.
+		 */
+		baseScale: number
 		config?: IBlueprintTextDisplayConfigJSON
 	}
 	ItemDisplay: IRenderedNode & {
 		type: 'item_display'
 		node: VanillaItemDisplay
 		item: string
-		scale: number
+		/**
+		 * The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit.
+		 */
+		baseScale: number
 		config?: IBlueprintBoneConfigJSON
 	}
 	BlockDisplay: IRenderedNode & {
 		type: 'block_display'
 		node: VanillaBlockDisplay
 		block: string
-		scale: number
+		/**
+		 * The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit.
+		 */
+		baseScale: number
 		config?: IBlueprintBoneConfigJSON
 	}
 }
@@ -343,7 +355,7 @@ function renderGroup(group: Group, rig: IRenderedRig): INodeStructure | undefine
 		customModelData: -1,
 		resourceLocation: parsed.resourceLocation,
 		boundingBox: getBoneBoundingBox(group),
-		scale: 1,
+		baseScale: 1,
 		configs: group.configs,
 	}
 
@@ -424,7 +436,7 @@ function renderGroup(group: Group, rig: IRenderedRig): INodeStructure | undefine
 		}
 	}
 
-	renderedBone.scale = 1 / scale
+	renderedBone.baseScale = 1 / scale
 	rig.models[group.uuid] = renderedBone.model
 	rig.nodeMap[group.uuid] = renderedBone
 	return structure
@@ -453,7 +465,7 @@ function renderItemDisplay(
 		name: display.name,
 		uuid: display.uuid,
 		item: display.item,
-		scale: 1,
+		baseScale: 1,
 		config: display.config,
 	}
 
@@ -487,7 +499,7 @@ function renderBlockDisplay(
 		name: display.name,
 		uuid: display.uuid,
 		block: display.block,
-		scale: 1,
+		baseScale: 1,
 		config: display.config,
 	}
 
@@ -524,7 +536,7 @@ function renderTextDisplay(display: TextDisplay, rig: IRenderedRig): INodeStruct
 		align: display.align,
 		shadow: display.shadow,
 		seeThrough: display.seeThrough,
-		scale: 1,
+		baseScale: 1,
 		config: display.config,
 	}