ohzi-core 5.18.3 → 6.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohzi-core",
-  "version": "5.18.3",
+  "version": "6.0.0",
   "description": "OHZI Core Library",
   "module": "build/index.module.js",
   "source": "src/index.js",
@@ -40,7 +40,7 @@
   },
   "homepage": "https://github.com/ohzinteractive/core#readme",
   "dependencies": {
-    "pit-js": "1.6.0",
+    "pit-js": "1.7.0",
     "three": "^0.134.0"
   },
   "devDependencies": {

package/src/BaseApplication.js

@@ -17,4 +17,7 @@ export default class BaseApplication
 
   on_pre_render()
   {}
+
+  on_frame_end()
+  {}
 }

package/src/RenderLoop.js

@@ -49,12 +49,14 @@ export default class RenderLoop
     Debug.render(this.graphics);             // render debug layer
 
     // ###### END  CYCLE #######
-    Input.clear();
-    UI.clear();
-    Debug.clear();
 
     this._frame_id = requestAnimationFrame(this.update.bind(this));
+    this.target_application.on_frame_end();
     this.frames_passed++;
+
+    Input.clear();
+    UI.clear();
+    Debug.clear();
   }
 
   start()

package/src/action_sequencer/ActionSequencer.js

@@ -6,7 +6,7 @@ export default class ActionSequencer
   constructor(context)
   {
     this.elapsed_time = -0.00001;
-
+    this.playback_speed = 1;
     this.playing = false;
 
     this.action_events = [];
@@ -52,8 +52,8 @@ export default class ActionSequencer
   {
     if (this.playing)
     {
-      this.__play_clips(this.elapsed_time, this.elapsed_time + delta_time);
-      this.elapsed_time = this.elapsed_time + delta_time;
+      this.__play_clips(this.elapsed_time, this.elapsed_time + delta_time * this.playback_speed);
+      this.elapsed_time = this.elapsed_time + delta_time * this.playback_speed;
     }
   }
 

package/src/index.js

@@ -4,7 +4,6 @@ import ApplicationView from './view_components/ApplicationView';
 import BaseApplication from './BaseApplication';
 import BaseRender from './render_mode/BaseRender';
 import BaseShaderMaterial from './materials/BaseShaderMaterial';
-import BasisLoader from './resource_loader/BasisLoader.js';
 import BlitMaterial from './materials/BlitMaterial';
 import Browser from './Browser';
 import CameraManager from './CameraManager';
@@ -19,7 +18,6 @@ import EventManager from './EventManager';
 import Graphics from './Graphics';
 import Input from './Input';
 import Initializer from './Initializer';
-import JSONLoader from './resource_loader/JSONLoader';
 import NormalAORender from './render_mode/NormalAORender';
 import NormalRender from './render_mode/NormalRender';
 import UnrealBloomRender from './render_mode/UnrealBloomRender';
@@ -27,8 +25,6 @@ import OrthographicCamera from './OrthographicCamera';
 import OS from './OS';
 import PerspectiveCamera from './PerspectiveCamera';
 import RenderLoop from './RenderLoop';
-import ResourceBatch from './resource_loader/ResourceBatch';
-import ResourceContainer from './ResourceContainer';
 import SceneManager from './SceneManager';
 import Screen from './Screen';
 import SimpleTextDrawer from './canvas_drawer/SimpleTextDrawer';
@@ -89,13 +85,32 @@ import DualFilteringBlurMaterial from './materials/DualFilteringBlurMaterial';
 import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils.js';
 import MeshBatcher from './static_batcher/MeshBatcher';
 
+import AudioLoader from './resource_loader/AudioLoader';
+import BasisLoader from './resource_loader/BasisLoader';
+import CubemapLoader from './resource_loader/CubemapLoader';
+import DAELoader from './resource_loader/DAELoader';
+import FileLoader from './resource_loader/FileLoader';
+import FontLoader from './resource_loader/FontLoader';
+import GLTFLoader from './resource_loader/GLTFLoader';
+import GLTFDRACOLoader from './resource_loader/GLTFDRACOLoader';
+import HDRCubeTextureLoader from './resource_loader/HDRCubeTextureLoader';
+import JSONLoader from './resource_loader/JSONLoader';
+import OBJLoader from './resource_loader/OBJLoader';
+import PointArrayLoader from './resource_loader/PointArrayLoader';
+import RGBETextureLoader from './resource_loader/RGBETextureLoader';
+import TextLoader from './resource_loader/TextLoader';
+import TextureLoader from './resource_loader/TextureLoader';
+import VideoLoader from './resource_loader/VideoLoader';
+
+import ResourceBatch from './resource_loader/ResourceBatch';
+import ResourceContainer from './ResourceContainer';
+
 export {
   AbstractLoader,
   ActionSequencerBuilder,
   ApplicationView,
   BaseApplication,
   BaseShaderMaterial,
-  BasisLoader,
   Browser,
   CameraManager,
   Capabilities,
@@ -109,7 +124,6 @@ export {
   Graphics,
   Input,
   Initializer,
-  JSONLoader,
   NormalAORender,
   NormalRender,
   UnrealBloomRender,
@@ -117,8 +131,6 @@ export {
   OS,
   PerspectiveCamera,
   RenderLoop,
-  ResourceBatch,
-  ResourceContainer,
   SceneManager,
   Screen,
   SimpleTextDrawer,
@@ -175,5 +187,25 @@ export {
 
   DualFilteringBlurMaterial,
   BufferGeometryUtils,
-  MeshBatcher
+  MeshBatcher,
+
+  AudioLoader,
+  BasisLoader,
+  CubemapLoader,
+  DAELoader,
+  FileLoader,
+  FontLoader,
+  GLTFLoader,
+  GLTFDRACOLoader,
+  HDRCubeTextureLoader,
+  JSONLoader,
+  OBJLoader,
+  PointArrayLoader,
+  RGBETextureLoader,
+  TextLoader,
+  TextureLoader,
+  VideoLoader,
+
+  ResourceBatch,
+  ResourceContainer
 };

package/src/resource_loader/ResourceBatch.js

@@ -1,20 +1,4 @@
-import TextureLoader from './TextureLoader';
-import GLTFLoader from './GLTFLoader';
-import DAELoader from './DAELoader';
-import TextLoader from './TextLoader';
-import CubemapLoader from './CubemapLoader';
-import AudioLoader from './AudioLoader';
-import JSONLoader from './JSONLoader';
-import OBJLoader from './OBJLoader';
-import FontLoader from './FontLoader';
-import RGBETextureLoader from './RGBETextureLoader';
-import PointArrayLoader from './PointArrayLoader';
-import HDRCubeTextureLoader from './HDRCubeTextureLoader';
-import GLTFDRACOLoader from './GLTFDRACOLoader';
-import BasisLoader from './BasisLoader';
 import ResourceContainer from '../ResourceContainer';
-import FileLoader from './FileLoader';
-import VideoLoader from './VideoLoader';
 
 export default class ResourceBatch
 {
@@ -24,86 +8,6 @@ export default class ResourceBatch
     this.batch_name = batch_name || 'unnamed batch';
   }
 
-  add_texture(resource_id, url, size)
-  {
-    this.resource_loaders.push(new TextureLoader(resource_id, url, size));
-  }
-
-  add_gltf(resource_id, url, size)
-  {
-    this.resource_loaders.push(new GLTFLoader(resource_id, url, size));
-  }
-
-  add_basis(resource_id, url, renderer, loader, size)
-  {
-    this.resource_loaders.push(new BasisLoader(resource_id, url, renderer, loader, size));
-  }
-
-  add_gltf_draco(resource_id, url, size)
-  {
-    this.resource_loaders.push(new GLTFDRACOLoader(resource_id, url, size));
-  }
-
-  add_dae(resource_id, url, size)
-  {
-    this.resource_loaders.push(new DAELoader(resource_id, url, size));
-  }
-
-  add_obj(resource_id, url, size)
-  {
-    this.resource_loaders.push(new OBJLoader(resource_id, url, size));
-  }
-
-  add_file(resource_id, url, size)
-  {
-    this.resource_loaders.push(new FileLoader(resource_id, url, size));
-  }
-
-  add_text(resource_id, url, size)
-  {
-    this.resource_loaders.push(new TextLoader(resource_id, url, size));
-  }
-
-  add_cubemap(resource_id, url, size)
-  {
-    this.resource_loaders.push(new CubemapLoader(resource_id, url, size));
-  }
-
-  add_audio(resource_id, url, loop, volume, size, positional)
-  {
-    this.resource_loaders.push(new AudioLoader(resource_id, url, loop, volume, size, positional));
-  }
-
-  add_video(resource_id, url, size)
-  {
-    this.resource_loaders.push(new VideoLoader(resource_id, url, size));
-  }
-
-  add_json(resource_id, url, size)
-  {
-    this.resource_loaders.push(new JSONLoader(resource_id, url, size));
-  }
-
-  add_point_array(resource_id, url, size)
-  {
-    this.resource_loaders.push(new PointArrayLoader(resource_id, url, size));
-  }
-
-  add_hdr(resource_id, url, size)
-  {
-    this.resource_loaders.push(new RGBETextureLoader(resource_id, url, size));
-  }
-
-  add_hdr_cubemap(resource_id, url, size)
-  {
-    this.resource_loaders.push(new HDRCubeTextureLoader(resource_id, url, size));
-  }
-
-  add_font(resource_id, url, size)
-  {
-    this.resource_loaders.push(new FontLoader(resource_id, url, size));
-  }
-
   add_loader(loader)
   {
     this.resource_loaders.push(loader);