@woosh/meep-engine 2.34.3 → 2.34.7

package/core/geom/3d/topology/TopoVertex.spec.js

@@ -88,9 +88,15 @@ test('replaceAnotherVertex', () => {
     v_b.addEdge(e_b);
 
     f_a.setVertexAt(0, v_a);
+    f_a.setVertexAt(1, new TopoVertex());
+    f_a.setVertexAt(2, new TopoVertex());
+
     e_a.v0 = v_a;
 
     f_b.setVertexAt(0, v_b);
+    f_b.setVertexAt(1, new TopoVertex());
+    f_b.setVertexAt(2, new TopoVertex());
+
     e_b.v0 = v_b;
 
     // verify assumptions about topology

package/core/model/object/objectDeepEquals.spec.js

@@ -1,4 +1,4 @@
-import { objectDeepEquals } from "./objectDeepEquals.d.ts";
+import { objectDeepEquals } from "./objectDeepEquals.js";
 
 test('objectDeepEquals', () => {
     expect(objectDeepEquals({}, {})).toBe(true);

package/engine/asset/loaders/image/ImageDecoderWorker.js

@@ -23,7 +23,7 @@ async function decode_png(png_bytes) {
             width,
             height,
             itemSize: uint_channels.itemSize,
-            bitDepth: uint_channels.bitDepth
+            bitDepth: png.bitDepth
         });
     });
 }

package/engine/asset/loaders/image/ImageRGBADataLoader.js

@@ -41,6 +41,12 @@ export class ImageRGBADataLoader extends AssetLoader {
         return await this.decoder.decode(new Uint8Array(array_buffer));
     }
 
+    /**
+     *
+     * @param {String} path
+     * @return {Promise<ImageRGBADataAsset>}
+     * @private
+     */
     async __standard(path) {
 
         const bitmap = await this.__decode_via_worker(path);
@@ -48,19 +54,19 @@ export class ImageRGBADataLoader extends AssetLoader {
 
         let data;
 
-        switch (bitmap.bitDepth) {
-            case 8:
+        const bitDepth = bitmap.bitDepth;
 
+        switch (bitDepth) {
+            case 8:
                 data = new Uint8Array(bitmap.data);
                 break
             case 16:
                 data = new Uint16Array(bitmap.data);
                 break;
             default:
-                throw new Error(`Unsupported bit depth '${bitmap.bitDepth}'`);
+                throw new Error(`Unsupported bit depth '${bitDepth}'. path='${path}'`);
         }
 
-
         return new ImageRGBADataAsset(data, bitmap.width, bitmap.height, bitmap.itemSize);
     }
 

package/engine/asset/loaders/image/codec/NativeImageDecoder.js

@@ -2,7 +2,7 @@ import { Codec } from "./Codec.js";
 
 /**
  *
- * @param {Image|ImageBitmap} img
+ * @param {Image|ImageBitmap|HTMLImageElement} img
  * @returns {Uint8Array}
  */
 function decode(img) {
@@ -28,10 +28,12 @@ export class NativeImageDecoder extends Codec {
     async decode(data) {
         const image = new Image();
 
+        // convert binary data to image URL that we can load
         const url = URL.createObjectURL(new Blob([data]));
 
         image.src = url;
 
+        // give browser a chance to decode image in async
         await image.decode();
 
         const rgba_data = decode(image);

package/engine/asset/loaders/image/codec/ThreadedImageDecoder.js

@@ -24,6 +24,7 @@ export class ThreadedImageDecoder extends Codec {
     }
 
     async decode(data) {
-        return await this.worker.request('decode', [data.buffer]);
+        const result = await this.worker.request('decode', [data.buffer]);
+        return result;
     }
 }

package/engine/asset/loaders/image/png/PNG.js

@@ -343,7 +343,9 @@ PNG.prototype.getUint8Data_case3 = function () {
     for (let i = 0; i < pixel_count; i++) {
         const destination_address = i * itemSize;
 
-        const lookup_value = pixels[i * d];
+        const lookup_index = pixels[i * d];
+
+        const lookup_value = lookup_index * 3;
 
         result_data[destination_address] = palette[lookup_value];
         result_data[destination_address + 1] = palette[lookup_value + 1];
@@ -381,7 +383,12 @@ PNG.prototype.getUint8Data = function () {
             break;
         case 3:
             // palette
-            return this.getUint8Data_case3();
+            const c3 = this.getUint8Data_case3();
+
+            data = c3.data;
+            itemSize = c3.itemSize;
+
+            break;
         case 4:
             // grayscale with alpha
             data = this.pixels;
@@ -397,7 +404,6 @@ PNG.prototype.getUint8Data = function () {
 
     return {
         data,
-        itemSize,
-        bitDepth: this.bitDepth
+        itemSize
     };
 };

package/engine/asset/loaders/material/bitmap2sampler_gl.js

@@ -2,7 +2,7 @@
  * Transfer bitmap contents to Sampler2D, effectively moving data to CPU, making it readable
  * @param {WebGL2RenderingContext} gl
  * @param {Sampler2D} sampler
- * @param {ImageBitmap} bitmap
+ * @param {ImageBitmap|ImageData|HTMLImageElement|HTMLCanvasElement|HTMLVideoElement} bitmap
  */
 export function bitmap2sampler_gl(gl, sampler, bitmap) {
     gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, bitmap);
@@ -15,5 +15,11 @@ export function bitmap2sampler_gl(gl, sampler, bitmap) {
         throw new Error(`Expected sampler.itemSize to be 4, instead was '${sampler.itemSize}'`);
     }
 
-    gl.readPixels(0, 0, w, h, gl.RGBA, gl.UNSIGNED_BYTE, sampler.data);
+    /**
+     *
+     * @type {Uint8ClampedArray}
+     */
+    const target_data = sampler.data;
+
+    gl.readPixels(0, 0, w, h, gl.RGBA, gl.UNSIGNED_BYTE, target_data);
 }

package/engine/asset/loaders/material/computeTextureEquality.js

@@ -78,6 +78,9 @@ export function textureImagesEqual(a, b) {
         if (a.src === b.src) {
             //same source
             return true;
+        } else {
+            // different source, assume images are different too
+            return false;
         }
     }
 

package/engine/asset/loaders/material/computeTextureHash.js

@@ -2,6 +2,7 @@ import { computeImageBitmapHash } from "./computeImageBitmapHash.js";
 import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
 import { murmur3_32 } from "../../../../core/math/hash/murmur3_32.js";
+import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
 
 /**
  *
@@ -20,6 +21,11 @@ function vector2Hash(v) {
  */
 const data_cache = new WeakMap();
 
+/**
+ *
+ * @param {ImageBitmap|HTMLImageElement|{data,width:number,height:number}} image
+ * @return {number}
+ */
 export function computeImageDataHash(image) {
     const cached_value = data_cache.get(image);
 
@@ -31,6 +37,8 @@ export function computeImageDataHash(image) {
 
     if (image instanceof ImageBitmap) {
         result = computeImageBitmapHash(image);
+    } else if (image instanceof HTMLImageElement) {
+        result = computeStringHash(image.src);
     }
 
     let width = 0;

package/engine/graphics/micron/plugin/MicronRenderPlugin.js

@@ -125,15 +125,15 @@ class GLTFAssetTransformer extends AssetTransformer {
     /**
      *
      * @param {Asset} source
-     * @param asset_description
+     * @param {AssetDescription} asset_description
      * @return {Promise<Asset>}
      */
     async transform(source, asset_description) {
         const animationClips = source.animations;
 
         if (animationClips !== undefined && animationClips.length > 0) {
-            // not suitable
-            return source;
+            // animations might cause trouble
+            console.warn(`model '${asset_description.path}' contains animations, these animations might not works as intended with micron.`);
         }
 
         /**

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.34.3",
+  "version": "2.34.7",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",

package/samples/terrain/editor.js

@@ -20,6 +20,7 @@ import { copy_Sampler2D_channel_data } from "../../engine/graphics/texture/sampl
 import { TextureAssetLoader } from "../../engine/asset/loaders/texture/TextureAssetLoader.js";
 import { CanvasView } from "../../view/elements/CanvasView.js";
 import convertSampler2D2Canvas from "../../engine/graphics/texture/sampler/Sampler2D2Canvas.js";
+import { drawSamplerHTML } from "../../engine/graphics/texture/sampler/util/drawSamplerHTML.js";
 
 const engineHarness = new EngineHarness();