ohzi-core 6.1.2 → 6.2.1

package/src/components/Line.js

@@ -1,199 +1,199 @@
-import line_vs from '../shaders/basic_line/basic_line.vert';
-import line_fs from '../shaders/basic_line/basic_line.frag';
-
-import { Mesh } from 'three';
-import { BufferAttribute } from 'three';
-import { BufferGeometry } from 'three';
-import { ShaderMaterial } from 'three';
-import { Color } from 'three';
-
-export default class Line extends Mesh
-{
-  constructor(points)
-  {
-    let geometry = new BufferGeometry();
-    geometry.setAttribute('position',           new BufferAttribute(new Float32Array([]), 3));
-    geometry.setAttribute('next_position',      new BufferAttribute(new Float32Array([]), 3));
-    geometry.setAttribute('previous_position',  new BufferAttribute(new Float32Array([]), 3));
-    geometry.setAttribute('orientation',        new BufferAttribute(new Float32Array([]), 1));
-    geometry.setAttribute('coverage',           new BufferAttribute(new Float32Array([]), 1));
-
-    let material = new ShaderMaterial({
-      uniforms: {
-        _Thickness: { value: 0.2 },
-        _Length: { value: 0 },
-        _ElapsedTime: { value: 0 },
-        _Color: { value: new Color('#FF0000') }
-      },
-      vertexShader: line_vs,
-      fragmentShader: line_fs,
-      transparent: true,
-      depthWrite: false,
-      extensions: { derivatives: true }
-
-    });
-
-    super(geometry, material);
-
-    if (points)
-    {
-      this.setup(points);
-    }
-  }
-
-  setup(points)
-  {
-    let vertices = [];
-    let next_position = [];
-    let previous_position = [];
-    let orientation = [];
-    let coverage = [];
-    let accumulated_length = 0;
-
-    for (let i = 0; i < points.length; i++)
-    {
-      vertices.push(points[i].x);
-      vertices.push(points[i].y);
-      vertices.push(points[i].z);
-      orientation.push(1);
-
-      vertices.push(points[i].x);
-      vertices.push(points[i].y);
-      vertices.push(points[i].z);
-      orientation.push(-1);
-
-      let next_point = this.__get_next_position(points, i);
-      next_position.push(next_point.x);
-      next_position.push(next_point.y);
-      next_position.push(next_point.z);
-
-      next_position.push(next_point.x);
-      next_position.push(next_point.y);
-      next_position.push(next_point.z);
-
-      let previous_point = this.__get_previous_position(points, i);
-      previous_position.push(previous_point.x);
-      previous_position.push(previous_point.y);
-      previous_position.push(previous_point.z);
-
-      previous_position.push(previous_point.x);
-      previous_position.push(previous_point.y);
-      previous_position.push(previous_point.z);
-
-      coverage.push(accumulated_length);
-      coverage.push(accumulated_length);
-
-      if (i < points.length - 1)
-      {
-        accumulated_length += points[i].distanceTo(next_point);
-      }
-    }
-    let vertexList            = new Float32Array(vertices);
-    let nextPositionList      = new Float32Array(next_position);
-    let previousPositionList  = new Float32Array(previous_position);
-    let orientationList       = new Float32Array(orientation);
-    let coverageList          = new Float32Array(coverage);
-
-    let indices = [];
-    for (let i = 0; i < ((vertexList.length / 3) - 2) / 2; i++)
-    {
-      let index = (i * 2) + 1;
-      indices.push(index);
-      indices.push(index + 1);
-      indices.push(index - 1);
-
-      indices.push(index);
-      indices.push(index + 2);
-      indices.push(index + 1);
-    }
-
-    this.geometry.setIndex(indices);
-    this.geometry.getAttribute('position').copy(new BufferAttribute(vertexList, 3));
-    this.geometry.getAttribute('next_position').copy(new BufferAttribute(nextPositionList, 3));
-    this.geometry.getAttribute('previous_position').copy(new BufferAttribute(previousPositionList, 3));
-    this.geometry.getAttribute('orientation').copy(new BufferAttribute(orientationList, 1));
-    this.geometry.getAttribute('coverage').copy(new BufferAttribute(coverageList, 1));
-
-    this.geometry.getAttribute('position').needsUpdate = true;
-    this.geometry.getAttribute('next_position').needsUpdate = true;
-    this.geometry.getAttribute('previous_position').needsUpdate = true;
-    this.geometry.getAttribute('orientation').needsUpdate = true;
-    this.geometry.getAttribute('coverage').needsUpdate = true;
-
-    this.material.uniforms._Length.value = accumulated_length;
-    this._length = accumulated_length;
-  }
-
-  set thickness(value)
-  {
-    this.material.uniforms._Thickness.value = value;
-  }
-
-  get thickness()
-  {
-    return this.material.uniforms._Thickness.value;
-  }
-
-  __get_previous_position(points, i)
-  {
-    if (i === 0)
-    {
-      return points[1].clone().sub(points[0]).multiplyScalar(-1).add(points[0]);
-    }
-    else
-    {
-      return points[i - 1];
-    }
-  }
-
-  __get_next_position(points, i)
-  {
-    if (i === points.length - 1)
-    {
-      return points[points.length - 2].clone().sub(points[points.length - 1]).multiplyScalar(-1).add(points[points.length - 1]);
-    }
-    else
-    {
-      return points[i + 1];
-    }
-  }
-
-  update()
-  {
-  }
-
-  distance()
-  {
-    return this.accumulated_length;
-  }
-
-  total_length()
-  {
-    return this.accumulated_length;
-  }
-
-  dispose()
-  {
-    this.geometry.dispose();
-    this.material.dispose();
-    if (this.parent)
-    {
-      this.parent.remove(this);
-    }
-  }
-
-  set color(col)
-  {
-    this.material.uniforms._Color.value.set(col);
-  }
-
-  get color()
-  {
-    return this.material.uniforms._Color.value;
-  }
-
-  copy_color(col)
-  {
-    this.material.uniforms._Color.value.copy(col);
-  }
-}
+import line_vs from '../shaders/basic_line/basic_line.vert';
+import line_fs from '../shaders/basic_line/basic_line.frag';
+
+import { Mesh } from 'three';
+import { BufferAttribute } from 'three';
+import { BufferGeometry } from 'three';
+import { ShaderMaterial } from 'three';
+import { Color } from 'three';
+
+export default class Line extends Mesh
+{
+  constructor(points)
+  {
+    let geometry = new BufferGeometry();
+    geometry.setAttribute('position',           new BufferAttribute(new Float32Array([]), 3));
+    geometry.setAttribute('next_position',      new BufferAttribute(new Float32Array([]), 3));
+    geometry.setAttribute('previous_position',  new BufferAttribute(new Float32Array([]), 3));
+    geometry.setAttribute('orientation',        new BufferAttribute(new Float32Array([]), 1));
+    geometry.setAttribute('coverage',           new BufferAttribute(new Float32Array([]), 1));
+
+    let material = new ShaderMaterial({
+      uniforms: {
+        _Thickness: { value: 0.2 },
+        _Length: { value: 0 },
+        _ElapsedTime: { value: 0 },
+        _Color: { value: new Color('#FF0000') }
+      },
+      vertexShader: line_vs,
+      fragmentShader: line_fs,
+      transparent: true,
+      depthWrite: false,
+      extensions: { derivatives: true }
+
+    });
+
+    super(geometry, material);
+
+    if (points)
+    {
+      this.setup(points);
+    }
+  }
+
+  setup(points)
+  {
+    let vertices = [];
+    let next_position = [];
+    let previous_position = [];
+    let orientation = [];
+    let coverage = [];
+    let accumulated_length = 0;
+
+    for (let i = 0; i < points.length; i++)
+    {
+      vertices.push(points[i].x);
+      vertices.push(points[i].y);
+      vertices.push(points[i].z);
+      orientation.push(1);
+
+      vertices.push(points[i].x);
+      vertices.push(points[i].y);
+      vertices.push(points[i].z);
+      orientation.push(-1);
+
+      let next_point = this.__get_next_position(points, i);
+      next_position.push(next_point.x);
+      next_position.push(next_point.y);
+      next_position.push(next_point.z);
+
+      next_position.push(next_point.x);
+      next_position.push(next_point.y);
+      next_position.push(next_point.z);
+
+      let previous_point = this.__get_previous_position(points, i);
+      previous_position.push(previous_point.x);
+      previous_position.push(previous_point.y);
+      previous_position.push(previous_point.z);
+
+      previous_position.push(previous_point.x);
+      previous_position.push(previous_point.y);
+      previous_position.push(previous_point.z);
+
+      coverage.push(accumulated_length);
+      coverage.push(accumulated_length);
+
+      if (i < points.length - 1)
+      {
+        accumulated_length += points[i].distanceTo(next_point);
+      }
+    }
+    let vertexList            = new Float32Array(vertices);
+    let nextPositionList      = new Float32Array(next_position);
+    let previousPositionList  = new Float32Array(previous_position);
+    let orientationList       = new Float32Array(orientation);
+    let coverageList          = new Float32Array(coverage);
+
+    let indices = [];
+    for (let i = 0; i < ((vertexList.length / 3) - 2) / 2; i++)
+    {
+      let index = (i * 2) + 1;
+      indices.push(index);
+      indices.push(index + 1);
+      indices.push(index - 1);
+
+      indices.push(index);
+      indices.push(index + 2);
+      indices.push(index + 1);
+    }
+
+    this.geometry.setIndex(indices);
+    this.geometry.getAttribute('position').copy(new BufferAttribute(vertexList, 3));
+    this.geometry.getAttribute('next_position').copy(new BufferAttribute(nextPositionList, 3));
+    this.geometry.getAttribute('previous_position').copy(new BufferAttribute(previousPositionList, 3));
+    this.geometry.getAttribute('orientation').copy(new BufferAttribute(orientationList, 1));
+    this.geometry.getAttribute('coverage').copy(new BufferAttribute(coverageList, 1));
+
+    this.geometry.getAttribute('position').needsUpdate = true;
+    this.geometry.getAttribute('next_position').needsUpdate = true;
+    this.geometry.getAttribute('previous_position').needsUpdate = true;
+    this.geometry.getAttribute('orientation').needsUpdate = true;
+    this.geometry.getAttribute('coverage').needsUpdate = true;
+
+    this.material.uniforms._Length.value = accumulated_length;
+    this._length = accumulated_length;
+  }
+
+  set thickness(value)
+  {
+    this.material.uniforms._Thickness.value = value;
+  }
+
+  get thickness()
+  {
+    return this.material.uniforms._Thickness.value;
+  }
+
+  __get_previous_position(points, i)
+  {
+    if (i === 0)
+    {
+      return points[1].clone().sub(points[0]).multiplyScalar(-1).add(points[0]);
+    }
+    else
+    {
+      return points[i - 1];
+    }
+  }
+
+  __get_next_position(points, i)
+  {
+    if (i === points.length - 1)
+    {
+      return points[points.length - 2].clone().sub(points[points.length - 1]).multiplyScalar(-1).add(points[points.length - 1]);
+    }
+    else
+    {
+      return points[i + 1];
+    }
+  }
+
+  update()
+  {
+  }
+
+  distance()
+  {
+    return this.accumulated_length;
+  }
+
+  total_length()
+  {
+    return this.accumulated_length;
+  }
+
+  dispose()
+  {
+    this.geometry.dispose();
+    this.material.dispose();
+    if (this.parent)
+    {
+      this.parent.remove(this);
+    }
+  }
+
+  set color(col)
+  {
+    this.material.uniforms._Color.value.set(col);
+  }
+
+  get color()
+  {
+    return this.material.uniforms._Color.value;
+  }
+
+  copy_color(col)
+  {
+    this.material.uniforms._Color.value.copy(col);
+  }
+}

package/src/components/MultiLinePath.js

@@ -1,19 +1,19 @@
-import Line from '../Line';
-
-import { Object3D } from 'three';
-
-export default class MultiLinePath extends Object3D
-{
-  constructor(paths, webgl)
-  {
-    super();
-
-    this.paths = [];
-    for (let i = 0; i < paths.length; i++)
-    {
-      let line = new Line(paths[i], webgl);
-      this.paths.push = line;
-      this.add(line);
-    }
-  }
-}
+import Line from '../Line';
+
+import { Object3D } from 'three';
+
+export default class MultiLinePath extends Object3D
+{
+  constructor(paths, webgl)
+  {
+    super();
+
+    this.paths = [];
+    for (let i = 0; i < paths.length; i++)
+    {
+      let line = new Line(paths[i], webgl);
+      this.paths.push = line;
+      this.add(line);
+    }
+  }
+}

package/src/components/MultiLineText2D.js

@@ -1,62 +1,62 @@
-import Text2D from './Text2D';
-
-import { Object3D } from 'three';
-import { Vector2 } from 'three';
-
-export default class MultiLineText2D extends Object3D
-{
-  constructor(text_array, font, color, pivot, is_static)
-  {
-    super();
-
-    font = font || '200px Arial';
-    color = color || '#000000';
-    pivot = pivot || new Vector2();
-
-    this.text_array = [];
-
-    for (let i = 0; i < text_array.length; i++)
-    {
-      let text2D = new Text2D(text_array[i], font, color, pivot);
-      this.text_array.push(text2D);
-      this.add(text2D);
-    }
-
-    this.update_text_positions();
-  }
-
-  update_text_positions()
-  {
-    for (let i = 0; i < this.text_array.length; i++)
-    {
-      this.text_array[i].position.y = -this.text_array[i].size.y * i;
-    }
-  }
-
-  set texts(text_array)
-  {
-    for (let i = 0; i < this.text_array.length; i++)
-    {
-      this.text_array[i].text = text_array[i];
-    }
-  }
-
-  set size(value)
-  {
-    for (let i = 0; i < this.text_array.length; i++)
-    {
-      this.text_array[i].size = value;
-    }
-    this.update_text_positions();
-  }
-
-  get texts()
-  {
-    return [];
-  }
-
-  get size()
-  {
-    return 1;
-  }
-}
+import Text2D from './Text2D';
+
+import { Object3D } from 'three';
+import { Vector2 } from 'three';
+
+export default class MultiLineText2D extends Object3D
+{
+  constructor(text_array, font, color, pivot, is_static)
+  {
+    super();
+
+    font = font || '200px Arial';
+    color = color || '#000000';
+    pivot = pivot || new Vector2();
+
+    this.text_array = [];
+
+    for (let i = 0; i < text_array.length; i++)
+    {
+      let text2D = new Text2D(text_array[i], font, color, pivot);
+      this.text_array.push(text2D);
+      this.add(text2D);
+    }
+
+    this.update_text_positions();
+  }
+
+  update_text_positions()
+  {
+    for (let i = 0; i < this.text_array.length; i++)
+    {
+      this.text_array[i].position.y = -this.text_array[i].size.y * i;
+    }
+  }
+
+  set texts(text_array)
+  {
+    for (let i = 0; i < this.text_array.length; i++)
+    {
+      this.text_array[i].text = text_array[i];
+    }
+  }
+
+  set size(value)
+  {
+    for (let i = 0; i < this.text_array.length; i++)
+    {
+      this.text_array[i].size = value;
+    }
+    this.update_text_positions();
+  }
+
+  get texts()
+  {
+    return [];
+  }
+
+  get size()
+  {
+    return 1;
+  }
+}

package/src/components/ObjectAxis.js

@@ -1,20 +1,20 @@
-import Arrow from '../primitives/Arrow';
-
-import { Object3D } from 'three';
-import { Vector3 } from 'three';
-
-export default class ObjectAxis extends Object3D
-{
-  constructor(obj, size)
-  {
-    super();
-    size = size || 1.5;
-    let right = new Vector3(1, 0, 0).applyQuaternion(obj.quaternion);
-    let up = new Vector3(0, 1, 0).applyQuaternion(obj.quaternion);
-    let forward = new Vector3(0, 0, 1).applyQuaternion(obj.quaternion);
-    console.log(right, up, forward);
-    this.add(new Arrow('#FF0000', size, right));
-    this.add(new Arrow('#00FF00', size, up));
-    this.add(new Arrow('#0000FF', size, forward));
-  }
-}
+import Arrow from '../primitives/Arrow';
+
+import { Object3D } from 'three';
+import { Vector3 } from 'three';
+
+export default class ObjectAxis extends Object3D
+{
+  constructor(obj, size)
+  {
+    super();
+    size = size || 1.5;
+    let right = new Vector3(1, 0, 0).applyQuaternion(obj.quaternion);
+    let up = new Vector3(0, 1, 0).applyQuaternion(obj.quaternion);
+    let forward = new Vector3(0, 0, 1).applyQuaternion(obj.quaternion);
+    console.log(right, up, forward);
+    this.add(new Arrow('#FF0000', size, right));
+    this.add(new Arrow('#00FF00', size, up));
+    this.add(new Arrow('#0000FF', size, forward));
+  }
+}