@woosh/meep-engine 2.75.4 → 2.75.6

package/src/engine/graphics/texture/sprite/prototypeSpriteCutoutGeometry.js

@@ -11,14 +11,12 @@ import GUIElementSystem from "../../../ecs/gui/GUIElementSystem.js";
 import ViewportPosition from "../../../ecs/gui/position/ViewportPosition.js";
 import ViewportPositionSystem from "../../../ecs/gui/position/ViewportPositionSystem.js";
 import { EngineHarness } from "../../../EngineHarness.js";
+import { canvas2d_draw_path } from "../../canvas/canvas2d_draw_path.js";
 import { Sampler2D } from "../sampler/Sampler2D.js";
 import sampler2D2Canvas from "../sampler/Sampler2D2Canvas.js";
 import { make_edge_condition_channel_threshold } from "../sampler/search/make_edge_condition_channel_threshold.js";
 import { sampler2d_find_pixels } from "../sampler/search/sampler2d_find_pixels.js";
 
-const edge_condition_alpha0 = make_edge_condition_channel_threshold(3, 0);
-
-
 function sampler_as_view(sampler) {
 
     const vSpriteSource = new CanvasView();
@@ -33,67 +31,6 @@ function sampler_as_view(sampler) {
     return vSpriteSource;
 }
 
-/**
- *
- * @param {number[]} vertices
- * @param {CanvasRenderingContext2D} ctx
- * @param [fillColor]
- * @param [strokeColor]
- * @param [highlight_vertices]
- * @param [vertex_draw_size]
- * @param {number} [offset] in pixels
- */
-function drawPath({
-                      vertices,
-                      ctx,
-                      fillColor = 'transparent',
-                      strokeColor = 'red',
-                      highlight_vertices = true,
-                      vertex_draw_size = 8,
-                      offset = [0, 0]
-                  }) {
-
-    function draw_point(x, y) {
-        ctx.fillStyle = 'rgba(255,255,255,0.8)';
-        ctx.strokeStyle = 'black';
-        ctx.lineWidth = "1px";
-
-        const x1 = x - vertex_draw_size / 2 + offset[0];
-        const y1 = y - vertex_draw_size / 2 + offset[1];
-
-        ctx.fillRect(x1, y1, vertex_draw_size, vertex_draw_size);
-
-        ctx.strokeRect(x1, y1, vertex_draw_size, vertex_draw_size);
-    }
-
-    if (highlight_vertices) {
-        for (let i = 0; i < vertices.length / 2; i++) {
-            draw_point(vertices[i * 2], vertices[i * 2 + 1]);
-        }
-    }
-
-    ctx.fillStyle = fillColor;
-    ctx.strokeStyle = strokeColor;
-    ctx.lineWidth = "1px";
-
-    ctx.beginPath();
-
-    ctx.moveTo(vertices[0] + offset[0], vertices[1] + offset[1]);
-    // drawPoint(jarvis_vertices[0].x, jarvis_vertices[0].y, jarvis_vertices[0].z, 'red');
-
-    for (let i = 1; i < vertices.length / 2; i++) {
-
-        ctx.lineTo(vertices[i * 2] + offset[0], vertices[i * 2 + 1] + offset[1]);
-
-        // drawPoint(last.x, last.y, last.z, 'red');
-    }
-
-    ctx.closePath();
-    ctx.stroke();
-    ctx.fill();
-
-}
-
 /**
  *
  * @param {Engine} engine
@@ -104,10 +41,10 @@ async function main(engine) {
     // const path = "data/textures/particle/UETools/Bones_01.png";
     // const path = "data/textures/particle/UETools/x64/Bones_01.png";
     // const path = "data/textures/particle/KriptoFX/x256/SmokeTile2.png";
-    const path = "data/textures/particle/KriptoFX/CloudMask.png";
+    // const path = "data/textures/particle/KriptoFX/CloudMask.png";
     // const path = "data/textures/particle/travnik/arrow_2_64.png";
     // const path = "data/textures/particle/travnik/leaf_01.png";
-    // const path = "data/textures/particle/travnik/portal_2_blue_64.png";
+    const path = "data/textures/particle/travnik/portal_2_blue_64.png";
     // const path = "data/textures/particle/travnik/flake.png";
 
     const asset = await engine.assetManager.promise(path, 'image')
@@ -147,7 +84,7 @@ async function main(engine) {
     // we make it a bit larger to fit markers drawn at the edges of the image
     vHull.size.set(sampler.width + 32, sampler.height + 32);
 
-    drawPath({
+    canvas2d_draw_path({
         vertices: convex_hull_vertices,
         ctx: vHull.context2d,
         offset: [16, 16]
@@ -184,7 +121,7 @@ async function main(engine) {
 
     vOptimalPoly.size.set(sampler.width + 100, sampler.height + 100);
 
-    drawPath({
+    canvas2d_draw_path({
         vertices: optimal_poly,
         ctx: vOptimalPoly.context2d,
         strokeColor: '#30c0ff',

package/src/engine/input/devices/PointerDevice.js

@@ -1,13 +1,13 @@
 /**
  * Created by Alex on 29/01/2015.
  */
-import Vector2 from "../../../core/geom/Vector2.js";
+import { assert } from "../../../core/assert.js";
 import Signal from "../../../core/events/signal/Signal.js";
+import Vector2 from "../../../core/geom/Vector2.js";
 import Vector3 from "../../../core/geom/Vector3.js";
-import { assert } from "../../../core/assert.js";
+import { sign } from "../../../core/math/sign.js";
 import { MouseEvents } from "./events/MouseEvents.js";
 import { TouchEvents } from "./events/TouchEvents.js";
-import { sign } from "../../../core/math/sign.js";
 import { InputDeviceSwitch } from "./InputDeviceSwitch.js";
 
 /**
@@ -353,6 +353,9 @@ export class PointerDevice {
         down: new Signal(),
         up: new Signal(),
         move: new Signal(),
+        /**
+         * @type {Signal<Vector2, (MouseEvent|TouchEvent)>}
+         */
         tap: new Signal(),
         drag: new Signal(),
         dragStart: new Signal(),

package/src/engine/makeSimpleTaskProgressView.js

@@ -0,0 +1,33 @@
+import Vector2 from "../core/geom/Vector2.js";
+import TaskProgressView from "../view/task/TaskProgressView.js";
+
+/**
+ *
+ * @param {Task|TaskGroup} task
+ * @param {Localization} localization
+ * @param {Vector2} [size]
+ * @returns {TaskProgressView}
+ */
+export function makeSimpleTaskProgressView({
+                                               task,
+                                               localization,
+                                               size = new Vector2(256, 32)
+                                           }) {
+
+    const vProgress = new TaskProgressView({
+        task,
+        localization
+    });
+
+    vProgress.size.copy(size);
+    vProgress.css({
+        position: 'absolute',
+        top: 0,
+        left: 0,
+        pointerEvents: "none"
+    });
+    vProgress.el.querySelector('.fill').style.background = 'rgb(255,220,94)';
+    vProgress.el.querySelector('.progress-bar').style.height = '8px';
+
+    return vProgress;
+}

package/src/engine/scene/transitionToScene.js

@@ -1,15 +1,15 @@
-import TaskGroup from "../../core/process/task/TaskGroup.js";
+import { assert } from "../../core/assert.js";
+import { noop } from "../../core/function/Functions.js";
 import Task from "../../core/process/task/Task.js";
+import TaskGroup from "../../core/process/task/TaskGroup.js";
 import TaskState from "../../core/process/task/TaskState.js";
-import { noop } from "../../core/function/Functions.js";
-import { compileAllMaterials } from "../graphics/ecs/compileAllMaterials.js";
-import { createTaskWaitForMeshesToLoad } from "../graphics/ecs/mesh/createTaskWaitForMeshesToLoad.js";
-import { loadVisibleTerrainTiles } from "../ecs/terrain/util/loadVisibleTerrainTiles.js";
-import { TaskLoadingScreen } from "../../view/task/TaskLoadingScreen.js";
 import { actionTask } from "../../core/process/task/util/actionTask.js";
 import { delayTask } from "../../core/process/task/util/delayTask.js";
 import { wrapTaskIgnoreFailure } from "../../core/process/task/util/wrapTaskIgnoreFailure.js";
-import { assert } from "../../core/assert.js";
+import { TaskLoadingScreen } from "../../view/task/TaskLoadingScreen.js";
+import { loadVisibleTerrainTiles } from "../ecs/terrain/util/loadVisibleTerrainTiles.js";
+import { compileAllMaterials } from "../graphics/ecs/compileAllMaterials.js";
+import { createTaskWaitForMeshesToLoad } from "../graphics/ecs/mesh/createTaskWaitForMeshesToLoad.js";
 
 
 /**
@@ -117,7 +117,6 @@ export function transitionToScene({
 
     Task.joinAll(allTasks,
         () => {
-            cleanup();
 
             taskGroup.state.set(TaskState.SUCCEEDED);
 
@@ -126,8 +125,6 @@ export function transitionToScene({
         },
         () => {
 
-            cleanup();
-
             taskGroup.state.set(TaskState.FAILED);
 
             taskGroup.on.failed.send0();
@@ -140,5 +137,7 @@ export function transitionToScene({
         engine.executor.runMany(extraTasks);
     }, noop);
 
+    promise.finally(cleanup);
+
     return promise;
 }

package/src/view/task/TaskLoadingScreen.js

@@ -1,8 +1,8 @@
-import TaskProgressView from "./TaskProgressView.js";
-import { AssetLoaderStatusView } from "../asset/AssetLoaderStatusView.js";
-import { logger } from "../../engine/logging/GlobalLogger.js";
-import { array_remove_first } from "../../core/collection/array/array_remove_first.js";
 import { assert } from "../../core/assert.js";
+import { array_remove_first } from "../../core/collection/array/array_remove_first.js";
+import { logger } from "../../engine/logging/GlobalLogger.js";
+import { AssetLoaderStatusView } from "../asset/AssetLoaderStatusView.js";
+import TaskProgressView from "./TaskProgressView.js";
 
 /**
  * @type {TaskLoadingScreen}
@@ -133,14 +133,7 @@ export class TaskLoadingScreen {
 
         this._pending_cleanup.push(cleanup);
 
-        const promise = new Promise((resolve, reject) => {
-
-            const p = task.promise();
-
-            p.finally(attempt_cleanup);
-            p.then(resolve, reject);
-
-        });
+        const promise = task.promise().finally(attempt_cleanup);
 
         this._active_promise = promise;
 

package/src/view/task/TaskProgressView.js

@@ -3,26 +3,26 @@
  */
 
 
-import View from '../View.js';
-import SmoothProgressBar from '../elements/progress/SmoothProgressBar.js';
-import LabelView from '../common/LabelView.js';
+import Vector1 from "../../core/geom/Vector1.js";
+import { RemainingTimeEstimator } from "../../core/process/task/RemainingTimeEstimator.js";
 
 import TaskState from '../../core/process/task/TaskState.js';
-
-import dom from '../DOM.js';
 import Clock from "../../engine/Clock.js";
-import Vector1 from "../../core/geom/Vector1.js";
+import LabelView from '../common/LabelView.js';
 import { LocalizedLabelView } from "../common/LocalizedLabelView.js";
-import { RemainingTimeEstimator } from "../../core/process/task/RemainingTimeEstimator.js";
+
+import dom from '../DOM.js';
+import SmoothProgressBar from '../elements/progress/SmoothProgressBar.js';
+import View from '../View.js';
 
 class TaskProgressView extends View {
     /**
      *
      * @param {Task|TaskGroup} task
-     * @param {Localization} localization
+     * @param {Localization} [localization]
      * @constructor
      */
-    constructor({ task, localization }) {
+    constructor({ task, localization=null }) {
         super();
 
         function makeNameId() {

package/src/engine/animation/curve/draw/draw_grid.js

@@ -1,27 +0,0 @@
-/**
- *
- * @param {CanvasRenderingContext2D} ctx
- * @param {number} width
- * @param {number} height
- * @param {string} color
- * @param {number} spacing
- * @param {number} [offset_x]
- * @param {number} [offset_y]
- */
-export function draw_grid({ ctx, width, height, color = 'red', spacing = 10, offset_x = 0, offset_y = 0 }) {
-    ctx.fillStyle = 'none';
-    ctx.lineWidth = 1;
-    ctx.strokeStyle = color;
-
-
-    ctx.beginPath();
-    for (let x = offset_x; x < width; x += spacing) {
-        ctx.moveTo(x, 0);
-        ctx.lineTo(x, height);
-    }
-    for (let y = offset_y; y < width; y += spacing) {
-        ctx.moveTo(0, y);
-        ctx.lineTo(width, y);
-    }
-    ctx.stroke();
-}

package/src/engine/animation/curve/draw/plot_data.js

@@ -1,49 +0,0 @@
-import { draw_grid } from "./draw_grid.js";
-import { plot_array } from "./plot_array.js";
-import Vector2 from "../../../../core/geom/Vector2.js";
-
-/**
- *
- * @param {CanvasRenderingContext2D} ctx
- * @param {number[]|Float32Array} data
- * @param {Vector2} [margin]
- * @param {number} width
- * @param {number} height
- * @param {number[]} [range_y]
- */
-export function plot_data({
-                              ctx,
-                              data,
-                              margin = Vector2.zero,
-                              width,
-                              height,
-                              range_y
-                          }) {
-
-    ctx.fillStyle = '#222222';
-    ctx.fillRect(0, 0, width, height);
-
-    draw_grid({
-        ctx,
-        width,
-        height,
-        color: '#262626',
-        spacing: 32
-    });
-
-    draw_grid({
-        ctx,
-        width,
-        height,
-        color: '#303030',
-        spacing: 32,
-        offset_x: 16,
-        offset_y: 16
-    });
-
-    ctx.fillStyle = 'none';
-    ctx.strokeStyle = '#00ff00';
-    ctx.lineWidth = 1;
-    plot_array(ctx, width - margin.x * 2, height - margin.y * 2, margin.x, margin.y, data, range_y);
-
-}

package/src/engine/graphics/geometry/QuadGeometry.js

@@ -1,13 +0,0 @@
-/**
- * Created by Alex on 01/11/2014.
- */
-import { PlaneBufferGeometry } from 'three';
-
-let faces = [[0, 1, 2], [0, 2, 3]];
-let vertices = [];
-
-const QuadGeometry = function (width, height) {
-    return new PlaneBufferGeometry(width, height, 1, 1);
-};
-
-export default QuadGeometry;