ohzi-core 6.1.2 → 6.2.1

package/src/components/sdf_text/SDFTextBatch.js

@@ -1,193 +1,193 @@
-import SDFText from './SDFText';
-import SDFTextMaterial from '../../materials/SDFTextMaterial';
-import ArrayUtilities from '../../utilities/ArrayUtilities';
-
-import {
-  PlaneBufferGeometry,
-  Mesh,
-  Vector2,
-  InstancedBufferGeometry,
-  InstancedBufferAttribute,
-  Float32BufferAttribute,
-  DynamicDrawUsage
-} from 'three';
-
-export default class SDFTextBatch extends Mesh
-{
-  constructor(font_layout, atlas_texture)
-  {
-    let max_allocations = 2000;
-
-    let instanced_geometry = new InstancedBufferGeometry();
-    instanced_geometry.instanceCount = 0;
-
-    let geometry = new PlaneBufferGeometry(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));
-    instanced_geometry.index = geometry.index;
-
-    let transformsCol0 = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
-    let transformsCol1 = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
-    let transformsCol2 = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
-    let transformsCol3 = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
-
-    let glyph_bounds = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
-    let plane_bounds = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
-
-    let color = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
-
-    transformsCol0.usage  = DynamicDrawUsage;
-    transformsCol1.usage  = DynamicDrawUsage;
-    transformsCol2.usage  = DynamicDrawUsage;
-    transformsCol3.usage  = DynamicDrawUsage;
-    glyph_bounds.usage    = DynamicDrawUsage;
-    plane_bounds.usage    = DynamicDrawUsage;
-    color.usage           = DynamicDrawUsage;
-
-    instanced_geometry.setAttribute('transformsCol0', transformsCol0);
-    instanced_geometry.setAttribute('transformsCol1', transformsCol1);
-    instanced_geometry.setAttribute('transformsCol2', transformsCol2);
-    instanced_geometry.setAttribute('transformsCol3', transformsCol3);
-
-    instanced_geometry.setAttribute('glyph_bounds', glyph_bounds);
-    instanced_geometry.setAttribute('plane_bounds', plane_bounds);
-    instanced_geometry.setAttribute('color',        color);
-
-    super(instanced_geometry, new SDFTextMaterial(atlas_texture));
-
-    this.text_elements = [];
-    this.font_layout = font_layout;
-
-    this.material.set_atlas_size(new Vector2(font_layout.atlas.width, font_layout.atlas.height));
-
-    this.frustumCulled = false;
-  }
-
-  set_boldness(value)
-  {
-    this.material.set_boldness(value);
-  }
-
-  add_text(text_str)
-  {
-    let elem = new SDFText(this.font_layout.glyphs, text_str);
-    this.text_elements.push(elem);
-    return elem;
-  }
-
-  remove_text(text_elem)
-  {
-    ArrayUtilities.remove_elem(this.text_elements, text_elem);
-    this.update(true);
-  }
-
-  update(force_update)
-  {
-    let glyph_bounds_atr = this.geometry.getAttribute('glyph_bounds');
-    let plane_bounds_atr = this.geometry.getAttribute('plane_bounds');
-
-    let transformsCol0 = this.geometry.getAttribute('transformsCol0');
-    let transformsCol1 = this.geometry.getAttribute('transformsCol1');
-    let transformsCol2 = this.geometry.getAttribute('transformsCol2');
-    let transformsCol3 = this.geometry.getAttribute('transformsCol3');
-
-    let color_atr = this.geometry.getAttribute('color');
-
-    let matrix_needs_update = force_update === true;
-    let glyph_needs_update  = force_update === true;
-    let color_needs_update  = force_update === true;
-
-    let glyph_count = 0;
-    for (let i = 0; i < this.text_elements.length; i++)
-    {
-      let text = this.text_elements[i];
-
-      if (text.matrix_is_dirty)
-      {
-        matrix_needs_update = true;
-        text.update_matrix();
-      }
-
-      if (text.glyph_is_dirty)
-      {
-        glyph_needs_update = true;
-        text.clear_glyph_dirty();
-      }
-
-      if (text.color_is_dirty)
-      {
-        color_needs_update = true;
-        text.clear_color_dirty();
-      }
-
-      let matrix = text.matrix;
-      let color = text.color;
-      let opacity = text.opacity;
-
-      for (let glyph_i = 0; glyph_i < text.glyphs.length; glyph_i++)
-      {
-        let glyph = text.glyphs[glyph_i];
-
-        let buffer_i = glyph_count;
-
-        glyph_bounds_atr.setXYZW(buffer_i, glyph.atlas_bounds.x, glyph.atlas_bounds.y, glyph.atlas_bounds.z, glyph.atlas_bounds.w);
-        plane_bounds_atr.setXYZW(buffer_i, glyph.position.x, glyph.position.y, glyph.scale.x, glyph.scale.y);
-
-        transformsCol0.setXYZW(buffer_i, matrix.elements[0],
-          matrix.elements[1],
-          matrix.elements[2],
-          matrix.elements[3]);
-
-        transformsCol1.setXYZW(buffer_i, matrix.elements[4],
-          matrix.elements[5],
-          matrix.elements[6],
-          matrix.elements[7]);
-
-        transformsCol2.setXYZW(buffer_i, matrix.elements[8],
-          matrix.elements[9],
-          matrix.elements[10],
-          matrix.elements[11]);
-
-        transformsCol3.setXYZW(buffer_i, matrix.elements[12],
-          matrix.elements[13],
-          matrix.elements[14],
-          matrix.elements[15]);
-
-        color_atr.setXYZW(buffer_i, color.r, color.g, color.b, opacity);
-
-        glyph_count++;
-      }
-    }
-
-    this.geometry.instanceCount = glyph_count;
-
-    if (glyph_count > this.max_allocations)
-    {
-      console.error('SDFTextBatch exceeded maximum glyph allocations(max/current): ', this.max_allocations, glyph_count, this);
-    }
-
-    if (matrix_needs_update)
-    {
-      transformsCol0.needsUpdate = true;
-      transformsCol1.needsUpdate = true;
-      transformsCol2.needsUpdate = true;
-      transformsCol3.needsUpdate = true;
-    }
-    if (glyph_needs_update)
-    {
-      glyph_bounds_atr.needsUpdate = true;
-      plane_bounds_atr.needsUpdate = true;
-    }
-    if (color_needs_update)
-    {
-      color_atr.needsUpdate = true;
-    }
-  }
-
-  dispose()
-  {
-    this.geometry.dispose();
-    this.material.dispose();
-  }
-}
+import SDFText from './SDFText';
+import SDFTextMaterial from '../../materials/SDFTextMaterial';
+import ArrayUtilities from '../../utilities/ArrayUtilities';
+
+import {
+  PlaneBufferGeometry,
+  Mesh,
+  Vector2,
+  InstancedBufferGeometry,
+  InstancedBufferAttribute,
+  Float32BufferAttribute,
+  DynamicDrawUsage
+} from 'three';
+
+export default class SDFTextBatch extends Mesh
+{
+  constructor(font_layout, atlas_texture)
+  {
+    let max_allocations = 2000;
+
+    let instanced_geometry = new InstancedBufferGeometry();
+    instanced_geometry.instanceCount = 0;
+
+    let geometry = new PlaneBufferGeometry(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));
+    instanced_geometry.index = geometry.index;
+
+    let transformsCol0 = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
+    let transformsCol1 = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
+    let transformsCol2 = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
+    let transformsCol3 = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
+
+    let glyph_bounds = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
+    let plane_bounds = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
+
+    let color = new InstancedBufferAttribute(new Float32Array(max_allocations * 4), 4, false);
+
+    transformsCol0.usage  = DynamicDrawUsage;
+    transformsCol1.usage  = DynamicDrawUsage;
+    transformsCol2.usage  = DynamicDrawUsage;
+    transformsCol3.usage  = DynamicDrawUsage;
+    glyph_bounds.usage    = DynamicDrawUsage;
+    plane_bounds.usage    = DynamicDrawUsage;
+    color.usage           = DynamicDrawUsage;
+
+    instanced_geometry.setAttribute('transformsCol0', transformsCol0);
+    instanced_geometry.setAttribute('transformsCol1', transformsCol1);
+    instanced_geometry.setAttribute('transformsCol2', transformsCol2);
+    instanced_geometry.setAttribute('transformsCol3', transformsCol3);
+
+    instanced_geometry.setAttribute('glyph_bounds', glyph_bounds);
+    instanced_geometry.setAttribute('plane_bounds', plane_bounds);
+    instanced_geometry.setAttribute('color',        color);
+
+    super(instanced_geometry, new SDFTextMaterial(atlas_texture));
+
+    this.text_elements = [];
+    this.font_layout = font_layout;
+
+    this.material.set_atlas_size(new Vector2(font_layout.atlas.width, font_layout.atlas.height));
+
+    this.frustumCulled = false;
+  }
+
+  set_boldness(value)
+  {
+    this.material.set_boldness(value);
+  }
+
+  add_text(text_str)
+  {
+    let elem = new SDFText(this.font_layout.glyphs, text_str);
+    this.text_elements.push(elem);
+    return elem;
+  }
+
+  remove_text(text_elem)
+  {
+    ArrayUtilities.remove_elem(this.text_elements, text_elem);
+    this.update(true);
+  }
+
+  update(force_update)
+  {
+    let glyph_bounds_atr = this.geometry.getAttribute('glyph_bounds');
+    let plane_bounds_atr = this.geometry.getAttribute('plane_bounds');
+
+    let transformsCol0 = this.geometry.getAttribute('transformsCol0');
+    let transformsCol1 = this.geometry.getAttribute('transformsCol1');
+    let transformsCol2 = this.geometry.getAttribute('transformsCol2');
+    let transformsCol3 = this.geometry.getAttribute('transformsCol3');
+
+    let color_atr = this.geometry.getAttribute('color');
+
+    let matrix_needs_update = force_update === true;
+    let glyph_needs_update  = force_update === true;
+    let color_needs_update  = force_update === true;
+
+    let glyph_count = 0;
+    for (let i = 0; i < this.text_elements.length; i++)
+    {
+      let text = this.text_elements[i];
+
+      if (text.matrix_is_dirty)
+      {
+        matrix_needs_update = true;
+        text.update_matrix();
+      }
+
+      if (text.glyph_is_dirty)
+      {
+        glyph_needs_update = true;
+        text.clear_glyph_dirty();
+      }
+
+      if (text.color_is_dirty)
+      {
+        color_needs_update = true;
+        text.clear_color_dirty();
+      }
+
+      let matrix = text.matrix;
+      let color = text.color;
+      let opacity = text.opacity;
+
+      for (let glyph_i = 0; glyph_i < text.glyphs.length; glyph_i++)
+      {
+        let glyph = text.glyphs[glyph_i];
+
+        let buffer_i = glyph_count;
+
+        glyph_bounds_atr.setXYZW(buffer_i, glyph.atlas_bounds.x, glyph.atlas_bounds.y, glyph.atlas_bounds.z, glyph.atlas_bounds.w);
+        plane_bounds_atr.setXYZW(buffer_i, glyph.position.x, glyph.position.y, glyph.scale.x, glyph.scale.y);
+
+        transformsCol0.setXYZW(buffer_i, matrix.elements[0],
+          matrix.elements[1],
+          matrix.elements[2],
+          matrix.elements[3]);
+
+        transformsCol1.setXYZW(buffer_i, matrix.elements[4],
+          matrix.elements[5],
+          matrix.elements[6],
+          matrix.elements[7]);
+
+        transformsCol2.setXYZW(buffer_i, matrix.elements[8],
+          matrix.elements[9],
+          matrix.elements[10],
+          matrix.elements[11]);
+
+        transformsCol3.setXYZW(buffer_i, matrix.elements[12],
+          matrix.elements[13],
+          matrix.elements[14],
+          matrix.elements[15]);
+
+        color_atr.setXYZW(buffer_i, color.r, color.g, color.b, opacity);
+
+        glyph_count++;
+      }
+    }
+
+    this.geometry.instanceCount = glyph_count;
+
+    if (glyph_count > this.max_allocations)
+    {
+      console.error('SDFTextBatch exceeded maximum glyph allocations(max/current): ', this.max_allocations, glyph_count, this);
+    }
+
+    if (matrix_needs_update)
+    {
+      transformsCol0.needsUpdate = true;
+      transformsCol1.needsUpdate = true;
+      transformsCol2.needsUpdate = true;
+      transformsCol3.needsUpdate = true;
+    }
+    if (glyph_needs_update)
+    {
+      glyph_bounds_atr.needsUpdate = true;
+      plane_bounds_atr.needsUpdate = true;
+    }
+    if (color_needs_update)
+    {
+      color_atr.needsUpdate = true;
+    }
+  }
+
+  dispose()
+  {
+    this.geometry.dispose();
+    this.material.dispose();
+  }
+}

package/src/components/sdf_text/TextGlyph.js

@@ -1,15 +1,15 @@
-import { Vector2, Vector4 } from 'three';
-
-export default class TextGlyph
-{
-  constructor(offset, plane_bounds, atlas_bounds)
-  {
-    let width   = plane_bounds.right - plane_bounds.left;
-    let height  = plane_bounds.top   - plane_bounds.bottom;
-
-    this.scale    = new Vector2(width, height);
-    this.position = new Vector2(offset + plane_bounds.left, plane_bounds.bottom);
-
-    this.atlas_bounds = new Vector4(atlas_bounds.left, atlas_bounds.right, atlas_bounds.top, atlas_bounds.bottom);
-  }
-}
+import { Vector2, Vector4 } from 'three';
+
+export default class TextGlyph
+{
+  constructor(offset, plane_bounds, atlas_bounds)
+  {
+    let width   = plane_bounds.right - plane_bounds.left;
+    let height  = plane_bounds.top   - plane_bounds.bottom;
+
+    this.scale    = new Vector2(width, height);
+    this.position = new Vector2(offset + plane_bounds.left, plane_bounds.bottom);
+
+    this.atlas_bounds = new Vector4(atlas_bounds.left, atlas_bounds.right, atlas_bounds.top, atlas_bounds.bottom);
+  }
+}

package/src/data_textures/CustomDataTexture.js

@@ -1,51 +1,51 @@
-import { DataTexture } from 'three';
-
-export default class CustomDataTexture extends DataTexture
-{
-  constructor(data, width, height, format, type)
-  {
-    super(data, width, height, format, type);
-    this.multiplier = 1;
-  }
-
-  set_rgba(index, r, g, b, a)
-  {
-    this.data[index * 3 + 0] = r * this.multiplier;
-    this.data[index * 3 + 1] = g * this.multiplier;
-    this.data[index * 3 + 2] = b * this.multiplier;
-    this.data[index * 3 + 3] = a * this.multiplier;
-    this.needsUpdate = true;
-  }
-
-  set_rgb(index, r, g, b)
-  {
-    this.data[index * 3 + 0] = r * this.multiplier;
-    this.data[index * 3 + 1] = g * this.multiplier;
-    this.data[index * 3 + 2] = b * this.multiplier;
-    this.needsUpdate = true;
-  }
-
-  set_r(index, value)
-  {
-    this.data[index * 3 + 0] = value * this.multiplier;
-    this.needsUpdate = true;
-  }
-
-  set_g(index, value)
-  {
-    this.data[index * 3 + 1] = value * this.multiplier;
-    this.needsUpdate = true;
-  }
-
-  set_b(index, value)
-  {
-    this.data[index * 3 + 2] = value * this.multiplier;
-    this.needsUpdate = true;
-  }
-
-  set_a(index, value)
-  {
-    this.data[index * 3 + 2] = value * this.multiplier;
-    this.needsUpdate = true;
-  }
-}
+import { DataTexture } from 'three';
+
+export default class CustomDataTexture extends DataTexture
+{
+  constructor(data, width, height, format, type)
+  {
+    super(data, width, height, format, type);
+    this.multiplier = 1;
+  }
+
+  set_rgba(index, r, g, b, a)
+  {
+    this.data[index * 3 + 0] = r * this.multiplier;
+    this.data[index * 3 + 1] = g * this.multiplier;
+    this.data[index * 3 + 2] = b * this.multiplier;
+    this.data[index * 3 + 3] = a * this.multiplier;
+    this.needsUpdate = true;
+  }
+
+  set_rgb(index, r, g, b)
+  {
+    this.data[index * 3 + 0] = r * this.multiplier;
+    this.data[index * 3 + 1] = g * this.multiplier;
+    this.data[index * 3 + 2] = b * this.multiplier;
+    this.needsUpdate = true;
+  }
+
+  set_r(index, value)
+  {
+    this.data[index * 3 + 0] = value * this.multiplier;
+    this.needsUpdate = true;
+  }
+
+  set_g(index, value)
+  {
+    this.data[index * 3 + 1] = value * this.multiplier;
+    this.needsUpdate = true;
+  }
+
+  set_b(index, value)
+  {
+    this.data[index * 3 + 2] = value * this.multiplier;
+    this.needsUpdate = true;
+  }
+
+  set_a(index, value)
+  {
+    this.data[index * 3 + 2] = value * this.multiplier;
+    this.needsUpdate = true;
+  }
+}

package/src/data_textures/RGBADataTexture.js

@@ -1,12 +1,12 @@
-import CustomDataTexture from './CustomDataTexture';
-import { RGBAFormat } from 'three';
-
-export default class RGBADataTexture extends CustomDataTexture
-{
-  constructor(width, height)
-  {
-    let data = new Uint8Array(width * height * 4);
-    super(data, width, height, RGBAFormat);
-    this.multiplier = 255;
-  }
-}
+import CustomDataTexture from './CustomDataTexture';
+import { RGBAFormat } from 'three';
+
+export default class RGBADataTexture extends CustomDataTexture
+{
+  constructor(width, height)
+  {
+    let data = new Uint8Array(width * height * 4);
+    super(data, width, height, RGBAFormat);
+    this.multiplier = 255;
+  }
+}

package/src/data_textures/RGBAFloatDataTexture.js

@@ -1,12 +1,12 @@
-import CustomDataTexture from './CustomDataTexture';
-import { FloatType } from 'three';
-import { RGBAFormat } from 'three';
-
-export default class RGBAFloatDataTexture extends CustomDataTexture
-{
-  constructor(width, height)
-  {
-    let data = new Float32Array(width * height * 4);
-    super(data, width, height, RGBAFormat, FloatType);
-  }
-}
+import CustomDataTexture from './CustomDataTexture';
+import { FloatType } from 'three';
+import { RGBAFormat } from 'three';
+
+export default class RGBAFloatDataTexture extends CustomDataTexture
+{
+  constructor(width, height)
+  {
+    let data = new Float32Array(width * height * 4);
+    super(data, width, height, RGBAFormat, FloatType);
+  }
+}

package/src/data_textures/RGBDataTexture.js

@@ -1,12 +1,12 @@
-import CustomDataTexture from './CustomDataTexture';
-import { RGBFormat } from 'three';
-
-export default class RGBDataTexture extends CustomDataTexture
-{
-  constructor(width, height)
-  {
-    let data = new Uint8Array(width * height * 3);
-    super(data, width, height, RGBFormat);
-    this.multiplier = 255;
-  }
-}
+import CustomDataTexture from './CustomDataTexture';
+import { RGBFormat } from 'three';
+
+export default class RGBDataTexture extends CustomDataTexture
+{
+  constructor(width, height)
+  {
+    let data = new Uint8Array(width * height * 3);
+    super(data, width, height, RGBFormat);
+    this.multiplier = 255;
+  }
+}

package/src/data_textures/RGBFloatDataTexture.js

@@ -1,12 +1,12 @@
-import CustomDataTexture from './CustomDataTexture';
-import { FloatType } from 'three';
-import { RGBFormat } from 'three';
-
-export default class RGBFloatDataTexture extends CustomDataTexture
-{
-  constructor(width, height)
-  {
-    let data = new Float32Array(width * height * 3);
-    super(data, width, height, RGBFormat, FloatType);
-  }
-}
+import CustomDataTexture from './CustomDataTexture';
+import { FloatType } from 'three';
+import { RGBFormat } from 'three';
+
+export default class RGBFloatDataTexture extends CustomDataTexture
+{
+  constructor(width, height)
+  {
+    let data = new Float32Array(width * height * 3);
+    super(data, width, height, RGBFormat, FloatType);
+  }
+}