@woosh/meep-engine 2.35.17 → 2.36.0

package/engine/ui/scene/SceneGUIContext.js

@@ -1,135 +1,7 @@
 import { ModalStack } from "../modal/ModalStack.js";
 import LinearModifier from "../../../core/model/stat/LinearModifier.js";
 import { NotificationManager } from "../notification/NotificationManager.js";
-import ViewEmitter from "../notification/ViewEmitter.js";
-import AnimationTrack from "../../animation/keyed2/AnimationTrack.js";
-import TransitionFunctions from "../../animation/TransitionFunctions.js";
-import { assert } from "../../../core/assert.js";
-import NotificationView from "../../../view/elements/notify/NotificationView.js";
-import { NotificationAreaKind } from "../GUIEngine.js";
-
-/**
- *
- * @param {NotificationManager} manager
- */
-function initializeNotifications(manager) {
-    function makePrimary() {
-        const viewEmitter = new ViewEmitter();
-        viewEmitter.setRushThreshold(1);
-
-        const animationTrack = new AnimationTrack(["alpha", "scale"]);
-        animationTrack.addKey(0, [0, 1.3]);
-        animationTrack.addKey(0.6, [1, 1]);
-        animationTrack.addKey(2.9, [1, 1]);
-        animationTrack.addKey(3.4, [0, 1]);
-
-        animationTrack.addTransition(0, TransitionFunctions.EaseIn);
-        animationTrack.addTransition(2, TransitionFunctions.EaseOut);
-
-        viewEmitter.setAnimation(animationTrack, function (alpha, scale) {
-            /**
-             * @type View
-             */
-            const view = this;
-
-            view.el.style.opacity = alpha;
-            view.scale.set(scale, scale);
-        });
-
-        viewEmitter.viewFactory = function (options) {
-            assert.notEqual(options, undefined, 'options is undefined');
-
-            const notificationView = new NotificationView(options);
-
-            return notificationView;
-        };
-
-
-        return viewEmitter;
-    }
-
-    function makeSecondary() {
-        const viewEmitter = new ViewEmitter();
-        viewEmitter.setRushThreshold(1);
-
-        const animationTrack = new AnimationTrack(["alpha", "position.y", "scale"]);
-        animationTrack.addKey(0, [0.2, 0, 1.1]);
-        animationTrack.addKey(0.17, [1, 0, 1]);
-        animationTrack.addKey(3.2, [1, -60, 1]);
-        animationTrack.addKey(3.7, [0, -70, 1]);
-
-        animationTrack.addTransition(0, TransitionFunctions.EaseIn);
-        animationTrack.addTransition(1, TransitionFunctions.Linear);
-        animationTrack.addTransition(2, TransitionFunctions.EaseOut);
-
-        viewEmitter.setAnimation(animationTrack, function (alpha, positionY, scale) {
-            /**
-             * @type View
-             */
-            const view = this;
-
-            view.el.style.opacity = alpha;
-            view.position.setY(positionY);
-            view.scale.set(scale, scale);
-        });
-
-
-        viewEmitter.viewFactory = function (options) {
-            const notificationView = new NotificationView(options);
-
-            return notificationView;
-        };
-
-        return viewEmitter;
-    }
-
-
-    function makeToast() {
-        const displayDuration = 7.5;
-
-        const viewEmitter = new ViewEmitter();
-        viewEmitter.setRushThreshold(5);
-
-        const animationTrack = new AnimationTrack(["alpha", "position.x"]);
-        animationTrack.addKey(0, [0.2, 100]);
-        animationTrack.addKey(0.17, [1, 0]);
-        animationTrack.addKey(displayDuration, [1, 0]);
-        animationTrack.addKey(displayDuration + 0.5, [0, 0]);
-
-        animationTrack.addTransition(0, TransitionFunctions.EaseIn);
-        animationTrack.addTransition(1, TransitionFunctions.Linear);
-        animationTrack.addTransition(2, TransitionFunctions.EaseOut);
-
-        viewEmitter.setAnimation(animationTrack, function (alpha, positionY) {
-            /**
-             * @type View
-             */
-            const view = this;
-
-            view.el.style.opacity = alpha;
-            view.position.setX(positionY);
-        });
-
-
-        viewEmitter.viewFactory = function (options) {
-            const notificationView = new NotificationView(options);
-
-            return notificationView;
-        };
-
-        return viewEmitter;
-    }
-
-    manager.createChannel(NotificationAreaKind.Primary);
-    manager.createChannel(NotificationAreaKind.Secondary);
-    manager.createChannel(NotificationAreaKind.Toast);
-
-    manager.addEmitterDisplay(NotificationAreaKind.Primary, makePrimary());
-    manager.addEmitterDisplay(NotificationAreaKind.Secondary, makeSecondary());
-    manager.addEmitterDisplay(NotificationAreaKind.Toast, makeToast(), 'managed-toast-notifications');
-
-    // testNotifications(manager);
-}
+import { initializeNotifications } from "./initializeNotifications.js";
 
 export class SceneGUIContext {
     constructor() {
@@ -138,6 +10,11 @@ export class SceneGUIContext {
          * @type {Scene}
          */
         this.scene = null;
+
+        /**
+         *
+         * @type {ModalStack}
+         */
         this.modals = new ModalStack();
 
         /**
@@ -146,6 +23,10 @@ export class SceneGUIContext {
          */
         this.notifications = new NotificationManager();
 
+        /**
+         *
+         * @type {LinearModifier}
+         */
         this.clockModifierZero = new LinearModifier(0, 0);
     }
 
@@ -165,7 +46,7 @@ export class SceneGUIContext {
      *
      * @param {number} timeDelta
      */
-    tick(timeDelta){
+    tick(timeDelta) {
         this.notifications.tick(timeDelta);
     }
 

package/engine/ui/scene/initializeNotifications.js

@@ -0,0 +1,141 @@
+import ViewEmitter from "../notification/ViewEmitter.js";
+import AnimationTrack from "../../animation/keyed2/AnimationTrack.js";
+import TransitionFunctions from "../../animation/TransitionFunctions.js";
+import { assert } from "../../../core/assert.js";
+import NotificationView from "../../../view/elements/notify/NotificationView.js";
+import { NotificationAreaKind } from "../GUIEngine.js";
+
+function makePrimary() {
+    /**
+     *
+     * @type {ViewEmitter<Notification>}
+     */
+    const viewEmitter = new ViewEmitter();
+    viewEmitter.setRushThreshold(1);
+
+    const animationTrack = new AnimationTrack(["alpha", "scale"]);
+    animationTrack.addKey(0, [0, 1.3]);
+    animationTrack.addKey(0.6, [1, 1]);
+    animationTrack.addKey(2.9, [1, 1]);
+    animationTrack.addKey(3.4, [0, 1]);
+
+    animationTrack.addTransition(0, TransitionFunctions.EaseIn);
+    animationTrack.addTransition(2, TransitionFunctions.EaseOut);
+
+    viewEmitter.setAnimation(animationTrack, function (alpha, scale) {
+        /**
+         * @type View
+         */
+        const view = this;
+
+        view.el.style.opacity = alpha;
+        view.scale.set(scale, scale);
+    });
+
+    viewEmitter.viewFactory = function (options) {
+        assert.notEqual(options, undefined, 'options is undefined');
+
+        const notificationView = new NotificationView(options);
+
+        return notificationView;
+    };
+
+
+    return viewEmitter;
+}
+
+function makeSecondary() {
+    /**
+     *
+     * @type {ViewEmitter<Notification>}
+     */
+    const viewEmitter = new ViewEmitter();
+    viewEmitter.setRushThreshold(1);
+
+    const animationTrack = new AnimationTrack(["alpha", "position.y", "scale"]);
+    animationTrack.addKey(0, [0.2, 0, 1.1]);
+    animationTrack.addKey(0.17, [1, 0, 1]);
+    animationTrack.addKey(3.2, [1, -60, 1]);
+    animationTrack.addKey(3.7, [0, -70, 1]);
+
+    animationTrack.addTransition(0, TransitionFunctions.EaseIn);
+    animationTrack.addTransition(1, TransitionFunctions.Linear);
+    animationTrack.addTransition(2, TransitionFunctions.EaseOut);
+
+    viewEmitter.setAnimation(animationTrack, function (alpha, positionY, scale) {
+        /**
+         * @type View
+         */
+        const view = this;
+
+        view.el.style.opacity = alpha;
+        view.position.setY(positionY);
+        view.scale.set(scale, scale);
+    });
+
+
+    viewEmitter.viewFactory = function (options) {
+        const notificationView = new NotificationView(options);
+
+        return notificationView;
+    };
+
+    return viewEmitter;
+}
+
+function makeToast() {
+    const displayDuration = 7.5;
+
+    /**
+     *
+     * @type {ViewEmitter<Notification>}
+     */
+    const viewEmitter = new ViewEmitter();
+    viewEmitter.setRushThreshold(5);
+
+    const animationTrack = new AnimationTrack(["alpha", "position.x"]);
+    animationTrack.addKey(0, [0.2, 100]);
+    animationTrack.addKey(0.17, [1, 0]);
+    animationTrack.addKey(displayDuration, [1, 0]);
+    animationTrack.addKey(displayDuration + 0.5, [0, 0]);
+
+    animationTrack.addTransition(0, TransitionFunctions.EaseIn);
+    animationTrack.addTransition(1, TransitionFunctions.Linear);
+    animationTrack.addTransition(2, TransitionFunctions.EaseOut);
+
+    viewEmitter.setAnimation(animationTrack, function (alpha, position_x) {
+        /**
+         * @type View
+         */
+        const view = this;
+
+        view.el.style.opacity = alpha;
+        view.position.setX(position_x);
+    });
+
+
+    viewEmitter.viewFactory = function (options) {
+        const notificationView = new NotificationView(options);
+
+        return notificationView;
+    };
+
+    return viewEmitter;
+}
+
+/**
+ *
+ * @param {NotificationManager} manager
+ */
+export function initializeNotifications(manager) {
+
+    manager.createChannel(NotificationAreaKind.Primary);
+    manager.createChannel(NotificationAreaKind.Secondary);
+    manager.createChannel(NotificationAreaKind.Toast);
+
+    manager.addEmitterDisplay(NotificationAreaKind.Primary, makePrimary());
+    manager.addEmitterDisplay(NotificationAreaKind.Secondary, makeSecondary());
+    manager.addEmitterDisplay(NotificationAreaKind.Toast, makeToast(), 'managed-toast-notifications');
+
+    // testNotifications(manager);
+}

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

package/view/elements/notify/NotificationView.js

@@ -10,10 +10,9 @@ class NotificationView extends View {
     /**
      *
      * @param {Notification} model
-     * @param options
      * @constructor
      */
-    constructor(model, options) {
+    constructor(model) {
         super();
 
         assert.notEqual(model, undefined, 'model is undefined');