ohzi-core 5.19.0 → 6.0.1

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/ResourceBatch.js

@@ -1,20 +1,4 @@
-import TextureLoader from './TextureLoader';
-import GLTFLoader from './GLTFLoader';
-import DAELoader from './DAELoader';
-import TextLoader from './TextLoader';
-import CubemapLoader from './CubemapLoader';
-import AudioLoader from './AudioLoader';
-import JSONLoader from './JSONLoader';
-import OBJLoader from './OBJLoader';
-import FontLoader from './FontLoader';
-import RGBETextureLoader from './RGBETextureLoader';
-import PointArrayLoader from './PointArrayLoader';
-import HDRCubeTextureLoader from './HDRCubeTextureLoader';
-import GLTFDRACOLoader from './GLTFDRACOLoader';
-import BasisLoader from './BasisLoader';
 import ResourceContainer from '../ResourceContainer';
-import FileLoader from './FileLoader';
-import VideoLoader from './VideoLoader';
 
 export default class ResourceBatch
 {
@@ -24,86 +8,6 @@ export default class ResourceBatch
     this.batch_name = batch_name || 'unnamed batch';
   }
 
-  add_texture(resource_id, url, size)
-  {
-    this.resource_loaders.push(new TextureLoader(resource_id, url, size));
-  }
-
-  add_gltf(resource_id, url, size)
-  {
-    this.resource_loaders.push(new GLTFLoader(resource_id, url, size));
-  }
-
-  add_basis(resource_id, url, renderer, loader, size)
-  {
-    this.resource_loaders.push(new BasisLoader(resource_id, url, renderer, loader, size));
-  }
-
-  add_gltf_draco(resource_id, url, size)
-  {
-    this.resource_loaders.push(new GLTFDRACOLoader(resource_id, url, size));
-  }
-
-  add_dae(resource_id, url, size)
-  {
-    this.resource_loaders.push(new DAELoader(resource_id, url, size));
-  }
-
-  add_obj(resource_id, url, size)
-  {
-    this.resource_loaders.push(new OBJLoader(resource_id, url, size));
-  }
-
-  add_file(resource_id, url, size)
-  {
-    this.resource_loaders.push(new FileLoader(resource_id, url, size));
-  }
-
-  add_text(resource_id, url, size)
-  {
-    this.resource_loaders.push(new TextLoader(resource_id, url, size));
-  }
-
-  add_cubemap(resource_id, url, size)
-  {
-    this.resource_loaders.push(new CubemapLoader(resource_id, url, size));
-  }
-
-  add_audio(resource_id, url, loop, volume, size, positional)
-  {
-    this.resource_loaders.push(new AudioLoader(resource_id, url, loop, volume, size, positional));
-  }
-
-  add_video(resource_id, url, size)
-  {
-    this.resource_loaders.push(new VideoLoader(resource_id, url, size));
-  }
-
-  add_json(resource_id, url, size)
-  {
-    this.resource_loaders.push(new JSONLoader(resource_id, url, size));
-  }
-
-  add_point_array(resource_id, url, size)
-  {
-    this.resource_loaders.push(new PointArrayLoader(resource_id, url, size));
-  }
-
-  add_hdr(resource_id, url, size)
-  {
-    this.resource_loaders.push(new RGBETextureLoader(resource_id, url, size));
-  }
-
-  add_hdr_cubemap(resource_id, url, size)
-  {
-    this.resource_loaders.push(new HDRCubeTextureLoader(resource_id, url, size));
-  }
-
-  add_font(resource_id, url, size)
-  {
-    this.resource_loaders.push(new FontLoader(resource_id, url, size));
-  }
-
   add_loader(loader)
   {
     this.resource_loaders.push(loader);

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);
 }