ohzi-core 9.3.1 → 9.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohzi-core",
-  "version": "9.3.1",
+  "version": "9.4.1",
   "description": "OHZI Core Library",
   "source": "src/index.js",
   "module": "build/index.module.js",

package/src/Browser.js

@@ -33,6 +33,8 @@ class Browser
       this.browser_name = 'other';
       break;
     }
+
+    this.version = this.get_version();
   }
 
   get name()
@@ -62,7 +64,7 @@ class Browser
 
   get has_webm()
   {
-    return this.is_chrome || this.is_firefox || this.is_edge_chromium;
+    return !!(this.is_chrome || this.is_firefox || this.is_edge_chromium);
   }
 
   get has_hvec()
@@ -74,6 +76,30 @@ class Browser
   {
     return this.has_webm ? 'webm' : this.has_hvec ? 'hvec.mp4' : 'mp4';
   }
+
+  get_version()
+  {
+    const ua = navigator.userAgent;
+    let tem = '';
+    let version = 0;
+
+    let M = ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
+    if (/trident/i.test(M[1]))
+    {
+      tem =  /\brv[ :]+(\d+)/g.exec(ua) || [];
+      version =  'IE ' + (tem[1] || '');
+    }
+    if (M[1] === 'Chrome')
+    {
+      tem = ua.match(/\b(OPR|Edge)\/(\d+)/);
+      if (tem != null) version = tem.slice(1).join(' ').replace('OPR', 'Opera');
+    }
+    M = M[2] ? [M[1], M[2]] : [navigator.appName, navigator.appVersion, '-?'];
+    if ((tem = ua.match(/version\/(\d+)/i)) != null) M.splice(1, 1, tem[1]);
+    version = M.join(' ');
+
+    return Number(version.split(' ')[1]);
+  }
 }
 
 const browser = new Browser();

package/src/resource_loader/AsyncTextureLoader.js

@@ -1,6 +1,7 @@
 import { AbstractLoader } from './AbstractLoader';
 
 import { Texture } from 'three';
+import { Browser } from '../Browser';
 
 class AsyncTextureLoader extends AbstractLoader
 {
@@ -10,6 +11,18 @@ class AsyncTextureLoader extends AbstractLoader
   }
 
   on_preloaded_finished(resource_container)
+  {
+    if (Browser.is_safari && Browser.version < 15)
+    {
+      this.load_with_old_method(resource_container);
+    }
+    else
+    {
+      this.load_with_new_method(resource_container);
+    }
+  }
+
+  load_with_old_method(resource_container)
   {
     if (resource_container.resources_by_url[this.url] === undefined)
     {
@@ -42,6 +55,43 @@ class AsyncTextureLoader extends AbstractLoader
       this.__loading_ended();
     }
   }
+
+  load_with_new_method(resource_container)
+  {
+    if (resource_container.resources_by_url[this.url] === undefined)
+    {
+      const fetchOptions = {};
+      fetchOptions.credentials = 'same-origin';
+      // fetchOptions.headers = this.requestHeader;
+
+      fetch(this.url, fetchOptions).then((res) =>
+      {
+        return res.blob();
+      }).then((blob) =>
+      {
+        return createImageBitmap(blob, { colorSpaceConversion: 'none' });
+      }).then((imageBitmap) =>
+      {
+        const texture = new Texture(imageBitmap);
+        texture.needsUpdate = true;
+
+        resource_container.set_resource(this.resource_id, this.url, texture);
+
+        this.__update_downloaded_bytes(1, 1);
+        this.__loading_ended();
+      }).catch(function(e)
+      {
+        console.error(e);
+      });
+    }
+    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();
+    }
+  }
 }
 
 export { AsyncTextureLoader };

package/src/resource_loader/CubemapLoader.js

@@ -4,18 +4,18 @@ import { CubeTextureLoader } from 'three';
 
 class CubemapLoader extends AbstractLoader
 {
-  constructor(resource_id, url, size)
+  constructor(resource_id, url, extension, size)
   {
     super(resource_id, url, size);
     this.loader = new CubeTextureLoader();
     this.loader.setPath(url + '/');
     this.urls = [
-      'px.png',
-      'nx.png',
-      'py.png',
-      'ny.png',
-      'pz.png',
-      'nz.png'
+      `px.${extension}`,
+      `nx.${extension}`,
+      `py.${extension}`,
+      `ny.${extension}`,
+      `pz.${extension}`,
+      `nz.${extension}`
     ];
   }
 

package/types/Browser.d.ts

@@ -4,6 +4,7 @@ declare class Browser {
     init(): void;
     browser_name: string;
     agent: string;
+    version: number;
     get name(): string;
     get is_safari(): boolean;
     get is_chrome(): boolean;
@@ -12,4 +13,5 @@ declare class Browser {
     get has_webm(): boolean;
     get has_hvec(): boolean;
     get preferred_video_extension(): "webm" | "hvec.mp4" | "mp4";
+    get_version(): number;
 }

package/types/resource_loader/AsyncTextureLoader.d.ts

@@ -1,5 +1,7 @@
 export class AsyncTextureLoader extends AbstractLoader {
     constructor(resource_id: any, url: any, size: any);
     on_preloaded_finished(resource_container: any): void;
+    load_with_old_method(resource_container: any): void;
+    load_with_new_method(resource_container: any): void;
 }
 import { AbstractLoader } from "./AbstractLoader";

package/types/resource_loader/CubemapLoader.d.ts

@@ -1,5 +1,5 @@
 export class CubemapLoader extends AbstractLoader {
-    constructor(resource_id: any, url: any, size: any);
+    constructor(resource_id: any, url: any, extension: any, size: any);
     loader: any;
     urls: string[];
     on_preloaded_finished(resource_container: any): void;