load model textures

src/renderer/scripts/editor/Model/create.ts

@@ -10,11 +10,9 @@ import {
 	GridHelper,
 } from 'three'
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
-import { join } from 'path'
 import { loadModels, IModelSchema } from './loadModel'
 import { readJSON } from '../../Utilities/JsonFS'
 import { loadAllTextures, ITextureData } from './loadTextures'
-import { CURRENT } from '../../constants'
 
 export interface IModelOptions {
 	fov?: number
@@ -82,9 +80,7 @@ export async function createModelEditor(
 	let allTextureData = await loadAllTextures(identifiers)
 	identifiers.forEach((id, i) => {
 		allTextureData[id].forEach((texData, j) => {
-			texData.texture.data = loader.load(
-				texData.texture.file_path
-			)
+			texData.texture.data = loader.load(texData.texture.file_path)
 			texData.material = materials[i]
 
 			if (j === 0) {

src/renderer/scripts/editor/Model/loadTextures.ts

@@ -3,8 +3,8 @@ import { readJSON } from '../../Utilities/JsonFS'
 import { Texture, MeshLambertMaterial } from 'three'
 import { CURRENT } from '../../constants'
 import { join } from 'path'
-import { promises as fs, existsSync } from "fs"
-declare const __static: string;
+import { promises as fs, existsSync } from 'fs'
+declare const __static: string
 
 export interface ITextureData {
 	texture: {
@@ -21,31 +21,64 @@ export async function loadAllTextures(identifiers: string[]) {
 		identifiers.map(async id => {
 			res[id] = await loadTextures(id)
 			console.log(await guessTexture(id))
-			if(res[id].length === 0) res[id] = await guessTexture(id)
+			if (res[id].length === 0) res[id] = await guessTexture(id)
 		})
 	)
 
 	return res
 }
 
-
-const GUESS_DATA = () => [[CURRENT.RP_PATH, '.png'], [join(__static, "vanilla/RP"), '.png']]
+const GUESS_DATA = () => [
+	[CURRENT.RP_PATH, '.png'],
+	[join(__static, 'vanilla/RP'), '.png'],
+]
 async function guessTexture(identifier: string) {
-	return (await Promise.all(GUESS_DATA().map(async ([base, ext]) => {
-		let try_folder = join(base, 'textures/entity', identifier.split(":").pop().split(".")[1])
-		try {
-				let entries = await fs.readdir(try_folder)
-				return entries.map(en => ({ texture: { file_path: join(try_folder, en + ext), name: 'Unknown' } }))
-		} catch(e) {
-			console.log(try_folder + ext, e)
-			return {
-				texture: {
-					name: 'Unknown',
-					file_path: try_folder + ext
+	return (
+		await Promise.all(
+			GUESS_DATA().map(async ([base, ext]) => {
+				let try_folder = join(
+					base,
+					'textures/entity',
+					identifier
+						.split(':')
+						.pop()
+						.split('.')[1]
+				)
+
+				try {
+					let entries = await fs.readdir(try_folder)
+					return await Promise.all(
+						entries.map(async en => {
+							if (
+								(
+									await fs.lstat(join(try_folder, en))
+								).isDirectory()
+							)
+								return
+
+							return {
+								texture: {
+									name: 'Unknown',
+									file_path: join(try_folder, en),
+								},
+							}
+						})
+					)
+				} catch (e) {
+					return {
+						texture: {
+							name: 'Unknown',
+							file_path: try_folder + ext,
+						},
+					}
 				}
-			}
-		}
-	}))).flat().filter(entry => entry !== undefined && existsSync(entry.texture.file_path))
+			})
+		)
+	)
+		.flat()
+		.filter(
+			entry => entry !== undefined && existsSync(entry.texture.file_path)
+		)
 }
 
 export async function loadTextures(identifier: string) {
@@ -73,7 +106,10 @@ export async function loadTextures(identifier: string) {
 			data.push({
 				texture: {
 					name: key,
-					file_path: join(CURRENT.RP_PATH, val.endsWith('.png') ? val : val + '.png'),
+					file_path: join(
+						CURRENT.RP_PATH,
+						val.endsWith('.png') ? val : val + '.png'
+					),
 				},
 			})
 	})

static/vanilla/RP/models/entity/horse_v2.geo.json

@@ -3,6 +3,8 @@
   "geometry.horse.v2": {
     "visible_bounds_width": 2,
     "visible_bounds_height": 3,
+    "texturewidth": 128,
+    "textureheight": 128,
     "visible_bounds_offset": [ 0, 1, 0 ],
     "bones": [
       {