ohzi-core 11.2.4 → 12.0.0

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "ohzi-core",
-  "sideEffects": false,
-  "version": "11.2.4",
+  "version": "12.0.0",
   "description": "OHZI Interactive Core Library",
   "source": "src/index.js",
-  "module": "build/index.module.js",
+  "module": "build/index.mjs",
   "types": "types/index.d.ts",
+  "sideEffects": false,
   "files": [
     "build",
     "LICENSE",
@@ -15,6 +15,7 @@
   ],
   "scripts": {
     "preinstall": "yarn config-hooks",
+    "start": "rollup -w -c",
     "config-hooks": "git config core.hooksPath git_hooks",
     "build": "rollup -c",
     "create-tag": "node tasks/app/create_tag.mjs",
@@ -44,7 +45,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "three": "0.161.0"
+    "three": "0.166.0"
   },
   "standardx": {
     "ignore": [
@@ -52,10 +53,11 @@
     ]
   },
   "devDependencies": {
-    "@rollup/plugin-terser": "^0.4.4",
-    "rollup": "4.1.4",
-    "rollup-plugin-glslify": "^1.3.1",
+    "rollup": "^2.44.0",
+    "rollup-plugin-glslify": "^1.2.0",
+    "rollup-plugin-sourcemaps": "^0.6.3",
+    "rollup-plugin-terser": "^7.0.2",
     "standardx": "^7.0.0",
-    "typescript": "4.4.4"
+    "typescript": "^4.4.3"
   }
 }

package/src/BaseApplication.js

@@ -26,9 +26,6 @@ class BaseApplication
 
   on_frame_end()
   {}
-
-  dispose()
-  {}
 }
 
 export { BaseApplication };

package/src/Browser.js

@@ -1,10 +1,10 @@
 
 class Browser
 {
-  async init(opr, chrome)
+  async init()
   {
     this.browser_name = '';
-    this.agent = navigator.userAgent.toLowerCase();
+    this.agent = window.navigator.userAgent.toLowerCase();
 
     this.has_web_xr_support = 'xr' in navigator;
     this.is_vr = this.has_web_xr_support && await navigator.xr.isSessionSupported('immersive-vr');
@@ -17,10 +17,10 @@ class Browser
     case this.agent.indexOf('edg') > -1:
       this.browser_name = 'edge_chromium';
       break;
-    case this.agent.indexOf('opr') > -1 && !!opr:
+    case this.agent.indexOf('opr') > -1 && !!window.opr:
       this.browser_name = 'opera';
       break;
-    case this.agent.indexOf('chrome') > -1 && !!chrome:
+    case this.agent.indexOf('chrome') > -1 && !!window.chrome:
       this.browser_name = 'chrome';
       break;
     case this.agent.indexOf('trident') > -1:

package/src/Initializer.js

@@ -1,3 +1,4 @@
+import { Browser } from './Browser';
 import { CameraManager } from './CameraManager';
 import { Capabilities } from './Capabilities';
 import { Debug } from './Debug';
@@ -26,6 +27,7 @@ class Initializer
     GeometryBatcher.init();
 
     OS.init();
+    Browser.init();
     ReflectionPlaneContext.init();
     ResourceContainer.init();
     SceneManager.init();
@@ -36,10 +38,12 @@ class Initializer
     Debug.init();
   }
 
-  dispose()
+  dispose(render_loop)
   {
     Graphics.dispose();
     SceneManager.dispose();
+
+    render_loop.dispose();
   }
 }
 

package/src/OS.js

@@ -23,8 +23,8 @@ class OS
 
   get_os()
   {
-    const userAgent = navigator.userAgent;
-    const platform = navigator.platform;
+    const userAgent = window.navigator.userAgent;
+    const platform = window.navigator.platform;
     const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'];
     const windowsPlatforms = ['Win32', 'Win64', 'Windows', 'WinCE'];
     const iosPlatforms = ['iPhone', 'iPad', 'iPod'];

package/src/RenderLoop.js

@@ -3,17 +3,18 @@ import { Debug } from './Debug';
 import { Time } from './Time';
 import { UI } from './UI';
 import { TransitionManager } from './view_components/TransitionManager';
-import { VCManager } from './view_components/VCManager';
-import { ViewComponentControllerManager } from './view_components/ViewComponentControllerManager';
+import { ViewComponentManager } from './view_components/ViewComponentManager';
+import { ViewManager } from './view_components/ViewManager';
 
 class RenderLoop
 {
-  constructor(target_application, graphics)
+  constructor(target_application, graphics, input)
   {
     target_application = target_application || new BaseApplication();
 
     this.target_application = target_application;
     this.graphics = graphics;
+    this.input = input;
 
     this.is_running = false;
     this.frames_passed = 0;
@@ -27,7 +28,6 @@ class RenderLoop
     {
       return;
     }
-
     Time.__update();
 
     // ###### START CYCLE ######
@@ -36,6 +36,8 @@ class RenderLoop
       this.target_application.on_post_start();
     }
 
+    this.input.update();
+
     this.time_accumulator += Time.delta_time;
 
     this.target_application.before_update();
@@ -48,21 +50,19 @@ class RenderLoop
 
       this.time_accumulator -= Time.fixed_delta_time;
     }
-
     Time.__set_frame_interpolation(this.time_accumulator / Time.fixed_delta_time);
 
     this.target_application.update();
 
     TransitionManager.update();
-    VCManager.update();
-    ViewComponentControllerManager.update();
+    ViewManager.update();
+    ViewComponentManager.update();
 
     this.target_application.on_pre_render();
 
     this.graphics.update();     // render scene
     UI.update();                // update after new camera matrix has been calculated
     UI.render(this.graphics);   // render ui layer on top
-
     this.target_application.on_post_render();
 
     Debug.render(this.graphics);             // render debug layer
@@ -70,9 +70,9 @@ class RenderLoop
     // ###### END  CYCLE #######
 
     this.target_application.on_frame_end();
-
     this.frames_passed++;
 
+    this.input.clear();
     UI.clear();
     Debug.clear();
   }

package/src/ResourceContainer.js

@@ -1,4 +1,3 @@
-
 class ResourceContainer
 {
   init()

package/src/Screen.js

@@ -0,0 +1,55 @@
+import { OScreen } from './OScreen';
+
+class Screen
+{
+  init()
+  {
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    OScreen.init();
+  }
+
+  update_position(x, y)
+  {
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    OScreen.update_position(x, y);
+  }
+
+  update()
+  {
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    OScreen.update();
+  }
+
+  update_size(width, height)
+  {
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    OScreen.update_size(width, height);
+  }
+
+  apply_pixel_density_v2(vector2)
+  {
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    return OScreen.apply_pixel_density_v2(vector2);
+  }
+
+  apply_pixel_density(value)
+  {
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    return OScreen.apply_pixel_density(value);
+  }
+
+  get_pixel_size()
+  {
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    return OScreen.get_pixel_size();
+  }
+
+  get aspect_ratio()
+  {
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    return OScreen.aspect_ratio;
+  }
+}
+
+const screen = new Screen();
+export { screen as Screen };

package/src/Time.js

@@ -1,4 +1,5 @@
-import { Clock, Vector2 } from 'three';
+import { Vector2 } from 'three';
+import { Clock } from 'three';
 
 class Time
 {
@@ -60,19 +61,6 @@ class Time
     return this.smooth_delta_time;
   }
 
-  to_json()
-  {
-    const data = {
-
-      elapsed_time: this.elapsed_time,
-      delta_time: this.delta_time,
-      smooth_delta_time: this.smooth_delta_time
-
-    };
-
-    return data;
-  }
-
   __set_frame_interpolation(value)
   {
     this.__frame_interpolation_t = value;

package/src/action_sequencer/ActionSequencer.js

@@ -3,11 +3,11 @@ import { OMath } from '../utilities/OMath';
 
 class ActionSequencer
 {
-  constructor(context = {}, transitions_velocity)
+  constructor(context = {})
   {
     this.previous_elapsed_time = -0.00001;
     this.elapsed_time = -0.00001;
-    this.playback_speed = this.__get_playback_speed(transitions_velocity);
+    this.playback_speed = this.__get_playback_speed();
     this.playing = true;
 
     this.action_events = [];
@@ -255,8 +255,12 @@ class ActionSequencer
     return current;
   }
 
-  __get_playback_speed(transitions_velocity)
+  __get_playback_speed()
   {
+    const url_params = new URLSearchParams(window.location.search);
+
+    const transitions_velocity = url_params.get('transitions_velocity');
+
     if (transitions_velocity)
     {
       return Number(transitions_velocity);

package/src/gpu_particles/ParticleAttribute.js

@@ -1,6 +1,6 @@
 import { Graphics } from '../Graphics';
 
-import { FloatType, HalfFloatType, LinearSRGBColorSpace, NearestFilter, RGBAFormat, WebGLRenderTarget } from 'three';
+import { FloatType, HalfFloatType, NearestFilter, NoColorSpace, RGBAFormat, WebGLRenderTarget } from 'three';
 import { Capabilities } from '../Capabilities';
 
 class ParticleAttribute
@@ -32,7 +32,7 @@ class ParticleAttribute
       minFilter: NearestFilter,
       magFilter: NearestFilter,
       format: RGBAFormat,
-      colorSpace: LinearSRGBColorSpace,
+      colorScape: NoColorSpace,
       type: Capabilities.fp_textures_available ? FloatType : HalfFloatType,
       stencilBuffer: false,
       depthBuffer: false

package/src/index.js

@@ -5,10 +5,12 @@ import { BlitMaterial } from './materials/BlitMaterial';
 import { UnrealBloomComposeMaterial } from './materials/UnrealBloomComposeMaterial';
 import { BaseRender } from './render_mode/BaseRender';
 import { AbstractLoader } from './resource_loader/AbstractLoader';
+import { AbstractScene } from './scenes/AbstractScene';
+import { HighQualityLoadingState } from './scenes/loading_states/HighQualityLoadingState';
+import { LoadingState } from './scenes/loading_states/LoadingState';
+import { RegularLoadingState } from './scenes/loading_states/RegularLoadingState';
 import { ApplicationView } from './view_components/ApplicationView';
-import { ApplicationViewController } from './view_components/ApplicationViewController';
 import { ActionSequencerBuilder } from './view_components/transition/ActionSequencerBuilder';
-import { WorkerToMain } from './view_components/WorkerToMain';
 
 import { Browser } from './Browser';
 import { CameraManager } from './CameraManager';
@@ -31,15 +33,12 @@ import { UnrealBloomRender } from './render_mode/UnrealBloomRender';
 import { VRRender } from './render_mode/VRRender';
 import { RenderLoop } from './RenderLoop';
 import { SceneManager } from './SceneManager';
+import { Screen } from './Screen';
 import { Time } from './Time';
 import { UI } from './UI';
 import { DrawIOAnimationSheet } from './view_components/transition/DrawIOAnimationSheet';
 import { TransitionTable } from './view_components/transition/TransitionTable';
-import { TransitionManager } from './view_components/TransitionManager';
-import { VCManager } from './view_components/VCManager';
 import { ViewComponent } from './view_components/ViewComponent';
-import { ViewComponentController } from './view_components/ViewComponentController';
-import { ViewComponentControllerManager } from './view_components/ViewComponentControllerManager';
 import { ViewComponentManager } from './view_components/ViewComponentManager';
 import { ViewManager } from './view_components/ViewManager';
 
@@ -113,15 +112,22 @@ import { TextLoader } from './resource_loader/TextLoader';
 import { TextureLoader } from './resource_loader/TextureLoader';
 import { VideoLoader } from './resource_loader/VideoLoader';
 
+import { AsyncAbstractLoader } from './loaders/AsyncAbstractLoader';
+import { AsyncAudiosLoader } from './loaders/AsyncAudiosLoader';
+import { AsyncObjectsLoader } from './loaders/AsyncObjectsLoader';
+import { AsyncTexturesLoader } from './loaders/AsyncTexturesLoader';
 import { ResourceBatch } from './resource_loader/ResourceBatch';
 import { ResourceContainer } from './ResourceContainer';
+import { TransitionManager } from './view_components/TransitionManager';
 
 export {
-  AbstractLoader, ActionEvent, ActionInterpolator, ActionSequencer, ActionSequencerBuilder, AddMaterial, ApplicationView, ApplicationViewController, ArrayUtilities, Arrow, AsyncTextureLoader, AudioLoader, BaseApplication, BaseRender, BaseShaderMaterial, BasisLoader, BlitMaterial, Blurrer, Browser, BufferGeometryUtils, CameraManager, CameraUtilities, CanvasDrawer, Capabilities,
+  AbstractLoader, AbstractScene, ActionEvent, ActionInterpolator, ActionSequencer, ActionSequencerBuilder, AddMaterial, ApplicationView, ArrayUtilities, Arrow, AsyncAbstractLoader, AsyncAudiosLoader, AsyncObjectsLoader, AsyncTextureLoader, AsyncTexturesLoader, AudioLoader, BaseApplication, BaseRender, BaseShaderMaterial, BasisLoader, BlitMaterial, Blurrer, Browser, BufferGeometryUtils, CameraManager, CameraUtilities, CanvasDrawer, Capabilities,
   CSSAnimator, Cube, CubemapLoader, DAELoader, Debug, DebugNormalsRender, DrawIOAnimationSheet, DualFilteringBlurMaterial, DualFilteringBlurrer, EasingFunctions, FileLoader,
-  FontLoader, FrustumPointFitter, GaussianBlurrer, GeometryUtilities, GLTFDRACOLoader, GLTFLoader, GPUParticleSystem, Graphics, Grid, HDRCubeTextureLoader, HorizontalPlane, HTMLUtilities,
-  ImageUtilities, Initializer, JSONLoader, KeyboardInput, Line, MedianFilter, MeshBatcher, MeshSampler,
-  ModelUtilities, NormalAORender, NormalRender, NumberInterpolator, ObjectUtilities, OBJLoader, OMath, OrthographicCamera, OrthographicFrustumPointFitter, OS, OScreen, ParticleAttribute,
-  ParticlePositionAttribute, PerspectiveCamera, PerspectiveFrustumPointFitter, PointArrayLoader, RenderLoop, ResourceBatch,
-  ResourceContainer, RGBETextureLoader, SceneManager, SDFTextBatch, SimpleTextDrawer, Sphere, StringUtilities, Text2D, TextLoader, TextureLoader, Time, TimeUtilities, TransitionManager, TransitionTable, UI, UIElement, UnrealBloomComposeMaterial, UnrealBloomRender, UpdatableMaterialMesh, Validation, VCManager, VectorInterpolator, VerticalPlane, VideoLoader, ViewComponent, ViewComponentController, ViewComponentControllerManager, ViewComponentManager, ViewManager, VRRender, WorkerToMain, WorldImage
+  FontLoader, FrustumPointFitter, GaussianBlurrer, GeometryUtilities, GLTFDRACOLoader, GLTFLoader, GPUParticleSystem, Graphics, Grid, HDRCubeTextureLoader, HighQualityLoadingState, HorizontalPlane, HTMLUtilities,
+  ImageUtilities, Initializer, JSONLoader, KeyboardInput, Line, LoadingState, MedianFilter, MeshBatcher, MeshSampler,
+  ModelUtilities, NormalAORender,
+  NormalRender, NumberInterpolator, ObjectUtilities, OBJLoader, OMath, OrthographicCamera, OrthographicFrustumPointFitter, OS, OScreen, ParticleAttribute,
+  ParticlePositionAttribute, PerspectiveCamera, PerspectiveFrustumPointFitter, PointArrayLoader, RegularLoadingState, RenderLoop, ResourceBatch,
+  ResourceContainer, RGBETextureLoader, SceneManager, Screen, SDFTextBatch, SimpleTextDrawer, Sphere, StringUtilities, Text2D, TextLoader, TextureLoader, Time, TimeUtilities, TransitionManager, TransitionTable, UI, UIElement, UnrealBloomComposeMaterial, UnrealBloomRender, UpdatableMaterialMesh, Validation, VectorInterpolator, VerticalPlane, VideoLoader, ViewComponent,
+  ViewComponentManager, ViewManager, VRRender, WorldImage
 };

package/src/loaders/AsyncAbstractLoader.js

@@ -0,0 +1,144 @@
+import { ResourceContainer } from '../ResourceContainer';
+
+class AsyncAbstractLoader
+{
+  constructor(name, assets, worker)
+  {
+    this.resource_container = ResourceContainer;
+    this.assets = assets;
+    this.name = name;
+
+    this.worker = worker;
+
+    this.bound_on_message = this.on_message.bind(this);
+
+    this.__setup_worker();
+
+    this.assets_loaders = this.__setup_loaders();
+  }
+
+  load()
+  {
+    this.worker.postMessage({ type: 'load', loader_name: this.name });
+  }
+
+  is_loaded()
+  {
+    for (let i = 0; i < this.assets_loaders.length; i++)
+    {
+      const asset_loader = this.assets_loaders[i];
+
+      if (!asset_loader.has_finished)
+      {
+        return false;
+      }
+      else
+      {
+        if (asset_loader.has_error)
+        {
+          // Restore original url so the error message make more sense
+          // asset_loader.url = asset_loader.original_url;
+
+          asset_loader.print_error();
+        }
+      }
+    }
+
+    return true;
+  }
+
+  get_progress()
+  {
+    return this.__get_loaded_bytes() / this.__get_total_bytes();
+  }
+
+  __get_loaded_bytes()
+  {
+    let loaded_bytes = 1;
+
+    for (let i = 0; i < this.assets_loaders.length; i++)
+    {
+      loaded_bytes += this.assets_loaders[i].loaded_bytes;
+    }
+
+    return loaded_bytes;
+  }
+
+  __get_total_bytes()
+  {
+    let total_bytes = 1;
+
+    for (let i = 0; i < this.assets_loaders.length; i++)
+    {
+      total_bytes += this.assets_loaders[i].total_bytes;
+    }
+
+    return total_bytes;
+  }
+
+  get_assets_names()
+  {
+    const names = [];
+
+    for (let i = 0; i < this.assets.length; i++)
+    {
+      const asset = this.assets[i];
+
+      names.push(asset.name);
+    }
+
+    return names;
+  }
+
+  static create_worker()
+  {
+    const worker = new Worker(
+      new URL('./assets_loader/AsyncAssetsLoaderWorker.js', import.meta.url),
+      { name: 'OHZI - AssetLoader', type: 'module' });
+
+    return worker;
+  }
+
+  __setup_worker()
+  {
+    this.worker.addEventListener('message', this.bound_on_message);
+
+    this.worker.postMessage({ type: 'assets', loader_name: this.name, data: this.assets });
+  }
+
+  on_message(e)
+  {
+    const message = e.data;
+
+    switch (message.type)
+    {
+    case `asset_loaded_${this.name}`:
+      this.__on_assets_loaded(message.data);
+      break;
+    }
+  }
+
+  __on_assets_loaded(resources)
+  {
+    this.worker.removeEventListener('message', this.bound_on_message);
+
+    for (let i = 0; i < this.assets_loaders.length; i++)
+    {
+      const asset_loader = this.assets_loaders[i];
+
+      // Save original url to show in a possible error
+      asset_loader.original_url = asset_loader.url;
+
+      asset_loader.url = resources[asset_loader.resource_id];
+
+      asset_loader.on_preloaded_finished(this.resource_container);
+    }
+  }
+
+  __setup_loaders()
+  {
+    console.warn('Not implemented');
+  }
+}
+
+export { AsyncAbstractLoader };

package/src/loaders/AsyncAudiosLoader.js

@@ -0,0 +1,34 @@
+import { AudioLoader } from '../resource_loader/AudioLoader';
+import { AsyncAbstractLoader } from './AsyncAbstractLoader';
+
+class AsyncAudiosLoader extends AsyncAbstractLoader
+{
+  constructor(scene_name, assets, worker)
+  {
+    super(scene_name, assets, worker);
+  }
+
+  // Called from parent
+  __setup_loaders()
+  {
+    const loaders = [];
+
+    for (let i = 0; i < this.assets.length; i++)
+    {
+      const asset_data = this.assets[i];
+
+      loaders.push(new AudioLoader(
+        asset_data.name,
+        asset_data.url,
+        asset_data.loop,
+        asset_data.volume,
+        asset_data.size,
+        asset_data.positional
+      ));
+    }
+
+    return loaders;
+  }
+}
+
+export { AsyncAudiosLoader };

package/src/loaders/AsyncObjectsLoader.js

@@ -0,0 +1,38 @@
+import { GLTFDRACOLoader } from '../resource_loader/GLTFDRACOLoader';
+import { GLTFLoader } from '../resource_loader/GLTFLoader';
+import { ResourceContainer } from '../ResourceContainer';
+import { AsyncAbstractLoader } from './AsyncAbstractLoader';
+
+class AsyncObjectsLoader extends AsyncAbstractLoader
+{
+  constructor(scene_name, assets, worker)
+  {
+    super(scene_name, assets, worker);
+  }
+
+  // Called from parent
+  __setup_loaders()
+  {
+    const loaders = [];
+
+    for (let i = 0; i < this.assets.length; i++)
+    {
+      const asset_data = this.assets[i];
+
+      if (asset_data.draco)
+      {
+        const draco_loader = ResourceContainer.get('draco_loader');
+
+        loaders.push(new GLTFDRACOLoader(asset_data.name, asset_data.url, draco_loader, asset_data.size));
+      }
+      else
+      {
+        loaders.push(new GLTFLoader(asset_data.name, asset_data.url, asset_data.size));
+      }
+    }
+
+    return loaders;
+  }
+}
+
+export { AsyncObjectsLoader };

package/src/loaders/AsyncTexturesLoader.js

@@ -0,0 +1,70 @@
+
+import { AsyncTextureLoader } from '../resource_loader/AsyncTextureLoader';
+import { BasisLoader } from '../resource_loader/BasisLoader';
+import { CubemapLoader } from '../resource_loader/CubemapLoader';
+import { RGBETextureLoader } from '../resource_loader/RGBETextureLoader';
+import { ResourceContainer } from '../ResourceContainer';
+import { AsyncAbstractLoader } from './AsyncAbstractLoader';
+
+class AsyncTexturesLoader extends AsyncAbstractLoader
+{
+  constructor(scene_name, assets, worker)
+  {
+    super(scene_name, assets, worker);
+  }
+
+  // Called from parent
+  __setup_loaders()
+  {
+    const loaders = [];
+
+    for (let i = 0; i < this.assets.length; i++)
+    {
+      const asset_data = this.assets[i];
+
+      switch (asset_data.kind)
+      {
+      case 'regular':
+        loaders.push(new AsyncTextureLoader(
+          asset_data.name,
+          asset_data.url,
+          asset_data.size
+        ));
+
+        break;
+      case 'basis':
+        loaders.push(new BasisLoader(
+          asset_data.name,
+          asset_data.url,
+          ResourceContainer.get('basis_loader'),
+          asset_data.size
+        ));
+
+        break;
+      case 'hdr':
+        loaders.push(new RGBETextureLoader(
+          asset_data.name,
+          asset_data.url,
+          asset_data.size
+        ));
+
+        break;
+      case 'cubemap':
+        loaders.push(new CubemapLoader(
+          asset_data.name,
+          asset_data.url,
+          asset_data.extension,
+          asset_data.size
+        ));
+
+        break;
+      default:
+        break;
+      }
+    }
+
+    return loaders;
+  }
+}
+
+export { AsyncTexturesLoader };