Merge branch 'experimental' of https://github.com/Animated-Java/animated-java

Author: IanSSenne

debug models/train_with_states.ajmodel

@@ -1,26 +1,27 @@
 {
   "meta": {
     "format_version": "0.0",
-    "creation_time": 1641650938,
+    "creation_time": 1641769747,
     "model_format": "animated_java/ajmodel",
     "box_uv": false,
     "settings": {
       "animatedJava": {
         "projectName": "armor_stand",
-        "exporter": "animationExporter",
-        "verbose": false,
+        "exporter": "vanillaAnimationExporter",
+        "verbose": true,
         "rigItem": "minecraft:leather_horse_armor",
         "rigModelsExportFolder": "C:\\Users\\Snave\\AppData\\Roaming\\.minecraft\\resourcepacks\\Animated Java Testing\\assets\\animated_java\\models\\rigs\\armor_stand",
         "predicateFilePath": "C:\\Users\\Snave\\AppData\\Roaming\\.minecraft\\resourcepacks\\Animated Java Testing\\assets\\minecraft\\models\\item\\leather_horse_armor.json",
         "transparentTexturePath": "C:\\Users\\Snave\\AppData\\Roaming\\.minecraft\\resourcepacks\\Animated Java Testing\\assets\\minecraft\\textures\\transparent.png"
       },
-      "animatedJava_exporter_statueExporter": {
+      "vanillaStatueExporter": {
         "rootEntityType": "minecraft:marker",
         "rootEntityNbt": "{}",
         "markerArmorStands": true,
         "modelTag": "aj.%projectName",
         "rootTag": "aj.%projectName.root",
         "allBonesTag": "aj.%projectName.bone",
+        "boneModelDisplayTag": "aj.%projectName.bone_display",
         "individualBoneTag": "aj.%projectName.bone.%boneName",
         "internalScoreboardObjective": "aj.i",
         "idScoreboardObjective": "aj.id",
@@ -29,7 +30,7 @@
         "mcbConfigPath": "",
         "dataPackPath": ""
       },
-      "animatedJava_exporter_animationExporter": {
+      "vanillaAnimationExporter": {
         "rootEntityType": "minecraft:marker",
         "rootEntityNbt": "{}",
         "markerArmorStands": false,
@@ -49,7 +50,7 @@
         "exportMode": "mcb",
         "mcbFilePath": "C:\\Users\\Snave\\AppData\\Roaming\\.minecraft\\saves\\Animated Java Dev\\datapacks\\Animated Java Development\\src\\armor_stand.mc",
         "mcbConfigPath": "",
-        "dataPackPath": "C:\\Users\\Snave\\AppData\\Roaming\\.minecraft\\saves\\Animated Java Dev\\datapacks\\armor_stand"
+        "dataPackPath": ""
       }
     },
     "variants": {
@@ -71,6 +72,10 @@
       "all_green": {
         "9aa33630-8f09-269e-1ff8-4006c170cc10": "f422a623-6d8c-1bd1-4da1-c61940601aaf",
         "29f44b0b-5027-de28-9958-e95a32a0cf4c": "transparent"
+      },
+      "no_head": {
+        "29f44b0b-5027-de28-9958-e95a32a0cf4c": "transparent",
+        "dfa38dd5-689f-f447-7d28-63645345c25d": "transparent"
       }
     },
     "uuid": "6315712c-d94e-91d8-dc54-eb2877b25239"
@@ -947,6 +952,7 @@
       ],
       "autouv": 0,
       "color": 1,
+      "visibility": false,
       "rotation": [
         -45,
         0,

debug_resourcepack/armor_stand.ajmodel

@@ -1,21 +1,34 @@
 import events from './constants/events'
 import { BuildModel } from './mainEntry'
-import { settings } from './settings'
 import { store } from './util/store'
 import { bus } from './util/bus'
 import './bbmods/patchAction'
 import { format as modelFormat } from './modelFormat'
 import { tl } from './util/intl'
+import { settings } from './settings'
 import { registerSettingRenderer } from './ui/dialogs/settings'
 import './ui/mods/boneConfig'
 import './compileLangMC'
 import './exporters/statueExporter'
 import './exporters/animationExporter'
 import './bbmods/modelFormatMod'
 import './bbmods/faceTint'
+import './util/minecraft/items'
+import './util/minecraft/entities'
 import { intl } from './util/intl'
 import { CustomError } from './util/customError'
-import { format } from './util/replace'
+
+const errorMessages = [
+	'Uh oh!',
+	"Time to fire up the ol' debugger!",
+	'Your armor stands are sad :(',
+	'Ok, who pushed the big red button?',
+]
+
+function getRandomErrorMessage() {
+	const index = Math.round(Math.random() * (errorMessages.length - 1))
+	return errorMessages[index]
+}
 
 function showUnknownErrorDialog(e: CustomError | any) {
 	// console.log(e.options)
@@ -26,16 +39,23 @@ function showUnknownErrorDialog(e: CustomError | any) {
 	new Dialog(
 		Object.assign(
 			{
-				id: 'animatedJava.dialog.miscError',
-				title: tl('animatedJava.dialog.miscError.title'),
+				id: 'animatedJava.dialogs.miscError',
+				title: tl('animatedJava.dialogs.errors.misc.title'),
 				lines: [
-					format(tl('animatedJava.dialog.miscError.body'), {
-						buildID: process.env.BUILD_ID,
-						errorMessage: e.options ? e.options.message : e.message,
-						errorStack: e.stack,
-						discordLink: process.env.DISCORD_LINK,
-						githubLink: process.env.GITHUB_ISSUES_LINK,
-					}),
+					tl(
+						'animatedJava.dialogs.errors.misc.body',
+						{
+							buildID: process.env.BUILD_ID,
+							errorMessage: e.options
+								? e.options.message
+								: e.message,
+							randomErrorMessage: getRandomErrorMessage(),
+							errorStack: e.stack,
+							discordLink: process.env.DISCORD_LINK,
+							githubLink: process.env.GITHUB_ISSUES_LINK,
+						},
+						true
+					),
 				],
 				width: 1024,
 				height: 512,
@@ -103,19 +123,29 @@ Blockbench.events['animated-java-ready'].length = 0
 
 // WOOO TYPING, YAAAAAAY
 
+export interface SettingDescriptor {
+	readonly value: any
+	error?: string
+	isValid?: boolean
+	setting: any
+	event: 'get' | 'set' | 'update' | 'dummy'
+}
+
 export interface Settings {
-	animatedJava: {
-		projectName: string
-		exporter: string
-		useCache: boolean
-		cacheMode: 'memory' | 'disk'
-		rigItem: string
-		predicateFilePath: string
-		rigModelsExportFolder: string
-		transparentTexturePath: string
-		boundingBoxRenderMode: 'single' | 'multiple' | 'disabled'
-		verbose: boolean
-	}
+	projectName: string
+	exporter: string
+	useCache: boolean
+	cacheMode: 'memory' | 'disk'
+	rigItem: string
+	predicateFilePath: string
+	rigModelsExportFolder: string
+	transparentTexturePath: string
+	boundingBoxRenderMode: 'single' | 'multiple' | 'disabled'
+	verbose: boolean
+}
+
+export interface GlobalSettings {
+	animatedJava: Settings
 	[index: string]: any
 }
 

src/animatedJava.ts

@@ -3,7 +3,7 @@ import { settings } from './settings'
 import { Async } from './util/async'
 import { bus } from './util/bus'
 import { roundToN } from './util/misc'
-import { hashAnim } from './util/hashAnim'
+import * as hash from './util/hash'
 import { store } from './util/store'
 import * as os from 'os'
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'fs'
@@ -14,7 +14,7 @@ import { tl } from './util/intl'
 import { format, safeFunctionName } from './util/replace'
 import { isSceneBased } from './util/hasSceneAsParent'
 import { CustomError } from './util/customError'
-store.set('static_animation_uuid', '138747e7-2de0-4130-b900-9275ca0e6333')
+store.set('staticAnimationUuid', '138747e7-2de0-4130-b900-9275ca0e6333')
 
 function setAnimatorTime(time) {
 	Timeline.setTime(time, false)
@@ -109,7 +109,7 @@ function getData(animation, renderedGroups) {
 				y: -thisRot[1],
 				z: thisRot[2],
 			},
-			scale: scl[groupName],
+			scale: scl[group.name],
 		}
 	})
 	return res
@@ -127,7 +127,7 @@ const struct = StructTypes.Object({
 				StructTypes.String,
 				StructTypes.Object({
 					pos: vec3,
-					rot: StructTypes.ArrayOf(StructTypes.Float),
+					rot: vec3,
 					scale: vec3,
 				})
 			),
@@ -159,7 +159,7 @@ const Cache = new (class {
 		settings.watch('animatedJava.cacheMode', () => {
 			this.initDiskCache()
 		})
-		settings.watch('animatedJava.use_cache', () => {
+		settings.watch('animatedJava.useCache', () => {
 			this.clear()
 		})
 		this.initDiskCache()
@@ -182,7 +182,7 @@ const Cache = new (class {
 		if (!settings.animatedJava.useCache) return null
 		if (this.cache.has(anim.uuid)) {
 			const old_hash = this.cache.get(anim.uuid)
-			const new_hash = hashAnim(anim)
+			const new_hash = hash.animation(anim)
 			const hit = old_hash !== new_hash
 			if (!hit) {
 				if (settings.animatedJava.cacheMode === 'memory') {
@@ -198,8 +198,7 @@ const Cache = new (class {
 			}
 			return null
 		} else {
-			const hash = hashAnim(anim)
-			this.cache.set(anim.uuid, hash)
+			this.cache.set(anim.uuid, hash.animation(anim))
 			return null
 		}
 	}
@@ -213,7 +212,7 @@ const Cache = new (class {
 				animToWriteable(value)
 			)
 		}
-		this.cache.set(anim.uuid, hashAnim(anim))
+		this.cache.set(anim.uuid, hash.animation(anim))
 	}
 	clear() {
 		this.data = new Map()
@@ -222,14 +221,17 @@ const Cache = new (class {
 })()
 
 // clear the animation cache if the origin or rotation of a group changes
-const $original_func = NodePreviewController.prototype.updateTransform
-NodePreviewController.prototype.updateTransform = function (el) {
-	if (Group.selected) Cache.clear()
-	return $original_func.bind(this)(el)
-}
-bus.on(events.LIFECYCLE.CLEANUP, () => {
-	NodePreviewController.prototype.updateTransform = $original_func
-})
+// const $original_func = NodePreviewController.prototype.updateTransform
+// NodePreviewController.prototype.updateTransform = function (el) {
+// 	if (Group.selected) Cache.clear()
+// 	return $original_func.bind(this)(el)
+// }
+// bus.on(events.LIFECYCLE.CLEANUP, () => {
+// 	NodePreviewController.prototype.updateTransform = $original_func
+// })
+
+let boneStructureHash
+
 async function renderAnimation(options) {
 	console.groupCollapsed('Render Animations')
 	// const timeline_save = get_timeline_save_point();
@@ -240,11 +242,11 @@ async function renderAnimation(options) {
 
 	if (options.generate_static_animation) {
 		static_animation = new Animation({
-			name: 'animatedJava.static_animation',
+			name: 'animatedJava.staticSnimation',
 			snapping: 20,
 			length: 0,
 		}).add(false)
-		static_animation.uuid = store.get('static_animation_uuid')
+		static_animation.uuid = store.get('staticAnimationUuid')
 	}
 
 	const totalAnimationLength = Animator.animations.reduce(
@@ -253,7 +255,7 @@ async function renderAnimation(options) {
 	)
 	// Accumulated animation length
 	let accAnimationLength = 0
-	const tldMessage = tl('animatedJava.progress.animationRendering.text')
+	const tldMessage = tl('animatedJava.progress.animationRendering')
 	const progressUpdaterID = setInterval(() => {
 		console.log(accAnimationLength, totalAnimationLength)
 		Blockbench.setStatusBarText(
@@ -271,31 +273,38 @@ async function renderAnimation(options) {
 		const renderedGroups = Group.all.filter(
 			(group) =>
 				!isSceneBased(group) &&
+				group.visibility &&
 				group.children.find((child) => child instanceof Cube)
 		)
 		console.log('All Groups:', Group.all)
 		console.log('Rendered Groups:', renderedGroups)
 
+		const newBoneStructureHash = hash.boneStructure()
+		if (boneStructureHash !== newBoneStructureHash) {
+			boneStructureHash = newBoneStructureHash
+			Cache.clear()
+		}
+
 		for (const animation of Animator.animations.sort()) {
 			if (animation.snapping != 20) {
 				throw new CustomError('Invalid Snapping Value Error', {
 					intentional: true,
 					dialog: {
-						id: 'animatedJava_exporter_animationExporter.popup.warning.invalidSnappingValue',
+						id: 'animatedJava.invalidAnimationSnappingValue',
 						title: tl(
-							'animatedJava_exporter_animationExporter.popup.warning.invalidSnappingValue.title'
+							'animatedJava.dialogs.errors.invalidAnimationSnappingValue.title'
 						),
-						lines: format(
+						lines: [
 							tl(
-								'animatedJava_exporter_animationExporter.popup.warning.invalidSnappingValue.body'
+								'animatedJava.dialogs.errors.invalidAnimationSnappingValue.body',
+								{
+									animationName: animation.name,
+									snapping: animation.snapping,
+								}
 							),
-							{
-								animationName: animation.name,
-								snapping: animation.snapping
-							}
-						)
-							.split('\n')
-							.map((line) => `<p>${line}</p>`),
+						],
+						width: 512 + 256,
+						singleButton: true,
 					},
 				})
 			}
@@ -305,8 +314,12 @@ async function renderAnimation(options) {
 				let maxDistance = -Infinity
 				const frames = []
 				animation.select()
+				const animLength =
+					animation.loop === 'loop'
+						? animation.length
+						: animation.length + 0.05
 
-				for (let i = 0; i <= animation.length; i += 0.05) {
+				for (let i = 0; i <= animLength; i += 0.05) {
 					accAnimationLength += 0.05
 					await Async.wait_if_overflow()
 					setAnimatorTime(i)