@woosh/meep-engine 2.63.0 → 2.65.0

package/src/engine/graphics/sh3/path_tracer/PathTracer.js

@@ -1,15 +1,4 @@
-import {
-    ExplicitBinaryBoundingVolumeHierarchy
-} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
-import { bvh_query_leaves_ray } from "../../../../core/bvh2/bvh3/query/bvh_query_leaves_ray.js";
-import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
-import { array_copy } from "../../../../core/collection/array/array_copy.js";
 import { mat4, vec3 } from "gl-matrix";
-import { ensureGeometryBoundingBox } from "../../util/ensureGeometryBoundingBox.js";
-import { GeometryBVHBatched } from "./GeometryBVHBatched.js";
-import { PathTracedMesh } from "./PathTracedMesh.js";
-import { TextureAttachmentsByMaterialType } from "../../../asset/loaders/material/TextureAttachmensByMaterialType.js";
-import { convertTexture2Sampler2D } from "../../texture/sampler/convertTexture2Sampler2D.js";
 import {
     LinearEncoding,
     LinearFilter,
@@ -19,16 +8,25 @@ import {
     sRGBEncoding,
     UnsignedByteType
 } from "three";
-import { linear_to_sRGB } from "../../../../core/color/sRGB/linear_to_sRGB.js";
-import { sample_triangle_attribute } from "./sample_triangle_attribute.js";
-import { vec3_uint8_to_float } from "./vec3_uint8_to_float.js";
-import { apply_texture_clamping_to_coordinate } from "./apply_texture_clamping_to_coordinate.js";
+import { BVH } from "../../../../core/bvh2/bvh3/BVH.js";
 import { ebvh_sort_for_traversal_depth_first } from "../../../../core/bvh2/bvh3/ebvh_sort_for_traversal_depth_first.js";
+import { bvh_query_leaves_ray } from "../../../../core/bvh2/bvh3/query/bvh_query_leaves_ray.js";
+import { array_copy } from "../../../../core/collection/array/array_copy.js";
+import { linear_to_sRGB } from "../../../../core/color/sRGB/linear_to_sRGB.js";
+import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
+import { ray3_array_compose } from "../../../../core/geom/3d/ray/ray3_array_compose.js";
 import { v3_dot } from "../../../../core/geom/vec3/v3_dot.js";
+import { TextureAttachmentsByMaterialType } from "../../../asset/loaders/material/TextureAttachmensByMaterialType.js";
+import { convertTexture2Sampler2D } from "../../texture/sampler/convertTexture2Sampler2D.js";
+import { ensureGeometryBoundingBox } from "../../util/ensureGeometryBoundingBox.js";
+import { apply_texture_clamping_to_coordinate } from "./apply_texture_clamping_to_coordinate.js";
+import { GeometryBVHBatched } from "./GeometryBVHBatched.js";
+import { getBiasedNormalSample } from "./getBiasedNormalSample.js";
 import { make_one_vector3 } from "./make_one_vector3.js";
+import { PathTracedMesh } from "./PathTracedMesh.js";
 import { transform_normal_m4 } from "./ray_hit_apply_transform.js";
-import { ray3_array_compose } from "../../../../core/geom/3d/ray/ray3_array_compose.js";
-import { getBiasedNormalSample } from "./getBiasedNormalSample.js";
+import { sample_triangle_attribute } from "./sample_triangle_attribute.js";
+import { vec3_uint8_to_float } from "./vec3_uint8_to_float.js";
 
 /*
  Ray hit data layout:
@@ -69,9 +67,9 @@ export class PathTracer {
 
         /**
          *
-         * @type {ExplicitBinaryBoundingVolumeHierarchy}
+         * @type {BVH}
          */
-        this.bvh_top_level = new ExplicitBinaryBoundingVolumeHierarchy();
+        this.bvh_top_level = new BVH();
 
         /**
          *

package/src/engine/sound/ecs/emitter/SoundEmitter.js

@@ -3,25 +3,27 @@
  */
 
 
-import {EBBVHLeafProxy} from "../../../../core/bvh2/bvh3/EBBVHLeafProxy.js";
-import {computeHashIntegerArray} from "../../../../core/collection/array/computeHashIntegerArray.js";
+import { BvhClient } from "../../../../core/bvh2/bvh3/BvhClient.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import List from '../../../../core/collection/list/List.js';
-import {aabb3_array_compute_from_sphere} from "../../../../core/geom/3d/aabb/aabb3_array_compute_from_sphere.js";
+import { aabb3_array_compute_from_sphere } from "../../../../core/geom/3d/aabb/aabb3_array_compute_from_sphere.js";
 import Vector1 from "../../../../core/geom/Vector1.js";
-import {interpolate_irradiance_linear} from "../../../../core/math/physics/irradiance/interpolate_irradiance_linear.js";
+import {
+    interpolate_irradiance_linear
+} from "../../../../core/math/physics/irradiance/interpolate_irradiance_linear.js";
 import {
     interpolate_irradiance_lograrithmic
 } from "../../../../core/math/physics/irradiance/interpolate_irradiance_lograrithmic.js";
-import {interpolate_irradiance_smith} from "../../../../core/math/physics/irradiance/interpolate_irradiance_smith.js";
-import {objectKeyByValue} from "../../../../core/model/object/objectKeyByValue.js";
-import {computeHashFloat} from "../../../../core/primitives/numbers/computeHashFloat.js";
-import {number_compare_ascending} from "../../../../core/primitives/numbers/number_compare_ascending.js";
-import {compareStrings} from "../../../../core/primitives/strings/compareStrings.js";
-import {computeStringHash} from "../../../../core/primitives/strings/computeStringHash.js";
-import {SoundAttenuationFunction} from "./SoundAttenuationFunction.js";
-import {SoundEmitterFlags} from "./SoundEmitterFlags.js";
-import {SoundPanningModelType} from "./SoundPanningModelType.js";
-import {SoundTrack} from "./SoundTrack.js";
+import { interpolate_irradiance_smith } from "../../../../core/math/physics/irradiance/interpolate_irradiance_smith.js";
+import { objectKeyByValue } from "../../../../core/model/object/objectKeyByValue.js";
+import { computeHashFloat } from "../../../../core/primitives/numbers/computeHashFloat.js";
+import { number_compare_ascending } from "../../../../core/primitives/numbers/number_compare_ascending.js";
+import { compareStrings } from "../../../../core/primitives/strings/compareStrings.js";
+import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
+import { SoundAttenuationFunction } from "./SoundAttenuationFunction.js";
+import { SoundEmitterFlags } from "./SoundEmitterFlags.js";
+import { SoundPanningModelType } from "./SoundPanningModelType.js";
+import { SoundTrack } from "./SoundTrack.js";
 
 const DEFAULT_DISTANCE_MIN = 1;
 const DEFAULT_DISTANCE_MAX = 10000;
@@ -116,9 +118,9 @@ export class SoundEmitter {
 
     /**
      * @readonly
-     * @type {EBBVHLeafProxy}
+     * @type {BvhClient}
      */
-    bvh = new EBBVHLeafProxy();
+    bvh = new BvhClient();
 
     /**
      *

package/src/engine/sound/ecs/emitter/SoundEmitterSystem.js

@@ -5,24 +5,21 @@
  */
 
 
-import {
-    ExplicitBinaryBoundingVolumeHierarchy
-} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
-import {
-    bvh_query_user_data_overlaps_sphere
-} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_sphere.js";
-import {invokeObjectCompare} from "../../../../core/model/object/invokeObjectCompare.js";
-import {GameAssetType} from "../../../asset/GameAssetType.js";
-import {SoundAssetLoader} from "../../../asset/loaders/SoundAssetLoader.js";
-import {System} from '../../../ecs/System.js';
-import {Transform} from '../../../ecs/transform/Transform.js';
-import {IncrementalDeltaSet} from "../../../graphics/render/visibility/IncrementalDeltaSet.js";
+import { BVH } from "../../../../core/bvh2/bvh3/BVH.js";
+import { bvh_query_user_data_generic } from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_generic.js";
+import { BVHQueryIntersectsSphere } from "../../../../core/bvh2/bvh3/query/BVHQueryIntersectsSphere.js";
+import { invokeObjectCompare } from "../../../../core/model/object/invokeObjectCompare.js";
+import { GameAssetType } from "../../../asset/GameAssetType.js";
+import { SoundAssetLoader } from "../../../asset/loaders/SoundAssetLoader.js";
+import { System } from '../../../ecs/System.js';
+import { Transform } from '../../../ecs/transform/Transform.js';
+import { IncrementalDeltaSet } from "../../../graphics/render/visibility/IncrementalDeltaSet.js";
 import SoundListener from "../SoundListener.js";
-import {SoundEmitter} from './SoundEmitter.js';
-import {SoundEmitterChannel} from "./SoundEmitterChannel.js";
-import {SoundEmitterComponentContext} from "./SoundEmitterComponentContext.js";
-import {SoundEmitterFlags} from "./SoundEmitterFlags.js";
-import {SoundTrackFlags} from "./SoundTrackFlags.js";
+import { SoundEmitter } from './SoundEmitter.js';
+import { SoundEmitterChannel } from "./SoundEmitterChannel.js";
+import { SoundEmitterComponentContext } from "./SoundEmitterComponentContext.js";
+import { SoundEmitterFlags } from "./SoundEmitterFlags.js";
+import { SoundTrackFlags } from "./SoundTrackFlags.js";
 
 /**
  * @readonly
@@ -92,10 +89,10 @@ export class SoundEmitterSystem extends System {
 
         /**
          * Spatial index
-         * @type {ExplicitBinaryBoundingVolumeHierarchy}
+         * @type {BVH}
          * @private
          */
-        this.__bvh = new ExplicitBinaryBoundingVolumeHierarchy();
+        this.__bvh = new BVH();
 
         /**
          * Number of currently linked entities
@@ -272,9 +269,11 @@ export class SoundEmitterSystem extends System {
 
             const listenerPosition = listenerTransform.position;
 
-            const matchCount = bvh_query_user_data_overlaps_sphere(
+            const query = BVHQueryIntersectsSphere.from([listenerPosition.x, listenerPosition.y, listenerPosition.z, 0]);
+
+            const matchCount = bvh_query_user_data_generic(
                 scratch_array, 0,
-                this.__bvh, [listenerPosition.x, listenerPosition.y, listenerPosition.z, 0]
+                this.__bvh, this.__bvh.root, query
             );
 
             for (let i = 0; i < matchCount; i++) {
@@ -362,6 +361,5 @@ export class SoundEmitterSystem extends System {
     }
 
 
-
 }
 

package/src/core/bvh2/bvh3/query/bvh_query_user_data_overlaps_sphere.js

@@ -1,81 +0,0 @@
-import {SCRATCH_UINT32_TRAVERSAL_STACK} from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
-import {aabb3_array_intersects_sphere_array} from "../../../geom/3d/aabb/aabb3_array_intersects_sphere_array.js";
-import {NULL_NODE} from "../ExplicitBinaryBoundingVolumeHierarchy.js";
-import {bvh_collect_user_data} from "./bvh_collect_user_data.js";
-
-const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
-
-const scratch_aabb = new Float32Array(6);
-
-/**
- *
- * @param {number[]} result
- * @param {number} result_offset
- * @param {ExplicitBinaryBoundingVolumeHierarchy} bvh
- * @param {number[]|Float32Array} sphere
- */
-export function bvh_query_user_data_overlaps_sphere(
-    result,
-    result_offset,
-    bvh,
-    sphere
-) {
-    const root = bvh.root;
-
-    if (root === NULL_NODE) {
-        return 0;
-    }
-
-    /**
-     *
-     * @type {number}
-     */
-    const stack_top = stack.pointer++;
-
-    stack[stack_top] = root;
-
-    let result_cursor = result_offset;
-
-    while (stack.pointer > stack_top) {
-        stack.pointer--;
-
-        /**
-         *
-         * @type {number}
-         */
-        const node = stack[stack.pointer];
-
-        // test node against the ray
-        bvh.node_get_aabb(node, scratch_aabb);
-        const intersection = aabb3_array_intersects_sphere_array(scratch_aabb, sphere);
-
-        if (intersection === 0) {
-            // fully outside
-            continue;
-        }
-
-        const node_is_leaf = bvh.node_is_leaf(node);
-
-        if (node_is_leaf) {
-            // leaf node
-            result[result_cursor++] = bvh.node_get_user_data(node);
-
-        } else if (intersection === 2) {
-            // fully inside, fast collection path
-            result_cursor += bvh_collect_user_data(result, result_cursor, bvh, node);
-        } else {
-            // partially inside
-            // read in-order
-            const child1 = bvh.node_get_child1(node);
-            const child2 = bvh.node_get_child2(node);
-
-            // write to stack in reverse order, so that fist child ends up being visited first
-            stack[stack.pointer++] = child1;
-            stack[stack.pointer++] = child2;
-        }
-    }
-
-    // drop stack frame
-
-    return result_cursor - result_offset;
-}

package/src/engine/ecs/foliage/Foliage.js

@@ -1,151 +0,0 @@
-/**
- * Created by Alex on 18/10/2014.
- */
-import SampleTraverser from '../../graphics/texture/sampler/SampleTraverser.js';
-import QuadGeometry from '../../graphics/geometry/QuadGeometry.js';
-import * as THREE from 'three';
-
-import ThreeFactory from '../../graphics/three/ThreeFactory.js';
-
-
-function makeCombinedGeometry(templateGeometry, normalAlign, width, height, count, scale, heightMap, material) {
-    const geometry = new THREE.Geometry();
-
-    const scaleMatrix = new THREE.Matrix4();
-    scaleMatrix.makeScale(scale.x, scale.y, scale.z);
-
-    function process(x, z) {
-        const y = heightMap.sampleHeight(x, z);
-        const pos = new THREE.Vector3(x, y, z);
-        //
-        const g = templateGeometry.clone();
-        //transform
-        const m = new THREE.Matrix4();
-        if (normalAlign) {
-            const normal = heightMap.sampleNormal(x, z);
-            m.lookAt(normal, new THREE.Vector3(), new THREE.Vector3(0, 1, 0));
-        }
-        m.setPosition(pos);
-        m.multiply(scaleMatrix);
-        g.applyMatrix4(m);
-        geometry.merge(g);
-    }
-
-    createPieces(process, count, width, height);
-    const mesh = new THREE.Mesh(geometry, material);
-    return mesh;
-}
-
-function makeMultiMesh(templateGeometry, normalAlign, width, height, count, scale, heightMap, material) {
-    const object = new THREE.Object3D();
-
-
-    function process(x, z) {
-        const y = heightMap.sampleHeight(x, z);
-        //
-        const m = new THREE.Mesh(templateGeometry, material);
-        //transform
-        if (normalAlign) {
-            const normal = heightMap.sampleNormal(x, z);
-            m.lookAt(normal, new THREE.Vector3(), new THREE.Vector3(0, 1, 0));
-        }
-        m.position.set(x, y, z);
-        m.scale.set(scale.x, scale.y, scale.z);
-        object.add(m);
-    }
-
-    createPieces(process, count, width, height);
-
-    return object;
-}
-
-function createPieces(process, count, width, height) {
-    for (let i = 0; i < count; i++) {
-        const x = width * Math.random();
-        const z = height * Math.random();
-        process(x, z);
-    }
-}
-
-
-const alignToVector = (function () {
-    const matrix4 = new THREE.Matrix4();
-
-    function alignToVector(mesh, direction) {
-        matrix4.identity();
-
-        const el = matrix4.elements;
-        el[4] = direction.x;
-        el[5] = direction.y;
-        el[6] = direction.z;
-        mesh.rotation.setFromRotationMatrix(matrix4, 'XZY');
-    }
-
-    return alignToVector;
-})();
-
-const Foliage = function (options, mask, quadTree, caster) {
-
-    const size = options.size || 1;
-    const randomRotateY = options.randomRotateY !== void 0 ? options.randomRotateY : false;
-
-    const templateGeometry = options.geometry || new QuadGeometry(1, 1);
-    let boundingSphere = templateGeometry.boundingSphere;
-    if (boundingSphere === void 0 || boundingSphere === null) {
-        boundingSphere = templateGeometry.computeBoundingSphere();
-    }
-    const scaleFactor = 1 / (boundingSphere.radius * 2);
-    const material = options.material;
-    const density = options.density;
-    const densityMap = options.densityMap;
-    const normalAlign = options.normalAlign !== void 0 ? options.normalAlign : true;
-    const castShadow = options.castShadow !== void 0 ? options.castShadow : false;
-    const receiveShadow = options.receiveShadow !== void 0 ? options.receiveShadow : false;
-    //
-
-    const mapSize = new THREE.Vector2(options.width, options.height);
-    //
-    const object = new THREE.Object3D();
-
-    const mapWidth = mapSize.x;
-    const mapHeight = mapSize.y;
-
-    function process(u, v, size) {
-        const x = u * mapWidth;
-        const z = v * mapHeight;
-        caster(x, z, function (hit, normal, geometry) {
-            const y = hit.y;
-            //
-            const m = ThreeFactory.createMesh(templateGeometry, material);
-            //transform
-            if (normalAlign) {
-                // m.lookAt(normal, new THREE.Vector3(), new THREE.Vector3(0, 1, 0));
-                alignToVector(m, normal);
-            }
-            if (randomRotateY) {
-                m.rotation.y = Math.PI * 2 * Math.random();
-            }
-            m.position.set(x, y, z);
-            m.castShadow = castShadow;
-            m.receiveShadow = receiveShadow;
-            const scale = scaleFactor * size;
-            m.scale.set(scale, scale, scale);
-            object.add(m);
-        });
-    }
-
-    //
-    //console.time('generating foliage');
-    const sampleTraverser = new SampleTraverser();
-    sampleTraverser.resolveSpace = true;
-    sampleTraverser.resolveSpaceSizeMin = size.min;
-    sampleTraverser.resolveSpaceSizeMax = size.max;
-    sampleTraverser.mask = mask;
-    sampleTraverser.quadTree = quadTree;
-
-    sampleTraverser.traverse(densityMap, density, mapSize, process);
-    //console.timeEnd('generating foliage');
-    //
-    return object;
-};
-export default Foliage;

package/src/engine/ecs/foliage/FoliageLoader.js

@@ -1,39 +0,0 @@
-/**
- * Created by Alex on 21/10/2014.
- */
-import * as THREE from 'three';
-
-
-const Loader = function () {
-    function load(options, callback) {
-        const url = options.url;
-        const density = options.density;
-        const normalAlign = options.normalAlign;
-        const size = options.size;
-        const densityMap = options.densityMap;
-        const randomRotateY = options.randomRotateY;
-        const loader = new THREE.JSONLoader();
-        loader.load(url, function (geometry, materials) {
-            const material = new THREE.MultiMaterial(materials);
-
-            callback({
-                density: density,
-                material: material,
-                geometry: geometry,
-                normalAlign: normalAlign,
-                densityMap: densityMap,
-                size: size,
-                width: options.width,
-                height: options.height,
-                randomRotateY: randomRotateY,
-                castShadow: options.castShadow,
-                receiveShadow: options.receiveShadow
-            });
-        });
-    }
-
-    this.load = load;
-};
-
-
-export default Loader;

package/src/engine/ecs/foliage/FoliageVisibilitySetBuilder.js

@@ -1,27 +0,0 @@
-import { BVHVisitor } from "../../../core/bvh2/traversal/BVHVisitor.js";
-import { BitSet } from "../../../core/binary/BitSet.js";
-
-export class FoliageVisibilitySetBuilder extends BVHVisitor {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {BitSet}
-         */
-        this.visibleSet = new BitSet();
-        //prevent re-allocation
-        this.visibleSet.preventShrink();
-    }
-
-    initialize() {
-        this.visibleSet.reset();
-    }
-
-    visitLeaf(node) {
-        const index = node.object;
-
-        //TODO check screen space size to decide if element should be seen or not
-        this.visibleSet.set(index, true);
-    }
-}

package/src/engine/ecs/foliage/ImpostorFoliage.js

@@ -1,106 +0,0 @@
-/**
- * Created by Alex on 24/10/2014.
- */
-/**
- * Created by Alex on 18/10/2014.
- */
-import SampleTraverser from '../../graphics/texture/sampler/SampleTraverser.js';
-import {
-    Box3 as ThreeBox3,
-    BufferAttribute,
-    BufferGeometry,
-    NormalBlending,
-    PointCloud,
-    PointCloudMaterial,
-    Sphere as ThreeSphere,
-    Vector3 as ThreeVector3,
-    VertexColors
-} from 'three';
-import Vector2 from "../../../core/geom/Vector2.js";
-import Vector4 from "../../../core/geom/Vector4.js";
-
-/**
- * @deprecated use other options, such as ShadedMesh with INSTANCED draw mode or dedicated instanced mesh system such as Foliage2System
- * @constructor
- */
-const Foliage = function (options) {
-    const size = options.size || 1;
-    const lightMap = options.lightMap;
-    const texture = options.texture;
-    const density = options.density;
-    const densityMap = options.densityMap;
-    const heightMap = options.heightMap;
-    let zRange = options.zRange;
-    let normalAlign = options.normalAlign !== void 0 ? options.normalAlign : true;
-    //
-    const mapSize = new Vector2(options.width, options.height);
-    //
-    //
-    console.time('generating impostor foliage');
-    const geometry = new BufferGeometry();
-    const _vertices = [];
-    const _colors = [];
-    let i = 0;
-
-    const offsetY = 0.00001;
-
-    const color = new Vector4();
-
-    function process(x, y, z, u, v) {
-        const iX = i++,
-            iY = i++,
-            iZ = i++;
-        _vertices[iX] = x;
-        _vertices[iY] = y + offsetY;
-        _vertices[iZ] = z;
-        //colors
-        lightMap.sample(u, v, color);
-        _colors[iX] = color.x / 255;
-        _colors[iY] = color.y / 255;
-        _colors[iZ] = color.z / 255;
-    }
-
-    const sampleTraverser = new SampleTraverser();
-    sampleTraverser.resolveSpace = true;
-    sampleTraverser.resolveSpaceSize = density / size;
-    sampleTraverser.traverse(heightMap, densityMap, density, mapSize, process);
-
-    const vertices = new Float32Array(i);
-    const colors = new Float32Array(i);
-    //copy
-    vertices.set(_vertices, 0);
-    colors.set(_colors, 0);
-    console.log("impostor count: " + i);
-
-    geometry.setAttribute('position', new BufferAttribute(vertices, 3));
-    //if color map is present - use it
-    geometry.setAttribute('color', new BufferAttribute(colors, 3));
-
-    //bake bounding box and sphere to save computation time
-    const center = new ThreeVector3(mapSize.x / 2, zRange / 2 - offsetY, mapSize.y / 2);
-    geometry.boundingSphere = new ThreeSphere(center, center.length());
-    geometry.boundingBox = new ThreeBox3(new ThreeVector3(0, -zRange / 2 + offsetY, 0), new ThreeVector3(mapSize.x, zRange / 2 + offsetY, mapSize.y));
-
-    const mat = new PointCloudMaterial({
-        size: size,
-        map: texture,
-        blending: NormalBlending,
-        depthTest: true,
-        depthWrite: false,
-        alphaTest: 0.5,
-        sizeAttenuation: true,
-        vertexColors: VertexColors,
-        transparent: true
-        //
-        //polygonOffset: true,
-        //polygonOffsetFactor: -4,
-        //polygonOffsetUnits: -4
-    });
-    mat.color.setHSL(1, 1, 1);
-
-    const mesh = new PointCloud(geometry, mat);
-    console.timeEnd('generating impostor foliage');
-    //
-    return mesh;
-};
-export default Foliage;