@woosh/meep-engine 2.34.33 → 2.34.37

package/engine/graphics/render/visibility/VisibilityComputer.js

@@ -1,42 +1,14 @@
-import { Frustum } from "three";
-import { frustumFromCamera } from "../../ecs/camera/CameraSystem.js";
 import { assert } from "../../../../core/assert.js";
 
-const frustum = new Frustum();
-/**
- *
- * @type {VisibilityFilter[]}
- */
-const objectFilters = [];
-
-/**
- *
- * @type {function[]}
- */
-const objectFilterExecutors = [];
-
-export const SOURCE_RENDER_LAYER_PROPERTY = '@meep-render-layer';
-
 export class VisibilityComputer {
     constructor() {
-        /**
-         *
-         * @type {VisibilityFilter[]}
-         */
-        this.filters = [];
+
         /**
          *
          * @type {CameraView}
          */
         this.__view = null;
 
-        /**
-         * @deprecated use view.frustum instead
-         * @type {Frustum[]}
-         * @private
-         */
-        this.__frustums = [];
-
         /**
          *
          * @type {RenderLayer}
@@ -53,15 +25,28 @@ export class VisibilityComputer {
     }
 
     /**
-     *
+     * @deprecated
+     * @returns {VisibilityFilter[]}
+     */
+    get filters() {
+
+        throw new Error('Method is deprecated');
+    }
+
+    /**
+     * @deprecated
+     * @param {VisibilityFilter[]} v
+     */
+    set filters(v) {
+        throw new Error('Method is deprecated');
+    }
+
+    /**
+     * @deprecated
      * @param {VisibilityFilter} filter
      */
     addFilter(filter) {
-        if (this.filters.find(f => f.name === filter.name)) {
-            throw new Error(`Filter named '${filter.name}' already exists`);
-        }
-
-        this.filters.push(filter);
+        throw new Error('Method is deprecated');
     }
 
     /**
@@ -70,16 +55,8 @@ export class VisibilityComputer {
      * @returns {boolean}
      */
     removeFilter(filter) {
-        const i = this.filters.indexOf(filter);
-
-        if (i === -1) {
-            //not present
-            return false;
-        }
 
-        //cut
-        this.filters.splice(i, 1);
-        return true;
+        throw new Error('Method is deprecated');
     }
 
     /**
@@ -97,9 +74,6 @@ export class VisibilityComputer {
     __includeObject(object3d) {
         assert.equal(object3d.isObject3D, true, 'object3d.isObject3D !== true');
 
-        // mark object, this is a hack, needs to be fixed at some point
-        object3d[SOURCE_RENDER_LAYER_PROPERTY] = this.__activeLayer;
-
         //object passed all filters, add it to visible set
         this.__output.push(object3d);
 
@@ -111,8 +85,6 @@ export class VisibilityComputer {
      * @param {RenderLayer} layer
      */
     __processLayer(layer) {
-
-
         if (!layer.state.visible) {
             //whole layer is hidden
 
@@ -123,61 +95,13 @@ export class VisibilityComputer {
         this.__activeLayer = layer;
 
         if (layer.managed) {
-            this.__output.pushOther(layer.visibleSet);
 
-            // mark all elements in the layer
-            const elements = layer.visibleSet.elements;
-
-            const element_count = elements.length;
-            for (let j = 0; j < element_count; j++) {
-                const object3D = elements[j];
-
-                object3D[SOURCE_RENDER_LAYER_PROPERTY] = layer;
-            }
+            this.__output.pushOther(layer.visibleSet);
 
             return;
         }
 
-        // clear visible set
-        // this.__output.initializeUpdate();
-
-        const filters = this.filters;
-        const filterCount = filters.length;
-
-        let objectFilterCount = 0;
-        let i;
-        for (i = 0; i < filterCount; i++) {
-            const f = filters[i];
-
-            if (f.enabled && f.layerPredicate(layer)) {
-                objectFilters[objectFilterCount] = f;
-                objectFilterExecutors[objectFilterCount] = f.objectPredicateExecute;
-
-                objectFilterCount++;
-            }
-        }
-
-
-        //prepare filters
-        for (i = 0; i < objectFilterCount; i++) {
-            const f = objectFilters[i];
-
-            f.objectPredicateInitialize(this.__view.camera);
-        }
-
-        objectFilterExecutors.length = objectFilterCount;
-
-        layer.buildVisibleSet(this.__frustums, objectFilterExecutors, this.__includeObject, this);
-
-        //finalize filters
-        for (i = 0; i < objectFilterCount; i++) {
-            const f = objectFilters[i];
-
-            f.objectPredicateFinalize();
-        }
-
-
-        // layer.visibleSet.finalizeUpdate();
+        layer.buildVisibleSet(this.__view, this.__includeObject, this);
     }
 
 
@@ -193,10 +117,6 @@ export class VisibilityComputer {
      * @param {RenderLayerManager} renderLayers
      */
     build(renderLayers) {
-        frustumFromCamera(this.__view.camera, frustum);
-
-        this.__frustums = [frustum];
-
         renderLayers.traverse(this.__processLayer, this);
     }
 }

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

@@ -14,11 +14,11 @@ import { BinaryNode } from "../../../../core/bvh2/BinaryNode.js";
 import SoundListener from "../SoundListener.js";
 import { IncrementalDeltaSet } from "../../../graphics/render/visibility/IncrementalDeltaSet.js";
 import { queryBinaryNode_SphereIntersections_Data } from "../../../../core/bvh2/traversal/queryBinaryNode_SphereIntersections.js";
-import { tryRotateSingleNode } from "../../../../core/bvh2/transform/RotationOptimizer.js";
 import { SoundEmitterComponentContext } from "./SoundEmitterComponentContext.js";
 import { SoundEmitterFlags } from "./SoundEmitterFlags.js";
 import { SoundEmitterChannel } from "./SoundEmitterChannel.js";
 import { invokeObjectCompare } from "../../../../core/model/object/invokeObjectCompare.js";
+import { tryRotateSingleNode } from "../../../../core/bvh2/transform/tryRotateSingleNode.js";
 
 /**
  * @readonly

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.33",
+  "version": "2.34.37",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",

package/samples/terrain/editor.js

@@ -20,7 +20,6 @@ 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();