diff --git a/.version b/.version index 24458a5..f92016f 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -v9.4.0 +v9.4.1 diff --git a/package.json b/package.json index 4558750..79e48ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ohzi-core", - "version": "9.4.0", + "version": "9.4.1", "description": "OHZI Core Library", "source": "src/index.js", "module": "build/index.module.js", diff --git a/src/Browser.js b/src/Browser.js index 99e52b9..0eed1b5 100644 --- a/src/Browser.js +++ b/src/Browser.js @@ -64,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() @@ -98,7 +98,7 @@ class Browser if ((tem = ua.match(/version\/(\d+)/i)) != null) M.splice(1, 1, tem[1]); version = M.join(' '); - return version.split(' ')[1]; + return Number(version.split(' ')[1]); } } diff --git a/src/resource_loader/CubemapLoader.js b/src/resource_loader/CubemapLoader.js index db056b2..0a784b8 100644 --- a/src/resource_loader/CubemapLoader.js +++ b/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}` ]; } diff --git a/types/Browser.d.ts b/types/Browser.d.ts index 9857009..40c199d 100644 --- a/types/Browser.d.ts +++ b/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; } diff --git a/types/resource_loader/AsyncTextureLoader.d.ts b/types/resource_loader/AsyncTextureLoader.d.ts index 9937a7f..0a7f72f 100644 --- a/types/resource_loader/AsyncTextureLoader.d.ts +++ b/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"; diff --git a/types/resource_loader/CubemapLoader.d.ts b/types/resource_loader/CubemapLoader.d.ts index d5ddbaa..4d127b2 100644 --- a/types/resource_loader/CubemapLoader.d.ts +++ b/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;