ohzi-core 6.13.1 → 6.14.2

package/src/resource_loader/JSONLoader.js

@@ -1,20 +1,30 @@
-import AbstractLoader from './AbstractLoader';
-
-export default class JSONLoader extends AbstractLoader
-{
-  constructor(resource_id, url, size)
-  {
-    super(resource_id, url, size);
-  }
-
-  on_preloaded_finished(resource_container, response)
-  {
-    response.json().then((json) =>
-    {
-      resource_container.set_resource(this.resource_id, this.url, json);
-
-      this.__update_downloaded_bytes(1, 1);
-      this.__loading_ended();
-    });
-  }
-}
+import AbstractLoader from './AbstractLoader';
+
+export default class JSONLoader extends AbstractLoader
+{
+  constructor(resource_id, url, size)
+  {
+    super(resource_id, url, size);
+  }
+
+  on_preloaded_finished(resource_container, response)
+  {
+    if (resource_container.resources_by_url[this.url] === undefined)
+    {
+      response.json().then((json) =>
+      {
+        resource_container.set_resource(this.resource_id, this.url, json);
+
+        this.__update_downloaded_bytes(1, 1);
+        this.__loading_ended();
+      });
+    }
+    else
+    {
+      resource_container.set_resource(this.resource_id, this.url, resource_container.resources_by_url[this.url]);
+
+      this.__update_downloaded_bytes(1, 1);
+      this.__loading_ended();
+    }
+  }
+}

package/src/resource_loader/OBJLoader.js

@@ -1,39 +1,46 @@
-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)
-  {
-    const 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)
+  {
+    if (resource_container.resources_by_url[this.url] === undefined)
+    {
+      this.loader.load(this.url, (obj) =>
+      {
+        resource_container.set_resource(this.resource_id, this.url, obj);
+
+        this.__update_downloaded_bytes(1, 1);
+        this.__loading_ended();
+      },
+      (xhr) =>
+      {
+      // if (xhr)
+      // {
+      //   let total = xhr.total || this.total_bytes;
+      //   this.__update_downloaded_bytes(xhr.loaded, total);
+      // }
+      },
+      (msg) =>
+      {
+        this.__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');
+        this.__loading_ended();
+      });
+    }
+    else
+    {
+      resource_container.set_resource(this.resource_id, this.url, resource_container.resources_by_url[this.url]);
+
+      this.__update_downloaded_bytes(1, 1);
+      this.__loading_ended();
+    }
+  }
+}

package/src/resource_loader/PointArrayLoader.js

@@ -1,63 +1,70 @@
-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)
-  {
-    const 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)
-  {
-    const string_array = raw_data.split('\n');
-
-    if (string_array[string_array.length - 1] === '')
-    {
-      string_array.pop();
-    }
-
-    const positions = [];
-
-    for (let i = 0; i < string_array.length; i += 3)
-    {
-      const x = parseFloat(string_array[i + 0]);
-      const y = parseFloat(string_array[i + 1]);
-      const 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)
+  {
+    if (resource_container.resources_by_url[this.url] === undefined)
+    {
+      this.loader.load(this.url, (text) =>
+      {
+        resource_container.set_resource(this.resource_id, this.url, this.parse_path(text));
+
+        this.__update_downloaded_bytes(1, 1);
+        this.__loading_ended();
+      },
+      (xhr) =>
+      {
+      // if (xhr)
+      // {
+      //   let total = xhr.total || this.total_bytes;
+      //   this.__update_downloaded_bytes(xhr.loaded, total);
+      // }
+      },
+      (msg) =>
+      {
+        this.__set_error(msg);
+        this.__loading_ended();
+      });
+    }
+    else
+    {
+      resource_container.set_resource(this.resource_id, this.url, resource_container.resources_by_url[this.url]);
+
+      this.__update_downloaded_bytes(1, 1);
+      this.__loading_ended();
+    }
+  }
+
+  parse_path(raw_data)
+  {
+    const string_array = raw_data.split('\n');
+
+    if (string_array[string_array.length - 1] === '')
+    {
+      string_array.pop();
+    }
+
+    const positions = [];
+
+    for (let i = 0; i < string_array.length; i += 3)
+    {
+      const x = parseFloat(string_array[i + 0]);
+      const y = parseFloat(string_array[i + 1]);
+      const 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,49 @@
-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)
-  {
-    const 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)
+  {
+    if (resource_container.resources_by_url[this.url] === undefined)
+    {
+      this.loader.load(this.url, (hdr) =>
+      {
+        resource_container.set_resource(this.resource_id, this.url, hdr);
+
+        this.__update_downloaded_bytes(1, 1);
+        this.__loading_ended();
+      },
+      (xhr) =>
+      {
+      // if (xhr)
+      // {
+      //   let total = xhr.total || this.total_bytes;
+      //   this.__update_downloaded_bytes(xhr.loaded, total);
+      // }
+      },
+      (msg) =>
+      {
+        this.__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');
+        this.__loading_ended();
+      });
+    }
+    else
+    {
+      resource_container.set_resource(this.resource_id, this.url, resource_container.resources_by_url[this.url]);
+
+      this.__update_downloaded_bytes(1, 1);
+      this.__loading_ended();
+    }
+  }
+}

package/src/resource_loader/SVGLoader.js

@@ -12,28 +12,35 @@ export default class SVGLoader extends AbstractLoader
 
   on_preloaded_finished(resource_container)
   {
-    const ctx = this;
-
-    this.loader.load(this.url, (data) =>
+    if (resource_container.resources_by_url[this.url] === undefined)
     {
-      resource_container.set_resource(ctx.resource_id, ctx.url, data);
+      this.loader.load(this.url, (data) =>
+      {
+        resource_container.set_resource(this.resource_id, this.url, data);
 
-      ctx.__update_downloaded_bytes(1, 1);
-      ctx.__loading_ended();
-    },
-    (xhr) =>
-    {
+        this.__update_downloaded_bytes(1, 1);
+        this.__loading_ended();
+      },
+      (xhr) =>
+      {
       // if (xhr)
       // {
       //   let total = xhr.total || this.total_bytes;
-      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
+      //   this.__update_downloaded_bytes(xhr.loaded, total);
       // }
-    },
-    (msg) =>
+      },
+      (msg) =>
+      {
+        this.__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');
+        this.__loading_ended();
+      });
+    }
+    else
     {
-      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();
+      resource_container.set_resource(this.resource_id, this.url, resource_container.resources_by_url[this.url]);
+
+      this.__update_downloaded_bytes(1, 1);
+      this.__loading_ended();
     }
-    );
   }
 }

package/src/resource_loader/TextLoader.js

@@ -12,28 +12,35 @@ export default class TextLoader extends AbstractLoader
 
   on_preloaded_finished(resource_container)
   {
-    const ctx = this;
-
-    this.loader.load(this.url, (gltf) =>
+    if (resource_container.resources_by_url[this.url] === undefined)
     {
-      resource_container.set_resource(ctx.resource_id, ctx.url, gltf);
+      this.loader.load(this.url, (gltf) =>
+      {
+        resource_container.set_resource(this.resource_id, this.url, gltf);
 
-      ctx.__update_downloaded_bytes(1, 1);
-      ctx.__loading_ended();
-    },
-    (xhr) =>
-    {
+        this.__update_downloaded_bytes(1, 1);
+        this.__loading_ended();
+      },
+      (xhr) =>
+      {
       // if (xhr)
       // {
       //   let total = xhr.total || this.total_bytes;
-      //   ctx.__update_downloaded_bytes(xhr.loaded, total);
+      //   this.__update_downloaded_bytes(xhr.loaded, total);
       // }
-    },
-    (msg) =>
+      },
+      (msg) =>
+      {
+        this.__set_error(msg);
+        this.__loading_ended();
+      });
+    }
+    else
     {
-      ctx.__set_error(msg);
-      ctx.__loading_ended();
+      resource_container.set_resource(this.resource_id, this.url, resource_container.resources_by_url[this.url]);
+
+      this.__update_downloaded_bytes(1, 1);
+      this.__loading_ended();
     }
-    );
   }
 }

package/src/resource_loader/TextureLoader.js

@@ -11,30 +11,40 @@ export default class TextureLoader extends AbstractLoader
 
   on_preloaded_finished(resource_container, response)
   {
-    response.blob().then((blob) =>
+    if (resource_container.resources_by_url[this.url] === undefined)
     {
-      const texture = new Texture();
+      response.blob().then((blob) =>
+      {
+        const texture = new Texture();
 
-      const url = URL.createObjectURL(blob);
+        const url = URL.createObjectURL(blob);
 
-      const image = new Image();
-      image.src = url;
+        const image = new Image();
+        image.src = url;
 
-      image.onload = () =>
-      {
-        texture.image = image;
-        texture.needsUpdate = true;
+        image.onload = () =>
+        {
+          texture.image = image;
+          texture.needsUpdate = true;
 
-        resource_container.set_resource(this.resource_id, this.url, texture);
+          resource_container.set_resource(this.resource_id, this.url, texture);
 
-        this.__update_downloaded_bytes(1, 1);
-        this.__loading_ended();
-      };
+          this.__update_downloaded_bytes(1, 1);
+          this.__loading_ended();
+        };
 
-      image.onerror = () =>
-      {
-        console.error('Error loading texture. Maybe the resource is not an image?', this.url);
-      };
-    });
+        image.onerror = () =>
+        {
+          console.error('Error loading texture. Maybe the resource is not an image?', this.url);
+        };
+      });
+    }
+    else
+    {
+      resource_container.set_resource(this.resource_id, this.url, resource_container.resources_by_url[this.url]);
+
+      this.__update_downloaded_bytes(1, 1);
+      this.__loading_ended();
+    }
   }
 }

package/src/resource_loader/VideoLoader.js

@@ -1,20 +1,30 @@
-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)
+  {
+    if (resource_container.resources_by_url[this.url] === undefined)
+    {
+      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();
+      });
+    }
+    else
+    {
+      resource_container.set_resource(this.resource_id, this.url, resource_container.resources_by_url[this.url]);
+
+      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);
 }