ohzi-core 6.11.0 → 6.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohzi-core",
-  "version": "6.11.0",
+  "version": "6.13.0",
   "description": "OHZI Core Library",
   "source": "src/index.js",
   "module": "build/index.module.js",
@@ -36,7 +36,7 @@
   },
   "homepage": "https://github.com/ohzinteractive/core",
   "dependencies": {
-    "pit-js": "1.8.6",
+    "pit-js": "1.9.0",
     "three": "^0.137.0"
   },
   "devDependencies": {

package/src/Input.js

@@ -7,8 +7,9 @@ class Input extends InputController
   {
     super();
 
-    this.left_mouse_button_clicked = false;
+    this.clicked = false;
     this.captured_NDC = { x: 0, y: 0 };
+    this.current_NDC_delta = { x: 0, y: 0 };
 
     this.keyboard = new KeyboardInput();
   }
@@ -27,11 +28,36 @@ class Input extends InputController
     this.keyboard.dispose();
   }
 
+  update()
+  {
+    if (this.left_mouse_button_pressed)
+    {
+      this.captured_NDC.x = this.NDC.x;
+      this.captured_NDC.y = this.NDC.y;
+    }
+
+    if (this.left_mouse_button_down)
+    {
+      this.current_NDC_delta.x += Math.abs(this.NDC_delta.x);
+      this.current_NDC_delta.y += Math.abs(this.NDC_delta.y);
+    }
+
+    if (this.left_mouse_button_released)
+    {
+      if (this.current_NDC_delta.x < 0.001 || this.current_NDC_delta.y < 0.001)
+      {
+        this.clicked = true;
+      }
+
+      this.current_NDC_delta = { x: 0, y: 0 };
+    }
+  }
+
   clear()
   {
     super.clear();
 
-    this.left_mouse_button_clicked = false;
+    this.clicked = false;
 
     this.keyboard.clear();
   }

package/src/KeyboardInput.js

@@ -5,7 +5,8 @@ export default class KeyboardInput
     this.ctrlz_pressed = false;
     this.ctrlz_fired = false;
 
-    this.keys = [];
+    this.keys = {};
+    this.keys_keys = [];
     this.container = container;
 
     this.container.addEventListener('keydown', this.on_key_down.bind(this), false);
@@ -33,16 +34,17 @@ export default class KeyboardInput
   clear()
   {
     this.ctrlz_pressed = false;
-    for (let i = 0; i < this.keys.length; i++)
+
+    for (let i = 0; i < this.keys_keys.length; i++)
     {
-      this.keys[i].pressed = false;
-      this.keys[i].released = false;
+      this.keys[this.keys_keys[i]].pressed = false;
+      this.keys[this.keys_keys[i]].released = false;
     }
   }
 
   release_key(key_name)
   {
-    const key = this.keys.find(key => key.key_name === key_name);
+    const key = this.keys[key_name];
     if (key)
     {
       key.fired = false;
@@ -55,16 +57,16 @@ export default class KeyboardInput
   {
     this.ctrlz_fired = false;
 
-    for (let i = 0; i < this.keys.length; i++)
+    for (let i = 0; i < this.keys_keys.length; i++)
     {
-      this.keys[i].fired = false;
-      this.keys[i].down = false;
+      this.keys[this.keys_keys[i]].fired = false;
+      this.keys[this.keys_keys[i]].down = false;
     }
   }
 
   press_key(key_name)
   {
-    const key = this.keys.find(key => key.key_name === key_name);
+    const key = this.keys[key_name];
     if (key)
     {
       if (key.down === false)
@@ -78,7 +80,7 @@ export default class KeyboardInput
 
   is_key_pressed(key_name)
   {
-    const key = this.keys.find(key => key.key_name === key_name);
+    const key = this.keys[key_name];
     if (key)
     {
       return key.pressed;
@@ -88,7 +90,7 @@ export default class KeyboardInput
 
   is_key_down(key_name)
   {
-    const key = this.keys.find(key => key.key_name === key_name);
+    const key = this.keys[key_name];
     if (key)
     {
       return key.down;
@@ -98,7 +100,7 @@ export default class KeyboardInput
 
   is_key_released(key_name)
   {
-    const key = this.keys.find(key => key.key_name === key_name);
+    const key = this.keys[key_name];
     if (key)
     {
       return key.released;
@@ -109,31 +111,20 @@ export default class KeyboardInput
 
   register_key(key)
   {
-    this.keys.push(
+    this.keys[key] =
       {
         key_name: key,
         pressed: false,
         down: false,
         fired: false
-      });
+      };
+
+    this.keys_keys = Object.keys(this.keys);
   }
 
   unregister_key(key_name)
   {
-    let key = undefined;
-    for (let i = 0; i < this.keys.length; i++)
-    {
-      if (this.keys[i].key_name === key_name)
-      {
-        key = this.keys[i];
-      }
-    }
-
-    const index = this.keys.indexOf(key);
-    if (index > -1)
-    {
-      this.keys.splice(index, 1);
-    }
+    delete this.keys[key_name];
   }
 
   dispose()

package/src/RenderLoop.js

@@ -33,6 +33,8 @@ export default class RenderLoop
       this.target_application.on_post_start();
     }
 
+    Input.update();
+
     this.target_application.update();
     ViewManager.update();
     ViewComponentManager.update();

package/src/index.js

@@ -48,6 +48,7 @@ import CameraUtilities from './utilities/CameraUtilities';
 import EasingFunctions from './utilities/EasingFunctions';
 import FrustumPointFitter from './utilities/FrustumPointFitter';
 import GeometryUtilities from './utilities/GeometryUtilities';
+import HTMLUtilities from './utilities/HTMLUtilities';
 import ImageUtilities from './utilities/ImageUtilities';
 import OMath from './utilities/OMath';
 import MeshSampler from './utilities/MeshSampler';
@@ -146,6 +147,7 @@ export {
   EasingFunctions,
   FrustumPointFitter,
   GeometryUtilities,
+  HTMLUtilities,
   ImageUtilities,
   OMath,
   MeshSampler,

package/src/utilities/HTMLUtilities.js

@@ -0,0 +1,44 @@
+export default class HTMLUtilities
+{
+  static load_images(container)
+  {
+    const images = container.querySelectorAll('img');
+
+    for (let i = 0; i < images.length; i++)
+    {
+      const image = images[i];
+
+      if (image.dataset.src)
+      {
+        image.src = image.dataset.src;
+      }
+    }
+
+    const image_objects = container.querySelectorAll('object');
+
+    for (let i = 0; i < image_objects.length; i++)
+    {
+      const image_object = image_objects[i];
+
+      if (image_object.dataset.src)
+      {
+        image_object.data = image_object.dataset.src;
+      }
+    }
+  }
+
+  static load_videos(container)
+  {
+    const videos = container.querySelectorAll('video');
+
+    for (let i = 0; i < videos.length; i++)
+    {
+      const video = videos[i];
+
+      if (video.dataset.src)
+      {
+        video.src = video.dataset.src;
+      }
+    }
+  }
+}

package/src/utilities/ObjectUtilities.js

@@ -1,9 +1,34 @@
 export default class ObjectUtilities
 {
-  constructor()
-  {}
+  static is_object(item)
+  {
+    return (item && typeof item === 'object' && !Array.isArray(item));
+  }
+
+  static merge_deep(target, ...sources)
+  {
+    if (!sources.length) return target;
+    const source = sources.shift();
+
+    if (ObjectUtilities.is_object(target) && ObjectUtilities.is_object(source))
+    {
+      for (const key in source)
+      {
+        if (ObjectUtilities.is_object(source[key]))
+        {
+          if (!target[key]) Object.assign(target, { [key]: {} });
+          ObjectUtilities.merge_deep(target[key], source[key]);
+        }
+        else
+        {
+          Object.assign(target, { [key]: source[key] });
+        }
+      }
+    }
+
+    return ObjectUtilities.merge_deep(target, ...sources);
+  }
 
-  // Changes XML to JSON
   static xml_to_json(xml)
   {
     // Create the return object

package/src/view_components/ApplicationView.js

@@ -1,4 +1,5 @@
 import ResourceContainer from '../ResourceContainer';
+import HTMLUtilities from '../utilities/HTMLUtilities';
 import ViewManager from './ViewManager';
 import ViewState from './ViewState';
 
@@ -59,32 +60,12 @@ export default class ApplicationView extends ViewState
 
   load_html_images()
   {
-    const images = this.container.querySelectorAll('img');
-
-    for (let i = 0; i < images.length; i++)
-    {
-      const image = images[i];
-
-      if (image.dataset.src)
-      {
-        image.src = image.dataset.src;
-      }
-    }
+    HTMLUtilities.load_images(this.container);
   }
 
   load_html_videos()
   {
-    const videos = this.container.querySelectorAll('video');
-
-    for (let i = 0; i < videos.length; i++)
-    {
-      const video = videos[i];
-
-      if (video.dataset.src)
-      {
-        video.src = video.dataset.src;
-      }
-    }
+    HTMLUtilities.load_videos(this.container);
   }
 
   set_opacity(current_state_data)

package/src/view_components/ViewComponent.js

@@ -1,3 +1,4 @@
+import HTMLUtilities from '../utilities/HTMLUtilities';
 import ViewComponentManager from './ViewComponentManager';
 
 export default class ViewComponent
@@ -58,4 +59,14 @@ export default class ViewComponent
       }
     }
   }
+
+  load_html_images()
+  {
+    HTMLUtilities.load_images(this.container);
+  }
+
+  load_html_videos()
+  {
+    HTMLUtilities.load_videos(this.container);
+  }
 }

package/types/Input.d.ts

@@ -1,8 +1,170 @@
+import { Vector2 } from "three";
+
  export class Input {
-    static left_mouse_button_clicked: boolean;
+    /**
+     * Works for left mouse button or first touch on the screen (primary touch).
+    */
+    static left_mouse_button_pressed: boolean;
+    /**
+     * Works for left mouse button or first touch on the screen (primary touch).
+    */
+    static left_mouse_button_down: boolean;
+    /**
+     * Works for left mouse button or first touch on the screen (primary touch).
+    */
+    static left_mouse_button_released: boolean;
+
+    /**
+     * Mouse only.
+    */
+    static middle_mouse_button_pressed: boolean;
+    /**
+     * Mouse only.
+    */
+    static middle_mouse_button_down: boolean;
+    /**
+     * Mouse only.
+    */
+    static middle_mouse_button_released: boolean;
+
+    /**
+     * Mouse only.
+    */
+    static right_mouse_button_pressed: boolean;
+    /**
+     * Mouse only.
+    */
+    static right_mouse_button_down: boolean;
+    /**
+     * Mouse only.
+    */
+    static right_mouse_button_released: boolean;
+
+    /**
+     * Mouse and primary touch.
+    */
+    static clicked: boolean;
+
+    /**
+     * Screen coordinates of the mouse (or primary touch) position.
+    */
+    static pointer_pos: {
+        x: number;
+        y: number;
+    };
+
+    /**
+     * Difference between previous position and current position.
+    */
+    static pointer_pos_delta: {
+        x: number;
+        y: number;
+    };
+
+    /**
+     * Screen coordinates of the mouse (or primary touch) position, where the origin is in the upper left corner (browser coordinates).
+    */
+    static html_pointer_pos: {
+        x: number;
+        y: number;
+    };
+
+    /**
+     * The center of all active touches. If using mouse, this is the same as pointer_pos.
+    */
+    static pointer_center: {
+        x: number;
+        y: number;
+    };
+
+    /**
+     * The center of all active touches. If using mouse, this is the same as pointer_pos.
+    */
+    static pointer_center_delta: {
+        x: number;
+        y: number;
+    };
+
+    /**
+     * [-1..1] the center of all active touches. If using mouse, this is the same as pointer_pos.
+    */
+    static pointer_center_NDC: {
+        x: number;
+        y: number;
+    };
+
+    /**
+     * [-1..1] difference between previous normalized center and current one.
+    */
+    static pointer_center_NDC_delta: {
+        x: number;
+        y: number;
+    };
+
+    /**
+     * Normalized [-1..1] device coordinates for mouse or primary touch.
+    */
+    static NDC: {
+        x: number;
+        y: number;
+    };
+
+    /**
+     * [-1..1] difference between previous normalized position and current normalized position.
+    */
+    static NDC_delta: {
+        x: number;
+        y: number;
+    };
+
+    /**
+     * Normalized [-1..1] device coordinates for mouse or primary touch, but in browser space (upper left corner maps to <-1,-1>).
+    */
+    static html_NDC: {
+        x: number;
+        y: number;
+    };
+
+    /**
+     * Normalized [-1..1] device coordinates for mouse or primary touch, captured when left click is pressed.
+    */
     static captured_NDC: {
         x: number;
         y: number;
     };
+
+    /**
+     * This is equivalent to the mouse wheel (-1, 0, 1) or dragging with one finger [-x..x] measured in pixels.
+    */
+    static scroll_delta: float;
+
+    /**
+     * This is equivalent to the mouse wheel (-1, 0, 1) or pinching with two fingers [-x..x] measured in pixels.
+    */
+    static zoom_delta: float;
+
+    /**
+     * Returns 1 if any mouse button is down, or return the amount of active touches.
+    */
+    static pointer_count: integer;
+
+    /**
+     * True if the mouse or primary touch is contained within the bounds of the subregion
+    */
+    static pointer_is_within_bounds: boolean;
+
+    /**
+     * True if the pointer is over an html element
+    */
+    static pointer_is_over_element(html_element: any): boolean;
+
+     /**
+     * Call this at the beginning of the current frame.
+    */
+    static update(): void;
+
+    /**
+     * Call this at the end of the current frame.
+    */
     static clear(): void;
 }

package/types/utilities/HTMLUtilities.d.ts

@@ -0,0 +1,10 @@
+export class HTMLUtilities {
+    /**
+    * Load Images defined in data-src.
+    */
+    static load_images(container: HTMLElement): void;
+    /**
+     * Load Videos defined in data-src.
+     */
+    static load_videos(container: HTMLElement): void;
+}

package/types/utilities/ObjectUtilities.d.ts

@@ -1,5 +1,16 @@
 export class ObjectUtilities {
-    static xml_to_json(xml: any): {
-        '@attributes': {};
-    };
+    /**
+    * Simple object check.
+    */
+    static is_object(item: any): boolean;
+
+    /**
+     * Deep merge two objects.
+     */
+    static merge_deep(target: any, ...sources: any): void;
+
+    /**
+     * Convert XML to JSON
+     */
+    static xml_to_json(xml: any): object;
 }

package/types/view_components/ApplicationView.d.ts

@@ -6,6 +6,15 @@ export class ApplicationView extends ViewState {
     });
     container: any;
     url: any;
+    start(): void;
+    show(): void;
+    before_enter(): void;
+    on_enter(): void;
+    before_exit(): void;
+    on_exit(): void;
+    update(): void;
     set_opacity(opacity: any): void;
+    load_html_images(): void;
+    load_html_videos(): void;
 }
 import ViewState from "./ViewState";

package/types/view_components/ViewComponent.d.ts

@@ -10,4 +10,6 @@ export class ViewComponent {
     update(): void;
     on_exit(): void;
     set_opacity(opacity: any): void;
+    load_html_images(): void;
+    load_html_videos(): void;
 }