ohzi-core 6.16.1 → 7.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohzi-core",
-  "version": "6.16.1",
+  "version": "7.0.1",
   "description": "OHZI Core Library",
   "source": "src/index.js",
   "module": "build/index.module.js",
@@ -37,7 +37,7 @@
   "homepage": "https://github.com/ohzinteractive/core",
   "dependencies": {
     "pit-js": "1.9.1",
-    "three": "^0.137.0"
+    "three": "0.146.0"
   },
   "devDependencies": {
     "cross-var": "^1.1.0",

package/src/Debug.js

@@ -11,7 +11,7 @@ import { Vector3 } from 'three';
 import { LineBasicMaterial } from 'three';
 import { BufferGeometry } from 'three';
 import { Line } from 'three';
-import { PlaneBufferGeometry } from 'three';
+import { PlaneGeometry } from 'three';
 import { ShaderMaterial } from 'three';
 import { Vector4 } from 'three';
 import { Mesh } from 'three';
@@ -136,7 +136,7 @@ class Debug
 
   draw_plane(width, height, color)
   {
-    const geometry = new PlaneBufferGeometry(width, height);
+    const geometry = new PlaneGeometry(width, height);
     const material = new ShaderMaterial({
       uniforms: {
         _Color: { value: new Vector4(0, 1, 0, 0.2) }
@@ -236,7 +236,7 @@ class Debug
 
   draw_texture(tex, w, h)
   {
-    const mesh = new Mesh(new PlaneBufferGeometry(1, 1), new ScreenSpaceTextureMaterial());
+    const mesh = new Mesh(new PlaneGeometry(1, 1), new ScreenSpaceTextureMaterial());
     this.display_texture_meshes.push(mesh);
     this.scene.add(mesh);
 

package/src/UI.js

@@ -13,11 +13,11 @@ class UI
     this.ui_elements = [];
     this._tmp_normalized_pos = new Vector2();
     this.ss_scene = new Scene();
-    this.ss_scene.autoUpdate = false;
+    this.ss_scene.matrixWorldAutoUpdate = false;
     this.ss_scene.frustumCulled = false;
 
     this.ws_scene = new Scene();
-    this.ws_scene.autoUpdate = false;
+    this.ws_scene.matrixWorldAutoUpdate = false;
     this.ws_scene.frustumCulled = false;
 
     this.ss_camera = new OrthographicCamera(-1, 1, 1, -1, -100, 100);

package/src/action_sequencer/ActionSequencer.js

@@ -1,5 +1,4 @@
 
-import { Math as TMath } from 'three';
 import OMath from '../utilities/OMath';
 
 export default class ActionSequencer
@@ -61,19 +60,19 @@ export default class ActionSequencer
 
   set_progress(time)
   {
-    this.elapsed_time = TMath.clamp(time, 0, this.duration);
+    this.elapsed_time = OMath.clamp(time, 0, this.duration);
     this.__play_clips(this.elapsed_time, this.elapsed_time);
   }
 
   set_normalized_progress(t)
   {
-    this.elapsed_time = TMath.clamp(t, 0, 1) * this.duration;
+    this.elapsed_time = OMath.clamp(t, 0, 1) * this.duration;
     this.__play_clips(this.elapsed_time, this.elapsed_time);
   }
 
   get_progress()
   {
-    return TMath.clamp(this.elapsed_time / this.get_duration(), 0, 1);
+    return OMath.clamp(this.elapsed_time / this.get_duration(), 0, 1);
   }
 
   is_finished()
@@ -180,7 +179,7 @@ export default class ActionSequencer
   {
     this.tmp_t = this.__linear_map_01(time, keyframe.from, keyframe.to);
 
-    return keyframe.interpolator.evaluate(TMath.clamp(this.tmp_t, 0, 1));
+    return keyframe.interpolator.evaluate(OMath.clamp(this.tmp_t, 0, 1));
   }
 
   get_keyframes(channel_name)

package/src/action_sequencer/NumberInterpolator.js

@@ -1,5 +1,5 @@
 import ActionInterpolator from './ActionInterpolator';
-import { Math as TMath } from 'three';
+import OMath from '../utilities/OMath';
 
 export default class NumberInterpolator extends ActionInterpolator
 {
@@ -15,11 +15,11 @@ export default class NumberInterpolator extends ActionInterpolator
 
   update(context, t)
   {
-    context[this.attribute_name] = TMath.lerp(this.from, this.to, this.easing_function(t));
+    context[this.attribute_name] = OMath.lerp(this.from, this.to, this.easing_function(t));
   }
 
   evaluate(t)
   {
-    return TMath.lerp(this.from, this.to, this.easing_function(t));
+    return OMath.lerp(this.from, this.to, this.easing_function(t));
   }
 }

package/src/components/EdgeMesh.js

@@ -13,7 +13,7 @@ import { EdgesGeometry } from 'three';
 import { LineSegments } from 'three';
 import { LineBasicMaterial } from 'three';
 import { Vector3 } from 'three';
-import { PlaneBufferGeometry } from 'three';
+import { PlaneGeometry } from 'three';
 import { BufferAttribute } from 'three';
 
 export default class EdgeMesh extends Object3D
@@ -82,7 +82,7 @@ export default class EdgeMesh extends Object3D
     for (let i = 0; i < points.length; i += 2)
     {
       const dir = points[i + 1].clone().sub(points[i]).normalize();
-      const geometry = new PlaneBufferGeometry(1, 1);
+      const geometry = new PlaneGeometry(1, 1);
       const vertices = geometry.getAttribute('position');
       // top right
       vertices.array[0] = points[i].x;
@@ -122,7 +122,7 @@ export default class EdgeMesh extends Object3D
     const circle_buffer_geometries = [];
     for (let i = 0; i < geometry_vertices.count; i++)
     {
-      const plane_geometry = new PlaneBufferGeometry(1, 1);
+      const plane_geometry = new PlaneGeometry(1, 1);
       const plane_vertices = plane_geometry.getAttribute('position');
       const w_pos = [];
       for (let d = 0; d < plane_vertices.count; d++)

package/src/components/Grid.js

@@ -5,7 +5,7 @@ import GeometryUtilities from '../utilities/GeometryUtilities';
 import { Mesh } from 'three';
 import { ShaderMaterial } from 'three';
 import { Color } from 'three';
-import { PlaneBufferGeometry } from 'three';
+import { PlaneGeometry } from 'three';
 
 export default class Grid extends Mesh
 {
@@ -22,7 +22,7 @@ export default class Grid extends Mesh
       depthWrite: false
     });
 
-    const plane_geometry = new PlaneBufferGeometry(100, 100, 100, 100);
+    const plane_geometry = new PlaneGeometry(100, 100, 100, 100);
 
     const non_indexed_geometry = GeometryUtilities.convert_to_non_indexed_geometry(plane_geometry);
 

package/src/components/sdf_text/SDFTextBatch.js

@@ -3,7 +3,7 @@ import SDFTextMaterial from '../../materials/SDFTextMaterial';
 import ArrayUtilities from '../../utilities/ArrayUtilities';
 
 import {
-  PlaneBufferGeometry,
+  PlaneGeometry,
   Mesh,
   Vector2,
   InstancedBufferGeometry,
@@ -21,7 +21,7 @@ export default class SDFTextBatch extends Mesh
     const instanced_geometry = new InstancedBufferGeometry();
     instanced_geometry.instanceCount = 0;
 
-    const geometry = new PlaneBufferGeometry(1, 1);
+    const geometry = new PlaneGeometry(1, 1);
     geometry.translate(0.5, 0.5, 0);
     instanced_geometry.setAttribute('position',  new Float32BufferAttribute(geometry.getAttribute('position').array, 3));
     instanced_geometry.setAttribute('uv',        new Float32BufferAttribute(geometry.getAttribute('uv').array, 2));

package/src/editor/ManipulatorHandle.js

@@ -9,7 +9,7 @@ import { BoxGeometry } from 'three';
 import { MeshBasicMaterial } from 'three';
 import { Mesh } from 'three';
 import { Raycaster } from 'three';
-import { Math as TMath } from 'three';
+import OMath from '../utilities/OMath';
 
 export default class ManipulatorHandle extends Object3D
 {
@@ -22,9 +22,9 @@ export default class ManipulatorHandle extends Object3D
     this.add(this.arrow_helper);
 
     const collider_size = new Vector3();
-    collider_size.x = TMath.clamp(direction.x * length, 1, 30);
-    collider_size.y = TMath.clamp(direction.y * length, 1, 30);
-    collider_size.z = TMath.clamp(direction.z * length, 1, 30);
+    collider_size.x = OMath.clamp(direction.x * length, 1, 30);
+    collider_size.y = OMath.clamp(direction.y * length, 1, 30);
+    collider_size.z = OMath.clamp(direction.z * length, 1, 30);
 
     const geometry = new BoxGeometry(collider_size.x, collider_size.y, collider_size.z);
     const material = new MeshBasicMaterial({ color: color, depthTest: false, depthWrite: false });

package/src/editor/ObjectPicker.js

@@ -47,8 +47,8 @@ export default class ObjectPicker
 
     this.camera_layers = this.camera.layers.mask;
     this.camera.layers.set(RenderLayers.selectable);
-    this.tmp_scene_auto_update = this.scene.autoUpdate;
-    this.scene.autoUpdate = false;
+    this.tmp_scene_auto_update = this.scene.matrixWorldAutoUpdate;
+    this.scene.matrixWorldAutoUpdate = false;
   }
 
   __restore_scene(objects)
@@ -59,7 +59,7 @@ export default class ObjectPicker
       objects[i].restore_layer_state();
     }
     this.camera.layers.mask = this.camera_layers;
-    this.scene.autoUpdate = this.tmp_scene_auto_update;
+    this.scene.matrixWorldAutoUpdate = this.tmp_scene_auto_update;
   }
 
   __readback_id(mouse_NDC)

package/src/html_utilities/css_animator_states/Animating.js

@@ -1,8 +1,7 @@
 import Time from '../../Time';
 import Idle from './Idle';
 
-import { Math as TMath } from 'three';
-
+import OMath from '../../utilities/OMath';
 export default class Animating
 {
   constructor()
@@ -25,9 +24,9 @@ export default class Animating
     this.t += Time.delta_time / animator.duration;
 
     this.easing_function_t = animator.easing_function(this.t);
-    this.easing_function_t = TMath.clamp(this.easing_function_t, 0, 1);
+    this.easing_function_t = OMath.clamp(this.easing_function_t, 0, 1);
 
-    animator.set_property_value(TMath.lerp(animator.from, animator.to, this.easing_function_t));
+    animator.set_property_value(OMath.lerp(animator.from, animator.to, this.easing_function_t));
 
     if (this.easing_function_t >= 0.9999)
     {

package/src/materials/SDFTextMaterial.js

@@ -2,7 +2,8 @@ import BaseShaderMaterial from './BaseShaderMaterial';
 import frag from '../shaders/sdf_text/sdf_text.frag';
 import vert from '../shaders/sdf_text/sdf_text.vert';
 
-import { Vector2, DoubleSide, LinearFilter, Math as TMath } from 'three';
+import { Vector2, DoubleSide, LinearFilter } from 'three';
+import OMath from '../utilities/OMath';
 
 export default class SDFTextMaterial extends BaseShaderMaterial
 {
@@ -32,6 +33,6 @@ export default class SDFTextMaterial extends BaseShaderMaterial
 
   set_boldness(value)
   {
-    this.uniforms._Boldness.value = TMath.lerp(0.5, 0.2, value);
+    this.uniforms._Boldness.value = OMath.lerp(0.5, 0.2, value);
   }
 }

package/src/materials/SSAOMaterial.js

@@ -3,12 +3,11 @@ import frag from '../shaders/ssao/ssao.frag';
 import vert from '../shaders/ssao/ssao.vert';
 
 import { Matrix4 } from 'three';
-import { Math as TMath } from 'three';
 import { Vector3 } from 'three';
 import { DataTexture } from 'three';
 import { RGBFormat } from 'three';
 import { RepeatWrapping } from 'three';
-
+import OMath from '../utilities/OMath';
 export default class SSAOMaterial extends BlitMaterial
 {
   constructor()
@@ -38,7 +37,7 @@ export default class SSAOMaterial extends BlitMaterial
         Math.random());
       dir.normalize();
       let scale = i / kernel_size;
-      scale   = TMath.lerp(0.1, 1.0, scale * scale);
+      scale   = OMath.lerp(0.1, 1.0, scale * scale);
       dir.multiplyScalar(scale);
 
       sample_kernel.push(dir);

package/src/primitives/HorizontalPlane.js

@@ -1,6 +1,6 @@
 import { Mesh } from 'three';
 import { MeshBasicMaterial } from 'three';
-import { PlaneBufferGeometry } from 'three';
+import { PlaneGeometry } from 'three';
 
 export default class HorizontalPlane extends Mesh
 {
@@ -11,7 +11,7 @@ export default class HorizontalPlane extends Mesh
     color = color || '#FF0000';
     material = material || new MeshBasicMaterial({ color: color });
 
-    const geometry = new PlaneBufferGeometry(width, height);
+    const geometry = new PlaneGeometry(width, height);
     geometry.rotateX(-3.14 / 2);
     super(geometry, material);
   }

package/src/primitives/VerticalPlane.js

@@ -1,5 +1,5 @@
 import { Mesh } from 'three';
-import { PlaneBufferGeometry } from 'three';
+import { PlaneGeometry } from 'three';
 import { MeshBasicMaterial } from 'three';
 
 export default class VerticalPlane extends Mesh
@@ -11,7 +11,7 @@ export default class VerticalPlane extends Mesh
     color = color || '#FF0000';
     material = material || new MeshBasicMaterial({ color: color });
 
-    const geometry = new PlaneBufferGeometry(width, height);
+    const geometry = new PlaneGeometry(width, height);
     super(geometry, material);
   }
 }

package/src/render_utilities/Blitter.js

@@ -2,7 +2,7 @@ import BlitMaterial from '../materials/BlitMaterial';
 
 import { Scene } from 'three';
 import { Mesh } from 'three';
-import { PlaneBufferGeometry } from 'three';
+import { PlaneGeometry } from 'three';
 import { OrthographicCamera } from 'three';
 
 export default class Blitter
@@ -13,7 +13,7 @@ export default class Blitter
     this._blit_scene = new Scene();
     this._blit_material = new BlitMaterial();
     this._blit_quad = new Mesh(
-      new PlaneBufferGeometry(1, 1), this._blit_material);
+      new PlaneGeometry(1, 1), this._blit_material);
     this._blit_scene.add(this._blit_quad);
     this._blit_camera = new OrthographicCamera(-1, 1, 1, -1, -10000, 10000);
   }

package/src/static_batcher/GeometryBatcher.js

@@ -2,8 +2,8 @@ import GeometryBatch from './GeometryBatch';
 
 import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils.js';
 
-import { Math as TMath } from 'three';
 import { BufferAttribute } from 'three';
+import OMath from '../utilities/OMath';
 
 class GeometryBatcher
 {
@@ -15,7 +15,7 @@ class GeometryBatcher
   batch(buffer_geometries)
   {
     const attr_accessor_uvs = [];
-    const texture_width = TMath.ceilPowerOfTwo(Math.sqrt(buffer_geometries.length));
+    const texture_width = OMath.ceilPowerOfTwo(Math.sqrt(buffer_geometries.length));
     // console.log("Store count: " + buffer_geometries.length + ", Texture size: " +texture_width);
 
     this.__init_uv_array(attr_accessor_uvs, texture_width);

package/src/utilities/OMath.js

@@ -1,5 +1,4 @@
 import { Vector3 } from 'three';
-import { Math as TMath } from 'three';
 
 export default class OMath
 {
@@ -64,7 +63,7 @@ export default class OMath
   {
     for (let i = 0; i < 16; i++)
     {
-      target.elements[i] = TMath.lerp(from.elements[i], to.elements[i], t);
+      target.elements[i] = this.lerp(from.elements[i], to.elements[i], t);
     }
   }
 

package/src/utilities/PerspectiveFrustumPointFitter.js

@@ -1,4 +1,5 @@
-import { Vector3, Plane, Quaternion, Sphere, Math as TMath, Line3 } from 'three';
+import { Vector3, Plane, Quaternion, Sphere, Line3 } from 'three';
+import OMath from './OMath';
 export default class PerspectiveFrustumPointFitter
 {
   constructor()
@@ -10,7 +11,7 @@ export default class PerspectiveFrustumPointFitter
   {
     this.sphere.setFromPoints(points);
 
-    const v_fov = TMath.degToRad(vertical_fov / 2);
+    const v_fov = OMath.degToRad(vertical_fov / 2);
     const h_fov = (2 * Math.atan(Math.tan(v_fov) * aspect)) / 2;
 
     const up_plane_normal = this.get_up_plane_normal(camera_quaternion, v_fov);

package/src/view_components/transition/ActionSequencerBuilder.js

@@ -16,7 +16,7 @@ export default class ActionSequencerBuilder
     const tracks = animation_data.animation_tracks;
     const triggers = animation_data.triggers;
 
-    const initial_tracks = this.state_to_tracks(this.initial_state_data);
+    const initial_tracks = this.state_to_tracks(this.initial_state_data, this.get_longest_time(animation_data.animation_tracks));
 
     for (let i = 0; i < initial_tracks.length; i++)
     {
@@ -52,7 +52,7 @@ export default class ActionSequencerBuilder
     return sequencer;
   }
 
-  state_to_tracks(state)
+  state_to_tracks(state, longest_time)
   {
     const tracks = [];
 
@@ -63,7 +63,7 @@ export default class ActionSequencerBuilder
       tracks.push({
         attribute_name: keys[i],
         from_time: 0,
-        to_time: 1,
+        to_time: longest_time < 1 ? longest_time : 1,
         to_value: state[keys[i]],
         initial: true,
         easing_function: 'ease_in_out_cubic'
@@ -103,4 +103,20 @@ export default class ActionSequencerBuilder
 
     return sequencer;
   }
+
+  get_longest_time(tracks)
+  {
+    let longest_time = -1;
+
+    for (let i = 0; i < tracks.length; i++)
+    {
+      const track = tracks[i];
+
+      const track_time = track.to_time;
+
+      longest_time = track_time > longest_time ? track_time : longest_time;
+    }
+
+    return longest_time;
+  }
 }