minerender 2.1.0-alpha.25 → 2.1.0-alpha.27

package/dist/node/index.d.mts

@@ -726,6 +726,7 @@ interface EntityModelFile extends MinecraftAsset {
 }
 interface EntityModelLayer {
     texture: [number, number];
+    textureLocation?: string;
     root: EntityModelPart;
 }
 interface EntityModelPart {
@@ -900,7 +901,6 @@ declare class SkinObject extends SceneObject {
     readonly options: SkinObjectOptions;
     private slim;
     private legacy;
-    private skinTextureSrc?;
     private skinTextureWidth;
     private skinTextureHeight;
     private capeTextureSrc?;

package/dist/node/index.d.ts

@@ -726,6 +726,7 @@ interface EntityModelFile extends MinecraftAsset {
 }
 interface EntityModelLayer {
     texture: [number, number];
+    textureLocation?: string;
     root: EntityModelPart;
 }
 interface EntityModelPart {
@@ -900,7 +901,6 @@ declare class SkinObject extends SceneObject {
     readonly options: SkinObjectOptions;
     private slim;
     private legacy;
-    private skinTextureSrc?;
     private skinTextureWidth;
     private skinTextureHeight;
     private capeTextureSrc?;

package/dist/node/index.js

@@ -2890,6 +2890,8 @@ var Entities = class {
     if (textureKey) {
       const path2 = isAssetKey(textureKey) ? textureKey.getFullPath() : textureKey.path;
       texture = isAssetKey(textureKey) && textureKey.assetType === "textures" && path2.startsWith("entity/") ? textureKey : new AssetKey(textureKey.namespace, path2, "textures", "entity", "assets", ".png", isAssetKey(textureKey) ? textureKey.root : void 0);
+    } else if (layer.textureLocation !== void 0) {
+      texture = AssetKey.parse("textures", layer.textureLocation.replace(/^([^:]+:)?textures\//, "$1"));
     } else {
       texture = await this.resolveTexture(modelKey);
     }
@@ -5648,7 +5650,41 @@ var baseSkinCoordinates = {
 var classicSkinTextureCoordinates = {
   ...baseSkinCoordinates
 };
-var slimSkinTextureCoordinates = { ...baseSkinCoordinates };
+var slimSkinTextureCoordinates = {
+  ...baseSkinCoordinates,
+  leftArm: {
+    ...baseSkinCoordinates.leftArm,
+    west: { uv: [39, 52, 43, 64] },
+    north: { uv: [36, 52, 39, 64] },
+    south: { uv: [43, 52, 46, 64] },
+    up: { uv: [39, 52, 36, 48] },
+    down: { uv: [42, 48, 39, 52] }
+  },
+  rightArm: {
+    ...baseSkinCoordinates.rightArm,
+    west: { uv: [47, 20, 51, 32] },
+    north: { uv: [44, 20, 47, 32] },
+    south: { uv: [51, 20, 54, 32] },
+    up: { uv: [47, 20, 44, 16] },
+    down: { uv: [50, 16, 47, 20] }
+  },
+  leftSleeve: {
+    ...baseSkinCoordinates.leftSleeve,
+    west: { uv: [55, 52, 59, 64] },
+    north: { uv: [52, 52, 55, 64] },
+    south: { uv: [59, 52, 62, 64] },
+    up: { uv: [55, 52, 52, 48] },
+    down: { uv: [58, 48, 55, 52], rotation: 180 }
+  },
+  rightSleeve: {
+    ...baseSkinCoordinates.rightSleeve,
+    west: { uv: [47, 36, 51, 48] },
+    north: { uv: [44, 36, 47, 48] },
+    south: { uv: [51, 36, 54, 48] },
+    up: { uv: [47, 36, 44, 32] },
+    down: { uv: [50, 32, 47, 36], rotation: 180 }
+  }
+};
 
 // src/skin/SkinGeometries.ts
 var box8inner = [8, 8, 8];
@@ -5758,7 +5794,6 @@ var SkinObject = class extends SceneObject {
   }
   setSkinTexture(src) {
     if (typeof src === "undefined") return;
-    this.skinTextureSrc = src;
     const mat = Materials.getImage({
       texture: { src },
       transparent: true
@@ -5772,18 +5807,18 @@ var SkinObject = class extends SceneObject {
   }
   //TODO: cape
   setSlim(slim) {
-    console.log("#setSlim");
-    const changed = slim !== this.slim;
+    if (slim === this.slim) return;
     this.slim = slim;
-    if (changed) {
-      this.createMeshes();
-    }
-    if (changed) {
-      if (this.skinTextureSrc) {
-        this.setSkinTexture(this.skinTextureSrc);
-      }
-    }
-    console.log("#setSlim done");
+    for (const part of ["leftArm" /* LEFT_ARM */, "leftSleeve" /* LEFT_SLEEVE */, "rightArm" /* RIGHT_ARM */, "rightSleeve" /* RIGHT_SLEEVE */]) {
+      const mesh = this.getMeshByName(part);
+      if (mesh) mesh.geometry = this.getBoxGeometry(part);
+    }
+    const offset = slim ? 0.5 : -0.5;
+    const leftArm = this.getGroupByName("leftArm" /* LEFT_ARM */);
+    const rightArm = this.getGroupByName("rightArm" /* RIGHT_ARM */);
+    if (leftArm) leftArm.position.x += offset;
+    if (rightArm) rightArm.position.x -= offset;
+    this.notifyDirty();
   }
   setLegacy(legacy) {
     if (legacy !== this.legacy) {