ohzi-core 6.1.2 → 6.2.1

package/src/static_batcher/GeometryBatcher.js

@@ -1,63 +1,63 @@
-import GeometryBatch from './GeometryBatch';
-
-import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils.js';
-
-import { Math as TMath } from 'three';
-import { BufferAttribute } from 'three';
-
-class GeometryBatcher
-{
-  init()
-  {
-    this.batches = [];
-  }
-
-  batch(buffer_geometries)
-  {
-    let attr_accessor_uvs = [];
-    let texture_width = TMath.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);
-
-    let uv_index = 0;
-
-    for (let i = 0; i < buffer_geometries.length; i++)
-    {
-      let vertex_count = buffer_geometries[i].getAttribute('position').count;
-      let y = Math.floor(i / texture_width);
-      let x = i - texture_width * y;
-      for (let count = 0; count < vertex_count; count++)
-      {
-        attr_accessor_uvs[uv_index] = (x / texture_width) + 0.5 / texture_width;
-        attr_accessor_uvs[uv_index + 1] = (y / texture_width) + 0.5 / texture_width;
-        uv_index += 2;
-      }
-    }
-
-    let buffer_attribute = new BufferAttribute(new Float32Array(attr_accessor_uvs), 2);
-    let buffer_geometry = BufferGeometryUtils.mergeBufferGeometries(buffer_geometries);
-    buffer_geometry.setAttribute('attr_accessor_uv', buffer_attribute);
-
-    this.batches.push(new GeometryBatch(buffer_geometry, texture_width));
-    return this.batches[this.batches.length - 1];
-  }
-
-  upload_texture_data(renderer)
-  {
-    for (let i = 0; i < this.batches.length; i++)
-    {
-      this.batches[i].upload_texture_data(renderer, 1);
-    }
-  }
-
-  __init_uv_array(uvs, texture_width)
-  {
-    for (let i = 0; i < texture_width * texture_width * 2; i++)
-    {
-      uvs.push(0);
-    }
-  }
-}
-
-export default new GeometryBatcher();
+import GeometryBatch from './GeometryBatch';
+
+import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils.js';
+
+import { Math as TMath } from 'three';
+import { BufferAttribute } from 'three';
+
+class GeometryBatcher
+{
+  init()
+  {
+    this.batches = [];
+  }
+
+  batch(buffer_geometries)
+  {
+    let attr_accessor_uvs = [];
+    let texture_width = TMath.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);
+
+    let uv_index = 0;
+
+    for (let i = 0; i < buffer_geometries.length; i++)
+    {
+      let vertex_count = buffer_geometries[i].getAttribute('position').count;
+      let y = Math.floor(i / texture_width);
+      let x = i - texture_width * y;
+      for (let count = 0; count < vertex_count; count++)
+      {
+        attr_accessor_uvs[uv_index] = (x / texture_width) + 0.5 / texture_width;
+        attr_accessor_uvs[uv_index + 1] = (y / texture_width) + 0.5 / texture_width;
+        uv_index += 2;
+      }
+    }
+
+    let buffer_attribute = new BufferAttribute(new Float32Array(attr_accessor_uvs), 2);
+    let buffer_geometry = BufferGeometryUtils.mergeBufferGeometries(buffer_geometries);
+    buffer_geometry.setAttribute('attr_accessor_uv', buffer_attribute);
+
+    this.batches.push(new GeometryBatch(buffer_geometry, texture_width));
+    return this.batches[this.batches.length - 1];
+  }
+
+  upload_texture_data(renderer)
+  {
+    for (let i = 0; i < this.batches.length; i++)
+    {
+      this.batches[i].upload_texture_data(renderer, 1);
+    }
+  }
+
+  __init_uv_array(uvs, texture_width)
+  {
+    for (let i = 0; i < texture_width * texture_width * 2; i++)
+    {
+      uvs.push(0);
+    }
+  }
+}
+
+export default new GeometryBatcher();

package/src/static_batcher/MeshBatcher.js

@@ -1,56 +1,56 @@
-import BatchedMesh from './BatchedMesh';
-
-import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils.js';
-
-import { BufferAttribute } from 'three';
-
-export default class MeshBatcher
-{
-  batch(meshes, material)
-  {
-    let max_texture_width = 2048;
-    // let texture_width  = meshes.length % max_texture_width;
-    // let texture_height = Math.ceil(meshes.length / max_texture_width);
-
-    // console.log("Store count: " + buffer_geometries.length + ", Texture size: " +texture_width);
-
-    let geometries = [];
-    let id_table = {};
-
-    let attr_mesh_id = [];
-
-    for (let i = 0; i < meshes.length; i++)
-    {
-      let mesh = meshes[i];
-      let vertex_count = mesh.geometry.getAttribute('position').count;
-
-      for (let count = 0; count < vertex_count; count++)
-      {
-        attr_mesh_id.push(i);
-      }
-
-      geometries.push(mesh.geometry);
-
-      if (id_table[mesh.name] === undefined)
-      {
-        id_table[mesh.name] = i;
-      }
-      else
-      {
-        console.error('Mesh name is duplicated when trying to merge meshes. Non-unique id error.', mesh.name, id_table);
-      }
-    }
-
-    let buffer_geometry = BufferGeometryUtils.mergeBufferGeometries(geometries);
-
-    let buffer_attribute = new BufferAttribute(new Float32Array(attr_mesh_id), 1);
-    buffer_geometry.setAttribute('mesh_id', buffer_attribute);
-
-    return this.create_batched_mesh(id_table, buffer_geometry, material, max_texture_width);
-  }
-
-  create_batched_mesh(id_table, buffer_geometry, material, max_texture_width)
-  {
-    return new BatchedMesh(id_table, buffer_geometry, material, max_texture_width);
-  }
-}
+import BatchedMesh from './BatchedMesh';
+
+import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils.js';
+
+import { BufferAttribute } from 'three';
+
+export default class MeshBatcher
+{
+  batch(meshes, material)
+  {
+    let max_texture_width = 2048;
+    // let texture_width  = meshes.length % max_texture_width;
+    // let texture_height = Math.ceil(meshes.length / max_texture_width);
+
+    // console.log("Store count: " + buffer_geometries.length + ", Texture size: " +texture_width);
+
+    let geometries = [];
+    let id_table = {};
+
+    let attr_mesh_id = [];
+
+    for (let i = 0; i < meshes.length; i++)
+    {
+      let mesh = meshes[i];
+      let vertex_count = mesh.geometry.getAttribute('position').count;
+
+      for (let count = 0; count < vertex_count; count++)
+      {
+        attr_mesh_id.push(i);
+      }
+
+      geometries.push(mesh.geometry);
+
+      if (id_table[mesh.name] === undefined)
+      {
+        id_table[mesh.name] = i;
+      }
+      else
+      {
+        console.error('Mesh name is duplicated when trying to merge meshes. Non-unique id error.', mesh.name, id_table);
+      }
+    }
+
+    let buffer_geometry = BufferGeometryUtils.mergeBufferGeometries(geometries);
+
+    let buffer_attribute = new BufferAttribute(new Float32Array(attr_mesh_id), 1);
+    buffer_geometry.setAttribute('mesh_id', buffer_attribute);
+
+    return this.create_batched_mesh(id_table, buffer_geometry, material, max_texture_width);
+  }
+
+  create_batched_mesh(id_table, buffer_geometry, material, max_texture_width)
+  {
+    return new BatchedMesh(id_table, buffer_geometry, material, max_texture_width);
+  }
+}

package/src/ui/ui_element_position/ScreenSpacePosition.js

@@ -1,14 +1,14 @@
-import { Vector2 } from 'three';
-
-export default class ScreenSpacePosition
-{
-  constructor()
-  {
-    this.tmp_vec = new Vector2();
-  }
-
-  get_pos_NDC(position)
-  {
-    return this.tmp_vec.set(position.x, position.y);
-  }
-}
+import { Vector2 } from 'three';
+
+export default class ScreenSpacePosition
+{
+  constructor()
+  {
+    this.tmp_vec = new Vector2();
+  }
+
+  get_pos_NDC(position)
+  {
+    return this.tmp_vec.set(position.x, position.y);
+  }
+}

package/src/ui/ui_element_position/WorldSpacePosition.js

@@ -1,21 +1,21 @@
-import CameraManager from '../../CameraManager';
-
-import { Vector2 } from 'three';
-import { Vector3 } from 'three';
-
-export default class WorldSpacePosition
-{
-  constructor()
-  {
-    this.tmp_vec3 = new Vector3();
-    this.tmp_vec2 = new Vector2();
-  }
-
-  get_pos_NDC(position)
-  {
-    this.tmp_vec3.copy(position);
-    this.tmp_vec3.project(CameraManager.current);
-
-    return this.tmp_vec2.set(this.tmp_vec3.x, this.tmp_vec3.y);
-  }
-}
+import CameraManager from '../../CameraManager';
+
+import { Vector2 } from 'three';
+import { Vector3 } from 'three';
+
+export default class WorldSpacePosition
+{
+  constructor()
+  {
+    this.tmp_vec3 = new Vector3();
+    this.tmp_vec2 = new Vector2();
+  }
+
+  get_pos_NDC(position)
+  {
+    this.tmp_vec3.copy(position);
+    this.tmp_vec3.project(CameraManager.current);
+
+    return this.tmp_vec2.set(this.tmp_vec3.x, this.tmp_vec3.y);
+  }
+}

package/src/ui/ui_element_state/OnIdle.js

@@ -1,17 +1,17 @@
-import UIElementState from './UIElementState';
-
-export default class OnIdle extends UIElementState
-{
-  constructor()
-  {
-    super();
-  }
-
-  update(ui_element, normalized_mouse_position)
-  {
-    if (ui_element.is_mouse_over(normalized_mouse_position))
-    {
-      ui_element.set_state(ui_element._on_enter_state);
-    }
-  }
-}
+import UIElementState from './UIElementState';
+
+export default class OnIdle extends UIElementState
+{
+  constructor()
+  {
+    super();
+  }
+
+  update(ui_element, normalized_mouse_position)
+  {
+    if (ui_element.is_mouse_over(normalized_mouse_position))
+    {
+      ui_element.set_state(ui_element._on_enter_state);
+    }
+  }
+}

package/src/ui/ui_element_state/OnMouseEnter.js

@@ -1,26 +1,26 @@
-import UIElementState from './UIElementState';
-
-export default class OnMouseEnter extends UIElementState
-{
-  constructor()
-  {
-    super();
-  }
-
-  on_enter(ui_element)
-  {
-    ui_element.on_mouse_enter();
-  }
-
-  update(ui_element, normalized_mouse_position)
-  {
-    if (ui_element.is_mouse_over(normalized_mouse_position))
-    {
-      ui_element.set_state(ui_element._on_hover_state);
-    }
-    else
-    {
-      ui_element.set_state(ui_element._on_exit_state);
-    }
-  }
-}
+import UIElementState from './UIElementState';
+
+export default class OnMouseEnter extends UIElementState
+{
+  constructor()
+  {
+    super();
+  }
+
+  on_enter(ui_element)
+  {
+    ui_element.on_mouse_enter();
+  }
+
+  update(ui_element, normalized_mouse_position)
+  {
+    if (ui_element.is_mouse_over(normalized_mouse_position))
+    {
+      ui_element.set_state(ui_element._on_hover_state);
+    }
+    else
+    {
+      ui_element.set_state(ui_element._on_exit_state);
+    }
+  }
+}

package/src/ui/ui_element_state/OnMouseExit.js

@@ -1,15 +1,15 @@
-import UIElementState from './UIElementState';
-
-export default class OnMouseExit extends UIElementState
-{
-  constructor()
-  {
-    super();
-  }
-
-  on_enter(ui_element)
-  {
-    ui_element.on_mouse_exit();
-    ui_element.set_state(ui_element._on_idle_state);
-  }
-}
+import UIElementState from './UIElementState';
+
+export default class OnMouseExit extends UIElementState
+{
+  constructor()
+  {
+    super();
+  }
+
+  on_enter(ui_element)
+  {
+    ui_element.on_mouse_exit();
+    ui_element.set_state(ui_element._on_idle_state);
+  }
+}

package/src/ui/ui_element_state/OnMouseHover.js

@@ -1,31 +1,31 @@
-import UIElementState from './UIElementState';
-
-export default class OnMouseHover extends UIElementState
-{
-  constructor()
-  {
-    super();
-  }
-
-  on_enter(ui_element)
-  {
-    this.__trigger_on_hover(ui_element);
-  }
-
-  update(ui_element, normalized_mouse_position)
-  {
-    if (ui_element.is_mouse_over(normalized_mouse_position))
-    {
-      this.__trigger_on_hover(ui_element);
-    }
-    else
-    {
-      ui_element.set_state(ui_element._on_exit_state);
-    }
-  }
-
-  __trigger_on_hover(ui_element)
-  {
-    ui_element.on_mouse_hover();
-  }
-}
+import UIElementState from './UIElementState';
+
+export default class OnMouseHover extends UIElementState
+{
+  constructor()
+  {
+    super();
+  }
+
+  on_enter(ui_element)
+  {
+    this.__trigger_on_hover(ui_element);
+  }
+
+  update(ui_element, normalized_mouse_position)
+  {
+    if (ui_element.is_mouse_over(normalized_mouse_position))
+    {
+      this.__trigger_on_hover(ui_element);
+    }
+    else
+    {
+      ui_element.set_state(ui_element._on_exit_state);
+    }
+  }
+
+  __trigger_on_hover(ui_element)
+  {
+    ui_element.on_mouse_hover();
+  }
+}

package/src/ui/ui_element_state/UIElementState.js

@@ -1,18 +1,18 @@
-export default class UIElementState
-{
-  constructor()
-  {
-
-  }
-
-  update(ui_element, normalized_mouse_position)
-  {
-
-  }
-
-  on_enter(ui_element)
-  {}
-
-  on_exit(ui_element)
-  {}
-}
+export default class UIElementState
+{
+  constructor()
+  {
+
+  }
+
+  update(ui_element, normalized_mouse_position)
+  {
+
+  }
+
+  on_enter(ui_element)
+  {}
+
+  on_exit(ui_element)
+  {}
+}

package/src/utilities/ArrayUtilities.js

@@ -1,55 +1,55 @@
-export default class ArrayUtilities
-{
-  constructor()
-  {}
-
-  static merge_from_to(source, target)
-  {
-    target.push.apply(target, source);
-  }
-
-  static expand_vec3_array(array, size)
-  {
-    let items_left_count = size - array.length;
-
-    for (let i = 0; i < items_left_count; i++)
-    {
-      array.push(array[i].clone());
-    }
-  }
-
-  static remove_elem(array, elem)
-  {
-    let index = array.indexOf(elem);
-    if (index > -1)
-    {
-      array.splice(index, 1);
-    }
-  }
-
-  static get_closest_point(points, target)
-  {
-    let closest_point = points[0];
-    let closest_distance = closest_point.distanceTo(target);
-    for (let i = 1; i < points.length; i++)
-    {
-      if (points[i].distanceTo(target) < closest_distance)
-      {
-        closest_point = points[i];
-        closest_distance = points[i].distanceTo(target);
-      }
-    }
-    return closest_point;
-  }
-
-  static object_values_to_array(obj)
-  {
-    let ids = Object.keys(obj);
-    let arr = [];
-    for (let i = 0; i < ids.length; i++)
-    {
-      arr.push(obj[ids[i]]);
-    }
-    return arr;
-  }
-}
+export default class ArrayUtilities
+{
+  constructor()
+  {}
+
+  static merge_from_to(source, target)
+  {
+    target.push.apply(target, source);
+  }
+
+  static expand_vec3_array(array, size)
+  {
+    let items_left_count = size - array.length;
+
+    for (let i = 0; i < items_left_count; i++)
+    {
+      array.push(array[i].clone());
+    }
+  }
+
+  static remove_elem(array, elem)
+  {
+    let index = array.indexOf(elem);
+    if (index > -1)
+    {
+      array.splice(index, 1);
+    }
+  }
+
+  static get_closest_point(points, target)
+  {
+    let closest_point = points[0];
+    let closest_distance = closest_point.distanceTo(target);
+    for (let i = 1; i < points.length; i++)
+    {
+      if (points[i].distanceTo(target) < closest_distance)
+      {
+        closest_point = points[i];
+        closest_distance = points[i].distanceTo(target);
+      }
+    }
+    return closest_point;
+  }
+
+  static object_values_to_array(obj)
+  {
+    let ids = Object.keys(obj);
+    let arr = [];
+    for (let i = 0; i < ids.length; i++)
+    {
+      arr.push(obj[ids[i]]);
+    }
+    return arr;
+  }
+}