Remove automatic texture size detection.

Author: SnaveSutit

src/lang/en.yaml

@@ -56,8 +56,8 @@ animated_java.project_settings.project_namespace.description: |-
 animated_java.project_settings.project_namespace.error.unset: |-
   Project Name cannot be empty
 
-animated_java.project_settings.texture_size: Texture Size
-animated_java.project_settings.texture_size.description: |-
+animated_java.project_settings.project_resolution: Project Resolution
+animated_java.project_settings.project_resolution.description: |-
   The UV resolution of the Project.
   This should equal the resolution of the largest texture in your project.
 

src/modelFormat.ts

@@ -215,6 +215,12 @@ export const ajCodec = new Blockbench.Codec('ajmodel', {
 		}
 		ajCodec.dispatchEvent('parse', { model, path })
 		DFU.process(model)
+
+		if (model.resolution !== undefined) {
+			Project.texture_width = model.resolution.width
+			Project.texture_height = model.resolution.height
+		}
+
 		loadAnimatedJavaProjectSettings(model)
 		loadAnimatedJavaExporterSettings(model)
 
@@ -229,11 +235,6 @@ export const ajCodec = new Blockbench.Codec('ajmodel', {
 		if (model.overrides) {
 			Project.overrides = model.overrides
 		}
-		if (model.resolution !== undefined) {
-			Project.texture_width = model.resolution.width
-			Project.texture_height = model.resolution.height
-		}
-
 		if (model.textures) {
 			model.textures.forEach((tex: Texture) => {
 				const texCopy = new Texture(tex, tex.uuid).add(false)

src/mods/textureMod.ts

@@ -16,23 +16,23 @@ createBlockbenchMod(
 			return x
 		}
 		// I'm lazy 🤪
-		const interval = setInterval(() => {
-			if (Format === ajModelFormat) {
-				const maxTextureWidth = Texture.all.reduce(
-					(max, texture) => Math.max(max, texture.width),
-					0
-				)
-				Project!.texture_height = maxTextureWidth
-				Project!.texture_width = maxTextureWidth
-			}
-		}, 1000)
+		// const interval = setInterval(() => {
+		// 	if (Format === ajModelFormat) {
+		// 		const maxTextureWidth = Texture.all.reduce(
+		// 			(max, texture) => Math.max(max, texture.width),
+		// 			0
+		// 		)
+		// 		Project!.texture_height = maxTextureWidth
+		// 		Project!.texture_width = maxTextureWidth
+		// 	}
+		// }, 1000)
 		return {
-			interval,
+			// interval,
 			...context,
 		}
 	},
 	context => {
-		clearInterval(context.interval)
+		// clearInterval(context.interval)
 		Texture.prototype.remove = context.remove
 	}
 )

src/projectSettings.ts

@@ -13,7 +13,7 @@ import * as events from './events'
 
 export interface IAnimatedJavaProjectSettings {
 	project_namespace: Settings.InlineTextSetting
-	// texture_size: Settings.DropdownSetting<number>
+	project_resolution: Settings.DoubleNumberSetting
 	rig_item: Settings.InlineTextSetting
 	rig_item_model: Settings.InlineTextSetting
 	rig_export_folder: Settings.FolderSetting
@@ -34,12 +34,12 @@ const TRANSLATIONS = {
 			unset: translate('animated_java.project_settings.project_namespace.error.unset'),
 		},
 	},
-	// texture_size: {
-	// 	displayName: translate('animated_java.project_settings.texture_size'),
-	// 	description: translate('animated_java.project_settings.texture_size.description').split(
-	// 		'\n'
-	// 	),
-	// },
+	project_resolution: {
+		displayName: translate('animated_java.project_settings.project_resolution'),
+		description: translate(
+			'animated_java.project_settings.project_resolution.description'
+		).split('\n'),
+	},
 	rig_item: {
 		displayName: translate('animated_java.project_settings.rig_item'),
 		description: translate('animated_java.project_settings.rig_item.description').split('\n'),
@@ -148,6 +148,26 @@ export function getDefaultProjectSettings(): IAnimatedJavaProjectSettings {
 			}
 		),
 
+		project_resolution: new Settings.DoubleNumberSetting(
+			{
+				id: 'animated_java:project_settings/project_resolution',
+				displayName: TRANSLATIONS.project_resolution.displayName,
+				description: TRANSLATIONS.project_resolution.description,
+				get defaultValue(): [number, number] {
+					return [Project!.texture_width, Project!.texture_height]
+				},
+				min: 1,
+				secondNumberLabel: 'x',
+				docsLink: 'page:project_settings#project_resolution',
+			},
+			function onUpdate(setting) {
+				Project!.texture_width = setting.numberA
+				Project!.texture_height = setting.numberB
+				console.log('Project resolution changed to', setting.value)
+				Canvas.updateAllUVs()
+			}
+		),
+
 		rig_item: new Settings.InlineTextSetting(
 			{
 				id: 'animated_java:project_settings/rig_item',
@@ -365,10 +385,10 @@ export const projectSettingStructure: GUIStructure = [
 				type: 'setting',
 				settingId: _.project_namespace.id,
 			},
-			// {
-			// 	type: 'setting',
-			// 	settingId: _.texture_size.id,
-			// },
+			{
+				type: 'setting',
+				settingId: _.project_resolution.id,
+			},
 		],
 	},
 	{

src/settings.ts

@@ -128,12 +128,12 @@ export class Setting<V, R = any> extends Subscribable<R> {
 
 	_onUpdate(forced = false) {
 		if (this._updating) return
-		if (!forced && this.lastValue === this.value) return
+		if (!forced && this.value === this.lastValue) return
+		// console.log('Updating setting', this.id, this.value)
 		this._updating = true
 		this.lastValue = this.value
 		this.infoPopup = undefined
 		if (this.onUpdate) this.onUpdate(this as unknown as R)
-		console.log(this.subscribers)
 		this.dispatch(this as unknown as R)
 		this._updating = false
 	}
@@ -199,6 +199,72 @@ export class NumberSetting extends Setting<number, NumberSetting> {
 	}
 }
 
+export class DoubleNumberSetting extends Setting<[number, number], DoubleNumberSetting> {
+	min?: number
+	max?: number
+	step?: number
+	snap?: boolean
+	firstNumberLabel?: string
+	secondNumberLabel?: string
+
+	constructor(
+		options: ISettingOptions<[number, number]> & {
+			min?: number
+			max?: number
+			step?: number
+			snap?: boolean
+			firstNumberLabel?: string
+			secondNumberLabel?: string
+		},
+		onUpdate?: (setting: DoubleNumberSetting) => void,
+		onInit?: (setting: DoubleNumberSetting) => void
+	) {
+		super(options, onUpdate, onInit)
+		this.min = options.min
+		this.max = options.max
+		this.step = options.step
+		this.snap = options.snap
+		this.firstNumberLabel = options.firstNumberLabel
+		this.secondNumberLabel = options.secondNumberLabel
+	}
+
+	get numberA() {
+		return this._value[0]
+	}
+
+	set numberA(value: number) {
+		this._value[0] = value
+		this._onUpdate(true)
+	}
+
+	get numberB() {
+		return this._value[1]
+	}
+
+	set numberB(value: number) {
+		this._value[1] = value
+		this._onUpdate(true)
+	}
+
+	_onUpdate(forced = false) {
+		if (isNaN(this._value[0])) this._value[0] = this.defaultValue[0]
+		if (isNaN(this._value[1])) this._value[1] = this.defaultValue[1]
+		if (this.step && this.snap) {
+			this._value[0] = Math.round(this._value[0] / this.step) * this.step
+			this._value[1] = Math.round(this._value[1] / this.step) * this.step
+		}
+		this._value[0] = Math.min(
+			Math.max(this._value[0], this.min ?? -Infinity),
+			this.max ?? Infinity
+		)
+		this._value[1] = Math.min(
+			Math.max(this._value[1], this.min ?? -Infinity),
+			this.max ?? Infinity
+		)
+		super._onUpdate(forced)
+	}
+}
+
 export class DropdownSetting<V = any, K extends number = number> extends Setting<
 	K,
 	DropdownSetting<V, K>

src/ui/components/setting.svelte

@@ -8,6 +8,7 @@
 	import Dropdown from './settings/dropdown.svelte'
 	import File from './settings/file.svelte'
 	import Folder from './settings/folder.svelte'
+	import DoubleNumber from './settings/doubleNumber.svelte'
 
 	export let setting: AJ.Setting<any>
 </script>
@@ -26,6 +27,8 @@
 	<Folder {setting} />
 {:else if setting instanceof AJ.NumberSetting}
 	<Number {setting} />
+{:else if setting instanceof AJ.DoubleNumberSetting}
+	<DoubleNumber {setting} />
 {:else if setting instanceof AJ.InlineTextSetting}
 	<TextInline {setting} />
 {:else}

src/ui/components/settingNode.svelte

@@ -6,7 +6,7 @@
 
 <script lang="ts">
 	import { fly, slide } from '../util/accessability'
-	import type { AnyGUIElement } from '../../GUIStructure'
+	import type { AnyGUIElement } from '../../guiStructure'
 	import * as AJ from '../../settings'
 	import Setting from './setting.svelte'
 

src/ui/components/settings/doubleNumber.svelte

@@ -0,0 +1,49 @@
+<script lang="ts">
+	import type * as AJ from '../../../settings'
+	import SettingContainer from '../settingContainer.svelte'
+
+	export let setting: AJ.DoubleNumberSetting
+	//
+</script>
+
+<SettingContainer {setting}>
+	<div class="container" slot="inline">
+		{#if setting.firstNumberLabel}
+			<div class="label">{setting.firstNumberLabel}</div>
+		{/if}
+		<input type="number" step={setting.step} bind:value={setting.numberA} />
+		{#if setting.secondNumberLabel}
+			<div class="label">{setting.secondNumberLabel}</div>
+		{/if}
+		<input type="number" step={setting.step} bind:value={setting.numberB} />
+	</div>
+</SettingContainer>
+
+<style>
+	.container {
+		display: flex;
+		align-items: center;
+	}
+
+	.label {
+		margin: 0px 10px;
+	}
+
+	input[type='number'] {
+		border: none;
+		background: var(--color-button);
+		display: inline-block;
+		text-align: center;
+		vertical-align: middle;
+		cursor: default;
+		outline: none;
+		height: 34px;
+		width: 6em;
+		color: var(--color-text);
+		padding-right: 16px;
+		padding-left: 16px;
+		font-weight: normal;
+		cursor: text;
+		text-align: left;
+	}
+</style>

src/util/misc.ts

@@ -114,4 +114,14 @@ export function transposeMatrix(matrixArray: number[]) {
 	]
 }
 
+export function arrayEqual(a: any[], b: any[]): boolean {
+	console.log(a, b)
+	if (a.length !== b.length) return false
+	return a.every((v, i) => {
+		const bi = b[i]
+		if (Array.isArray(v) && Array.isArray(bi)) return arrayEqual(v, bi)
+		return v === bi
+	})
+}
+
 export class ExpectedError extends Error {}