@woosh/meep-engine 2.34.36 → 2.34.40

package/engine/ecs/foliage/ViewState.js

@@ -1,6 +1,5 @@
 import { BitSet } from "../../../core/binary/BitSet.js";
 import { InstancedMeshGroup } from "../../graphics/geometry/instancing/InstancedMeshGroup.js";
-import { assert } from "../../../core/assert.js";
 import { queryBinaryNode_FrustumIntersections_Data } from "../../../core/bvh2/traversal/queryBinaryNode_FrustumIntersections.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
 
@@ -48,30 +47,6 @@ export class ViewState {
         this.instances.dispose();
     }
 
-
-    /**
-     *
-     * @param {number} index
-     * @param {int} ref
-     */
-    __updateVisibility(index, ref) {
-        assert.isNonNegativeInteger(ref, 'ref');
-
-        /**
-         *
-         * @type {BitSet}
-         */
-        const visibleElementSet = this.__visible_set;
-
-        if (!visibleElementSet.get(ref)) {
-            //no longer visible
-            this.__garbage[this.__garbagePointer++] = ref;
-        } else {
-            //visible, and is already in the group, update the set
-            visibleElementSet.set(ref, false);
-        }
-    }
-
     __compute_visibility_update() {
         const instances = this.instances;
 
@@ -127,16 +102,16 @@ export class ViewState {
      */
     update(bvh, data) {
 
+        const visible_instance_set = this.__visible_set;
+
+        const instances = this.instances;
+
         // reset visible set
-        this.__visible_set.reset();
+        visible_instance_set.reset();
 
         //reset garbage pointer
         this.__garbagePointer = 0;
 
-        const instances = this.instances;
-
-        const visible_instance_set = this.__visible_set;
-
 
         // collect visible instances
         const collected_nodes = queryBinaryNode_FrustumIntersections_Data(scratch_array, 0, bvh, this.__view.frustum);

package/engine/ecs/foliage/ecs/Foliage2System.js

@@ -26,13 +26,8 @@ function cleanupLayer(layerData, renderLayer) {
 export function loadFoliageLayer(layer, assetManager) {
     const instancedFoliage = layer.data;
 
-    /**
-     * @type {THREE.Mesh}
-     */
-    const threeMesh = instancedFoliage.instances.mesh;
-
-    threeMesh.castShadow = layer.castShadow.getValue();
-    threeMesh.receiveShadow = layer.receiveShadow.getValue();
+    instancedFoliage.castShadow = layer.castShadow.getValue();
+    instancedFoliage.receiveShadow = layer.receiveShadow.getValue();
 
     const modelURL = layer.modelURL.getValue();
 

package/engine/graphics/GraphicsEngine.js

@@ -538,7 +538,7 @@ function classifyPassTypeFromObject(object) {
          * @type {THREE.Material}
          */
         const material = object.material;
-        if (material.transparent) {
+        if (material.depthWrite === false && material.depthTest === false) {
             return RenderPassType.Transparent;
         }
     }

package/engine/graphics/ecs/camera/Camera.js

@@ -5,11 +5,13 @@
 
 import ObservedBoolean from "../../../../core/model/ObservedBoolean.js";
 import ObservedEnum from "../../../../core/model/ObservedEnum.js";
-import {Frustum, Vector3 as ThreeVector3} from 'three';
-import {assert} from "../../../../core/assert.js";
+import { Frustum } from 'three';
+import { assert } from "../../../../core/assert.js";
 import Vector1 from "../../../../core/geom/Vector1.js";
-import {frustumFromCamera} from "./CameraSystem.js";
-import {computePointDistanceToPlane} from "../../../../core/geom/Plane.js";
+import { frustumFromCamera } from "./CameraSystem.js";
+import { computePointDistanceToPlane } from "../../../../core/geom/Plane.js";
+import { unprojectPoint } from "./unprojectPoint.js";
+import Vector3 from "../../../../core/geom/Vector3.js";
 
 /**
  *
@@ -116,15 +118,15 @@ export class Camera {
 
     /**
      *
-     * @param {Camera} camera
+     * @param {Camera|THREE.PerspectiveCamera|THREE.OrthographicCamera} camera
      * @param {number} x
      * @param {number} y
      * @param {Vector3} source
      * @param {Vector3} direction
      */
     static projectRay(camera, x, y, source, direction) {
-        assert.notEqual(camera, undefined, "Camera must be defined");
-        assert.notEqual(camera.position, undefined, "Camera.position must be defined");
+        assert.defined(camera, "camera");
+        assert.defined(camera.position, "Camera.position");
 
 
         assert.isNumber(x, 'x');
@@ -136,18 +138,32 @@ export class Camera {
         // assert.ok(y >= -1, `Y(=${y}) must be greater than or equal to -1.0, not a clip-space coordinate`);
         // assert.ok(y <= 1, `Y(=${y}) must be less than or equal to 1.0, not a clip-space coordinate`);
 
-        source.copy(camera.position);
+        if (camera.isPerspectiveCamera) {
+            scratch_v3_1.setFromMatrixPosition(camera.matrixWorld.elements);
 
-        v3.set(x, y, 0.5);
+            scratch_v3_0.set(x, y, 0.5);
 
-        // NOTE: projection inverse and world matrices are used in "unproject" operation, we update those to make things work as intended. This is handled by the camera system
+            // NOTE: projection inverse and world matrices are used in "unproject" operation, we update those to make things work as intended. This is handled by the camera system
 
-        v3.unproject(camera);
+            unprojectPoint(
+                scratch_v3_0,
+                scratch_v3_0,
+                camera.projectionMatrixInverse.elements,
+                camera.matrixWorld.elements
+            );
 
-        //get direction
-        v3.sub(source).normalize();
+            //get direction
+            scratch_v3_0.sub(scratch_v3_1);
+            scratch_v3_0.normalize();
 
-        direction.copy(v3);
+            source.copy(scratch_v3_1);
+            direction.copy(scratch_v3_0);
+
+        } else if (camera.isOrthographicCamera) {
+            throw new Error('Unsupported camera type: "Orthographic" ');
+        } else {
+            throw new Error('Unsupported camera type');
+        }
     }
 
     /**
@@ -179,7 +195,7 @@ export class Camera {
 
         const near = scratch_frustum.planes[0];
 
-        v3.set(x, y, z);
+        scratch_v3_0.set(x, y, z);
 
         const normal = near.normal;
 
@@ -199,7 +215,8 @@ Camera.typeName = "Camera";
 
 Camera.ProjectionType = ProjectionType;
 
-const v3 = new ThreeVector3();
+const scratch_v3_0 = new Vector3();
+const scratch_v3_1 = new Vector3();
 const scratch_frustum = new Frustum();
 
 

package/engine/graphics/ecs/camera/unprojectPoint.js

@@ -0,0 +1,14 @@
+//
+
+/**
+ *
+ * @param {Vector3} result
+ * @param {Vector3} input
+ * @param {number[]} projection_matrix_inverse inverse of projection matrix
+ * @param {number[]} world_matrix world transform
+ */
+export function unprojectPoint(result, input, projection_matrix_inverse, world_matrix) {
+    result.copy(input);
+    result.applyMatrix4(projection_matrix_inverse);
+    result.applyMatrix4(world_matrix);
+}

package/engine/graphics/ecs/light/binding/three/ThreeLightBinding.js

@@ -44,8 +44,30 @@ function __getDepthMaterial(object) {
  * @return {boolean}
  */
 function scene_object_filter(object3D) {
-    return object3D.castShadow
-        && object3D.visible
+
+    if (object3D.castShadow === false) {
+        return false;
+    }
+
+    if (object3D.visible === false) {
+        return false;
+    }
+
+    if (object3D.isMesh) {
+
+        /**
+         * @type {THREE.Material|null|undefined}
+         */
+        const material = (object3D.customDepthMaterial !== null ? object3D.customDepthMaterial : object3D.material);
+
+        if (material && material.visible === false) {
+            //material's main
+            return false;
+        }
+
+    }
+
+    return true;
 }
 
 export class ThreeLightBinding extends LightBinding {

package/engine/graphics/ecs/water2/shader/AlexWaterShader.js

@@ -228,7 +228,13 @@ export function makeAlexWaterMaterial() {
         blending: NormalBlending,
         lights: false,
         fog: false,
-        depthTest: true,
+
+        /*
+         forcing transparent pass in Graphics Engine
+         three.js and indeed WebGL doesn't provide a way to pass depth buffer into the main draw pass (to canvas), so this is a workaround
+         */
+        depthTest: false,
+        depthWrite: false,
         transparent: true,
         vertexColors: false
     });

package/engine/graphics/geometry/instancing/InstancedMeshGroup.js

@@ -274,7 +274,7 @@ export class InstancedMeshGroup {
         //get index
         const index = this.count;
         //grow
-        this.setCount(this.count + 1);
+        this.setCount(index + 1);
 
         this.indices[reference] = index;
         this.references[index] = reference;

package/engine/graphics/micron/format/MicronGeometryPatch.js

@@ -68,13 +68,6 @@ export class MicronGeometryPatch {
          */
         this.children = [];
 
-        /**
-         * Runtime dependency patches, if this patch is refined at runtime - dependencies must be refined as well
-         * These dependencies allow for more aggressive simplification of topology
-         * @type {number[]}
-         */
-        this.dependencies = [];
-
         /**
          * Level of detail, lower number means more detailed
          * @type {number}

package/engine/graphics/particles/particular/engine/renderers/billboard/ParticleBillboardMaterial.js

@@ -464,7 +464,11 @@ export function make_particle_billboard_shader({ lights = false } = {}) {
         fragmentShader: make_fragment_shader(),
         blending: CustomBlending,
         lights: lights,
-        depthTest: true,
+        /*
+         forcing transparent pass in Graphics Engine
+         three.js and indeed WebGL doesn't provide a way to pass depth buffer into the main draw pass (to canvas), so this is a workaround
+         */
+        depthTest: false,
         depthWrite: false,
         transparent: true,
         vertexColors: false,

package/engine/graphics/render/buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js

@@ -27,7 +27,9 @@ export class AmbientOcclusionPostProcessEffect extends EnginePlugin {
             fragmentShader: SAOShader.fragmentShader,
             vertexShader: SAOShader.vertexShader,
             uniforms: UniformsUtils.clone(SAOShader.uniforms),
-            glslVersion: GLSL3
+            glslVersion: GLSL3,
+            depthWrite: false,
+            depthTest: false
         });
 
         // AO parameters

package/engine/graphics/render/buffer/simple-fx/ao/SAOShader.js

@@ -168,7 +168,8 @@ const SAOShader = {
 		void main() {
 			float centerDepth = getDepth( vUv );
 			if( centerDepth >= ( 1.0 - EPSILON ) ) {
-				discard;
+				out_occlusion = 1.0;
+				return;
 			}
 
 			float centerViewZ = getViewZ( centerDepth );

package/engine/plugin/EnginePluginManager.js

@@ -82,6 +82,7 @@ export class EnginePluginManager extends BaseProcess {
         if (state === ProcessState.Initialized || state === ProcessState.Running) {
             const dependencies = plugin.dependencies;
 
+            // resolve dependencies
             for (let i = 0; i < dependencies.length; i++) {
                 const dependency = dependencies[i];
 
@@ -206,7 +207,7 @@ export class EnginePluginManager extends BaseProcess {
     async shutdown() {
         super.shutdown();
 
-        return this.__transition_active_plugins_to(ProcessState.Initialized);
+        return this.__transition_active_plugins_to(ProcessState.Finalized);
     }
 
     /**

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