ohzi-core 9.3.0 → 9.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohzi-core",
-  "version": "9.3.0",
+  "version": "9.4.0",
   "description": "OHZI Core Library",
   "source": "src/index.js",
   "module": "build/index.module.js",

package/src/Browser.js

@@ -33,6 +33,8 @@ class Browser
       this.browser_name = 'other';
       break;
     }
+
+    this.version = this.get_version();
   }
 
   get name()
@@ -74,6 +76,30 @@ class Browser
   {
     return this.has_webm ? 'webm' : this.has_hvec ? 'hvec.mp4' : 'mp4';
   }
+
+  get_version()
+  {
+    const ua = navigator.userAgent;
+    let tem = '';
+    let version = 0;
+
+    let M = ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
+    if (/trident/i.test(M[1]))
+    {
+      tem =  /\brv[ :]+(\d+)/g.exec(ua) || [];
+      version =  'IE ' + (tem[1] || '');
+    }
+    if (M[1] === 'Chrome')
+    {
+      tem = ua.match(/\b(OPR|Edge)\/(\d+)/);
+      if (tem != null) version = tem.slice(1).join(' ').replace('OPR', 'Opera');
+    }
+    M = M[2] ? [M[1], M[2]] : [navigator.appName, navigator.appVersion, '-?'];
+    if ((tem = ua.match(/version\/(\d+)/i)) != null) M.splice(1, 1, tem[1]);
+    version = M.join(' ');
+
+    return version.split(' ')[1];
+  }
 }
 
 const browser = new Browser();

package/src/resource_loader/AsyncTextureLoader.js

@@ -1,6 +1,7 @@
 import { AbstractLoader } from './AbstractLoader';
 
 import { Texture } from 'three';
+import { Browser } from '../Browser';
 
 class AsyncTextureLoader extends AbstractLoader
 {
@@ -10,6 +11,18 @@ class AsyncTextureLoader extends AbstractLoader
   }
 
   on_preloaded_finished(resource_container)
+  {
+    if (Browser.is_safari && Browser.version < 15)
+    {
+      this.load_with_old_method(resource_container);
+    }
+    else
+    {
+      this.load_with_new_method(resource_container);
+    }
+  }
+
+  load_with_old_method(resource_container)
   {
     if (resource_container.resources_by_url[this.url] === undefined)
     {
@@ -42,6 +55,43 @@ class AsyncTextureLoader extends AbstractLoader
       this.__loading_ended();
     }
   }
+
+  load_with_new_method(resource_container)
+  {
+    if (resource_container.resources_by_url[this.url] === undefined)
+    {
+      const fetchOptions = {};
+      fetchOptions.credentials = 'same-origin';
+      // fetchOptions.headers = this.requestHeader;
+
+      fetch(this.url, fetchOptions).then((res) =>
+      {
+        return res.blob();
+      }).then((blob) =>
+      {
+        return createImageBitmap(blob, { colorSpaceConversion: 'none' });
+      }).then((imageBitmap) =>
+      {
+        const texture = new Texture(imageBitmap);
+        texture.needsUpdate = true;
+
+        resource_container.set_resource(this.resource_id, this.url, texture);
+
+        this.__update_downloaded_bytes(1, 1);
+        this.__loading_ended();
+      }).catch(function(e)
+      {
+        console.error(e);
+      });
+    }
+    else
+    {
+      resource_container.set_resource(this.resource_id, this.url, resource_container.resources_by_url[this.url]);
+
+      this.__update_downloaded_bytes(1, 1);
+      this.__loading_ended();
+    }
+  }
 }
 
 export { AsyncTextureLoader };

package/types/BaseApplication.d.ts

@@ -5,4 +5,5 @@ export class BaseApplication {
     update(): void;
     on_post_render(): void;
     on_pre_render(): void;
+    on_frame_end(): void;
 }

package/types/Browser.d.ts

@@ -1,12 +1,15 @@
- export class Browser {
-    static init(): void;
-    static browser_name: string;
-    static get name(): string;
-    static get is_safari(): boolean;
-    static get is_chrome(): boolean;
-    static get is_ie(): boolean;
-    static get is_firefox(): boolean;
-    static get has_webm(): boolean;
-    static get has_hvec(): boolean;
-    static get preferred_video_extension(): string;
+export { browser as Browser };
+declare const browser: Browser;
+declare class Browser {
+    init(): void;
+    browser_name: string;
+    agent: string;
+    get name(): string;
+    get is_safari(): boolean;
+    get is_chrome(): boolean;
+    get is_edge(): boolean;
+    get is_edge_chromium(): boolean;
+    get has_webm(): boolean;
+    get has_hvec(): boolean;
+    get preferred_video_extension(): "webm" | "hvec.mp4" | "mp4";
 }

package/types/CameraManager.d.ts

@@ -1,8 +1,13 @@
 import { Camera } from "three";
 
-export class CameraManager {
-    static init(): void;
-    static _current: Camera;
-    static set current(arg: Camera);
-    static get current(): Camera;
+export { camera_manager as CameraManager };
+declare const camera_manager: CameraManager;
+declare class CameraManager {
+    init(): void;
+    _current: Camera;
+    _spectator: Camera;
+    set current(arg: any);
+    get current(): any;
+    set spectator(arg: any);
+    get spectator(): any;
 }

package/types/Capabilities.d.ts

@@ -1,6 +1,8 @@
-export class Capabilities {
-    static init(): void;
-    static max_anisotropy: number;
-    static vertex_texture_sampler_available: boolean;
-    static fp_textures_available: boolean;
+export { capabilities as Capabilities };
+declare const capabilities: Capabilities;
+declare class Capabilities {
+    init(): void;
+    max_anisotropy: number;
+    vertex_texture_sampler_available: boolean;
+    fp_textures_available: boolean;
 }

package/types/Configuration.d.ts

@@ -1,6 +1,8 @@
- export class Configuration {
-    static init(parameters?: {}): void;
-    static dpr: number;
-    static app: {};
-    static from_json(json: any): void;
+export { configuration as Configuration };
+declare const configuration: Configuration;
+declare class Configuration {
+    init(parameters?: {}): void;
+    dpr: number;
+    app: {};
+    from_json(json: any): void;
 }

package/types/CustomBezierCurve.d.ts

@@ -0,0 +1,7 @@
+export class CustomBezierCurve {
+    constructor(points: any);
+    original_points: any[];
+    tmp_points: any[];
+    build(point_amount: any): any[];
+    get_point_at(t: any): any;
+}

package/types/Debug.d.ts

@@ -1,38 +1,37 @@
-import { PerspectiveCamera } from "ohzi-core";
-import { AxisHelper } from "ohzi-core/types/components/AxisHelper";
-import { Arrow } from "ohzi-core/types/primitives/Arrow";
-import { Cube } from "ohzi-core/types/primitives/Cube";
-import { Sphere } from "ohzi-core/types/primitives/Sphere";
-import { Vector3 } from "three";
-
-export class Debug {
-    static init(): void;
-    static Vector3_one: any;
-    static Vector3_zero: any;
-    static canvas_renderer: any;
-    static display_texture_meshes: any[];
-    static ctx: any;
-    static scene: any;
-    static camera: PerspectiveCamera;
-    static draw_arrow(origin: any, dir: any, color?: number): Arrow
-    ;
-    static draw_axis(): AxisHelper;
-    static set_debug_RT(RT: any): void;
-    static rt_debug: any;
-    static draw_rectangle(position_2d: any, width: any, height: any, color: any): void;
-    static clear(): void;
-    static draw_line_2D(from: any, to: any, color: any): void;
-    static draw_line(points: any, color?: number): any;
-    static draw_cube(pos: any, size: any, color: any): Cube;
-    static draw_oriented_cube(from: any, to: any, height?: number, color?: string, depth?: number): Cube;
-    static draw_plane(width: any, height: any, color: any): any;
-    static draw_empty_cube(pos: any, size: any, color: any): any;
-    static draw_sphere(pos: Vector3, size: number, color: string): Sphere;
-    static draw_point_array(input_points: any, open?: boolean, color?: number): any;
-    static draw_sphere_helper(sphere: any, color: any): any;
-    static draw_math_sphere(sphere: any): void;
-    static draw_bounding_box(bb: any): void;
-    static draw_curve(curve: any, options: any): void;
-    static draw_texture(tex: any, w: any, h: any): any;
-    static render(graphics: any): void;
+export { debug as Debug };
+declare const debug: Debug;
+declare class Debug {
+    init(): void;
+    Vector3_one: any;
+    Vector3_zero: any;
+    canvas_renderer: any;
+    display_texture_meshes: any[];
+    ctx: any;
+    scene: any;
+    camera: PerspectiveCamera;
+    draw_arrow(origin: any, dir: any, color?: number): Arrow;
+    draw_axis(): AxisHelper;
+    set_debug_RT(RT: any): void;
+    rt_debug: any;
+    draw_rectangle(position_2d: any, width: any, height: any, color: any): void;
+    clear(): void;
+    draw_line_2D(from: any, to: any, color: any): void;
+    draw_line(points: any, color?: number): any;
+    draw_cube(pos: any, size: any, color: any): Cube;
+    draw_oriented_cube(from: any, to: any, height?: number, color?: string, depth?: number): Cube;
+    draw_plane(width: any, height: any, color: any): any;
+    draw_empty_cube(pos: any, size: any, color: any): any;
+    draw_sphere(pos: any, size: any, color: any): Sphere;
+    draw_point_array(input_points: any, open?: boolean, color?: number): any;
+    draw_sphere_helper(sphere: any, color: any): any;
+    draw_math_sphere(sphere: any): void;
+    draw_bounding_box(bb: any): void;
+    draw_curve(curve: any, options: any): void;
+    draw_texture(tex: any, w: any, h: any): any;
+    render(graphics: any): void;
 }
+import { PerspectiveCamera } from "./PerspectiveCamera";
+import { Arrow } from "./primitives/Arrow";
+import { AxisHelper } from "./components/AxisHelper";
+import { Cube } from "./primitives/Cube";
+import { Sphere } from "./primitives/Sphere";

package/types/EventManager.d.ts

@@ -1,42 +1,44 @@
-export class EventManager {
-    static init(): void;
-    static queue: {};
-    static zoom_changed_evt: string;
-    static store_clickd_evt: string;
-    static point_selected_evt: string;
-    static config_changed: string;
-    static path_substep_completed: string;
-    static path_completed: string;
-    static go_to_store_requested_evt: string;
-    static resource_loaded_evt: string;
-    static service_clicked_evt: string;
-    static unit_pos_updated_evt: string;
-    static floor_changed_evt: string;
-    static on_enter_floor_navigation: string;
-    static on_exit_floor_navigation: string;
-    static on_enter_floor_selection: string;
-    static on_exit_floor_selection: string;
-    static on_enter_outside_navigation: string;
-    static on_exit_outside_navigation: string;
-    static step_selected_evt: string;
-    static fire(event: any, payload: any): void;
-    static on(event: any, callback: any): void;
-    static fire_zoom_changed(zoom: any): void;
-    static fire_store_selected(store_id: any): void;
-    static fire_point_selected(hit_data: any): void;
-    static fire_config_changed(): void;
-    static fire_path_substep_completed(step_number: any): void;
-    static fire_path_completed(): void;
-    static fire_step_selected(step_index: any): void;
-    static fire_go_to_store_requested(store_id: any): void;
-    static fire_resource_loaded(resource: any): void;
-    static fire_service_clicked(service: any): void;
-    static fire_unit_position_updated(unit_data: any): void;
-    static fire_floor_switched(floor_id: any): void;
-    static fire_on_enter_floor_navigation(state: any): void;
-    static fire_on_exit_floor_navigation(state: any): void;
-    static fire_on_enter_floor_selection(state: any): void;
-    static fire_on_exit_floor_selection(state: any): void;
-    static fire_on_enter_outside_navigation(state: any): void;
-    static fire_on_exit_outside_navigation(state: any): void;
+export { event_manager as EventManager };
+declare const event_manager: EventManager;
+declare class EventManager {
+    init(): void;
+    queue: {};
+    zoom_changed_evt: string;
+    store_clickd_evt: string;
+    point_selected_evt: string;
+    config_changed: string;
+    path_substep_completed: string;
+    path_completed: string;
+    go_to_store_requested_evt: string;
+    resource_loaded_evt: string;
+    service_clicked_evt: string;
+    unit_pos_updated_evt: string;
+    floor_changed_evt: string;
+    on_enter_floor_navigation: string;
+    on_exit_floor_navigation: string;
+    on_enter_floor_selection: string;
+    on_exit_floor_selection: string;
+    on_enter_outside_navigation: string;
+    on_exit_outside_navigation: string;
+    step_selected_evt: string;
+    fire(event: any, payload: any): void;
+    on(event: any, callback: any): void;
+    fire_zoom_changed(zoom: any): void;
+    fire_store_selected(store_id: any): void;
+    fire_point_selected(hit_data: any): void;
+    fire_config_changed(): void;
+    fire_path_substep_completed(step_number: any): void;
+    fire_path_completed(): void;
+    fire_step_selected(step_index: any): void;
+    fire_go_to_store_requested(store_id: any): void;
+    fire_resource_loaded(resource: any): void;
+    fire_service_clicked(service: any): void;
+    fire_unit_position_updated(unit_data: any): void;
+    fire_floor_switched(floor_id: any): void;
+    fire_on_enter_floor_navigation(state: any): void;
+    fire_on_exit_floor_navigation(state: any): void;
+    fire_on_enter_floor_selection(state: any): void;
+    fire_on_exit_floor_selection(state: any): void;
+    fire_on_enter_outside_navigation(state: any): void;
+    fire_on_exit_outside_navigation(state: any): void;
 }

package/types/Graphics.d.ts

@@ -1,35 +1,49 @@
-
-export class Graphics {
-    static init(canvas: any, context_attributes: any): void;
-    static _renderer: any;
-    static blitter: Blitter;
-    static canvas: any;
-    static no_render: BaseRender;
-    static current_render_mode: any;
-    static generateDepthNormalTexture: boolean;
-    static depth_and_normals_renderer: DepthAndNormalsRenderer;
-    static is_webgl2: boolean;
-    static canvas_context: any;
-    static context_attributes: any;
-    static get dom_element(): any;
-    static get depth_normals_RT(): any;
-    static set_state(new_state: any): void;
-    static update(): void;
-    static __update_current_camera(): void;
-    static render(scene: any, camera: any, RT: any, override_mat: any): void;
-    static render_scene(scene: any): void;
-    static __apply_override_material(scene: any, mat: any): void;
-    static readback_RT(RT: any, buffer: any): void;
-    static clear(RT: any, camera: any, clear_depth: any, clear_stencil: any): void;
-    static on_resize(): void;
-    static material_pass(mat: any, dst: any): void;
-    static blit(src_RT: any, dst_RT: any, mat: any): void;
-    static blit_clear_with_material(dst_RT: any, mat: any): void;
-    static take_screenshot(blob_callback: any, width?: any, height?: any): void;
-    static download_screenshot(blob: any): void;
-    static dispose(): void;
+export { graphics as Graphics };
+declare const graphics: Graphics;
+declare class Graphics {
+    init(canvas: any, context_attributes: any): void;
+    _renderer: any;
+    blitter: Blitter;
+    canvas: any;
+    no_render: BaseRender;
+    current_render_mode: any;
+    generateDepthNormalTexture: boolean;
+    depth_and_normals_renderer: DepthAndNormalsRenderer;
+    is_webgl2: boolean;
+    canvas_context: any;
+    context_attributes: {
+        alpha: boolean;
+        depth: boolean;
+        desynchronized: boolean;
+        stencil: boolean;
+        antialias: boolean;
+        premultipliedAlpha: boolean;
+        preserveDrawingBuffer: boolean;
+        powerPreference: string;
+        logarithmicDepthBuffer: boolean;
+        force_webgl2: boolean;
+        xr_enabled: boolean;
+    };
+    resize_observer: ResizeObserver;
+    get dom_element(): any;
+    get depth_normals_RT(): any;
+    set_state(new_state: any): void;
+    update(): void;
+    __update_current_camera(): void;
+    render(scene: any, camera: any, RT: any, override_mat: any): void;
+    render_scene(scene: any): void;
+    __apply_override_material(scene: any, mat: any): void;
+    readback_RT(RT: any, buffer: any): void;
+    clear(RT: any, camera: any, clear_depth: any, clear_stencil: any): void;
+    on_resize(entries: any): void;
+    material_pass(mat: any, dst: any): void;
+    blit(src_RT: any, dst_RT: any, mat: any): void;
+    blit_clear_with_material(dst_RT: any, mat: any): void;
+    take_screenshot(blob_callback: any, width?: any, height?: any): void;
+    download_screenshot(blob: any): void;
+    dispose(): void;
+    is_floating_point_texture_available(): boolean;
 }
-import { BaseRender } from "ohzi-core";
-import { Blitter } from "ohzi-core/types/render_utilities/Blitter";
-import { DepthAndNormalsRenderer } from "ohzi-core/types/render_utilities/DepthAndNormalsRenderer";
-
+import { Blitter } from "./render_utilities/Blitter";
+import { BaseRender } from "./render_mode/BaseRender";
+import { DepthAndNormalsRenderer } from "./render_utilities/DepthAndNormalsRenderer";

package/types/Initializer.d.ts

@@ -1,4 +1,6 @@
- export class Initializer {
-    static init(canvas: any, app_container: any, context_attributes: any): void;
-    static dispose(render_loop: any): void;
+export { initializer as Initializer };
+declare const initializer: Initializer;
+declare class Initializer {
+    init(canvas: any, app_container: any, context_attributes: any, keyboard_input_container?: Document): void;
+    dispose(render_loop: any): void;
 }