@woosh/meep-engine 2.39.1 → 2.39.4

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

@@ -0,0 +1,27 @@
+import { Vector3 as ThreeVector3 } from "three";
+
+/**
+ * Compute position of focal point of the camera in world coordinate space. This is the "pinhole" where all perspective lines meet.
+ * @param {THREE.PerspectiveCamera} camera
+ * @param {Vector3} result
+ */
+export function compute_perspective_camera_focal_position(camera, result) {
+    if (camera.isPerspectiveCamera !== true) {
+        throw new TypeError('expected a perspective camera, got something else');
+    }
+
+    const focalLength = camera.getFocalLength();
+
+    const v3 = new ThreeVector3(0, 0, 0.5);
+
+    v3.unproject(camera);
+    //get direction
+    v3.sub(camera.position).normalize();
+
+    //
+    v3.multiplyScalar(-focalLength);
+
+    v3.add(camera.position);
+
+    result.set(v3.x, v3.y, v3.z);
+}

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

@@ -0,0 +1,20 @@
+import { Matrix4 } from "three";
+
+const matrix4 = new Matrix4();
+
+/**
+ *
+ * @param {Camera|ThreePerspectiveCamera} camera Three.js camera object
+ * @param {Frustum|THREE.Frustum|ThreeFrustum} result Three.js frustum object
+ * @param update_projection
+ */
+export function frustum_from_camera(camera, result, update_projection = true) {
+    if (update_projection) {
+        camera.updateProjectionMatrix();
+    }
+
+    // construct view projection matrix
+    matrix4.multiplyMatrices(camera.projectionMatrix, camera.matrixWorldInverse);
+
+    result.setFromProjectionMatrix(matrix4);
+}

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

@@ -0,0 +1,11 @@
+/**
+ *
+ * @param {number} value
+ * @returns {boolean}
+ */
+export function is_valid_distance_value(value) {
+    return value !== Number.NEGATIVE_INFINITY
+        && value !== Number.POSITIVE_INFINITY
+        && !Number.isNaN(value)
+        ;
+}

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

@@ -0,0 +1,46 @@
+import { Camera } from "./Camera.js";
+
+/**
+ *
+ * @param {Camera} camera
+ * @param {number} width
+ * @param {number} height
+ */
+export function set_camera_aspect_ratio(camera, width, height) {
+    const c = camera.object;
+
+    if (c === null) {
+        return;
+    }
+
+    const aspect = width / height;
+
+    switch (camera.projectionType.getValue()) {
+        case Camera.ProjectionType.Perspective:
+            c.aspect = aspect;
+            break;
+        case Camera.ProjectionType.Orthographic:
+            //use smaller values to get a bit of a "zoom" on the world
+            const w = c.right - c.left;
+            const h = c.bottom - c.top;
+
+            const existingAspect = w / h;
+
+            const aspectDelta = aspect - existingAspect;
+
+            if (aspectDelta > 0) {
+                const d = h * aspectDelta;
+                c.left -= d / 2;
+                c.right += d / 2;
+            } else if (aspectDelta < 0) {
+                const d = -h * aspectDelta;
+
+                c.top += d / 2;
+                c.bottom -= d / 2;
+            }
+
+            break;
+    }
+
+    c.updateProjectionMatrix();
+}

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

@@ -0,0 +1,17 @@
+import { threeUpdateTransform } from "../../util/threeUpdateTransform.js";
+
+/**
+ *
+ * @param {Camera} camera
+ */
+export function update_camera_transform(camera) {
+
+    const three_camera = camera.object;
+
+    if (three_camera === null) {
+        return;
+    }
+
+    three_camera.updateProjectionMatrix();
+    threeUpdateTransform(three_camera);
+}

package/engine/graphics/ecs/path/testPathDisplaySystem.js

@@ -68,6 +68,9 @@ import { PathDisplayHighlightSystem } from "./highlight/PathDisplayHighlightSyst
 import { ShadedGeometryHighlightSystem } from "../highlight/system/ShadedGeometryHighlightSystem.js";
 import { BasicMaterialDefinition } from "./tube/BasicMaterialDefinition.js";
 
+import '../../../../../../../css/game.scss';
+import { GizmoRenderingPlugin } from "../../render/gizmo/GizmoRenderingPlugin.js";
+
 const engineHarness = new EngineHarness();
 
 function makeConfig(engine) {
@@ -126,7 +129,8 @@ function makeConfig(engine) {
 
     // Plugins
 
-    config.addPlugin(AmbientOcclusionPostProcessEffect)
+    config.addPlugin(AmbientOcclusionPostProcessEffect);
+    config.addPlugin(GizmoRenderingPlugin);
 
     // Knowledge
 
@@ -322,9 +326,9 @@ function sample_style_tube() {
         style.color.setHSV(0, 1, 0.9);
     }
 
-    function make_basic(style){
+    function make_basic(style) {
         style.material_type = TubeMaterialType.Basic;
-        style.material  = new BasicMaterialDefinition();
+        style.material = new BasicMaterialDefinition();
 
         style.color.setHSV(0, 1, 0.9);
     }
@@ -350,23 +354,23 @@ function sample_style_tube() {
     //     -0.1, -0.5,
     // ];
 
-    // style.shape = [
-    //     -0.5, -0.1,
-    //     0.5, -0.1,
-    //     0.5, 0.1,
-    //     -0.5, 0.1,
-    // ];
-    //
     style.shape = [
         -0.5, -0.1,
-        -0.45, -0.15,
-        0.45, -0.15,
         0.5, -0.1,
         0.5, 0.1,
-        0.45, 0.15,
-        -0.45, 0.15,
-        -0.5, 0.1
+        -0.5, 0.1,
     ];
+    //
+    // style.shape = [
+    //     -0.5, -0.1,
+    //     -0.45, -0.15,
+    //     0.45, -0.15,
+    //     0.5, -0.1,
+    //     0.5, 0.1,
+    //     0.45, 0.15,
+    //     -0.45, 0.15,
+    //     -0.5, 0.1
+    // ];
 
     style.path_mask = [
         0, 1

package/engine/graphics/ecs/path/tube/StandardMaterialDefinition.js

@@ -3,4 +3,13 @@ export class StandardMaterialDefinition {
         this.metalness = 0;
         this.roughness = 1;
     }
+
+    fromJSON({
+                 roughness = 1,
+                 metalness = 0
+             }) {
+
+        this.roughness = roughness;
+        this.metalness = metalness;
+    }
 }

package/engine/graphics/ecs/path/tube/TubePathStyle.js

@@ -3,6 +3,8 @@ import { TubeMaterialType } from "./TubeMaterialType.js";
 import { assert } from "../../../../../core/assert.js";
 import { MatcapMaterialDefinition } from "./MatcapMaterialDefinition.js";
 import { CapType } from "./CapType.js";
+import { StandardMaterialDefinition } from "./StandardMaterialDefinition.js";
+import { BasicMaterialDefinition } from "./BasicMaterialDefinition.js";
 
 const DEFAULT_COLOR = Object.freeze({ r: 1, g: 1, b: 1 });
 
@@ -135,6 +137,7 @@ export class TubePathStyle {
         assert.enum(cap_type, CapType, 'cap_type');
 
         if (shape === undefined) {
+            // legacy API, using circle
             assert.isNumber(radial_resolution, 'radial_resolution');
 
             shape = build_circle_shape(radial_resolution);
@@ -163,6 +166,12 @@ export class TubePathStyle {
             case TubeMaterialType.Matcap:
                 this.material = new MatcapMaterialDefinition();
                 break;
+            case TubeMaterialType.Standard:
+                this.material = new StandardMaterialDefinition();
+                break;
+            case TubeMaterialType.Basic:
+                this.material = new BasicMaterialDefinition();
+                break;
             default:
                 throw new Error(`Unsupported material type '${material_type}'`);
         }

package/engine/graphics/{Utils.js → makeModelView.js}

@@ -1,10 +1,6 @@
-/**
- * Created by Alex on 09/03/2016.
- */
 import { Sampler2D } from "./texture/sampler/Sampler2D.js";
 import { renderObjectToSampler2D } from "./util/renderObjectToSampler2D.js";
 
-
 /**
  *
  * @param {{create:function():Object3D}} asset
@@ -13,7 +9,7 @@ import { renderObjectToSampler2D } from "./util/renderObjectToSampler2D.js";
  * @param {AABB2} focus
  * @returns {{domElement: HTMLCanvasElement, pixels: Uint8Array, graphics, camera: PerspectiveCamera, render: Function, dispose:Function, mesh, scene: Scene}}
  */
-function makeModelView(asset, size, renderer, focus) {
+export function makeModelView(asset, size, renderer, focus) {
     const mesh = asset.create();
 
     const canvas = document.createElement("canvas");
@@ -49,8 +45,3 @@ function makeModelView(asset, size, renderer, focus) {
         dispose: proxy_renderer.dispose
     };
 }
-
-
-export {
-    makeModelView
-};

package/engine/graphics/particles/particular/engine/emitter/ParticleEmitter.js

@@ -4,7 +4,6 @@ import { lerp } from "../../../../../../core/math/lerp.js";
 import { max2 } from "../../../../../../core/math/max2.js";
 import { min2 } from "../../../../../../core/math/min2.js";
 import { Box3, BufferGeometry, Frustum, Matrix4, Points, PointsMaterial } from 'three';
-import { frustumFromCamera } from "../../../../ecs/camera/CameraSystem.js";
 import { ParticlePool } from "./ParticlePool.js";
 import { ParticleParameter } from "../parameter/ParticleParameter.js";
 import { ParameterSet } from "../parameter/ParameterSet.js";
@@ -35,6 +34,7 @@ import { distance_to_camera } from "./distance_to_camera.js";
 import { computeEmissionFunction } from "./computeEmissionFunction.js";
 import { PARTICULAR_PARTICLE_SPECIFICATION } from "./PARTICULAR_PARTICLE_SPECIFICATION.js";
 import { computeHashIntegerArray } from "../../../../../../core/collection/array/computeHashIntegerArray.js";
+import { frustum_from_camera } from "../../../../ecs/camera/frustum_from_camera.js";
 
 const EMPTY_GEOMETRY = new BufferGeometry();
 
@@ -745,7 +745,7 @@ export class ParticleEmitter {
         //assert.notOk(this.particles.hasHoles(), 'Broken pre-condition: particle pool must not have holes. Make sure to call "compact" before sorting');
 
         //get font plane of camera
-        frustumFromCamera(camera, frustum);
+        frustum_from_camera(camera, frustum);
         const nearPlane = frustum.planes[0];
         const nearPlaneNormal = nearPlane.normal;
 

package/engine/graphics/render/forward_plus/LightManager.js

@@ -13,7 +13,6 @@ import {
     UnsignedByteType,
     UnsignedShortType
 } from "three";
-import { frustumFromCamera } from "../../ecs/camera/CameraSystem.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
 import { query_bvh_frustum_from_objects } from "./query/query_bvh_frustum_from_objects.js";
 import { IncrementalDeltaSet } from "../visibility/IncrementalDeltaSet.js";
@@ -47,6 +46,7 @@ import { v3_distance } from "../../../../core/geom/v3_distance.js";
 import { array_copy } from "../../../../core/collection/array/copyArray.js";
 import { arrayQuickSort } from "../../../../core/collection/array/arrayQuickSort.js";
 import { invokeObjectCompare } from "../../../../core/model/object/invokeObjectCompare.js";
+import { frustum_from_camera } from "../../ecs/camera/frustum_from_camera.js";
 
 const LOOKUP_CACHE_SIZE = 1024; // must be power of two
 
@@ -592,7 +592,7 @@ export class LightManager {
      * @private
      */
     __build_view_frustum(camera) {
-        frustumFromCamera(camera, this.__view_frustum);
+        frustum_from_camera(camera, this.__view_frustum);
 
         arraySwapElements(this.__view_frustum.planes, 4, 5);
 

package/engine/graphics/render/view/CameraView.js

@@ -1,11 +1,11 @@
 import { IncrementalDeltaSet } from "../visibility/IncrementalDeltaSet.js";
 import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
 import { CameraViewFlags } from "./CameraViewFlags.js";
-import { frustumFromCamera } from "../../ecs/camera/CameraSystem.js";
 import { Frustum } from "three";
 import { read_frustum_planes_to_array } from "../../../../core/geom/3d/frustum/read_frustum_planes_to_array.js";
 import Signal from "../../../../core/events/signal/Signal.js";
 import { compare_three_objects } from "../../three/compare_three_objects.js";
+import { frustum_from_camera } from "../../ecs/camera/frustum_from_camera.js";
 
 const DEFAULT_FLAGS = CameraViewFlags.Active
     | CameraViewFlags.AdaptivePlaneNear
@@ -76,7 +76,7 @@ export class CameraView {
         this.__camera = camera;
 
         // read frustum
-        frustumFromCamera(camera, scratch_frustum, false);
+        frustum_from_camera(camera, scratch_frustum, false);
 
         // update view definition
         read_frustum_planes_to_array(scratch_frustum.planes, this.frustum);