ohzi-core 5.18.3 → 5.19.0

package/src/resource_loader/FontLoader.js

@@ -1,39 +1,39 @@
-import AbstractLoader from './AbstractLoader';
-
-import { FontLoader as TFontLoader } from 'three/examples/jsm/loaders/FontLoader.js';
-
-export default class FontLoader extends AbstractLoader
-{
-  constructor(resource_id, url, size)
-  {
-    super(resource_id, url, size);
-    this.loader = new TFontLoader();
-  }
-
-  on_preloaded_finished(resource_container)
-  {
-    let ctx = this;
-
-    this.loader.load(this.url, (font) =>
-    {
-      resource_container.set_resource(ctx.resource_id, ctx.url, font);
-
-      ctx.__update_downloaded_bytes(1, 1);
-      ctx.__loading_ended();
-    },
-    (xhr) =>
-    {
-      // if (xhr)
-      // {
-      //   let total = xhr.total || this.total_bytes;
-      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
-      // }
-    },
-    (msg) =>
-    {
-      ctx.__set_error(msg + '\n\n\t If the error says something about unexpected token < in JSON then probably the problem is related to the file not being found. Check the name and path of the resource');
-      ctx.__loading_ended();
-    }
-    );
-  }
-}
+import AbstractLoader from './AbstractLoader';
+
+import { FontLoader as TFontLoader } from 'three/examples/jsm/loaders/FontLoader.js';
+
+export default class FontLoader extends AbstractLoader
+{
+  constructor(resource_id, url, size)
+  {
+    super(resource_id, url, size);
+    this.loader = new TFontLoader();
+  }
+
+  on_preloaded_finished(resource_container)
+  {
+    let ctx = this;
+
+    this.loader.load(this.url, (font) =>
+    {
+      resource_container.set_resource(ctx.resource_id, ctx.url, font);
+
+      ctx.__update_downloaded_bytes(1, 1);
+      ctx.__loading_ended();
+    },
+    (xhr) =>
+    {
+      // if (xhr)
+      // {
+      //   let total = xhr.total || this.total_bytes;
+      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
+      // }
+    },
+    (msg) =>
+    {
+      ctx.__set_error(msg + '\n\n\t If the error says something about unexpected token < in JSON then probably the problem is related to the file not being found. Check the name and path of the resource');
+      ctx.__loading_ended();
+    }
+    );
+  }
+}

package/src/resource_loader/JSONLoader.js

@@ -1,40 +1,40 @@
-import AbstractLoader from './AbstractLoader';
-
-import { FileLoader as THREEFileLoader } from 'three';
-
-export default class JSONLoader extends AbstractLoader
-{
-  constructor(resource_id, url, size)
-  {
-    super(resource_id, url, size);
-
-    this.loader = new THREEFileLoader();
-  }
-
-  on_preloaded_finished(resource_container)
-  {
-    let ctx = this;
-
-    this.loader.load(this.url, (data) =>
-    {
-      resource_container.set_resource(ctx.resource_id, ctx.url, JSON.parse(data));
-
-      ctx.__update_downloaded_bytes(1, 1);
-      ctx.__loading_ended();
-    },
-    (xhr) =>
-    {
-      // if (xhr)
-      // {
-      //   let total = xhr.total || this.total_bytes;
-      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
-      // }
-    },
-    (msg) =>
-    {
-      ctx.__set_error(msg + '\n\n\t If the error says something about unexpected token < in JSON then the probably the problem is related to the file not being found. Check the name and path of the resource');
-      ctx.__loading_ended();
-    }
-    );
-  }
-}
+import AbstractLoader from './AbstractLoader';
+
+import { FileLoader as THREEFileLoader } from 'three';
+
+export default class JSONLoader extends AbstractLoader
+{
+  constructor(resource_id, url, size)
+  {
+    super(resource_id, url, size);
+
+    this.loader = new THREEFileLoader();
+  }
+
+  on_preloaded_finished(resource_container)
+  {
+    let ctx = this;
+
+    this.loader.load(this.url, (data) =>
+    {
+      resource_container.set_resource(ctx.resource_id, ctx.url, JSON.parse(data));
+
+      ctx.__update_downloaded_bytes(1, 1);
+      ctx.__loading_ended();
+    },
+    (xhr) =>
+    {
+      // if (xhr)
+      // {
+      //   let total = xhr.total || this.total_bytes;
+      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
+      // }
+    },
+    (msg) =>
+    {
+      ctx.__set_error(msg + '\n\n\t If the error says something about unexpected token < in JSON then the probably the problem is related to the file not being found. Check the name and path of the resource');
+      ctx.__loading_ended();
+    }
+    );
+  }
+}

package/src/resource_loader/OBJLoader.js

@@ -1,39 +1,39 @@
-import AbstractLoader from './AbstractLoader';
-
-import * as THREEOBJLoader from 'three/examples/jsm/loaders/OBJLoader.js';
-
-export default class OBJLoader extends AbstractLoader
-{
-  constructor(resource_id, url, size)
-  {
-    super(resource_id, url, size);
-    this.loader = new THREEOBJLoader.OBJLoader();
-  }
-
-  on_preloaded_finished(resource_container)
-  {
-    let ctx = this;
-
-    this.loader.load(this.url, (gltf) =>
-    {
-      resource_container.set_resource(ctx.resource_id, ctx.url, gltf);
-
-      ctx.__update_downloaded_bytes(1, 1);
-      ctx.__loading_ended();
-    },
-    (xhr) =>
-    {
-      // if (xhr)
-      // {
-      //   let total = xhr.total || this.total_bytes;
-      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
-      // }
-    },
-    (msg) =>
-    {
-      ctx.__set_error(msg + '\n\n\t If the error says something about unexpected token < in JSON then probably the problem is related to the file not being found. Check the name and path of the resource');
-      ctx.__loading_ended();
-    }
-    );
-  }
-}
+import AbstractLoader from './AbstractLoader';
+
+import * as THREEOBJLoader from 'three/examples/jsm/loaders/OBJLoader.js';
+
+export default class OBJLoader extends AbstractLoader
+{
+  constructor(resource_id, url, size)
+  {
+    super(resource_id, url, size);
+    this.loader = new THREEOBJLoader.OBJLoader();
+  }
+
+  on_preloaded_finished(resource_container)
+  {
+    let ctx = this;
+
+    this.loader.load(this.url, (gltf) =>
+    {
+      resource_container.set_resource(ctx.resource_id, ctx.url, gltf);
+
+      ctx.__update_downloaded_bytes(1, 1);
+      ctx.__loading_ended();
+    },
+    (xhr) =>
+    {
+      // if (xhr)
+      // {
+      //   let total = xhr.total || this.total_bytes;
+      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
+      // }
+    },
+    (msg) =>
+    {
+      ctx.__set_error(msg + '\n\n\t If the error says something about unexpected token < in JSON then probably the problem is related to the file not being found. Check the name and path of the resource');
+      ctx.__loading_ended();
+    }
+    );
+  }
+}

package/src/resource_loader/PointArrayLoader.js

@@ -1,63 +1,63 @@
-import AbstractLoader from './AbstractLoader';
-
-import { Vector3 as THREEVector3 } from 'three';
-import { FileLoader as THREEFileLoader } from 'three';
-
-export default class PointArrayLoader extends AbstractLoader
-{
-  constructor(resource_id, url, size)
-  {
-    super(resource_id, url, size);
-    this.loader = new THREEFileLoader();
-  }
-
-  on_preloaded_finished(resource_container)
-  {
-    let ctx = this;
-
-    this.loader.load(this.url, (text) =>
-    {
-      resource_container.set_resource(ctx.resource_id, ctx.url, ctx.parse_path(text));
-
-      ctx.__update_downloaded_bytes(1, 1);
-      ctx.__loading_ended();
-    },
-    (xhr) =>
-    {
-      // if (xhr)
-      // {
-      //   let total = xhr.total || this.total_bytes;
-      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
-      // }
-    },
-    (msg) =>
-    {
-      ctx.__set_error(msg);
-      ctx.__loading_ended();
-    }
-    );
-  }
-
-  parse_path(raw_data)
-  {
-    let string_array = raw_data.split('\n');
-
-    if (string_array[string_array.length - 1] === '')
-    {
-      string_array.pop();
-    }
-
-    let positions = [];
-
-    for (let i = 0; i < string_array.length; i += 3)
-    {
-      let x = parseFloat(string_array[i + 0]);
-      let y = parseFloat(string_array[i + 1]);
-      let z = parseFloat(string_array[i + 2]);
-      positions.push(new THREEVector3(x, y, z));
-    }
-    return positions;
-    // let curve = new THREE.CatmullRomCurve3(positions);
-    // return curve.getPoints(100);
-  }
-}
+import AbstractLoader from './AbstractLoader';
+
+import { Vector3 as THREEVector3 } from 'three';
+import { FileLoader as THREEFileLoader } from 'three';
+
+export default class PointArrayLoader extends AbstractLoader
+{
+  constructor(resource_id, url, size)
+  {
+    super(resource_id, url, size);
+    this.loader = new THREEFileLoader();
+  }
+
+  on_preloaded_finished(resource_container)
+  {
+    let ctx = this;
+
+    this.loader.load(this.url, (text) =>
+    {
+      resource_container.set_resource(ctx.resource_id, ctx.url, ctx.parse_path(text));
+
+      ctx.__update_downloaded_bytes(1, 1);
+      ctx.__loading_ended();
+    },
+    (xhr) =>
+    {
+      // if (xhr)
+      // {
+      //   let total = xhr.total || this.total_bytes;
+      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
+      // }
+    },
+    (msg) =>
+    {
+      ctx.__set_error(msg);
+      ctx.__loading_ended();
+    }
+    );
+  }
+
+  parse_path(raw_data)
+  {
+    let string_array = raw_data.split('\n');
+
+    if (string_array[string_array.length - 1] === '')
+    {
+      string_array.pop();
+    }
+
+    let positions = [];
+
+    for (let i = 0; i < string_array.length; i += 3)
+    {
+      let x = parseFloat(string_array[i + 0]);
+      let y = parseFloat(string_array[i + 1]);
+      let z = parseFloat(string_array[i + 2]);
+      positions.push(new THREEVector3(x, y, z));
+    }
+    return positions;
+    // let curve = new THREE.CatmullRomCurve3(positions);
+    // return curve.getPoints(100);
+  }
+}

package/src/resource_loader/RGBETextureLoader.js

@@ -1,42 +1,42 @@
-import AbstractLoader from './AbstractLoader';
-
-import * as THREERGBELoader from 'three/examples/jsm/loaders/RGBELoader.js';
-
-import { UnsignedByteType as THREEUnsignedByteType } from 'three';
-
-export default class RGBETextureLoader extends AbstractLoader
-{
-  constructor(resource_id, url, size)
-  {
-    super(resource_id, url, size);
-    this.loader = new THREERGBELoader.RGBELoader();
-    this.loader.setDataType(THREEUnsignedByteType);
-  }
-
-  on_preloaded_finished(resource_container)
-  {
-    let ctx = this;
-
-    this.loader.load(this.url, (hdr) =>
-    {
-      resource_container.set_resource(ctx.resource_id, ctx.url, hdr);
-
-      ctx.__update_downloaded_bytes(1, 1);
-      ctx.__loading_ended();
-    },
-    (xhr) =>
-    {
-      // if (xhr)
-      // {
-      //   let total = xhr.total || this.total_bytes;
-      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
-      // }
-    },
-    (msg) =>
-    {
-      ctx.__set_error(msg + '\n\n\t If the error says something about unexpected token < in JSON then the probably the problem is related to the file not being found. Check the name and path of the resource');
-      ctx.__loading_ended();
-    }
-    );
-  }
-}
+import AbstractLoader from './AbstractLoader';
+
+import * as THREERGBELoader from 'three/examples/jsm/loaders/RGBELoader.js';
+
+import { UnsignedByteType as THREEUnsignedByteType } from 'three';
+
+export default class RGBETextureLoader extends AbstractLoader
+{
+  constructor(resource_id, url, size)
+  {
+    super(resource_id, url, size);
+    this.loader = new THREERGBELoader.RGBELoader();
+    this.loader.setDataType(THREEUnsignedByteType);
+  }
+
+  on_preloaded_finished(resource_container)
+  {
+    let ctx = this;
+
+    this.loader.load(this.url, (hdr) =>
+    {
+      resource_container.set_resource(ctx.resource_id, ctx.url, hdr);
+
+      ctx.__update_downloaded_bytes(1, 1);
+      ctx.__loading_ended();
+    },
+    (xhr) =>
+    {
+      // if (xhr)
+      // {
+      //   let total = xhr.total || this.total_bytes;
+      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
+      // }
+    },
+    (msg) =>
+    {
+      ctx.__set_error(msg + '\n\n\t If the error says something about unexpected token < in JSON then the probably the problem is related to the file not being found. Check the name and path of the resource');
+      ctx.__loading_ended();
+    }
+    );
+  }
+}

package/src/resource_loader/VideoLoader.js

@@ -1,20 +1,20 @@
-import AbstractLoader from './AbstractLoader';
-
-export default class VideoLoader extends AbstractLoader
-{
-  constructor(resource_id, url, size)
-  {
-    super(resource_id, url, size);
-  }
-
-  on_preloaded_finished(resource_container, response)
-  {
-    response.blob().then((blob) =>
-    {
-      resource_container.set_resource(this.resource_id, this.url, URL.createObjectURL(blob));
-
-      this.__update_downloaded_bytes(1, 1);
-      this.__loading_ended();
-    });
-  }
-}
+import AbstractLoader from './AbstractLoader';
+
+export default class VideoLoader extends AbstractLoader
+{
+  constructor(resource_id, url, size)
+  {
+    super(resource_id, url, size);
+  }
+
+  on_preloaded_finished(resource_container, response)
+  {
+    response.blob().then((blob) =>
+    {
+      resource_container.set_resource(this.resource_id, this.url, URL.createObjectURL(blob));
+
+      this.__update_downloaded_bytes(1, 1);
+      this.__loading_ended();
+    });
+  }
+}

package/src/shaders/add/add.frag

@@ -1,9 +1,9 @@
-uniform sampler2D _MainTex;
-uniform sampler2D _SecondTex;
-
-varying vec2 vUv;
-void main()
-{
-	gl_FragColor = texture2D(_MainTex, vUv);
-	gl_FragColor += texture2D(_SecondTex, vUv);
+uniform sampler2D _MainTex;
+uniform sampler2D _SecondTex;
+
+varying vec2 vUv;
+void main()
+{
+	gl_FragColor = texture2D(_MainTex, vUv);
+	gl_FragColor += texture2D(_SecondTex, vUv);
 }

package/src/shaders/anti_aliasing/fxaa.frag

@@ -1,72 +1,72 @@
-// FXAA shader, GLSL code adapted from:
-// http://horde3d.org/wiki/index.php5?title=Shading_Technique_-_FXAA
-// Whitepaper describing the technique:
-// http://developer.download.nvidia.com/assets/gamedev/files/sdk/11/FXAA_WhitePaper.pdf
-
-// from: https://code.google.com/p/processing/source/browse/trunk/processing/java/libraries/opengl/examples/Shaders/FXAA/data/fxaa.glsl?r=9668
-
-uniform sampler2D _MainTex;
-uniform vec2 _Resolution;
-
-varying vec2 vUv;
-
-
-void main() {
-    // The inverse of the texture dimensions along X and Y
-  vec2 texcoordOffset = 1. / _Resolution;
-
-  //varying vec4 vertColor;
-  vec4 vertTexcoord = vec4( vUv, 1., 1. );
-
-  // The parameters are hardcoded for now, but could be
-  // made into uniforms to control fromt he program.
-  float FXAA_SPAN_MAX = 8.0;
-  float FXAA_REDUCE_MUL = 1.0/8.0;
-  float FXAA_REDUCE_MIN = (1.0/128.0);
-
-  vec3 rgbNW = texture2D(_MainTex, vertTexcoord.xy + (vec2(-1.0, -1.0) * texcoordOffset)).xyz;
-  vec3 rgbNE = texture2D(_MainTex, vertTexcoord.xy + (vec2(+1.0, -1.0) * texcoordOffset)).xyz;
-  vec3 rgbSW = texture2D(_MainTex, vertTexcoord.xy + (vec2(-1.0, +1.0) * texcoordOffset)).xyz;
-  vec3 rgbSE = texture2D(_MainTex, vertTexcoord.xy + (vec2(+1.0, +1.0) * texcoordOffset)).xyz;
-  vec3 rgbM  = texture2D(_MainTex, vertTexcoord.xy).xyz;
-	
-  vec3 luma = vec3(0.299, 0.587, 0.114);
-  float lumaNW = dot(rgbNW, luma);
-  float lumaNE = dot(rgbNE, luma);
-  float lumaSW = dot(rgbSW, luma);
-  float lumaSE = dot(rgbSE, luma);
-  float lumaM  = dot( rgbM, luma);
-	
-  float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE)));
-  float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));
-	
-  vec2 dir;
-  dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));
-  dir.y =  ((lumaNW + lumaSW) - (lumaNE + lumaSE));
-	
-  float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) * (0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN);
-	  
-  float rcpDirMin = 1.0/(min(abs(dir.x), abs(dir.y)) + dirReduce);
-	
-  dir = min(vec2(FXAA_SPAN_MAX,  FXAA_SPAN_MAX), 
-        max(vec2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX), dir * rcpDirMin)) * texcoordOffset;
-		
-  vec3 rgbA = (1.0/2.0) * (
-              texture2D(_MainTex, vertTexcoord.xy + dir * (1.0/3.0 - 0.5)).xyz +
-              texture2D(_MainTex, vertTexcoord.xy + dir * (2.0/3.0 - 0.5)).xyz);
-  vec3 rgbB = rgbA * (1.0/2.0) + (1.0/4.0) * (
-              texture2D(_MainTex, vertTexcoord.xy + dir * (0.0/3.0 - 0.5)).xyz +
-              texture2D(_MainTex, vertTexcoord.xy + dir * (3.0/3.0 - 0.5)).xyz);
-  float lumaB = dot(rgbB, luma);
-
-  if((lumaB < lumaMin) || (lumaB > lumaMax)){
-    gl_FragColor.xyz=rgbA;
-  } else {
-    gl_FragColor.xyz=rgbB;
-  }
-  gl_FragColor.a = 1.0;
-  
-  // gl_FragColor = vec4(texture2D(_MainTex, vUv).rgb, 1.0);
-  // gl_FragColor = vec4(1.0, 0.0, 0.0, 0.0);
-  //gl_FragColor *= vertColor;
+// FXAA shader, GLSL code adapted from:
+// http://horde3d.org/wiki/index.php5?title=Shading_Technique_-_FXAA
+// Whitepaper describing the technique:
+// http://developer.download.nvidia.com/assets/gamedev/files/sdk/11/FXAA_WhitePaper.pdf
+
+// from: https://code.google.com/p/processing/source/browse/trunk/processing/java/libraries/opengl/examples/Shaders/FXAA/data/fxaa.glsl?r=9668
+
+uniform sampler2D _MainTex;
+uniform vec2 _Resolution;
+
+varying vec2 vUv;
+
+
+void main() {
+    // The inverse of the texture dimensions along X and Y
+  vec2 texcoordOffset = 1. / _Resolution;
+
+  //varying vec4 vertColor;
+  vec4 vertTexcoord = vec4( vUv, 1., 1. );
+
+  // The parameters are hardcoded for now, but could be
+  // made into uniforms to control fromt he program.
+  float FXAA_SPAN_MAX = 8.0;
+  float FXAA_REDUCE_MUL = 1.0/8.0;
+  float FXAA_REDUCE_MIN = (1.0/128.0);
+
+  vec3 rgbNW = texture2D(_MainTex, vertTexcoord.xy + (vec2(-1.0, -1.0) * texcoordOffset)).xyz;
+  vec3 rgbNE = texture2D(_MainTex, vertTexcoord.xy + (vec2(+1.0, -1.0) * texcoordOffset)).xyz;
+  vec3 rgbSW = texture2D(_MainTex, vertTexcoord.xy + (vec2(-1.0, +1.0) * texcoordOffset)).xyz;
+  vec3 rgbSE = texture2D(_MainTex, vertTexcoord.xy + (vec2(+1.0, +1.0) * texcoordOffset)).xyz;
+  vec3 rgbM  = texture2D(_MainTex, vertTexcoord.xy).xyz;
+	
+  vec3 luma = vec3(0.299, 0.587, 0.114);
+  float lumaNW = dot(rgbNW, luma);
+  float lumaNE = dot(rgbNE, luma);
+  float lumaSW = dot(rgbSW, luma);
+  float lumaSE = dot(rgbSE, luma);
+  float lumaM  = dot( rgbM, luma);
+	
+  float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE)));
+  float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));
+	
+  vec2 dir;
+  dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));
+  dir.y =  ((lumaNW + lumaSW) - (lumaNE + lumaSE));
+	
+  float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) * (0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN);
+	  
+  float rcpDirMin = 1.0/(min(abs(dir.x), abs(dir.y)) + dirReduce);
+	
+  dir = min(vec2(FXAA_SPAN_MAX,  FXAA_SPAN_MAX), 
+        max(vec2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX), dir * rcpDirMin)) * texcoordOffset;
+		
+  vec3 rgbA = (1.0/2.0) * (
+              texture2D(_MainTex, vertTexcoord.xy + dir * (1.0/3.0 - 0.5)).xyz +
+              texture2D(_MainTex, vertTexcoord.xy + dir * (2.0/3.0 - 0.5)).xyz);
+  vec3 rgbB = rgbA * (1.0/2.0) + (1.0/4.0) * (
+              texture2D(_MainTex, vertTexcoord.xy + dir * (0.0/3.0 - 0.5)).xyz +
+              texture2D(_MainTex, vertTexcoord.xy + dir * (3.0/3.0 - 0.5)).xyz);
+  float lumaB = dot(rgbB, luma);
+
+  if((lumaB < lumaMin) || (lumaB > lumaMax)){
+    gl_FragColor.xyz=rgbA;
+  } else {
+    gl_FragColor.xyz=rgbB;
+  }
+  gl_FragColor.a = 1.0;
+  
+  // gl_FragColor = vec4(texture2D(_MainTex, vUv).rgb, 1.0);
+  // gl_FragColor = vec4(1.0, 0.0, 0.0, 0.0);
+  //gl_FragColor *= vertColor;
 }

package/src/shaders/basic_color/basic_color.frag

@@ -1,6 +1,6 @@
-uniform vec3 _Color;
-
-void main()
-{
-    gl_FragColor = vec4(_Color, 1.0);
+uniform vec3 _Color;
+
+void main()
+{
+    gl_FragColor = vec4(_Color, 1.0);
 }