ohzi-core 10.6.7 → 11.0.1

package/src/view_components/ViewControllerManager.js

@@ -0,0 +1,91 @@
+import { TransitionManager } from './TransitionManager';
+
+class ViewControllerManager
+{
+  constructor()
+  {
+    this.view_controllers = [];
+  }
+
+  go_to_view_controller(view_controller_name, skip = false)
+  {
+    const v = this.get(view_controller_name);
+    TransitionManager.transition_handler.go_to_state(v, skip);
+  }
+
+  update()
+  {
+    this.__set_view_controllers_opacities();
+  }
+
+  register_view_controller(view_controller)
+  {
+    this.view_controllers.push(view_controller);
+  }
+
+  set_view_controller(view_controller_name)
+  {
+    const view_controller = this.get(view_controller_name);
+
+    TransitionManager.transition_handler.set_state(view_controller);
+  }
+
+  get_current_view_controller()
+  {
+    return TransitionManager.transition_handler.current_state;
+  }
+
+  get(view_controller_name)
+  {
+    for (let i = 0; i < this.view_controllers.length; i++)
+    {
+      if (this.view_controllers[i].name === view_controller_name)
+      {
+        return this.view_controllers[i];
+      }
+    }
+    console.error('[ViewControllerManager.get] no view controller found for: ', view_controller_name);
+    return undefined;
+  }
+
+  // get_by_url(url)
+  // {
+  //   for (let i = 0; i < this.view_controllers.length; i++)
+  //   {
+  //     if (this.view_controllers[i].url === url)
+  //     {
+  //       return this.view_controllers[i];
+  //     }
+  //   }
+  //   console.error('[ViewControllerManager.get_by_url] no view controller found for: ', url);
+  //   return undefined;
+  // }
+
+  __set_view_controllers_opacities()
+  {
+    for (let i = 0; i < this.view_controllers.length; i++)
+    {
+      this.view_controllers[i].set_opacity(TransitionManager.transition_handler.current_state_data);
+    }
+  }
+
+  __capitalize(string)
+  {
+    let aux_string = string.toUpperCase().replace('/', '');
+    aux_string = this.__snake_to_whitespace(aux_string);
+
+    return aux_string;
+  }
+
+  __snake_to_whitespace(string)
+  {
+    return string.replace(
+      /([-_][A-Z])/g,
+      (group) => group
+        .replace('-', ' ')
+        .replace('_', ' ')
+    );
+  }
+}
+
+export { ViewControllerManager };

package/src/view_components/ViewManager.js

@@ -1,41 +1,17 @@
-import { TransitionTable } from './transition/TransitionTable';
-import { ViewStateTransitionHandler } from './transition/ViewStateTransitionHandler';
 
 class ViewManager
 {
   constructor()
   {
     this.views = [];
-
-    this.transition_table = new TransitionTable();
-    this.transition_handler = new ViewStateTransitionHandler(this.transition_table);
-
-    this.view_change_subscribers = [];
+    this.main_to_worker = undefined;
 
     this.browser_title_suffix = '';
   }
 
-  before_update()
-  {
-    this.transition_handler.before_update();
-  }
-
-  update()
-  {
-    this.transition_handler.update();
-
-    this.__set_views_opacities();
-  }
-
-  fixed_update()
-  {
-    this.transition_handler.fixed_update();
-  }
-
   go_to_view(view_name, change_url = true, skip = false)
   {
     const v = this.get(view_name);
-    this.transition_handler.go_to_state(v, skip);
 
     if (change_url)
     {
@@ -43,64 +19,16 @@ class ViewManager
       this.__change_browser_title(v.url);
     }
 
-    this.notify_view_change(view_name);
+    this.main_to_worker.post('go_to_view_controller', { view_controller_name: view_name, skip });
   }
 
   go_to_scene(scene_name, change_url = false, skip = false)
   {
-    const next_view = this.get(scene_name);
     const transition_view = this.get('transition');
 
-    transition_view.set_next_view(next_view);
-    this.go_to_view(transition_view.name, change_url, skip);
-  }
-
-  subscribe_to_view_change(subscriber)
-  {
-    this.view_change_subscribers.push(subscriber);
-  }
+    transition_view.set_next_view_name(scene_name);
 
-  notify_view_change(view_name)
-  {
-    for (let i = 0; i < this.view_change_subscribers.length; i++)
-    {
-      const subscriber = this.view_change_subscribers[i];
-      subscriber.on_view_change(view_name);
-    }
-  }
-
-  register_view(view)
-  {
-    this.views.push(view);
-  }
-
-  has_view(view_name)
-  {
-    for (let i = 0; i < this.views.length; i++)
-    {
-      if (this.views[i].name === view_name)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  add_transitions(transitions)
-  {
-    this.transition_table.add_transitions(transitions);
-  }
-
-  set_transitions(transitions)
-  {
-    this.transition_table.set_transitions(transitions);
-  }
-
-  set_view(view_name)
-  {
-    const view = this.get(view_name);
-
-    this.transition_handler.set_state(view);
+    this.go_to_view(transition_view.name, change_url, skip);
   }
 
   set_browser_title_suffix(title_suffix)
@@ -108,17 +36,6 @@ class ViewManager
     this.browser_title_suffix = title_suffix;
   }
 
-  get_current_view()
-  {
-    return this.transition_handler.current_state;
-  }
-
-  get_view_by_name(view_name)
-  {
-    console.warn('DEPRECATED. Use ViewManager.get instead');
-    this.get(view_name);
-  }
-
   get(view_name)
   {
     for (let i = 0; i < this.views.length; i++)
@@ -132,12 +49,6 @@ class ViewManager
     return undefined;
   }
 
-  get_view_by_url(url)
-  {
-    console.warn('DEPRECATED. Use ViewManager.get_by_url instead');
-    this.get_by_url(url);
-  }
-
   get_by_url(url)
   {
     for (let i = 0; i < this.views.length; i++)
@@ -151,10 +62,14 @@ class ViewManager
     return undefined;
   }
 
-  set_default_state_data(default_state_data)
+  register_view(view)
+  {
+    this.views.push(view);
+  }
+
+  set_main_to_worker(main_to_worker)
   {
-    this.transition_table.set_default_state_data(default_state_data);
-    this.transition_handler.set_default_state_data(default_state_data);
+    this.main_to_worker = main_to_worker;
   }
 
   __change_browser_url(url)
@@ -169,14 +84,6 @@ class ViewManager
     document.title = title ? `${title} | ${this.browser_title_suffix}` : this.browser_title_suffix;
   }
 
-  __set_views_opacities()
-  {
-    for (let i = 0; i < this.views.length; i++)
-    {
-      this.views[i].set_opacity(this.transition_handler.current_state_data);
-    }
-  }
-
   __capitalize(string)
   {
     let aux_string = string.toUpperCase().replace('/', '');

package/src/view_components/ViewState.js

@@ -39,19 +39,12 @@ class ViewState
 
   update_enter_transition(global_view_data, transition_progress, action_sequencer)
   {
-    // Backward compatibility. It will be removed in future releases.
-    this.update_transition(global_view_data, transition_progress, action_sequencer);
   }
 
   update_exit_transition(global_view_data, transition_progress, action_sequencer)
   {
   }
 
-  // Deprecated
-  update_transition(global_view_data, transition_progress, action_sequencer)
-  {
-  }
-
   before_exit()
   {
   }

package/src/view_components/WorkerToMain.js

@@ -0,0 +1,25 @@
+
+class WorkerToMain
+{
+  constructor()
+  {
+    // TODO: Use SharedArrayBuffer?
+    this.methods = [];
+    this.args = [];
+  }
+
+  push(method, args = [])
+  {
+    this.methods.push(method);
+    this.args.push(args);
+  }
+
+  clear()
+  {
+    this.methods = [];
+    this.args = [];
+  }
+}
+
+const worker_to_main = new WorkerToMain();
+export { worker_to_main as WorkerToMain };

package/src/view_components/transition/ActionSequencerBuilder.js

@@ -1,6 +1,6 @@
+import { ActionEvent } from '../../action_sequencer/ActionEvent';
 import { ActionSequencer } from '../../action_sequencer/ActionSequencer';
 import { NumberInterpolator } from '../../action_sequencer/NumberInterpolator';
-import { ActionEvent } from '../../action_sequencer/ActionEvent';
 import { DrawIOAnimationSheet } from './DrawIOAnimationSheet';
 
 class ActionSequencerBuilder
@@ -10,7 +10,7 @@ class ActionSequencerBuilder
     this.default_state_data = default_state_data;
   }
 
-  from_animation_sheet(animation_data, current_context, initial_context)
+  from_animation_sheet(animation_data, current_context, initial_context, transitions_velocity)
   {
     initial_context = initial_context || this.default_state_data;
     const tracks = animation_data.animation_tracks;
@@ -26,7 +26,7 @@ class ActionSequencerBuilder
       }
     }
 
-    const sequencer = new ActionSequencer(current_context);
+    const sequencer = new ActionSequencer(current_context, transitions_velocity);
 
     for (let i = 0; i < tracks.length; i++)
     {

package/src/view_components/transition/TransitionTable.js

@@ -6,6 +6,8 @@ class TransitionTable
   {
     this.transitions = [];
     this.default_state_data = {};
+
+    this.transitions_velocity = 1;
   }
 
   get(from_state_name, to_state_name, current_context)
@@ -14,7 +16,7 @@ class TransitionTable
     {
       if (this.transitions[i].from === from_state_name && this.transitions[i].to === to_state_name)
       {
-        const action_sequencer = new ActionSequencerBuilder(this.default_state_data).from_animation_sheet(this.transitions[i].data, current_context);
+        const action_sequencer = new ActionSequencerBuilder(this.default_state_data).from_animation_sheet(this.transitions[i].data, current_context, this.transitions_velocity);
         return action_sequencer;
       }
     }
@@ -23,7 +25,7 @@ class TransitionTable
     {
       if (this.transitions[i].to === to_state_name && this.transitions[i].from === undefined)
       {
-        const action_sequencer = new ActionSequencerBuilder(this.default_state_data).from_animation_sheet(this.transitions[i].data, current_context);
+        const action_sequencer = new ActionSequencerBuilder(this.default_state_data).from_animation_sheet(this.transitions[i].data, current_context, this.transitions_velocity);
         return action_sequencer;
       }
     }
@@ -49,6 +51,11 @@ class TransitionTable
   {
     this.default_state_data = default_state_data;
   }
+
+  set_transitions_velocity(transitions_velocity)
+  {
+    this.transitions_velocity = transitions_velocity;
+  }
 }
 
 export { TransitionTable };

package/types/BaseApplication.d.ts

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

package/types/Browser.d.ts

@@ -1,7 +1,7 @@
 export { browser as Browser };
 declare const browser: Browser;
 declare class Browser {
-    init(): void;
+    init(opr: any, chrome: any): void;
     browser_name: string;
     agent: string;
     vr_browser_keywords: string[];

package/types/CameraManager.d.ts

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

package/types/Graphics.d.ts

@@ -1,7 +1,13 @@
 export { graphics as Graphics };
 declare const graphics: Graphics;
 declare class Graphics {
-    init(canvas: any, core_attributes: any, context_attributes: any, threejs_attributes: any): void;
+    init({ canvas, core_attributes, context_attributes, threejs_attributes, dpr }: {
+        canvas: any;
+        core_attributes: any;
+        context_attributes: any;
+        threejs_attributes: any;
+        dpr: any;
+    }): void;
     _renderer: any;
     blitter: Blitter;
     canvas: any;
@@ -29,7 +35,6 @@ declare class Graphics {
     threejs_attributes: {
         logarithmicDepthBuffer: boolean;
     };
-    resize_observer: ResizeObserver;
     get dom_element(): any;
     get depth_normals_RT(): any;
     set_state(new_state: any): void;
@@ -40,7 +45,7 @@ declare class Graphics {
     __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;
+    on_resize(entries: any, dpr: 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;

package/types/Initializer.d.ts

@@ -2,5 +2,5 @@ export { initializer as Initializer };
 declare const initializer: Initializer;
 declare class Initializer {
     init(input: any): void;
-    dispose(render_loop: any): void;
+    dispose(): void;
 }

package/types/RenderLoop.d.ts

@@ -1,8 +1,7 @@
 export class RenderLoop {
-    constructor(target_application: any, graphics: any, input: any);
+    constructor(target_application: any, graphics: any);
     target_application: any;
     graphics: any;
-    input: any;
     is_running: boolean;
     frames_passed: number;
     time_accumulator: number;

package/types/SceneManager.d.ts

@@ -2,11 +2,9 @@ export { scene_manager as SceneManager };
 declare const scene_manager: SceneManager;
 declare class SceneManager {
     init(): void;
-    _current: Scene;
+    _current: any;
     add_scene(name: any): void;
     set current(arg: any);
     get current(): any;
     dispose(): void;
 }
-
-import { Scene } from "three";

package/types/action_sequencer/ActionSequencer.d.ts

@@ -1,5 +1,5 @@
 export class ActionSequencer {
-    constructor(context?: {});
+    constructor(context: {}, transitions_velocity: any);
     previous_elapsed_time: number;
     elapsed_time: number;
     playback_speed: number;
@@ -32,5 +32,5 @@ export class ActionSequencer {
     is_channel_redefined(channel_name: any): boolean;
     __linear_map_01(value: any, from_range_start_value: any, from_range_end_value: any): number;
     __get_current_keyframe(channel_name: any, time: any): any;
-    __get_playback_speed(): number;
+    __get_playback_speed(transitions_velocity: any): number;
 }

package/types/blitter_index.d.ts

@@ -0,0 +1,6 @@
+import { MedianFilter } from "./render_utilities/MedianFilter";
+import { GaussianBlurrer } from "./render_utilities/GaussianBlurrer";
+import { Blurrer } from "./render_utilities/Blurrer";
+import { Blitter } from "./render_utilities/Blitter";
+import { DualFilteringBlurMaterial } from "./materials/DualFilteringBlurMaterial";
+export { MedianFilter, GaussianBlurrer, Blurrer, Blitter, DualFilteringBlurMaterial };