@woosh/meep-engine 2.34.36 → 2.34.37

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/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/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/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.37",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",