minerender 2.1.0-alpha.69 → 2.1.0-alpha.70

package/dist/browser/index.d.mts

@@ -1,5 +1,5 @@
 import * as three from 'three';
-import { Vector3, PixelFormat, BoxGeometry, Material, ColorRepresentation, MeshBasicMaterial, Mesh, Euler, Vector2, BufferAttribute, Float32BufferAttribute, BufferGeometry, Object3D, Box3, InstancedMesh, PerspectiveCamera, OrthographicCamera, Matrix4, Box2, Scene, Object3DEventMap, Texture, Camera, MOUSE, TOUCH, WebGLRenderer, EventDispatcher, Raycaster, Intersection, CanvasTexture, InterleavedBufferAttribute, TrianglesDrawModes, Line, Points, Group } from 'three';
+import { Vector3, PixelFormat, BoxGeometry, Material, ColorRepresentation, MeshBasicMaterial, Mesh, Euler, Vector2, BufferAttribute, Float32BufferAttribute, BufferGeometry, Object3D, Box3, InstancedMesh, PerspectiveCamera, OrthographicCamera, Matrix4, Box2, Scene, Object3DEventMap, Texture, Camera, MOUSE, TOUCH, WebGLRenderer, EventDispatcher, Raycaster, Intersection, DataTexture, CanvasTexture, InterleavedBufferAttribute, TrianglesDrawModes, Line, Points, Group } from 'three';
 import * as nodeCanvas from 'canvas';
 import { ImageData as ImageData$1, CanvasRenderingContext2D } from 'canvas';
 import { Buffer } from 'buffer';
@@ -277,7 +277,6 @@ interface EntityModelCube {
 }
 
 declare class Materials {
-    private static readonly MISSING_TEXTURE_SRC;
     static get MISSING_TEXTURE(): Material;
     static createImage(key: MaterialKey): Material;
     static createBasicCanvasMaterial(canvas: HTMLCanvasElement, transparent?: boolean, shade?: boolean): Material;
@@ -2315,6 +2314,8 @@ declare class TextureLoader {
 }
 
 declare class Textures {
+    /** Creates the shared checkerboard from pixels without fetching or decoding an image. */
+    static getMissing(): DataTexture;
     static initTextureProps<T extends Texture>(texture: T): T;
     static createImage(key: TextureKey): Texture;
     static createAsset(key: AssetKey): Texture;

package/dist/browser/index.d.ts

@@ -1,5 +1,5 @@
 import * as three from 'three';
-import { Vector3, PixelFormat, BoxGeometry, Material, ColorRepresentation, MeshBasicMaterial, Mesh, Euler, Vector2, BufferAttribute, Float32BufferAttribute, BufferGeometry, Object3D, Box3, InstancedMesh, PerspectiveCamera, OrthographicCamera, Matrix4, Box2, Scene, Object3DEventMap, Texture, Camera, MOUSE, TOUCH, WebGLRenderer, EventDispatcher, Raycaster, Intersection, CanvasTexture, InterleavedBufferAttribute, TrianglesDrawModes, Line, Points, Group } from 'three';
+import { Vector3, PixelFormat, BoxGeometry, Material, ColorRepresentation, MeshBasicMaterial, Mesh, Euler, Vector2, BufferAttribute, Float32BufferAttribute, BufferGeometry, Object3D, Box3, InstancedMesh, PerspectiveCamera, OrthographicCamera, Matrix4, Box2, Scene, Object3DEventMap, Texture, Camera, MOUSE, TOUCH, WebGLRenderer, EventDispatcher, Raycaster, Intersection, DataTexture, CanvasTexture, InterleavedBufferAttribute, TrianglesDrawModes, Line, Points, Group } from 'three';
 import * as nodeCanvas from 'canvas';
 import { ImageData as ImageData$1, CanvasRenderingContext2D } from 'canvas';
 import { Buffer } from 'buffer';
@@ -277,7 +277,6 @@ interface EntityModelCube {
 }
 
 declare class Materials {
-    private static readonly MISSING_TEXTURE_SRC;
     static get MISSING_TEXTURE(): Material;
     static createImage(key: MaterialKey): Material;
     static createBasicCanvasMaterial(canvas: HTMLCanvasElement, transparent?: boolean, shade?: boolean): Material;
@@ -2315,6 +2314,8 @@ declare class TextureLoader {
 }
 
 declare class Textures {
+    /** Creates the shared checkerboard from pixels without fetching or decoding an image. */
+    static getMissing(): DataTexture;
     static initTextureProps<T extends Texture>(texture: T): T;
     static createImage(key: TextureKey): Texture;
     static createAsset(key: AssetKey): Texture;

package/dist/browser/index.js

@@ -690,6 +690,25 @@ var init_ImageLoader = __esm({
         };
       }
       static async loadInfo(src) {
+        if (/^data:/i.test(src.trimStart())) {
+          const url = new URL(src);
+          url.hash = "";
+          const comma = url.href.indexOf(",");
+          if (comma < 0) {
+            throw new Error("Invalid image data URL");
+          }
+          let bytes = url.href.slice(comma + 1).replace(
+            /%([\da-f]{2})/gi,
+            (_, hex) => String.fromCharCode(parseInt(hex, 16))
+          );
+          if (/; *base64 *$/i.test(url.href.slice(5, comma))) {
+            bytes = atob(bytes);
+          }
+          return this.processResponse({
+            url: src,
+            data: Uint8Array.from(bytes, (char) => char.charCodeAt(0)).buffer
+          });
+        }
         return Requests.genericRequest({
           url: src,
           responseType: "arraybuffer"
@@ -774,6 +793,26 @@ var init_Textures = __esm({
     init_CacheKey();
     THREE2 = __toESM(require("three"));
     Textures = class _Textures {
+      /** Creates the shared checkerboard from pixels without fetching or decoding an image. */
+      static getMissing() {
+        return Caching.textureCache.get("builtin:missing-texture", () => {
+          const size = 64;
+          const data = new Uint8Array(size * size * 4);
+          for (let y = 0; y < size; y++) {
+            for (let x = 0; x < size; x++) {
+              const offset = (y * size + x) * 4;
+              const color = (x + y) % 2 === 0 ? 255 : 0;
+              data[offset] = data[offset + 2] = color;
+              data[offset + 3] = 255;
+            }
+          }
+          const texture = new import_three4.DataTexture(data, size, size);
+          texture.colorSpace = THREE2.SRGBColorSpace;
+          texture.flipY = true;
+          texture.needsUpdate = true;
+          return this.initTextureProps(texture);
+        });
+      }
       static initTextureProps(texture) {
         texture.magFilter = THREE2.NearestFilter;
         texture.minFilter = THREE2.NearestFilter;
@@ -806,7 +845,7 @@ var init_Textures = __esm({
 });
 
 // src/Materials.ts
-var import_three5, _Materials, Materials;
+var import_three5, Materials;
 var init_Materials = __esm({
   "src/Materials.ts"() {
     init_CacheKey();
@@ -814,11 +853,12 @@ var init_Materials = __esm({
     init_Textures();
     init_TextureLoader();
     init_Caching();
-    _Materials = class _Materials {
-      // resolved lazily: as a static field this decoded an image the moment the library was
-      // imported, which needs both a DOM and an EnvProvider to already be in place
+    Materials = class _Materials {
       static get MISSING_TEXTURE() {
-        return _Materials.getImage({ texture: { src: _Materials.MISSING_TEXTURE_SRC } });
+        return Caching.materialCache.get("builtin:missing-texture", () => new import_three5.MeshBasicMaterial({
+          map: Textures.getMissing(),
+          alphaTest: 0.5
+        }));
       }
       static createImage(key) {
         const transparent = key.transparent || false;
@@ -1089,8 +1129,6 @@ var init_Materials = __esm({
         }
       }
     };
-    _Materials.MISSING_TEXTURE_SRC = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQMAAACQp+OdAAAABlBMVEX/AP8AAACfphTyAAAAFUlEQVQoz2MIhQKGVVAwKjIqQrwIAHRz/wFI17TEAAAAAElFTkSuQmCC";
-    Materials = _Materials;
   }
 });
 
@@ -2617,7 +2655,7 @@ var init_UVMapper = __esm({
     init_CanvasImage();
     init_TextureAtlas();
     init_Caching();
-    init_ImageLoader();
+    init_Textures();
     init_AssetKey();
     init_ModelGenerator();
     init_log();
@@ -2904,11 +2942,12 @@ var init_UVMapper = __esm({
           const size = Math.ceil(s * maxWidth);
           console.debug(p5, "Atlas size:", size);
           const squaredSize = size * size;
-          const missing = await ImageLoader.getData("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQMAAACQp+OdAAAABlBMVEX/AP8AAACfphTyAAAAFUlEQVQoz2MIhQKGVVAwKjIqQrwIAHRz/wFI17TEAAAAAElFTkSuQmCC");
-          const empty = await ImageLoader.getData("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQMAAACQp+OdAAAAA1BMVEUAAACnej3aAAAAAXRSTlMAQObYZgAAAA5JREFUKM9jGAWjgAIAAAJAAAFSSwuTAAAAAElFTkSuQmCC");
           const image = new CanvasImage(size, size);
-          image.putData(missing, 0, 0);
-          image.putData(empty, 0, 0, 0, 0, maxWidth, maxWidth);
+          const missing = Textures.getMissing().image;
+          const missingPixels = image.context.createImageData(missing.width, missing.height);
+          missingPixels.data.set(missing.data);
+          image.putData(missingPixels, 0, 0);
+          image.context.clearRect(0, 0, maxWidth, maxWidth);
           const positions = {};
           let hasTransparency = false;
           let hasAnimation = false;
@@ -2974,8 +3013,6 @@ var init_UVMapper = __esm({
               ty++;
             }
           }
-          const atlasImageData = image.toDataURL();
-          console.log(p5, "Atlas Image for", model.key, atlasImageData);
           this.fillMissingTextureKeys(model.textures, positions);
           if (isItemModel) {
             console.debug(p5, "Generating item model for", model);