ohzi-core 6.5.5 → 6.7.0

package/src/render_mode/TransparencyMixRender.js

@@ -1,4 +1,4 @@
-import Screen from '../Screen';
+import OScreen from '../OScreen';
 import RenderLayers from '../RenderLayers';
 import transparent_mix_vert from '../shaders/transparent_mix/transparent_mix.vert';
 import transparent_mix_frag from '../shaders/transparent_mix/transparent_mix.frag';
@@ -18,15 +18,15 @@ export default class TransparencyMixRender
   constructor(webgl)
   {
     this.SSAA = Configuration.use_ssaa ? 2 : 1;
-    this.main_rt   = new WebGLRenderTarget(Screen.width * this.SSAA, Screen.height * this.SSAA);
-    this.opaque_rt = new WebGLRenderTarget(Screen.width * this.SSAA, Screen.height * this.SSAA);
-    this.fxaa_rt   = new WebGLRenderTarget(Screen.width * this.SSAA, Screen.height * this.SSAA);
+    this.main_rt   = new WebGLRenderTarget(OScreen.width * this.SSAA, OScreen.height * this.SSAA);
+    this.opaque_rt = new WebGLRenderTarget(OScreen.width * this.SSAA, OScreen.height * this.SSAA);
+    this.fxaa_rt   = new WebGLRenderTarget(OScreen.width * this.SSAA, OScreen.height * this.SSAA);
 
     this.mix_material = new ShaderMaterial({
       uniforms: {
         _OpaqueTex: { value: this.opaque_rt.texture },
         _TransparentTex: { value: this.main_rt.texture },
-        _Resolution: { value: new Vector2(Screen.width, Screen.height) },
+        _Resolution: { value: new Vector2(OScreen.width, OScreen.height) },
         _Opacity: { value: Configuration.transparency_amount }
       },
       vertexShader: transparent_mix_vert,
@@ -62,11 +62,11 @@ export default class TransparencyMixRender
 
   resize()
   {
-    this.main_rt.setSize(Screen.width * this.SSAA, Screen.height * this.SSAA);
-    this.opaque_rt.setSize(Screen.width * this.SSAA, Screen.height * this.SSAA);
-    this.fxaa_rt.setSize(Screen.width * this.SSAA, Screen.height * this.SSAA);
-    this.fxaa_material.uniforms._Resolution.value.set(Screen.width * this.SSAA, Screen.height * this.SSAA);
-    this.mix_material.uniforms._Resolution.value.set(Screen.width * this.SSAA, Screen.height * this.SSAA);
+    this.main_rt.setSize(OScreen.width * this.SSAA, OScreen.height * this.SSAA);
+    this.opaque_rt.setSize(OScreen.width * this.SSAA, OScreen.height * this.SSAA);
+    this.fxaa_rt.setSize(OScreen.width * this.SSAA, OScreen.height * this.SSAA);
+    this.fxaa_material.uniforms._Resolution.value.set(OScreen.width * this.SSAA, OScreen.height * this.SSAA);
+    this.mix_material.uniforms._Resolution.value.set(OScreen.width * this.SSAA, OScreen.height * this.SSAA);
   }
 
   __get_fxaa_material()
@@ -74,7 +74,7 @@ export default class TransparencyMixRender
     return new ShaderMaterial({
       uniforms: {
         _MainTex: { value: this.fxaa_rt.texture },
-        _Resolution: { value: new Vector2(Screen.width * this.SSAA, Screen.height * this.SSAA) }
+        _Resolution: { value: new Vector2(OScreen.width * this.SSAA, OScreen.height * this.SSAA) }
       },
       vertexShader: transparent_mix_vert,
       fragmentShader: fxaa,

package/src/render_mode/UnrealBloomRender.js

@@ -1,4 +1,4 @@
-import Screen from '../Screen';
+import OScreen from '../OScreen';
 import BaseRender from '../render_mode/BaseRender';
 import UnrealBloomComposeMaterial from '../materials/UnrealBloomComposeMaterial';
 import AddMaterial from '../materials/AddMaterial';
@@ -28,8 +28,8 @@ export default class UnrealBloomRender extends BaseRender
   on_enter()
   {
     this.blurrer = new GaussianBlurrer();
-    this.main_RT = new WebGLRenderTarget(Screen.render_width, Screen.render_height);
-    this.blur_RT = new WebGLRenderTarget(Screen.render_width, Screen.render_height);
+    this.main_RT = new WebGLRenderTarget(OScreen.render_width, OScreen.render_height);
+    this.blur_RT = new WebGLRenderTarget(OScreen.render_width, OScreen.render_height);
 
     this.bloom_compose_mat = new UnrealBloomComposeMaterial(5);
     this.blurrer = new GaussianBlurrer(5);
@@ -100,10 +100,10 @@ export default class UnrealBloomRender extends BaseRender
 
   __check_RT_size()
   {
-    if (this.main_RT.width !== Screen.render_width || this.main_RT.height !== Screen.render_height)
+    if (this.main_RT.width !== OScreen.render_width || this.main_RT.height !== OScreen.render_height)
     {
-      this.main_RT.setSize(Screen.render_width, Screen.render_height);
-      this.blur_RT.setSize(Screen.render_width, Screen.render_height);
+      this.main_RT.setSize(OScreen.render_width, OScreen.render_height);
+      this.blur_RT.setSize(OScreen.render_width, OScreen.render_height);
     }
   }
 }

package/src/render_utilities/DepthAndNormalsRenderer.js

@@ -1,5 +1,5 @@
 import CameraManager from '../CameraManager';
-import Screen from '../Screen';
+import OScreen from '../OScreen';
 
 import ClearDepthNormalMaterial from '../materials/ClearDepthNormalMaterial';
 import DepthNormalMaterial from '../materials/DepthNormalMaterial';
@@ -11,7 +11,7 @@ export default class DepthAndNormalsRenderer
 {
   constructor()
   {
-    this.RT = new WebGLRenderTarget(Screen.width, Screen.height);
+    this.RT = new WebGLRenderTarget(OScreen.width, OScreen.height);
 
     this.clear_depth_normal_mat = new ClearDepthNormalMaterial(1, new Vector3(0, 0, 1));
     this.depth_normal_material = new DepthNormalMaterial();
@@ -32,9 +32,9 @@ export default class DepthAndNormalsRenderer
 
   __resize_RT_if_necessary()
   {
-    if (this.RT.width !== Screen.width || this.RT.height !== Screen.height)
+    if (this.RT.width !== OScreen.width || this.RT.height !== OScreen.height)
     {
-      this.RT.setSize(Screen.width, Screen.height);
+      this.RT.setSize(OScreen.width, OScreen.height);
     }
   }
 

package/src/render_utilities/ViewPositionRenderer.js

@@ -1,6 +1,6 @@
 import CameraManager from '../CameraManager';
 import SceneManager from '../SceneManager';
-import Screen from '../Screen';
+import OScreen from '../OScreen';
 import ViewPositionMaterial from '../materials/ViewPositionMaterial';
 
 import { WebGLRenderTarget } from 'three';
@@ -11,21 +11,21 @@ export default class ViewPositionRenderer
 {
   constructor()
   {
-    this.RT = new WebGLRenderTarget(Screen.width, Screen.height, { type: FloatType });
+    this.RT = new WebGLRenderTarget(OScreen.width, OScreen.height, { type: FloatType });
     this.clear_color = new Color(0, 0, 0);
     this.render_pos_mat = new ViewPositionMaterial();
   }
 
   render(context, renderer)
   {
-    if (this.RT.width !== Screen.width || this.RT.height !== Screen.height)
+    if (this.RT.width !== OScreen.width || this.RT.height !== OScreen.height)
     {
-      this.RT.setSize(Screen.width, Screen.height);
+      this.RT.setSize(OScreen.width, OScreen.height);
     }
 
     if (CameraManager.current)
     {
-      CameraManager.current.aspect = Screen.aspect_ratio;
+      CameraManager.current.aspect = OScreen.aspect_ratio;
       CameraManager.current.updateProjectionMatrix();
       CameraManager.current.updateMatrix();
       CameraManager.current.updateMatrixWorld(true);

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/utilities/CameraUtilities.js

@@ -1,7 +1,7 @@
 import CameraManager from '../CameraManager';
 import Input from '../Input';
 import OMath from '../utilities/OMath';
-import Screen from '../Screen';
+import OScreen from '../OScreen';
 
 import { Vector3 } from 'three';
 import { Matrix4 } from 'three';
@@ -152,13 +152,13 @@ class CameraUtilities
       const obj_x = this.tmp_size.x;
       const obj_y = this.tmp_size.y;
       const object_aspect = obj_x / obj_y;
-      if (Screen.aspect_ratio / object_aspect > 1)
+      if (OScreen.aspect_ratio / object_aspect > 1)
       {
-        return Screen.height / obj_y;
+        return OScreen.height / obj_y;
       }
       else
       {
-        return Screen.width / obj_x;
+        return OScreen.width / obj_x;
       }
     }
     else
@@ -178,8 +178,8 @@ class CameraUtilities
     object.getWorldPosition(tmp_vec);
     tmp_vec.project(camera);
 
-    tmp_vec.x = (tmp_vec.x * 0.5 + 0.5) * (Screen.width);
-    tmp_vec.y = (1 - (tmp_vec.y * 0.5 + 0.5)) * Screen.height;
+    tmp_vec.x = (tmp_vec.x * 0.5 + 0.5) * (OScreen.width);
+    tmp_vec.y = (1 - (tmp_vec.y * 0.5 + 0.5)) * OScreen.height;
     return tmp_vec;
   }
 
@@ -191,18 +191,18 @@ class CameraUtilities
     tmp_vec.copy(pos);
     tmp_vec.project(camera);
 
-    tmp_vec.x = (tmp_vec.x * 0.5 + 0.5) * (Screen.width);
-    tmp_vec.y = (1 - (tmp_vec.y * 0.5 + 0.5)) * Screen.height;
+    tmp_vec.x = (tmp_vec.x * 0.5 + 0.5) * (OScreen.width);
+    tmp_vec.y = (1 - (tmp_vec.y * 0.5 + 0.5)) * OScreen.height;
     return tmp_vec;
   }
 
   update_projection(camera)
   {
-    camera.left   = -Screen.width / 2;
-    camera.right  = Screen.width / 2;
-    camera.top    = Screen.height / 2;
-    camera.bottom = -Screen.height / 2;
-    camera.aspect = Screen.aspect_ratio;
+    camera.left   = -OScreen.width / 2;
+    camera.right  = OScreen.width / 2;
+    camera.top    = OScreen.height / 2;
+    camera.bottom = -OScreen.height / 2;
+    camera.aspect = OScreen.aspect_ratio;
     camera.updateProjectionMatrix(true);
   }
 }

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();

package/types/OScreen.d.ts

@@ -0,0 +1,18 @@
+export class OScreen {
+    static init(): void;
+    static width: any;
+    static height: any;
+    static position: any;
+    static render_width: number;
+    static render_height: number;
+    static width_height: any;
+    static dpr: number;
+    static pixel_size: any;
+    static update_position(x: any, y: any): void;
+    static update_size(width: any, height: any): void;
+    static apply_pixel_density_v2(vector2: any): any;
+    static apply_pixel_density(value: any): number;
+    static get_pixel_size(): any;
+    static get aspect_ratio(): number;
+    static get portrait(): boolean;
+}

package/types/index.d.ts

@@ -27,6 +27,7 @@ export * from './PerspectiveCamera';
 export * from './RenderLoop';
 export * from './SceneManager';
 export * from './Screen';
+export * from './OScreen';
 export * from './canvas_drawer/SimpleTextDrawer';
 export * from './Time';
 export * from './UI';