ohzi-core 6.5.3 → 6.6.0

package/package.json

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

package/src/Debug.js

@@ -5,7 +5,7 @@ import SceneManager from './SceneManager';
 import Cube from './primitives/Cube';
 import Sphere from './primitives/Sphere';
 import Arrow from './primitives/Arrow';
-import Screen from './Screen';
+import OScreen from './OScreen';
 import ScreenSpaceTextureMaterial from './materials/ScreenSpaceTextureMaterial';
 import { Vector3 } from 'three';
 import { LineBasicMaterial } from 'three';
@@ -248,7 +248,7 @@ class Debug
   {
     for (let i = 0; i < this.display_texture_meshes.length; i++)
     {
-      this.display_texture_meshes[i].material.set_screen_size(Screen.width, Screen.height);
+      this.display_texture_meshes[i].material.set_screen_size(OScreen.width, OScreen.height);
     }
     if (this.scene.children.length > 0)
     {

package/src/Graphics.js

@@ -1,6 +1,6 @@
 import Configuration from './Configuration';
 import BaseRender from './render_mode/BaseRender';
-import Screen from './Screen';
+import OScreen from './OScreen';
 import CameraManager from './CameraManager';
 import SceneManager from './SceneManager';
 import Capabilities from './Capabilities';
@@ -64,7 +64,7 @@ class Graphics
 
     this._renderer.setPixelRatio(1);
 
-    Screen.dpr = Configuration.dpr;
+    OScreen.dpr = Configuration.dpr;
 
     if (!this.is_webgl2)
     {
@@ -123,14 +123,14 @@ class Graphics
       this.current_render_mode.render();
     }
 
-    Screen.update();
+    OScreen.update();
   }
 
   __update_current_camera()
   {
     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);
@@ -206,14 +206,14 @@ class Graphics
   {
     for (const entry of entries)
     {
-      Screen.dpr = Configuration.dpr;
-      Screen.update_position(entry.contentRect.x, entry.contentRect.y);
-      Screen.update_size(entry.contentRect.width, entry.contentRect.height);
+      OScreen.dpr = Configuration.dpr;
+      OScreen.update_position(entry.contentRect.x, entry.contentRect.y);
+      OScreen.update_size(entry.contentRect.width, entry.contentRect.height);
 
-      this.canvas.width  = Screen.render_width;
-      this.canvas.height = Screen.render_height;
+      this.canvas.width  = OScreen.render_width;
+      this.canvas.height = OScreen.render_height;
 
-      this._renderer.setViewport(0, 0, Screen.render_width, Screen.render_height);
+      this._renderer.setViewport(0, 0, OScreen.render_width, OScreen.render_height);
 
       this.__update_current_camera();
     }
@@ -241,12 +241,12 @@ class Graphics
     this.blitter.blit_clear_with_material(dst_RT, mat);
   }
 
-  take_screenshot(blob_callback, width = Screen.width, height = Screen.height)
+  take_screenshot(blob_callback, width = OScreen.width, height = OScreen.height)
   {
     // const ctx = this;
 
-    const old_width = Screen.width;
-    const old_height = Screen.height;
+    const old_width = OScreen.width;
+    const old_height = OScreen.height;
 
     const new_width = width;
     const new_height = height;
@@ -257,7 +257,7 @@ class Graphics
     const divisions_x = parseInt(Math.ceil(new_width / tile_width));
     const divisions_y = parseInt(Math.ceil(new_height / tile_height));
 
-    Screen.update_size(tile_width, tile_height);
+    OScreen.update_size(tile_width, tile_height);
 
     this._renderer.setPixelRatio(1);
 
@@ -269,7 +269,7 @@ class Graphics
     ctx_2D.canvas.width  = new_width;
     ctx_2D.canvas.height = new_height;
 
-    CameraManager.current.aspect = Screen.aspect_ratio;
+    CameraManager.current.aspect = OScreen.aspect_ratio;
     CameraManager.current.updateMatrix();
     CameraManager.current.updateMatrixWorld(true);
 
@@ -278,11 +278,11 @@ class Graphics
       for (let y = 0; y < divisions_y; y++)
       {
         CameraManager.current.setViewOffset(new_width,             new_height,
-          Screen.width * x,         Screen.height * y,
-          Screen.width,            Screen.height);
+          OScreen.width * x,         OScreen.height * y,
+          OScreen.width,            OScreen.height);
         this.current_render_mode.render();
 
-        ctx_2D.drawImage(this._renderer.domElement, Screen.width * x, Screen.height * y);
+        ctx_2D.drawImage(this._renderer.domElement, OScreen.width * x, OScreen.height * y);
       }
     }
 
@@ -292,11 +292,11 @@ class Graphics
 
     CameraManager.current.clearViewOffset();
 
-    Screen.update_size(old_width, old_height);
+    OScreen.update_size(old_width, old_height);
     this._renderer.setPixelRatio(Configuration.dpr);
     this._renderer.setSize(old_width, old_height, false);
 
-    CameraManager.current.aspect = Screen.aspect_ratio;
+    CameraManager.current.aspect = OScreen.aspect_ratio;
     CameraManager.current.updateMatrix();
     CameraManager.current.updateMatrixWorld(true);
   }

package/src/Initializer.js

@@ -7,10 +7,10 @@ import EventManager from './EventManager';
 import Graphics from './Graphics';
 import Input from './Input';
 import OS from './OS';
+import OScreen from './OScreen';
 import ReflectionPlaneContext from './ReflectionPlaneContext';
 import ResourceContainer from './ResourceContainer';
 import SceneManager from './SceneManager';
-import Screen from './Screen';
 import GeometryBatcher from './static_batcher/GeometryBatcher';
 import Time from './Time';
 import UI from './UI';
@@ -36,7 +36,7 @@ class Initializer
     ReflectionPlaneContext.init();
     ResourceContainer.init();
     SceneManager.init();
-    Screen.init();
+    OScreen.init();
     Time.init();
     UI.init();
 

package/src/OScreen.js

@@ -0,0 +1,74 @@
+import { Vector2 } from 'three';
+
+class OScreen
+{
+  init()
+  {
+    this.width = 1;
+    this.height = 1;
+
+    this.position = new Vector2();
+
+    this.render_width = 1;
+    this.render_height = 1;
+    this.width_height = new Vector2(this.width, this.height);
+
+    this.dpr = 1;
+    this.pixel_size = new Vector2(1 / this.width, 1 / this.height);
+  }
+
+  update_position(x, y)
+  {
+    this.position.set(x, y);
+  }
+
+  update()
+  {
+    this.size_changed = false;
+  }
+
+  update_size(width, height)
+  {
+    this.width = width;
+    this.height = height;
+
+    this.pixel_size = new Vector2(1 / this.width, 1 / this.height);
+
+    this.width_height.x = width;
+    this.width_height.y = height;
+
+    this.render_width = width * this.dpr;
+    this.render_height = height * this.dpr;
+
+    this.size_changed = true;
+  }
+
+  apply_pixel_density_v2(vector2)
+  {
+    vector2.multiplyScalar(1 / this.dpr);
+
+    return vector2;
+  }
+
+  apply_pixel_density(value)
+  {
+    return value * (1 / this.dpr);
+  }
+
+  get_pixel_size()
+  {
+    return this.pixel_size;
+  }
+
+  get aspect_ratio()
+  {
+    return this.width / this.height;
+  }
+
+  get portrait()
+  {
+    return this.width < this.height;
+  }
+}
+
+export default new OScreen();

package/src/Screen.js

@@ -1,68 +1,53 @@
-import { Vector2 } from 'three';
+import OScreen from './OScreen';
 
 class Screen
 {
   init()
   {
-    this.width = 1;
-    this.height = 1;
-
-    this.position = new Vector2();
-
-    this.render_width = 1;
-    this.render_height = 1;
-    this.width_height = new Vector2(this.width, this.height);
-
-    this.dpr = 1;
-    this.pixel_size = new Vector2(1 / this.width, 1 / this.height);
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    OScreen.init();
   }
 
   update_position(x, y)
   {
-    this.position.set(x, y);
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    OScreen.update_position(x, y);
   }
 
   update()
   {
-    this.size_changed = false;
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    OScreen.update();
   }
 
   update_size(width, height)
   {
-    this.width = width;
-    this.height = height;
-
-    this.pixel_size = new Vector2(1 / this.width, 1 / this.height);
-
-    this.width_height.x = width;
-    this.width_height.y = height;
-
-    this.render_width = width * this.dpr;
-    this.render_height = height * this.dpr;
-
-    this.size_changed = true;
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    OScreen.update_size(width, height);
   }
 
   apply_pixel_density_v2(vector2)
   {
-    vector2.multiplyScalar(1 / this.dpr);
-
-    return vector2;
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    return OScreen.apply_pixel_density_v2(vector2);
   }
 
   apply_pixel_density(value)
   {
-    return value * (1 / this.dpr);
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    return OScreen.apply_pixel_density(value);
   }
 
   get_pixel_size()
   {
-    return this.pixel_size;
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    return OScreen.get_pixel_size();
   }
 
   get aspect_ratio()
   {
-    return this.width / this.height;
+    console.warn('Screen Singleton is deprecated. Please use OScreen.');
+    return OScreen.aspect_ratio;
   }
 }
 

package/src/Time.js

@@ -36,7 +36,7 @@ class Time
     this.__elapsed_time = this.___time.getElapsedTime();
 
     this.delta_buffer.shift();
-    this.delta_buffer.push(this.__raw_delta_time);
+    this.delta_buffer.push(this.__raw_delta_time < 0.32 ? this.__raw_delta_time : 0.032);
 
     this.__calculate_delta_time();
   }

package/src/UI.js

@@ -55,10 +55,10 @@ class UI
 
   update()
   {
-    // this.ss_camera.left     = -Screen.width / 2;
-    // this.ss_camera.right    = Screen.width / 2;
-    // this.ss_camera.top      = Screen.top / 2;
-    // this.ss_camera.right    = -Screen.bottom / 2;
+    // this.ss_camera.left     = -OScreen.width / 2;
+    // this.ss_camera.right    = OScreen.width / 2;
+    // this.ss_camera.top      = OScreen.top / 2;
+    // this.ss_camera.right    = -OScreen.bottom / 2;
     this.ss_camera.updateProjectionMatrix();
 
     this._tmp_normalized_pos.copy(Input.NDC);

package/src/components/UIElement.js

@@ -1,5 +1,5 @@
 
-import Screen from '../Screen';
+import OScreen from '../OScreen';
 
 import UIElementMaterial from '../materials/UIElementMaterial';
 
@@ -132,7 +132,7 @@ export default class UIElement extends Mesh
 
   update_state(normalized_mouse_pos)
   {
-    this.material.uniforms._ScreenSize.value.set(Screen.width, Screen.height);
+    this.material.uniforms._ScreenSize.value.set(OScreen.width, OScreen.height);
     this.get_size(this.material.uniforms._TextureSize.value);
 
     this.cached_NDC_position.copy(this.position_strategy.get_pos_NDC(this.position));
@@ -157,8 +157,8 @@ export default class UIElement extends Mesh
 
   to_screen_position(projected_pos)
   {
-    projected_pos.x = (projected_pos.x * 0.5 + 0.5) * Screen.width  + this.pixel_offset.x;
-    projected_pos.y = (projected_pos.y * 0.5 + 0.5) * Screen.height + this.pixel_offset.y;
+    projected_pos.x = (projected_pos.x * 0.5 + 0.5) * OScreen.width  + this.pixel_offset.x;
+    projected_pos.y = (projected_pos.y * 0.5 + 0.5) * OScreen.height + this.pixel_offset.y;
   }
 
   get_screen_space_position()
@@ -170,8 +170,8 @@ export default class UIElement extends Mesh
 
   set_screen_space_position(screen_pos)
   {
-    this.position.x = (screen_pos.x / Screen.width) * 2 - 1;
-    this.position.y = (screen_pos.y / Screen.height) * 2 - 1;
+    this.position.x = (screen_pos.x / OScreen.width) * 2 - 1;
+    this.position.y = (screen_pos.y / OScreen.height) * 2 - 1;
   }
 
   dispose()
@@ -180,7 +180,7 @@ export default class UIElement extends Mesh
     {
       this.material.uniforms._MainTex.value.dispose();
     }
-    Screen.remove_screen_material(this.material);
+    // Screen.remove_screen_material(this.material);
     this.geometry.dispose();
     this.material.dispose();
   }
@@ -189,11 +189,11 @@ export default class UIElement extends Mesh
   {
     if (vector2)
     {
-      return vector2.copy(this.texture_size).multiplyScalar(this.size / Screen.dpr);
+      return vector2.copy(this.texture_size).multiplyScalar(this.size / OScreen.dpr);
     }
     else
     {
-      return new Vector2().copy(this.texture_size).multiplyScalar(this.size / Screen.dpr);
+      return new Vector2().copy(this.texture_size).multiplyScalar(this.size / OScreen.dpr);
     }
   }
 

package/src/editor/ObjectPicker.js

@@ -1,5 +1,5 @@
 import RenderLayers from '../RenderLayers';
-import Screen from '../Screen';
+import OScreen from '../OScreen';
 
 import { Color } from 'three';
 import { WebGLRenderTarget } from 'three';
@@ -16,7 +16,7 @@ export default class ObjectPicker
     this.camera_layers = camera.layers;
 
     this.clear_color = new Color('#000000');
-    this.picking_texture = new WebGLRenderTarget(Screen.width, Screen.height);
+    this.picking_texture = new WebGLRenderTarget(OScreen.width, OScreen.height);
     this.tmp_scene_auto_update = undefined;
 
     this.tmp_mouse_pos = new Vector2();
@@ -66,8 +66,8 @@ export default class ObjectPicker
   {
     this.tmp_mouse_pos.copy(mouse_NDC);
     this.tmp_mouse_pos.multiplyScalar(0.5);
-    this.tmp_mouse_pos.x = (this.tmp_mouse_pos.x + 0.5) * Screen.width;
-    this.tmp_mouse_pos.y = (this.tmp_mouse_pos.y + 0.5) * Screen.height;
+    this.tmp_mouse_pos.x = (this.tmp_mouse_pos.x + 0.5) * OScreen.width;
+    this.tmp_mouse_pos.y = (this.tmp_mouse_pos.y + 0.5) * OScreen.height;
     this.renderer.readRenderTargetPixels(this.picking_texture, this.tmp_mouse_pos.x, this.tmp_mouse_pos.y, 1, 1, this.readback_buffer);
 
     return (this.readback_buffer[2]) | (this.readback_buffer[1] << 8) | (this.readback_buffer[0] << 16);

package/src/index.js

@@ -26,6 +26,7 @@ import OS from './OS';
 import PerspectiveCamera from './PerspectiveCamera';
 import RenderLoop from './RenderLoop';
 import SceneManager from './SceneManager';
+import OScreen from './OScreen';
 import Screen from './Screen';
 import SimpleTextDrawer from './canvas_drawer/SimpleTextDrawer';
 import Time from './Time';
@@ -132,6 +133,7 @@ export {
   PerspectiveCamera,
   RenderLoop,
   SceneManager,
+  OScreen,
   Screen,
   SimpleTextDrawer,
   Time,

package/src/materials/UIElementMaterial.js

@@ -5,13 +5,15 @@ import BaseShaderMaterial from '../materials/BaseShaderMaterial';
 import { Vector2 } from 'three';
 import { Vector3 } from 'three';
 
+import OScreen from '../OScreen';
+
 export default class UIElementMaterial extends BaseShaderMaterial
 {
   constructor(intensity = 1)
   {
     super(vert, frag, {
       _MainTex: { value: undefined },
-      _ScreenSize: { value: new Vector2(Screen.width, Screen.height) },
+      _ScreenSize: { value: new Vector2(OScreen.width, OScreen.height) },
       _TextureSize: { value: new Vector2() },
       _PixelOffset: { value: new Vector2(0, 0) },
       _NDC: { value: new Vector3() },

package/src/render_mode/BloomRender.js

@@ -1,4 +1,4 @@
-import Screen from '../Screen';
+
 import BaseRender from '../render_mode/BaseRender';
 import BloomComposeMaterial from '../materials/BloomComposeMaterial';
 
@@ -8,6 +8,7 @@ import Blurrer from '../render_utilities/Blurrer';
 import Graphics from '../Graphics';
 import CameraManager from '../CameraManager';
 import SceneManager from '../SceneManager';
+import OScreen from '../OScreen';
 
 export default class BloomRender extends BaseRender
 {
@@ -27,8 +28,8 @@ export default class BloomRender extends BaseRender
   {
     this.blurrer = new Blurrer();
     // this.blurrer = new DualFilteringBlurrer()
-    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);
   }
 
   render()
@@ -51,10 +52,10 @@ export default class BloomRender 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_mode/DeferredRender.js

@@ -1,6 +1,6 @@
 import CameraManager from '../CameraManager';
 import SceneManager from '../SceneManager';
-import Screen from '../Screen';
+import OScreen from '../OScreen';
 import BaseRender from '../render_mode/BaseRender';
 import DeferredRendererComposeMaterial from '../materials/DeferredRendererComposeMaterial';
 import Graphics from '../Graphics';
@@ -19,7 +19,7 @@ export default class DeferredRender extends BaseRender
     super();
 
     this.compose_mat = new DeferredRendererComposeMaterial();
-    this.main_rt = new WebGLRenderTarget(Screen.width, Screen.height, {
+    this.main_rt = new WebGLRenderTarget(OScreen.width, OScreen.height, {
       // magFilter: NearestFilter,
       // minFilter: NearestFilter
     });
@@ -104,9 +104,9 @@ export default class DeferredRender extends BaseRender
 
   __check_RT_size()
   {
-    if (this.main_rt.width !== Screen.width || this.main_rt.height !== Screen.height)
+    if (this.main_rt.width !== OScreen.width || this.main_rt.height !== OScreen.height)
     {
-      this.main_rt.setSize(Screen.width, Screen.height);
+      this.main_rt.setSize(OScreen.width, OScreen.height);
     }
   }
 }

package/src/render_mode/NormalAORender.js

@@ -1,6 +1,6 @@
 import CameraManager from '../CameraManager';
 import SceneManager from '../SceneManager';
-import Screen from '../Screen';
+import OScreen from '../OScreen';
 import BaseRender from '../render_mode/BaseRender';
 import Configuration from '../Configuration';
 import SSAOMaterial from '../materials/SSAOMaterial';
@@ -23,9 +23,9 @@ export default class NormalAORender extends BaseRender
 
     this.ssaa = Configuration.use_ssaa ? 2 : 1;
 
-    this.main_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.SSAO_RT = new WebGLRenderTarget(Screen.width, Screen.height);
+    this.SSAO_RT = new WebGLRenderTarget(OScreen.width, OScreen.height);
 
     this.blurrer = new Blurrer();
     Graphics.generateDepthNormalTexture = true;
@@ -62,10 +62,10 @@ export default class NormalAORender extends BaseRender
 
   __check_RT_size()
   {
-    if (this.main_RT.width !== Screen.width * this.ssaa || this.main_RT.height !== Screen.height * this.ssaa)
+    if (this.main_RT.width !== OScreen.width * this.ssaa || this.main_RT.height !== OScreen.height * this.ssaa)
     {
-      this.main_RT.setSize(Screen.width * this.ssaa, Screen.height * this.ssaa);
-      this.SSAO_RT.setSize(Screen.width, Screen.height);
+      this.main_RT.setSize(OScreen.width * this.ssaa, OScreen.height * this.ssaa);
+      this.SSAO_RT.setSize(OScreen.width, OScreen.height);
     }
   }
 }

package/src/render_mode/OutlineRender.js

@@ -1,4 +1,4 @@
-import Screen from '../Screen';
+import OScreen from '../OScreen';
 import RenderLayers from '../RenderLayers';
 import compose_frag from '../shaders/box_blur/compose.frag';
 import box_blur_frag from '../shaders/box_blur/box_blur.frag';
@@ -18,9 +18,9 @@ export default class OutlineRender
 {
   constructor(webgl)
   {
-    this.main_rt = new WebGLRenderTarget(Screen.width, Screen.height);
-    this.rt1     = new WebGLRenderTarget(Screen.width, Screen.height);
-    this.rt2     = new WebGLRenderTarget(Screen.width, Screen.height);
+    this.main_rt = new WebGLRenderTarget(OScreen.width, OScreen.height);
+    this.rt1     = new WebGLRenderTarget(OScreen.width, OScreen.height);
+    this.rt2     = new WebGLRenderTarget(OScreen.width, OScreen.height);
 
     this.compose_material    = this.__get_compose_material();
     this.copy_material       = this.__get_copy_material();
@@ -101,7 +101,7 @@ export default class OutlineRender
       uniforms: {
         _MainTex: { value: undefined },
         _SampleDir: { value: new Vector2() },
-        _Screen: { value: new Vector2(Screen.width, Screen.height) }
+        _Screen: { value: new Vector2(OScreen.width, OScreen.height) }
       },
       vertexShader: copy_vert,
       fragmentShader: box_blur_frag,
@@ -116,7 +116,7 @@ export default class OutlineRender
       uniforms: {
         _MainTex: { value: undefined },
         _Blur: { value: undefined },
-        _Screen: { value: new Vector2(Screen.width, Screen.height) }
+        _Screen: { value: new Vector2(OScreen.width, OScreen.height) }
       },
       vertexShader: copy_vert,
       fragmentShader: compose_frag,

package/src/render_mode/PlanarReflectionsRender.js

@@ -3,7 +3,7 @@ import basic_color_vert from '../shaders/basic_color/basic_color.vert';
 import SceneManager from '../SceneManager';
 import CameraManager from '../CameraManager';
 import ReflectionPlaneContext from '../ReflectionPlaneContext';
-import Screen from '../Screen';
+import OScreen from '../OScreen';
 import BaseRender from '../render_mode/BaseRender';
 
 import { ShaderMaterial } from 'three';
@@ -65,7 +65,7 @@ export default class PlanarReflectionsRender extends BaseRender
   {
     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);