minerender 2.1.0-alpha.17 → 2.1.0-alpha.19

package/dist/browser/index.d.mts

@@ -173,6 +173,7 @@ declare class AssetKey extends BasicAssetKey {
     rootType: "assets" | "data" | string;
     extension: ".json" | ".png" | string;
     root?: string | undefined;
+    readonly isAssetKey: true;
     constructor(namespace: string, path: string, assetType?: AssetType | undefined, type?: string | undefined, rootType?: "assets" | "data" | string, extension?: ".json" | ".png" | string, root?: string | undefined);
     static parse(assetType: AssetType, str: string, origin?: AssetKey): AssetKey;
     toString(): string;
@@ -553,6 +554,7 @@ declare class UVMapper {
     static setCubeUvs(geometry: BoxGeometry, originalTextureSize: DoubleArray, actualTextureSize: DoubleArray, faces: ModelFaces): void;
     static facesToUvArray(faces: ModelFaces, originalTextureSize: DoubleArray, actualTextureSize: DoubleArray): number[];
     static facesToUv(faces: ModelFaces, originalTextureSize: DoubleArray, actualTextureSize: DoubleArray): Float32BufferAttribute;
+    static lockUvs(geometry: BoxGeometry, faces: ModelFaces, atlas: TextureAtlas, rotation: Euler): void;
     static getAtlas(model: Model): Promise<Maybe<TextureAtlas>>;
     static fillMissingTextureKeys<T>(textures: ModelTextures, target: {
         [k: string]: T;
@@ -846,6 +848,8 @@ declare class ModelObject extends SceneObject {
     protected applyTextures(): void;
 }
 interface ModelObjectOptions extends SceneObjectOptions {
+    /** Quarter-turn block rotation in radians to compensate when locking UVs. */
+    uvLockRotation?: TripleArray;
 }
 declare function isModelObject(obj: any): obj is ModelObject;
 
@@ -1537,6 +1541,8 @@ declare class Skins {
     static capeFromUsername(username: string): Promise<Maybe<string>>;
     static capeFromCapesDev(uuid: string, capeType?: string): Promise<Maybe<string>>;
     private static usernameToUuid;
+    private static usernameToUuidMcProxy;
+    /** @deprecated **/
     private static usernameToUuidSkinProxy;
     private static usernameToUuidMineTools;
     private static getProfileFromMinetools;
@@ -1546,8 +1552,12 @@ declare class Skins {
     private static getCrafatarCapeUrl;
     private static getMcHeadsSkinUrl;
     private static getMineSkinPlayerSkinUrl;
+    /** @deprecated **/
     private static getSkinProxySkinUrl;
+    /** @deprecated **/
     private static getSkinProxyCapeUrl;
+    private static getMcProxySkinUrl;
+    private static getMcProxyCapeUrl;
 }
 
 declare class TextureLoader {

package/dist/browser/index.d.ts

@@ -173,6 +173,7 @@ declare class AssetKey extends BasicAssetKey {
     rootType: "assets" | "data" | string;
     extension: ".json" | ".png" | string;
     root?: string | undefined;
+    readonly isAssetKey: true;
     constructor(namespace: string, path: string, assetType?: AssetType | undefined, type?: string | undefined, rootType?: "assets" | "data" | string, extension?: ".json" | ".png" | string, root?: string | undefined);
     static parse(assetType: AssetType, str: string, origin?: AssetKey): AssetKey;
     toString(): string;
@@ -553,6 +554,7 @@ declare class UVMapper {
     static setCubeUvs(geometry: BoxGeometry, originalTextureSize: DoubleArray, actualTextureSize: DoubleArray, faces: ModelFaces): void;
     static facesToUvArray(faces: ModelFaces, originalTextureSize: DoubleArray, actualTextureSize: DoubleArray): number[];
     static facesToUv(faces: ModelFaces, originalTextureSize: DoubleArray, actualTextureSize: DoubleArray): Float32BufferAttribute;
+    static lockUvs(geometry: BoxGeometry, faces: ModelFaces, atlas: TextureAtlas, rotation: Euler): void;
     static getAtlas(model: Model): Promise<Maybe<TextureAtlas>>;
     static fillMissingTextureKeys<T>(textures: ModelTextures, target: {
         [k: string]: T;
@@ -846,6 +848,8 @@ declare class ModelObject extends SceneObject {
     protected applyTextures(): void;
 }
 interface ModelObjectOptions extends SceneObjectOptions {
+    /** Quarter-turn block rotation in radians to compensate when locking UVs. */
+    uvLockRotation?: TripleArray;
 }
 declare function isModelObject(obj: any): obj is ModelObject;
 
@@ -1537,6 +1541,8 @@ declare class Skins {
     static capeFromUsername(username: string): Promise<Maybe<string>>;
     static capeFromCapesDev(uuid: string, capeType?: string): Promise<Maybe<string>>;
     private static usernameToUuid;
+    private static usernameToUuidMcProxy;
+    /** @deprecated **/
     private static usernameToUuidSkinProxy;
     private static usernameToUuidMineTools;
     private static getProfileFromMinetools;
@@ -1546,8 +1552,12 @@ declare class Skins {
     private static getCrafatarCapeUrl;
     private static getMcHeadsSkinUrl;
     private static getMineSkinPlayerSkinUrl;
+    /** @deprecated **/
     private static getSkinProxySkinUrl;
+    /** @deprecated **/
     private static getSkinProxyCapeUrl;
+    private static getMcProxySkinUrl;
+    private static getMcProxyCapeUrl;
 }
 
 declare class TextureLoader {

package/dist/browser/index.js

@@ -1279,6 +1279,7 @@ var AssetKey = class _AssetKey extends BasicAssetKey {
     this.rootType = rootType;
     this.extension = extension;
     this.root = root;
+    this.isAssetKey = true;
   }
   static parse(assetType, str, origin) {
     let namespace = origin?.namespace || DEFAULT_NAMESPACE;
@@ -1294,7 +1295,10 @@ var AssetKey = class _AssetKey extends BasicAssetKey {
       split.shift();
     }
     let path = split.join("/");
-    let extension = assetType === "textures" ? ".png" : origin?.assetType || ".json";
+    const extension = assetType === "textures" ? ".png" : origin?.extension ?? ".json";
+    if (extension && path.endsWith(extension)) {
+      path = path.slice(0, -extension.length);
+    }
     return new _AssetKey(namespace, path, assetType, type, "assets", extension, origin?.root);
   }
   toString() {
@@ -1324,10 +1328,10 @@ var AssetKey = class _AssetKey extends BasicAssetKey {
   }
 };
 function isBasicAssetKey(obj) {
-  return "namespace" in obj && "path" in obj;
+  return obj !== null && typeof obj === "object" && typeof obj.namespace === "string" && typeof obj.path === "string";
 }
 function isAssetKey(obj) {
-  return isBasicAssetKey(obj) && "parse" in obj;
+  return isBasicAssetKey(obj) && obj.isAssetKey === true;
 }
 
 // src/model/ModelMerger.ts
@@ -2205,6 +2209,14 @@ var DEFAULT_UV = [0, 0, 16, 16];
 var X = 0;
 var Y = 1;
 var Z = 2;
+var FACE_UV_AXES = {
+  east: [new import_three8.Vector3(0, 0, -1), new import_three8.Vector3(0, -1, 0)],
+  west: [new import_three8.Vector3(0, 0, 1), new import_three8.Vector3(0, -1, 0)],
+  up: [new import_three8.Vector3(1, 0, 0), new import_three8.Vector3(0, 0, 1)],
+  down: [new import_three8.Vector3(1, 0, 0), new import_three8.Vector3(0, 0, -1)],
+  south: [new import_three8.Vector3(1, 0, 0), new import_three8.Vector3(0, -1, 0)],
+  north: [new import_three8.Vector3(-1, 0, 0), new import_three8.Vector3(0, -1, 0)]
+};
 var UVMapper = class {
   static makeUv(uvCoord, originalTextureSize, actualTextureSize) {
     if (uvCoord === 0) return 0;
@@ -2302,6 +2314,42 @@ var UVMapper = class {
   static facesToUv(faces, originalTextureSize, actualTextureSize) {
     return new import_three8.Float32BufferAttribute(this.facesToUvArray(faces, originalTextureSize, actualTextureSize), 2);
   }
+  static lockUvs(geometry, faces, atlas, rotation) {
+    const uv = geometry.getAttribute("uv");
+    for (let faceIndex = 0; faceIndex < CUBE_FACES.length; faceIndex++) {
+      const faceName = CUBE_FACES[faceIndex];
+      const texture = faces[faceName]?.texture?.substring(1);
+      const position = texture && atlas.positions[texture];
+      const size = texture && atlas.sizes[texture];
+      if (!position || !size) continue;
+      const [sourceU, sourceV] = FACE_UV_AXES[faceName];
+      const uAxis = sourceU.clone().applyEuler(rotation);
+      const vAxis = sourceV.clone().applyEuler(rotation);
+      const normal = vAxis.clone().cross(uAxis);
+      const targetFace = CUBE_FACES.find((name) => {
+        const [u, v] = FACE_UV_AXES[name];
+        return v.clone().cross(u).dot(normal) > 0.5;
+      });
+      const [targetU, targetV] = FACE_UV_AXES[targetFace];
+      const uu = Math.round(targetU.dot(uAxis));
+      const uvCross = Math.round(targetU.dot(vAxis));
+      const vu = Math.round(targetV.dot(uAxis));
+      const vv = Math.round(targetV.dot(vAxis));
+      for (let corner = 0; corner < 4; corner++) {
+        const index = faceIndex * 4 + corner;
+        const u = (uv.getX(index) * atlas.image.width - position[0]) / size[0] - 0.5;
+        const v = ((1 - uv.getY(index)) * atlas.image.height - position[1]) / size[1] - 0.5;
+        const lockedU = uu * u + uvCross * v + 0.5;
+        const lockedV = vu * u + vv * v + 0.5;
+        uv.setXY(
+          index,
+          (position[0] + lockedU * size[0]) / atlas.image.width,
+          1 - (position[1] + lockedV * size[1]) / atlas.image.height
+        );
+      }
+    }
+    uv.needsUpdate = true;
+  }
   static async getAtlas(model) {
     const keyStr = model.key.serialize();
     return Caching.modelTextureAtlasCache.get(keyStr, (k) => {
@@ -2908,6 +2956,7 @@ var _SceneObject = class _SceneObject extends import_three9.Object3D {
   }
   createInstancedMesh(name, geometry, material, count) {
     const mesh = new import_three9.InstancedMesh(geometry, material, count);
+    mesh.count = 0;
     if (name) {
       mesh.name = `mesh:${name}`;
     }
@@ -2985,6 +3034,10 @@ var _SceneObject = class _SceneObject extends import_three9.Object3D {
     if (!this.isInstanced) throw new MineRenderError("Object is not instanced");
     const i = this._instanceCounter++;
     this.setMatrixAt(i, new import_three9.Matrix4());
+    const mesh = this.children[0];
+    if (mesh && isInstancedMesh(mesh)) {
+      mesh.count = Math.min(this._instanceCounter, mesh.instanceMatrix.count);
+    }
     console.debug(p6, "nextInstance " + i);
     if (i === this.options.maxInstanceCount) {
       console.warn(p6, "Max instance count reached for " + this);
@@ -4287,6 +4340,9 @@ var _ModelObject = class _ModelObject extends SceneObject {
       if (this.atlas.model.elements) {
         this.atlas.model.elements?.forEach((el) => {
           const elGeo = this._getBoxGeometryFromElement(el).clone();
+          if (this.options.uvLockRotation) {
+            UVMapper.lockUvs(elGeo, el.faces, this.atlas, new import_three15.Euler(...this.options.uvLockRotation));
+          }
           elGeo.applyMatrix4(new import_three15.Matrix4().makeTranslation((el.to[0] - el.from[0]) / 2, (el.to[1] - el.from[1]) / 2, (el.to[2] - el.from[2]) / 2));
           elGeo.applyMatrix4(new import_three15.Matrix4().makeTranslation(el.from[0], el.from[1], el.from[2]));
           if (el.rotation) {
@@ -4521,25 +4577,24 @@ var _BlockObject = class _BlockObject extends SceneObject {
     await this.createVariant(variant);
   }
   async createVariant(variant) {
-    const model = await Models.getMerged(AssetKey.parse("models", variant.model));
-    const obj = await this.scene.addModel(model, this.options);
-    if (isInstanceReference(obj) || obj.isInstanced) {
-      this._isInstanced = true;
-      this._instanceCounter = 1;
-    }
-    let rotation = new import_three16.Euler(0, 0, 0);
+    const rotation = new import_three16.Euler();
     if (typeof variant.x !== "undefined") {
       rotation.x = toRadians(clampRotationDegrees(variant.x));
     }
     if (typeof variant.y !== "undefined") {
-      if (typeof variant.x !== "undefined") {
-        rotation.y = toRadians(clampRotationDegrees(variant.y));
-      } else {
-        rotation.y = toRadians(clampRotationDegrees(360 - variant.y));
-      }
+      rotation.y = toRadians(clampRotationDegrees(typeof variant.x !== "undefined" ? variant.y : 360 - variant.y));
+    }
+    const model = await Models.getMerged(AssetKey.parse("models", variant.model));
+    const options = {
+      ...this.options,
+      uvLockRotation: variant.uvlock && (rotation.x !== 0 || rotation.y !== 0) ? [rotation.x, rotation.y, rotation.z] : void 0
+    };
+    const obj = await this.scene.addModel(model, options);
+    if (isInstanceReference(obj) || obj.isInstanced) {
+      this._isInstanced = true;
+      this._instanceCounter = 1;
     }
     obj.setRotation(rotation);
-    console.log(obj);
     return obj;
   }
   async resetState() {
@@ -5602,7 +5657,8 @@ var _MineRenderScene = class _MineRenderScene extends import_three17.Scene {
     const obj = await objectSupplier();
     if (obj?.options?.instanceMeshes && asset.key && asset.key?.assetType === "models") {
       console.log("instanceMeshes + key");
-      const key = asset.key.serialize();
+      const uvLockRotation = isModelObject(obj) ? obj.options.uvLockRotation : void 0;
+      const key = asset.key.serialize() + (uvLockRotation ? `|uvlock:${uvLockRotation.join(",")}` : "");
       return this.instanceManager.getOrCreate(key, async () => {
         obj.scene = this;
         await obj.init();
@@ -6639,7 +6695,7 @@ var Skins = class {
     return this.fromUsername(uuidOrUsername);
   }
   static async fromUuid(uuid) {
-    return this.getSkinProxySkinUrl(uuid);
+    return this.getMcProxySkinUrl(uuid);
   }
   static async fromUsername(username) {
     return this.usernameToUuid(username).then((uuid) => {
@@ -6666,7 +6722,7 @@ var Skins = class {
     return this.capeFromUsername(uuidOrUsername);
   }
   static async capeFromUuid(uuid) {
-    return this.getSkinProxyCapeUrl(uuid);
+    return this.getMcProxyCapeUrl(uuid);
   }
   static async capeFromUsername(username) {
     return this.usernameToUuid(username).then((uuid) => {
@@ -6687,8 +6743,23 @@ var Skins = class {
   //</editor-fold>
   //<editor-fold desc="Helpers">
   static async usernameToUuid(username) {
-    return this.usernameToUuidSkinProxy(username);
+    return this.usernameToUuidMcProxy(username);
+  }
+  static async usernameToUuidMcProxy(username) {
+    return Requests.genericRequest({
+      baseURL: "https://mcproxy.dev",
+      url: "/uuid/" + username
+    }).then((res) => {
+      if (res.status === 200) {
+        return res.data["data"]["id"];
+      }
+      return void 0;
+    }).catch((err) => {
+      console.warn(err);
+      return void 0;
+    });
   }
+  /** @deprecated **/
   static async usernameToUuidSkinProxy(username) {
     return Requests.genericRequest({
       baseURL: "https://minecraft-skin-proxy.inventive.workers.dev",
@@ -6767,12 +6838,20 @@ var Skins = class {
   static getMineSkinPlayerSkinUrl(uuid) {
     return "https://mineskin.org/skin/player/" + uuid;
   }
+  /** @deprecated **/
   static getSkinProxySkinUrl(uuid) {
     return "https://minecraft-skin-proxy.inventive.workers.dev/skin/" + uuid;
   }
+  /** @deprecated **/
   static getSkinProxyCapeUrl(uuid) {
     return "https://minecraft-skin-proxy.inventive.workers.dev/cape/" + uuid;
   }
+  static getMcProxySkinUrl(uuid) {
+    return "https://mcproxy.dev/skin/" + uuid;
+  }
+  static getMcProxyCapeUrl(uuid) {
+    return "https://mcproxy.dev/cape/" + uuid;
+  }
   //</editor-fold>
 };