@woosh/meep-engine 2.109.4 → 2.109.5

package/src/engine/graphics/texture/sampler/convertTexture2Sampler2D.js

@@ -1,7 +1,9 @@
+import { assert } from "../../../../core/assert.js";
 import ImageFilter from "../../filter/ImageFilter.js";
 import { sampler2d_flipY_in_place } from "../../filter/sampler2d_flipY_in_place.js";
 import CopyShader from "../../postprocess/threejs/shaders/CopyShader.js";
 import { WebGLRendererPool } from "../../render/RendererPool.js";
+import { canvasDataToSampler } from "../Canvas2Sampler2D.js";
 import { formatToChannelCount } from "../formatToChannelCount.js";
 import { sampler2d_scale } from "./resize/sampler2d_scale.js";
 import { Sampler2D } from "./Sampler2D.js";
@@ -11,6 +13,62 @@ import { sampler2d_ensure_uint8_RGBA } from "./sampler2d_ensure_uint8_RGBA.js";
 const DEFAULT_TEXTURE_WIDTH = 512;
 const DEFAULT_TEXTURE_HEIGHT = 512;
 
+/**
+ *
+ * @param {THREE.DataTexture} texture
+ * @param {number} channel_count
+ * @param {number} _width
+ * @param {number} _height
+ * @returns {Sampler2D}
+ */
+function data_texture_to_sampler(texture, channel_count, _width, _height) {
+    const source = new Sampler2D(texture.image.data, channel_count, texture.image.width, texture.image.height);
+
+    let converted = sampler2d_ensure_uint8_RGBA(source);
+
+    if (converted.width !== _width || converted.height !== _height) {
+        const target = Sampler2D.uint8(4, _width, _height);
+
+        sampler2d_scale(converted, target);
+
+        converted = target;
+    }
+    return converted;
+}
+
+/**
+ *
+ * @param {THREE.Texture} texture
+ * @param {number} channel_count
+ * @param {number} _width
+ * @param {number} _height
+ * @returns {Sampler2D}
+ */
+function html_image_texture_to_sampler(texture, channel_count, _width, _height) {
+    /**
+     *
+     * @type {Image}
+     */
+    const img = texture.image;
+
+    assert.isInstanceOf(img, Image, 'texture.image', 'Image');
+
+    const canvas = document.createElement('canvas');
+
+    canvas.width = _width;
+    canvas.height = _height;
+
+    const ctx = canvas.getContext('2d');
+
+    ctx.drawImage(img, 0, 0, img.width, img.height, 0, 0, _width, _height);
+
+    const result = Sampler2D.uint8(4, _width, _height);
+
+    canvasDataToSampler(result, ctx);
+
+    return result;
+}
+
 /**
  *
  * @param {Texture} texture
@@ -30,8 +88,6 @@ export function convertTexture2Sampler2D(
 
     const channel_count = formatToChannelCount(texture.format);
 
-    // TODO take channel count into account
-
     if (_width === undefined || _height === undefined) {
 
         //figure out texture size
@@ -70,21 +126,14 @@ export function convertTexture2Sampler2D(
     if (texture.isDataTexture === true) {
 
         // special case
+        const converted = data_texture_to_sampler(texture, channel_count, _width, _height);
 
-        const source = new Sampler2D(texture.image.data, channel_count, texture.image.width, texture.image.height);
-
-        let converted = sampler2d_ensure_uint8_RGBA(source);
-
-        if (converted.width !== _width || converted.height !== _height) {
-            const target = Sampler2D.uint8(4, _width, _height);
-
-            sampler2d_scale(converted, target);
+        data = converted.data;
 
-            converted = target;
-        }
+    } else if (texture.image instanceof Image) {
+        const converted = html_image_texture_to_sampler(texture, channel_count, _width, _height);
 
         data = converted.data;
-
     } else {
         const built = WebGLRendererPool.global.use(renderer => {
 

package/src/engine/graphics/three/material/iterate_three_material_textures.d.ts

@@ -0,0 +1,10 @@
+/**
+ *
+ * @param {THREE.Material} material
+ * @returns {Generator<{texture:THREE.Texture, name:string}>}
+ */
+export function iterate_three_material_textures(material: THREE.Material): Generator<{
+    texture: THREE.Texture;
+    name: string;
+}>;
+//# sourceMappingURL=iterate_three_material_textures.d.ts.map

package/src/engine/graphics/three/material/iterate_three_material_textures.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"iterate_three_material_textures.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/three/material/iterate_three_material_textures.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,0DAHW,MAAM,QAAQ,GACZ,UAAU;IAAC,OAAO,EAAC,MAAM,OAAO,CAAC;IAAC,MAAK,MAAM,CAAA;CAAC,CAAC,CA2B3D"}

package/src/engine/graphics/three/material/iterate_three_material_textures.js

@@ -0,0 +1,33 @@
+import { TextureAttachmentsByMaterialType } from "../../../asset/loaders/material/TextureAttachmensByMaterialType.js";
+
+/**
+ *
+ * @param {THREE.Material} material
+ * @returns {Generator<{texture:THREE.Texture, name:string}>}
+ */
+export function* iterate_three_material_textures(material) {
+
+    //patch textures
+    const materialType = material.type;
+
+    /**
+     *
+     * @type {TextureAttachment[]}
+     */
+    const attachments = TextureAttachmentsByMaterialType[materialType];
+
+    if (attachments !== undefined) {
+
+        for (let i = 0; i < attachments.length; i++) {
+            const attachment = attachments[i];
+
+            const texture = attachment.read(material);
+
+            if (texture === undefined || texture === null) {
+                continue;
+            }
+
+            yield { texture, name: attachment.name };
+        }
+    }
+}

package/src/core/math/max4.d.ts

@@ -1,10 +0,0 @@
-/**
- *
- * @param {number} a
- * @param {number} b
- * @param {number} c
- * @param {number} d
- * @returns {number}
- */
-export function max4(a: number, b: number, c: number, d: number): number;
-//# sourceMappingURL=max4.d.ts.map

package/src/core/math/max4.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"max4.d.ts","sourceRoot":"","sources":["../../../../src/core/math/max4.js"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,wBANW,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,GACJ,MAAM,CAgBlB"}

package/src/core/math/max4.js

@@ -1,24 +0,0 @@
-/**
- *
- * @param {number} a
- * @param {number} b
- * @param {number} c
- * @param {number} d
- * @returns {number}
- */
-export function max4(a, b, c, d) {
-    let v = a;
-
-    if (b > v) {
-        v = b;
-    }
-    if (c > v) {
-        v = c;
-    }
-    if (d > v) {
-        v = d;
-    }
-
-    return v;
-}
-

package/src/core/math/min4.d.ts

@@ -1,10 +0,0 @@
-/**
- *
- * @param {number} a
- * @param {number} b
- * @param {number} c
- * @param {number} d
- * @returns {number}
- */
-export function min4(a: number, b: number, c: number, d: number): number;
-//# sourceMappingURL=min4.d.ts.map

package/src/core/math/min4.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"min4.d.ts","sourceRoot":"","sources":["../../../../src/core/math/min4.js"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,wBANW,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,GACJ,MAAM,CAgBlB"}

package/src/core/math/min4.js

@@ -1,23 +0,0 @@
-/**
- *
- * @param {number} a
- * @param {number} b
- * @param {number} c
- * @param {number} d
- * @returns {number}
- */
-export function min4(a, b, c, d) {
-    let v = a;
-
-    if (b < v) {
-        v = b;
-    }
-    if (c < v) {
-        v = c;
-    }
-    if (d < v) {
-        v = d;
-    }
-
-    return v;
-}