ohzi-core 6.6.0 → 6.8.0

package/package.json

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

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/resource_loader/JSONLoader.js

@@ -1,40 +1,20 @@
 import AbstractLoader from './AbstractLoader';
 
-import { FileLoader as THREEFileLoader } from 'three';
-
 export default class JSONLoader extends AbstractLoader
 {
   constructor(resource_id, url, size)
   {
     super(resource_id, url, size);
-
-    this.loader = new THREEFileLoader();
   }
 
-  on_preloaded_finished(resource_container)
+  on_preloaded_finished(resource_container, response)
   {
-    const ctx = this;
-
-    this.loader.load(this.url, (data) =>
+    response.json().then((json) =>
     {
-      resource_container.set_resource(ctx.resource_id, ctx.url, JSON.parse(data));
+      resource_container.set_resource(this.resource_id, this.url, json);
 
-      ctx.__update_downloaded_bytes(1, 1);
-      ctx.__loading_ended();
-    },
-    (xhr) =>
-    {
-      // if (xhr)
-      // {
-      //   let total = xhr.total || this.total_bytes;
-      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
-      // }
-    },
-    (msg) =>
-    {
-      ctx.__set_error(msg + '\n\n\t If the error says something about unexpected token < in JSON then the probably the problem is related to the file not being found. Check the name and path of the resource');
-      ctx.__loading_ended();
-    }
-    );
+      this.__update_downloaded_bytes(1, 1);
+      this.__loading_ended();
+    });
   }
 }

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/src/view_components/ViewManager.js

@@ -11,6 +11,8 @@ class ViewManager
     this.transition_handler = new ViewStateTransitionHandler(this.transition_table);
 
     this.view_change_subscribers = [];
+
+    this.browser_title_suffix = '';
   }
 
   update()
@@ -28,6 +30,7 @@ class ViewManager
     if (change_url)
     {
       this.__change_browser_url(v.url);
+      this.__change_browser_title(v.url);
     }
 
     this.notify_view_change(view_name);
@@ -81,6 +84,11 @@ class ViewManager
     this.transition_handler.set_state(view);
   }
 
+  set_browser_title_suffix(title_suffix)
+  {
+    this.browser_title_suffix = title_suffix;
+  }
+
   get_current_view()
   {
     return this.transition_handler.current_state;
@@ -135,6 +143,13 @@ class ViewManager
     window.history.pushState('', '', url);
   }
 
+  __change_browser_title(name)
+  {
+    const title = this.__capitalize(name);
+
+    document.title = title ? `${title} | ${this.browser_title_suffix}` : this.browser_title_suffix;
+  }
+
   __set_views_opacities()
   {
     for (let i = 0; i < this.views.length; i++)
@@ -142,6 +157,24 @@ class ViewManager
       this.views[i].set_opacity(this.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 default new ViewManager();