@woosh/meep-engine 2.108.0 → 2.108.3

package/src/engine/graphics/sh3/prototypeSH3Probe.js

@@ -1,11 +1,15 @@
+import { GUI } from "dat.gui";
 import {
     ClampToEdgeWrapping,
     DataTexture,
     LinearFilter,
     MeshBasicMaterial,
+    MeshStandardMaterial,
     NearestFilter,
     PlaneBufferGeometry,
+    RepeatWrapping,
     RGBAFormat,
+    TextureLoader,
     UnsignedByteType
 } from "three";
 import '../../../../../../../css/game.scss';
@@ -13,7 +17,10 @@ import { BinaryBuffer } from "../../../core/binary/BinaryBuffer.js";
 import { array_copy } from "../../../core/collection/array/array_copy.js";
 import { is_typed_array_equals } from "../../../core/collection/array/typed/is_typed_array_equals.js";
 import { Color } from "../../../core/color/Color.js";
+import { kelvin_to_rgb } from "../../../core/color/kelvin/kelvin_to_rgb.js";
+import Quaternion from "../../../core/geom/Quaternion.js";
 import Vector3 from "../../../core/geom/Vector3.js";
+import { max2 } from "../../../core/math/max2.js";
 import { randomFloatBetween } from "../../../core/math/random/randomFloatBetween.js";
 import { seededRandom } from "../../../core/math/random/seededRandom.js";
 import { number_pretty_print } from "../../../core/primitives/numbers/number_pretty_print.js";
@@ -27,6 +34,8 @@ import ViewportPositionSystem from "../../ecs/gui/position/ViewportPositionSyste
 import { TransformAttachmentSystem } from "../../ecs/transform-attachment/TransformAttachmentSystem.js";
 import { Transform } from "../../ecs/transform/Transform.js";
 import { EngineHarness } from "../../EngineHarness.js";
+import { Camera } from "../ecs/camera/Camera.js";
+import TopDownCameraController from "../ecs/camera/topdown/TopDownCameraController.js";
 import { Light } from "../ecs/light/Light.js";
 import LightSystem from "../ecs/light/LightSystem.js";
 import { LightType } from "../ecs/light/LightType.js";
@@ -37,10 +46,10 @@ import { ShadedGeometryFlags } from "../ecs/mesh-v2/ShadedGeometryFlags.js";
 import { ShadedGeometrySystem } from "../ecs/mesh-v2/ShadedGeometrySystem.js";
 import { three_object_to_entity_composition } from "../ecs/mesh-v2/three_object_to_entity_composition.js";
 import { GizmoRenderingPlugin } from "../render/gizmo/GizmoRenderingPlugin.js";
+import { MaterialTransformer } from "./gi/material/MaterialTransformer.js";
 import { build_probes_for_scene } from "./lpv/build_probes_for_scene.js";
 import { LightProbeVolume } from "./lpv/LightProbeVolume.js";
 import { LightProbeVolumeSerializationAdapter } from "./lpv/LightProbeVolumeSerializationAdapter.js";
-import { probe_volume_to_textures } from "./lpv/probe_volume_to_textures.js";
 
 /**
  *
@@ -189,17 +198,22 @@ function make_test_texture(t = 1) {
  *
  * @param {Engine} engine
  * @param {string} path
+ * @param {LightProbeVolume} volume
  * @return {Promise<LightProbeVolume>}
  */
-async function getVolume({ engine, path }) {
+async function getVolume({
+                             engine,
+                             path,
+                             volume = new LightProbeVolume()
+                         }) {
+
+    volume.clear();
 
     const key = `lpv:${path}`;
 
     const adapter = new LightProbeVolumeSerializationAdapter();
 
     if (await engine.storage.promiseContains(key)) {
-        const volume = new LightProbeVolume();
-
         const data = await engine.storage.promiseLoadBinary(key);
 
         console.log(`LPV data size ${number_pretty_print(data.byteLength)} bytes`);
@@ -216,11 +230,12 @@ async function getVolume({ engine, path }) {
 
     const ecd = engine.entityManager.dataset;
 
-    const volume = await build_probes_for_scene({
+    await build_probes_for_scene({
+        volume,
         engine,
         ecd,
         bounds: mesh_bounds,
-        density: 10000
+        density: 3000
     });
 
     const buffer = new BinaryBuffer();
@@ -234,12 +249,65 @@ async function getVolume({ engine, path }) {
     return volume;
 }
 
+/**
+ *
+ * @param {number} level
+ * @param {EntityComponentDataset} ecd
+ * @param {GraphicsEngine} graphics
+ */
+function createFloor({ level, ecd, graphics }) {
+
+    const texture_frequency = 10;
+    const size = 1000;
+
+    const map = new TextureLoader().load('data/textures/utility/checkers_dark_grey_256x256.png', t => {
+        map.needsUpdate = true;
+
+        map.wrapS = RepeatWrapping;
+        map.wrapT = RepeatWrapping;
+
+        map.repeat.set(size / texture_frequency, size / texture_frequency);
+
+        map.matrixAutoUpdate = true;
+    });
+
+
+    const material = graphics.getMaterialManager().obtain(new MeshStandardMaterial({
+        map: map
+    })).getValue();
+
+    const geometry = new PlaneBufferGeometry(1, 1, 100, 100);
+
+    geometry.computeVertexNormals();
+    geometry.computeTangents();
+
+    new Entity()
+        .add(Transform.fromJSON({
+            position: {
+                x: 0,
+                y: level,
+                z: 0
+            },
+            rotation: Quaternion.fromEulerAngles(-Math.PI * 0.5, 0, 0),
+            scale: size
+        }))
+        .add(ShadedGeometry.from(geometry, material))
+        .build(ecd);
+
+}
+
 /**
  *
  * @param {Engine} engine
  * @return {Promise<void>}
  */
 async function main(engine) {
+    const volume = new LightProbeVolume();
+
+    const transformer = new MaterialTransformer({ volume });
+
+    engine.graphics.getMaterialManager().addCompileStep(transformer);
+
     await EngineHarness.buildBasics({
         engine,
         enableWater: false,
@@ -254,13 +322,18 @@ async function main(engine) {
         // shadowmapResolution: 4096
     });
 
+    const sun_color = new Color();
+
+    kelvin_to_rgb(sun_color, 0, 6000);
+
     await EngineHarness.buildLights({
         engine,
         shadowmapResolution: 4096,
-        ambientIntensity: 0.03,
-        sun: Color.white,
-        sunIntensity: 17,
-        sunDirection: new Vector3(0.5, -1, 0.3)
+        ambientIntensity: 0.0,
+        sun: sun_color,
+        sunIntensity: 1.7,
+        // sunDirection: new Vector3(0.5, -1, 0.3)
+        sunDirection: new Vector3(1.2, -1,0.2 )
     })
 
     engine.graphics.getRenderer().setClearColor('#1e3441', 1);
@@ -272,16 +345,29 @@ async function main(engine) {
 
     // const path = 'data/models/LowPolyTownshipSet/Small_house/Small_house.gltf';
     // const path = 'data/models/sibenik/2/model.gltf';
-    // const path = 'data/models/sibenik/3-window-less/model.gltf';
     // const path = 'data/models/vokselia_spawn/model.gltf';
-    const path = 'data/models/sponza-pbr/gltf/sponza.glb';
     // const path = 'data/models/LowPolyTownshipSet/Town_Hall/model.gltf';
-    // const path = 'data/models/Slaughter Mech/Slaugter Mech.gltf';
     // const path = 'data/models/pica_pica/pica_pica.gltf';
+    // const path = 'data/models/samples/low_poly_classroom/no-glass/model.gltf';
+    // const path = 'data/models/samples/just_a_girl/scene.gltf';
+    // const path = 'data/models/samples/slum_house/scene.gltf';
+    // const path = 'data/models/samples/jack_trigger/scene.gltf';
+    // const path = 'data/models/samples/cornell_box/scene.gltf';
+    // const path = 'data/models/samples/cyberpunk_bike/scene.gltf';
+    // const path = 'data/models/samples/sd_macross_city_standoff_diorama/scene.gltf';
+    // const path = 'data/models/Slaughter Mech/Slaugter Mech.gltf';
+    const path = 'data/models/sponza-pbr/gltf/sponza.glb';
+    // const path = 'data/models/samples/gi_box_01/model.glb';
+    // const path = 'data/models/samples/gi_box_01/model-thick-1.glb';
+    // const path = 'data/models/sibenik/3-window-less/model.gltf';
 
     const mesh_asset = await engine.assetManager.promise(path, 'model/gltf+json');
     const gltf = mesh_asset.gltf;
 
+    console.log(gltf);
+
+    // add floor
+
     // make_cornel_box(ecd);
 
     const mesh_entity = new Entity();
@@ -290,6 +376,11 @@ async function main(engine) {
         .add(SGMesh.fromURL(path))
     ;
 
+    createFloor({
+        level: mesh_asset.boundingBox.y0,
+        ecd,
+        graphics: engine.graphics
+    });
 
     const composition = three_object_to_entity_composition(gltf.scene);
 
@@ -307,6 +398,8 @@ async function main(engine) {
     });
 
     composition.transform.scale.setScalar(1);
+    //
+    // composition.transform.rotation.fromEulerAngles(0, Math.PI, 0);
 
     composition.build(ecd);
 
@@ -317,6 +410,10 @@ async function main(engine) {
     const model_footprint = Math.hypot(mesh_bounds.getExtentsX(), mesh_bounds.getExtentsY(), mesh_bounds.getExtentsZ());
 
 
+    const camera = ecd.getAnyComponent(Camera);
+    camera.component.clip_far = max2(100, model_footprint);
+    ecd.getComponent(camera.entity, TopDownCameraController).distanceMax = model_footprint * 1.1;
+
     const random = seededRandom();
 
     for (let i = 0; i < 0; i++) {
@@ -351,21 +448,21 @@ async function main(engine) {
 
     console.time('getVolume');
     // console.profile('getVolume');
-    const volume = await getVolume({ engine, path });
+    await getVolume({ engine, path, volume });
     // console.profileEnd('getVolume');
     console.timeEnd('getVolume');
 
     console.log('LPV:', volume);
 
+    transformer.update();
+
 
     volume.visualize_probes({ ecd, size: model_footprint * 0.002 });
-    // volume.visualize_mesh({ ecd , opacity: 0.2});
+    // volume.visualize_mesh({ ecd, opacity: 0.5 });
 
-    console.time('prepareTextures');
-    const textures = probe_volume_to_textures(volume);
-    console.timeEnd('prepareTextures');
+    new GUI()
+        .add(transformer, 'intensity').min(0).max(10);
 
-    console.log(textures);
 
     // mesh_entity.addEventListener(SGMeshEvents.AssetLoaded, build);
     //

package/src/engine/graphics/texture/AttributeDataTexture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AttributeDataTexture.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/texture/AttributeDataTexture.js"],"names":[],"mappings":"AAYA;IAwRI;;;;;;OAMG;IACH,+CAHW,MAAM,cACN,MAAM,GAHL,oBAAoB,CAO/B;IAhSD;;;;;OAKG;IACH,+CAHW,MAAM,cACN,MAAM,EA2ChB;IA/BG;;;;OAIG;IACH,eAAkB;IAElB,mBAAoB;IAEpB;;;;OAIG;IACH,uBAAkC;IAElC;;;;OAIG;IACH,kBAAqB;IAErB;;;;OAIG;IACH,qBAA8B;IAKlC;;;OAGG;IACH,0BAEC;IAED,cASC;IAED,0BAGC;IAED,2BAEC;IAED;;;OAGG;IACH,mBAFW,MAAM,QAwChB;IAED,cA4BC;IAED;;;;;;OAMG;IACH,yBALW,MAAM,WACN,MAAM,EAAE,UACR,MAAM,EAAE,GACN,OAAO,CAoCnB;IAED;;;;;OAKG;IACH,8BAJW,MAAM,WACN,MAAM,EAAE,UACR,MAAM,EAAE,QAmClB;IAED;;;OAGG;IACH,sBAFW,MAAM,QAgBhB;IAED;;;OAGG;IACH,sCAEC;IAED;;;OAGG;IACH,2BAEC;IAED;;;OAGG;IACH,oBAFY,MAAM,CAIjB;CAYJ;4BA9S0C,OAAO"}
+{"version":3,"file":"AttributeDataTexture.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/texture/AttributeDataTexture.js"],"names":[],"mappings":"AAaA;IA6RI;;;;;;OAMG;IACH,+CAHW,MAAM,cACN,MAAM,GAHL,oBAAoB,CAO/B;IArSD;;;;;OAKG;IACH,+CAHW,MAAM,cACN,MAAM,EA2ChB;IA/BG;;;;OAIG;IACH,eAAkB;IAElB,mBAAoB;IAEpB;;;;OAIG;IACH,uBAAkC;IAElC;;;;OAIG;IACH,kBAAqB;IAErB;;;;OAIG;IACH,qBAA8B;IAKlC;;;OAGG;IACH,0BAEC;IAED,cASC;IAED,0BAGC;IAED,2BAEC;IAED;;;OAGG;IACH,mBAFW,MAAM,QAwChB;IAED,cAiCC;IAED;;;;;;OAMG;IACH,yBALW,MAAM,WACN,MAAM,EAAE,UACR,MAAM,EAAE,GACN,OAAO,CAoCnB;IAED;;;;;OAKG;IACH,8BAJW,MAAM,WACN,MAAM,EAAE,UACR,MAAM,EAAE,QAmClB;IAED;;;OAGG;IACH,sBAFW,MAAM,QAgBhB;IAED;;;OAGG;IACH,sCAEC;IAED;;;OAGG;IACH,2BAEC;IAED;;;OAGG;IACH,oBAFY,MAAM,CAIjB;CAYJ;4BApT0C,OAAO"}

package/src/engine/graphics/texture/AttributeDataTexture.js

@@ -5,7 +5,8 @@ import {
 } from "../../../core/binary/type/DataType2TypedArrayConstructorMapping.js";
 import { DataTypeByteSizes } from "../../../core/binary/type/DataTypeByteSizes.js";
 import { typed_array_copy } from "../../../core/collection/array/typed/typed_array_copy.js";
-import { channelCountToThreeTextureFormat } from "./channelCountToThreeTextureFormat.js";
+
+import { computeThreeTextureFormatFromDataType } from "./computeThreeTextureFormatFromDataType.js";
 import { computeThreeTextureInternalFormatFromDataType } from "./computeThreeTextureInternalFormatFromDataType.js";
 import { computeThreeTextureTypeFromDataType } from "./computeThreeTextureTypeFromDataType.js";
 import { normalized_internal_format } from "./normalized_internal_format.js";
@@ -140,7 +141,7 @@ export class AttributeDataTexture {
         const width = this.computeSlotWidth() * this.__column_count;
         const height = Math.ceil(this.__capacity / this.__column_count);
 
-        const format = channelCountToThreeTextureFormat(spec.itemSize);
+        const format = computeThreeTextureFormatFromDataType(spec.type, spec.itemSize);
         const type = computeThreeTextureTypeFromDataType(spec.type);
 
         const array = new TypedArray(width * height * spec.itemSize);
@@ -151,12 +152,17 @@ export class AttributeDataTexture {
         texture.generateMipmaps = false;
         texture.minFilter = texture.magFilter = NearestFilter;
 
+        texture.format = format;
+        texture.type = type;
+
         if (spec.normalized) {
             texture.internalFormat = normalized_internal_format(spec.type, spec.itemSize);
         } else {
             texture.internalFormat = computeThreeTextureInternalFormatFromDataType(spec.type, spec.itemSize);
         }
 
+        texture.needsUpdate = true;
+
         this.__texture = texture;
 
 

package/src/engine/graphics/texture/computeThreeTextureFormat.js

@@ -1,6 +1,6 @@
 import { NumericType } from "../../../core/math/NumericType.js";
-import { channelCountToThreIntegerTextureType } from "./channelCountToThreIntegerTextureType.js";
 import { channelCountToThreeTextureFormat } from "./channelCountToThreeTextureFormat.js";
+import { channelCountToThreIntegerTextureType } from "./channelCountToThreIntegerTextureType.js";
 
 /**
  *
@@ -16,3 +16,4 @@ export function computeThreeTextureFormat(type, channel_count) {
         throw new Error(`Unsupported numeric type '${type}'`);
     }
 }
+

package/src/engine/graphics/texture/computeThreeTextureFormatFromDataType.d.ts

@@ -0,0 +1,7 @@
+/**
+ *
+ * @param {BinaryDataType} dt
+ * @param {number} channel_count
+ */
+export function computeThreeTextureFormatFromDataType(dt: BinaryDataType, channel_count: number): number | import("three").PixelFormat;
+//# sourceMappingURL=computeThreeTextureFormatFromDataType.d.ts.map

package/src/engine/graphics/texture/computeThreeTextureFormatFromDataType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"computeThreeTextureFormatFromDataType.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/texture/computeThreeTextureFormatFromDataType.js"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,yFAFW,MAAM,wCAMhB"}

package/src/engine/graphics/texture/computeThreeTextureFormatFromDataType.js

@@ -0,0 +1,13 @@
+import { computeThreeTextureFormat } from "./computeThreeTextureFormat.js";
+import { numericTypeFromBinaryDataType } from "./numericTypeFromBinaryDataType.js";
+
+/**
+ *
+ * @param {BinaryDataType} dt
+ * @param {number} channel_count
+ */
+export function computeThreeTextureFormatFromDataType(dt, channel_count) {
+    const numeric_type = numericTypeFromBinaryDataType(dt);
+
+    return computeThreeTextureFormat(numeric_type, channel_count);
+}

package/src/engine/graphics/texture/numericTypeFromBinaryDataType.d.ts

@@ -0,0 +1,9 @@
+/**
+ *
+ * @param {BinaryDataType} dt
+ * @returns {NumericType}
+ */
+export function numericTypeFromBinaryDataType(dt: BinaryDataType): NumericType;
+import { BinaryDataType } from "../../../core/binary/type/BinaryDataType.js";
+import { NumericType } from "../../../core/math/NumericType.js";
+//# sourceMappingURL=numericTypeFromBinaryDataType.d.ts.map

package/src/engine/graphics/texture/numericTypeFromBinaryDataType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"numericTypeFromBinaryDataType.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/texture/numericTypeFromBinaryDataType.js"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,kDAHW,cAAc,GACZ,WAAW,CAwBvB;+BA9B8B,6CAA6C;4BAChD,mCAAmC"}

package/src/engine/graphics/texture/numericTypeFromBinaryDataType.js

@@ -0,0 +1,31 @@
+import { BinaryDataType } from "../../../core/binary/type/BinaryDataType.js";
+import { NumericType } from "../../../core/math/NumericType.js";
+
+/**
+ *
+ * @param {BinaryDataType} dt
+ * @returns {NumericType}
+ */
+export function numericTypeFromBinaryDataType(dt) {
+
+    switch (dt) {
+        case BinaryDataType.Uint8:
+        case BinaryDataType.Uint16:
+        case BinaryDataType.Uint32:
+            return NumericType.Uint
+
+        case BinaryDataType.Int8:
+        case BinaryDataType.Int16:
+        case BinaryDataType.Int32:
+            return NumericType.Int;
+
+        case BinaryDataType.Float16:
+        case BinaryDataType.Float32:
+        case BinaryDataType.Float64:
+            return NumericType.Float;
+
+        default:
+            throw new Error(`Unsupported data type '${dt}'`);
+    }
+
+}

package/src/engine/graphics/texture/sampler/Sampler2D.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sampler2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/Sampler2D.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Sampler2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/Sampler2D.js"],"names":[],"mappings":"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"}

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

@@ -321,7 +321,7 @@ export class Sampler2D {
      *
      * @param {number} u
      * @param {number} v
-     * @param {number[]} result
+     * @param {number[]|Float32Array} result
      * @param {number} result_offset
      */
     sampleBilinearUV(u, v, result, result_offset = 0) {
@@ -396,8 +396,8 @@ export class Sampler2D {
         const clamped_x = clamp(x, 0, x_max);
         const clamped_y = clamp(y, 0, y_max);
 
-        const x0 = clamped_x | 0;
-        const y0 = clamped_y | 0;
+        const x0 = clamped_x >>> 0;
+        const y0 = clamped_y >>> 0;
 
         //
         const row0 = y0 * rowSize;
@@ -458,7 +458,7 @@ export class Sampler2D {
      *
      * @param {number} u
      * @param {number} v
-     * @param {ArrayLike<number>} result
+     * @param {number[]|ArrayLike<number>} result
      */
     sampleNearestUV(u, v, result) {
         const w = this.width;

package/src/engine/graphics/texture/sampler/convertTexture2Sampler2D.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convertTexture2Sampler2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/convertTexture2Sampler2D.js"],"names":[],"mappings":"AAUA;;;;;;;GAOG;AACH,mEALW,MAAM,WACN,MAAM,UACN,OAAO,GACN,SAAS,CAyEpB;0BArFyB,gBAAgB"}
+{"version":3,"file":"convertTexture2Sampler2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/convertTexture2Sampler2D.js"],"names":[],"mappings":"AAaA;;;;;;;GAOG;AACH,mEALW,MAAM,WACN,MAAM,UACN,OAAO,GACN,SAAS,CAkGpB;0BA/GyB,gBAAgB"}

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

@@ -1,8 +1,11 @@
-import { flipArrayInPlace } from "../../filter/FlipArrayInPlace.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 { formatToChannelCount } from "../formatToChannelCount.js";
+import { sampler2d_scale } from "./resize/sampler2d_scale.js";
 import { Sampler2D } from "./Sampler2D.js";
+import { sampler2d_ensure_uint8_RGBA } from "./sampler2d_ensure_uint8_RGBA.js";
 
 
 const DEFAULT_TEXTURE_WIDTH = 512;
@@ -25,6 +28,8 @@ export function convertTexture2Sampler2D(
     let _height = height;
     let _width = width;
 
+    const channel_count = formatToChannelCount(texture.format);
+
     // TODO take channel count into account
 
     if (_width === undefined || _height === undefined) {
@@ -59,32 +64,55 @@ export function convertTexture2Sampler2D(
 
     }
 
-    // TODO add special case for DataTexture
 
-    const built = WebGLRendererPool.global.use(renderer => {
+    let data;
 
-        const ctx = renderer.getContext();
+    if (texture.isDataTexture === true) {
 
-        //support for compressed textures
-        ctx.getExtension("WEBGL_compressed_texture_s3tc");
+        // special case
+
+        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;
+        }
+
+        data = converted.data;
+
+    } else {
+        const built = WebGLRendererPool.global.use(renderer => {
+
+            const ctx = renderer.getContext();
+
+            //support for compressed textures
+            ctx.getExtension("WEBGL_compressed_texture_s3tc");
+
+            return ImageFilter(renderer, _width, _height, {
+                vertexShader: CopyShader.vertexShader,
+                fragmentShader: CopyShader.fragmentShader,
+                uniforms: {
+                    tDiffuse: {
+                        value: texture,
+                        type: 't'
+                    },
+                    opacity: { value: 1.0 }
+                }
+            });
 
-        return ImageFilter(renderer, _width, _height, {
-            vertexShader: CopyShader.vertexShader,
-            fragmentShader: CopyShader.fragmentShader,
-            uniforms: {
-                tDiffuse: {
-                    value: texture,
-                    type: 't'
-                },
-                opacity: { value: 1.0 }
-            }
         });
 
-    });
+        data = built.array;
+    }
 
     if (flipY) {
-        flipArrayInPlace(built.array, _width, _height);
+        sampler2d_flipY_in_place(data, _width, _height);
     }
 
-    return new Sampler2D(built.array, 4, _width, _height);
+    return new Sampler2D(data, 4, _width, _height);
 }

package/src/engine/graphics/texture/sampler/debug/prototypeSamplerFiltering.js

@@ -16,6 +16,7 @@ import { sampler2d_scale_down_lanczos } from "../resize/sampler2d_scale_down_lan
 import { sampler2d_scale_down_mipmap } from "../resize/sampler2d_scale_down_mipmap.js";
 import { sampler2d_scale_generic } from "../resize/sampler2d_scale_generic.js";
 import { Sampler2D } from "../Sampler2D.js";
+import { sampler2d_copy_rectangle } from "../sampler2d_copy_rectangle.js";
 import { debug_draw_sampler } from "./debug_draw_sampler.js";
 import { debug_draw_sampler_grid } from "./debug_draw_sampler_grid.js";
 
@@ -35,40 +36,11 @@ function setup_zoom_preview({ engine, sampler }) {
 
     const preview_container = debug_draw_sampler(engine, preview, 0, sampler.height);
     preview_container.transformOrigin.set(0, 0);
-    // preview_container.scale.setScalar(20);
-
-    /**
-     *
-     * @param {Sampler2D} source
-     * @param {Sampler2D} target
-     * @param {number} u0
-     * @param {number} v0
-     * @param {number} u1
-     * @param {number} v1
-     */
-    function update_preview(
-        source, target,
-        u0, v0, u1, v1
-    ) {
-
-        const sample = [];
-
-        for (let y = 0; y < target.height; y++) {
-            for (let x = 0; x < target.width; x++) {
-
-                const local_u = x / target.width;
-                const local_v = y / target.height;
 
-                source.sampleBilinearUV(local_u * (u1 - u0) + u0, local_v * (v1 - v0) + v0, sample);
-
-                target.write(x, y, sample);
-
-            }
-        }
+    // preview_container.scale.setScalar(20);
 
-    }
 
-    function setPreviewPosition(x,y){
+    function setPreviewPosition(x, y) {
         const window_size = 0.1;
 
 
@@ -81,7 +53,7 @@ function setup_zoom_preview({ engine, sampler }) {
         const center_v = clamp(v, w_2, 1 - w_2);
 
 
-        update_preview(
+        sampler2d_copy_rectangle(
             sampler, preview,
             center_u - w_2, center_v - w_2,
             center_u + w_2, center_v + w_2
@@ -89,7 +61,7 @@ function setup_zoom_preview({ engine, sampler }) {
 
         preview_container.$redraw();
 
-        console.log(x,y);
+        console.log(x, y);
     }
 
     // setPreviewPosition(366,420);

package/src/engine/graphics/texture/sampler/sampler2d_copy_rectangle.d.ts

@@ -0,0 +1,11 @@
+/**
+ *
+ * @param {Sampler2D} source
+ * @param {Sampler2D} target
+ * @param {number} u0
+ * @param {number} v0
+ * @param {number} u1
+ * @param {number} v1
+ */
+export function sampler2d_copy_rectangle(source: Sampler2D, target: Sampler2D, u0: number, v0: number, u1: number, v1: number): void;
+//# sourceMappingURL=sampler2d_copy_rectangle.d.ts.map

package/src/engine/graphics/texture/sampler/sampler2d_copy_rectangle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sampler2d_copy_rectangle.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/texture/sampler/sampler2d_copy_rectangle.js"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,mFALW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,QAiChB"}

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

@@ -0,0 +1,41 @@
+/**
+ *
+ * @param {Sampler2D} source
+ * @param {Sampler2D} target
+ * @param {number} u0
+ * @param {number} v0
+ * @param {number} u1
+ * @param {number} v1
+ */
+export function sampler2d_copy_rectangle(
+    source, target,
+    u0, v0, u1, v1
+) {
+
+    const sample = [];
+
+    const target_height = target.height;
+    const target_width = target.width;
+
+    const v_span = v1 - v0;
+    const u_span = u1 - u0;
+
+    const v_multiplier = v_span / target_height;
+    const u_multiplier = u_span / target_width;
+
+    for (let y = 0; y < target_height; y++) {
+
+        const source_v = y * v_multiplier + v0;
+
+        for (let x = 0; x < target_width; x++) {
+
+            const source_u = x * u_multiplier + u0;
+
+            source.sampleBilinearUV(source_u, source_v, sample);
+
+            target.write(x, y, sample);
+
+        }
+    }
+
+}