ohzi-core 11.2.4 → 12.0.0

package/src/scenes/loading_states/LoadingState.js

@@ -0,0 +1,106 @@
+import { ResourceContainer } from 'ohzi-core';
+
+import { AsyncAudiosLoader } from '../../loaders/AsyncAudiosLoader';
+import { AsyncObjectsLoader } from '../../loaders/AsyncObjectsLoader';
+import { AsyncTexturesLoader } from '../../loaders/AsyncTexturesLoader';
+import { CompilatorManager } from './CompilatorManager';
+
+export class LoadingState
+{
+  constructor(scene, { SceneCompilator, TexturesCompilator, AudiosCompilator })
+  {
+    this.scene = scene;
+
+    this.SceneCompilator = SceneCompilator;
+    this.TexturesCompilator = TexturesCompilator;
+    this.AudiosCompilator = AudiosCompilator;
+
+    this.loaders = [];
+    this.compilators = [];
+
+    this.callback_called = false;
+  }
+
+  set_assets(scene_objects, scene_textures, scene_sounds)
+  {
+    this.scene_objects = scene_objects;
+    this.scene_textures = scene_textures;
+    this.scene_sounds = scene_sounds;
+  }
+
+  get loading_progress()
+  {
+    let progress = 0;
+
+    for (let i = 0; i < this.loaders.length; i++)
+    {
+      const loader = this.loaders[i];
+      progress += loader.get_progress();
+    }
+    return progress / this.loaders.length;
+  }
+
+  load()
+  {
+    this.setup_loader();
+
+    // TODO: improve this.
+    // We call load method to one of the 3 loaders because they share the same worker.
+    this.loaders[0].load();
+  }
+
+  on_enter()
+  {
+  }
+
+  on_exit()
+  {
+  }
+
+  update()
+  {
+
+  }
+
+  setup_loader()
+  {
+    const compilators = [];
+
+    const assets_worker = ResourceContainer.get('assets_worker');
+    assets_worker.postMessage({ type: 'reset', loader_name: this.scene.name });
+
+    const object_loader = new AsyncObjectsLoader(this.scene.name, this.scene_objects, assets_worker);
+    this.loaders.push(object_loader);
+    compilators.push(new this.SceneCompilator(this.scene));
+
+    const textures_loader = new AsyncTexturesLoader(this.scene.name, this.scene_textures, assets_worker);
+    this.loaders.push(textures_loader);
+    compilators.push(new this.TexturesCompilator(textures_loader.get_assets_names()));
+
+    const audios_loader = new AsyncAudiosLoader(this.scene.name, this.scene_sounds, assets_worker);
+    this.loaders.push(audios_loader);
+    compilators.push(new this.AudiosCompilator(audios_loader.get_assets_names()));
+
+    this.compilator_manager = new CompilatorManager(compilators);
+  }
+
+  is_loaded()
+  {
+    let loaded = true;
+
+    for (let i = 0; i < this.loaders.length; i++)
+    {
+      const loader = this.loaders[i];
+
+      loaded = loaded && loader.is_loaded();
+    }
+
+    return loaded;
+  }
+
+  is_compiled()
+  {
+    this.compilator_manager.update();
+    return this.compilator_manager.is_finished();
+  }
+}

package/src/scenes/loading_states/RegularLoadingState.js

@@ -0,0 +1,41 @@
+import { LoadingState } from './LoadingState';
+
+export class RegularLoadingState extends LoadingState
+{
+  constructor(scene, compilators)
+  {
+    super(scene, compilators);
+
+    this.on_assets_ready_called = false;
+  }
+
+  on_enter()
+  {
+    super.on_enter();
+    // this.setup_loader();
+  }
+
+  on_exit()
+  {
+    super.on_exit();
+  }
+
+  update()
+  {
+    super.update();
+
+    if (this.is_loaded())
+    {
+      if (!this.on_assets_ready_called)
+      {
+        this.scene.on_assets_ready();
+        this.on_assets_ready_called = true;
+      }
+
+      if (this.is_compiled())
+      {
+        this.scene.on_assets_compiled();
+      }
+    }
+  }
+}

package/src/utilities/OMath.js

@@ -1,3 +1,4 @@
+
 class OMath
 {
   constructor()
@@ -50,6 +51,7 @@ class OMath
     projected_point.set(0, 0, 0);
 
     const points_on_plane = [];
+
     for (let i = 0; i < points.length; i++)
     {
       plane.projectPoint(points[i], projected_point);

package/src/view_components/ApplicationView.js

@@ -1,16 +1,32 @@
+import { TransitionManager } from './TransitionManager';
 import { ViewManager } from './ViewManager';
 import { ViewState } from './ViewState';
 
 class ApplicationView extends ViewState
 {
-  constructor({ name, url, container })
+  constructor({ name, url, container, transition_data })
   {
     super(name);
 
     this.container = container;
     this.url = url;
 
+    this.current_opacity = 0;
+
+    transition_data = transition_data || {
+      animation_tracks: [],
+      triggers: []
+    };
+
+    const transitions = [
+      {
+        to: name,
+        data: transition_data
+      }
+    ];
+
     ViewManager.register_view(this);
+    TransitionManager.add_transitions(transitions);
   }
 
   before_enter()
@@ -41,9 +57,16 @@ class ApplicationView extends ViewState
     this.container.classList.remove('before_exit');
   }
 
-  set_opacity(opacity)
+  set_opacity(current_state_data)
   {
-    this.container.style.opacity = opacity;
+    const opacity = current_state_data[`${this.name}_opacity`];
+
+    if (this.current_opacity > opacity || this.current_opacity < opacity)
+    {
+      this.current_opacity = opacity;
+
+      this.container.style.opacity = this.current_opacity;
+    }
   }
 }
 

package/src/view_components/TransitionManager.js

@@ -19,6 +19,16 @@ class TransitionManager
     return this.transition_handler.current_state_data;
   }
 
+  get_current_state()
+  {
+    return this.transition_handler.current_state;
+  }
+
+  go_to_state(state, skip = false)
+  {
+    this.transition_handler.go_to_state(state, skip);
+  }
+
   before_update()
   {
     this.transition_handler.before_update();
@@ -44,6 +54,11 @@ class TransitionManager
     this.transition_table.set_transitions(transitions);
   }
 
+  set_state(state)
+  {
+    this.transition_handler.set_state(state);
+  }
+
   set_default_state_data(default_state_data)
   {
     this.transition_table.set_default_state_data(default_state_data);

package/src/view_components/ViewComponent.js

@@ -1,13 +1,12 @@
 import { ViewComponentManager } from './ViewComponentManager';
 
-class ViewComponent
+export class ViewComponent
 {
   constructor({ name, container })
   {
     this.name = name;
     this.container = container;
-
-    // this.hidden = true;
+    this.hidden = true;
 
     ViewComponentManager.register_component(this);
   }
@@ -19,10 +18,9 @@ class ViewComponent
   on_enter()
   {
     this.container.classList.remove('hidden');
-
-    // this.hidden = false;
-
     ViewComponentManager.enable_component(this);
+
+    this.hidden = false;
   }
 
   update()
@@ -32,16 +30,32 @@ class ViewComponent
   on_exit()
   {
     this.container.classList.add('hidden');
+    ViewComponentManager.disable_component(this);
 
-    // this.hidden = true;
+    this.hidden = true;
+  }
 
-    ViewComponentManager.disable_component(this);
+  set_opacity(current_state_data)
+  {
+    this.container.style.opacity = current_state_data[`${this.name}_opacity`];
+    this.toggle_hidden();
   }
 
-  set_opacity(opacity)
+  toggle_hidden()
   {
-    this.container.style.opacity = opacity;
+    if (this.container.style.opacity > 0.001)
+    {
+      if (this.hidden)
+      {
+        this.on_enter();
+      }
+    }
+    else
+    {
+      if (!this.hidden)
+      {
+        this.on_exit();
+      }
+    }
   }
 }
-
-export { ViewComponent };

package/src/view_components/ViewComponentManager.js

@@ -25,14 +25,24 @@ class ViewComponentManager
 
   enable_component(component)
   {
+    // const component_to_enable = this.get_component_by_name(component_name);
+
     this.enabled_components.add(component);
   }
 
   disable_component(component)
   {
+    // const component_to_disable = this.get_component_by_name(component_name);
+
     this.enabled_components.delete(component);
   }
 
+  get_component_by_name(component_name)
+  {
+    console.warn('DEPRECATED. Use ViewComponentManager.get instead');
+    this.get(component_name);
+  }
+
   get(component_name)
   {
     for (let i = 0; i < this.components.length; i++)

package/src/view_components/ViewManager.js

@@ -1,14 +1,19 @@
+import { TransitionManager } from './TransitionManager';
 
 class ViewManager
 {
   constructor()
   {
     this.views = [];
-    this.main_to_worker = undefined;
 
     this.browser_title_suffix = '';
   }
 
+  update()
+  {
+    this.__set_views_opacities();
+  }
+
   go_to_view(view_name, change_url = true, skip = false)
   {
     const v = this.get(view_name);
@@ -19,23 +24,58 @@ class ViewManager
       this.__change_browser_title(v.url);
     }
 
-    this.main_to_worker.push('go_to_view_controller', [view_name, skip]);
+    TransitionManager.go_to_state(v, 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_name(scene_name);
-
+    transition_view.set_next_view(next_view);
     this.go_to_view(transition_view.name, change_url, skip);
   }
 
+  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;
+  }
+
+  set_view(view_name)
+  {
+    const view = this.get(view_name);
+
+    TransitionManager.set_state(view);
+  }
+
   set_browser_title_suffix(title_suffix)
   {
     this.browser_title_suffix = title_suffix;
   }
 
+  get_current_view()
+  {
+    return TransitionManager.get_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++)
@@ -62,16 +102,6 @@ class ViewManager
     return undefined;
   }
 
-  register_view(view)
-  {
-    this.views.push(view);
-  }
-
-  set_main_to_worker(main_to_worker)
-  {
-    this.main_to_worker = main_to_worker;
-  }
-
   __change_browser_url(url)
   {
     window.history.pushState('', '', url);
@@ -84,6 +114,14 @@ 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(TransitionManager.current_state_data);
+    }
+  }
+
   __capitalize(string)
   {
     let aux_string = string.toUpperCase().replace('/', '');

package/src/view_components/ViewState.js

@@ -17,31 +17,31 @@ class ViewState
   {
   }
 
-  before_update()
+  before_exit()
   {
   }
 
-  update()
+  on_exit()
   {
   }
 
-  fixed_update()
+  before_update()
   {
   }
 
-  update_enter_transition(global_view_data, transition_progress, action_sequencer)
+  update()
   {
   }
 
-  update_exit_transition(global_view_data, transition_progress, action_sequencer)
+  fixed_update()
   {
   }
 
-  before_exit()
+  update_enter_transition(global_view_data, transition_progress, action_sequencer)
   {
   }
 
-  on_exit()
+  update_exit_transition(global_view_data, transition_progress, action_sequencer)
   {
   }
 }

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, transitions_velocity)
+  from_animation_sheet(animation_data, current_context, initial_context)
   {
     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, transitions_velocity);
+    const sequencer = new ActionSequencer(current_context);
 
     for (let i = 0; i < tracks.length; i++)
     {

package/src/view_components/transition/TransitionTable.js

@@ -6,8 +6,6 @@ class TransitionTable
   {
     this.transitions = [];
     this.default_state_data = {};
-
-    this.transitions_velocity = 1;
   }
 
   get(from_state_name, to_state_name, current_context)
@@ -16,7 +14,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, this.transitions_velocity);
+        const action_sequencer = new ActionSequencerBuilder(this.default_state_data).from_animation_sheet(this.transitions[i].data, current_context);
         return action_sequencer;
       }
     }
@@ -25,7 +23,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, this.transitions_velocity);
+        const action_sequencer = new ActionSequencerBuilder(this.default_state_data).from_animation_sheet(this.transitions[i].data, current_context);
         return action_sequencer;
       }
     }
@@ -51,11 +49,6 @@ 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,5 +8,4 @@ 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(opr: any, chrome: any): void;
+    init(): void;
     browser_name: string;
     agent: string;
     vr_browser_keywords: string[];

package/types/CameraManager.d.ts

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

package/types/Graphics.d.ts

@@ -1,13 +1,7 @@
 export { graphics as Graphics };
 declare const graphics: Graphics;
 declare class Graphics {
-    init({ canvas, core_attributes, context_attributes, threejs_attributes, dpr }: {
-        canvas: any;
-        core_attributes: any;
-        context_attributes: any;
-        threejs_attributes: any;
-        dpr: any;
-    }): void;
+    init(canvas: any, core_attributes: any, context_attributes: any, threejs_attributes: any): void;
     _renderer: any;
     blitter: Blitter;
     canvas: any;
@@ -35,6 +29,7 @@ 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;
@@ -45,7 +40,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, dpr: 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;

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(): void;
+    dispose(render_loop: any): void;
 }

package/types/RenderLoop.d.ts

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

package/types/SceneManager.d.ts

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

package/types/Time.d.ts

@@ -18,11 +18,6 @@ declare class Time {
     get fdt(): number;
     get dt(): any;
     get sdt(): any;
-    to_json(): {
-        elapsed_time: any;
-        delta_time: any;
-        smooth_delta_time: any;
-    };
     __set_frame_interpolation(value: any): void;
     __update(): void;
     __calculate_smooth_delta_time(): void;

package/types/action_sequencer/ActionSequencer.d.ts

@@ -1,5 +1,5 @@
 export class ActionSequencer {
-    constructor(context: {}, transitions_velocity: any);
+    constructor(context?: {});
     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(transitions_velocity: any): number;
+    __get_playback_speed(): number;
 }

package/types/canvas_drawer/SimpleTextDrawer.d.ts

@@ -1,5 +1,6 @@
 export class SimpleTextDrawer extends CanvasDrawer {
     constructor();
     text_margin: any;
+    __draw(text: any, ctxOptions: any, canvas: any, ctx: any): void;
 }
 import { CanvasDrawer } from "./CanvasDrawer";