ohzi-core 6.7.0 → 6.10.0

package/package.json

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

package/src/Graphics.js

@@ -34,12 +34,14 @@ class Graphics
       premultipliedAlpha: true,
       preserveDrawingBuffer: true,
       powerPreference: 'high-performance',
-      logarithmicDepthBuffer: false
+      logarithmicDepthBuffer: false,
+      force_webgl2: true,
+      xr_enabled: false
     };
 
     Object.assign(this.context_attributes, context_attributes);
 
-    if (context_attributes.force_webgl2)
+    if (this.context_attributes.force_webgl2)
     {
       this.canvas_context = canvas.getContext('webgl2', this.context_attributes) ||
                             canvas.getContext('webgl', this.context_attributes) ||
@@ -60,6 +62,11 @@ class Graphics
       context: this.canvas_context
     });
 
+    if (this.context_attributes.xr_enabled)
+    {
+      this._renderer.xr.enabled = true;
+    }
+
     this._renderer.autoClear = false;
 
     this._renderer.setPixelRatio(1);

package/src/RenderLoop.js

@@ -12,8 +12,6 @@ export default class RenderLoop
   {
     target_application = target_application || new BaseApplication();
 
-    this._frame_id = -1;
-
     this.target_application = target_application;
     this.graphics = graphics;
 
@@ -50,7 +48,6 @@ export default class RenderLoop
 
     // ###### END  CYCLE #######
 
-    this._frame_id = requestAnimationFrame(this.update.bind(this));
     this.target_application.on_frame_end();
     this.frames_passed++;
 
@@ -69,7 +66,8 @@ export default class RenderLoop
     }
 
     this.is_running = true;
-    this.update();
+
+    this.graphics._renderer.setAnimationLoop(this.update.bind(this));
   }
 
   stop()
@@ -79,7 +77,7 @@ export default class RenderLoop
     this.is_running = false;
     this.target_application.on_exit();
 
-    cancelAnimationFrame(this._frame_id);
+    this.graphics._renderer.setAnimationLoop(null);
   }
 
   set_state(new_state)

package/src/components/UIElement.js

@@ -180,7 +180,7 @@ export default class UIElement extends Mesh
     {
       this.material.uniforms._MainTex.value.dispose();
     }
-    // Screen.remove_screen_material(this.material);
+    // OScreen.remove_screen_material(this.material);
     this.geometry.dispose();
     this.material.dispose();
   }

package/src/index.js

@@ -100,6 +100,7 @@ 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 AsyncTextureLoader from './resource_loader/AsyncTextureLoader';
 import TextureLoader from './resource_loader/TextureLoader';
 import VideoLoader from './resource_loader/VideoLoader';
 
@@ -205,6 +206,7 @@ export {
   PointArrayLoader,
   RGBETextureLoader,
   TextLoader,
+  AsyncTextureLoader,
   TextureLoader,
   VideoLoader,
 

package/src/resource_loader/AsyncTextureLoader.js

@@ -0,0 +1,35 @@
+import AbstractLoader from './AbstractLoader';
+
+import { Texture } from 'three';
+
+export default class AsyncTextureLoader extends AbstractLoader
+{
+  constructor(resource_id, url, size)
+  {
+    super(resource_id, url, size);
+  }
+
+  on_preloaded_finished(resource_container)
+  {
+    const texture = new Texture();
+    const image = new Image();
+
+    image.src = this.url;
+
+    image.onload = () =>
+    {
+      texture.image = image;
+      texture.needsUpdate = true;
+
+      resource_container.set_resource(this.resource_id, this.url, texture);
+
+      this.__update_downloaded_bytes(1, 1);
+      this.__loading_ended();
+    };
+
+    image.onerror = () =>
+    {
+      console.error('Error loading texture. Maybe the resource is not an image?', this.url);
+    };
+  }
+}

package/src/view_components/ApplicationView.js

@@ -1,5 +1,4 @@
 import ResourceContainer from '../ResourceContainer';
-import DrawIOAnimationSheet from './transition/DrawIOAnimationSheet';
 import ViewManager from './ViewManager';
 import ViewState from './ViewState';
 
@@ -12,7 +11,12 @@ export default class ApplicationView extends ViewState
     this.container = container;
     this.url = url;
 
-    const transition_data = new DrawIOAnimationSheet().parse(ResourceContainer.get(`${name}_data`));
+    let transition_data = ResourceContainer.get(`${name}_data`);
+
+    transition_data = transition_data || {
+      animation_tracks: [],
+      triggers: []
+    };
 
     const transitions = [
       {

package/types/RenderLoop.d.ts

@@ -1,6 +1,5 @@
 export class RenderLoop {
     constructor(target_application: any, graphics: any);
-    _frame_id: number;
     target_application: any;
     graphics: any;
     is_running: boolean;

package/types/resource_loader/AsyncTextureLoader.ts

@@ -0,0 +1,6 @@
+import { AbstractLoader } from "./AbstractLoader";
+
+export class AsyncTextureLoader extends AbstractLoader {
+    constructor(resource_id: any, url: any, size: any);
+    loader: any;
+}

package/types/resource_loader/BasisLoader.d.ts

@@ -1,6 +1,6 @@
 import { AbstractLoader } from "./AbstractLoader";
 
 export class BasisLoader extends AbstractLoader {
-    constructor(resource_id: any, url: any, renderer: any, loader: any, size: any);
+    constructor(resource_id: any, url: any, loader: any, size: any);
     loader: any;
 }