bg2e-js 2.3.11 → 2.3.13

package/src/db/Loader.ts

@@ -1,116 +1,116 @@
-
-import { isAbsolute, jointUrl, ResourceType } from '../tools/Resource';
-import { 
-    PluginOperationType,
-    createPluginDatabase, 
-    registerPluginInDatabase, 
-    getPluginFromDatabase 
-} from './DBPluginApi';
-import Canvas from '../app/Canvas';
-import LoaderPlugin from './LoaderPlugin';
-import PolyList from '../base/PolyList';
-import Texture from '../base/Texture';
-
-const g_loadPluginDatabase = createPluginDatabase(PluginOperationType.Read);
-
-type ResourceCache = {
-    [ResourceType.PolyList]: Record<string, PolyList>;
-    [ResourceType.Drawable]: Record<string, any>;
-    [ResourceType.Node]: Record<string, any>;
-    [ResourceType.Texture]: Record<string, Texture>;
-    [ResourceType.Material]: Record<string, any>;
-}
-
-export const registerLoaderPlugin = (pluginInstance: LoaderPlugin): void => {
-    pluginInstance.dependencies.forEach(dep => registerPluginInDatabase(dep, g_loadPluginDatabase));
-    registerPluginInDatabase(pluginInstance, g_loadPluginDatabase);
-}
-
-export const getLoaderPlugin = (path: string, type: ResourceType): LoaderPlugin => {
-    return getPluginFromDatabase(path, type, g_loadPluginDatabase);
-}
-
-const getClearedCache = (): ResourceCache => {
-    return {
-        [ResourceType.PolyList]: {},
-        [ResourceType.Drawable]: {},
-        [ResourceType.Node]: {},
-        [ResourceType.Texture]: {},
-        [ResourceType.Material]: {}
-    }
-}
-
-export default class Loader {
-    private _canvas: Canvas;
-    private _cache: ResourceCache;
-    private _currentPath: string;
-
-    constructor(canvas?: Canvas | null) {
-        this._canvas = canvas || Canvas.FirstCanvas();
-        this._cache = getClearedCache();
-        this._currentPath = "";
-    }
-
-    get canvas(): Canvas {
-        return this._canvas;
-    }
-
-    get currentPath(): string {
-        return this._currentPath;
-    }
-
-    set currentPath(p: string) {
-        this._currentPath = p;
-    }
-
-    clearCache(): void {
-        this._cache = getClearedCache();
-    }
-
-    findCache(path: string, type: ResourceType): any {
-        return this._cache[type] && this._cache[type][path];
-    }
-
-    async loadResource(path: string, type: ResourceType): Promise<any> {
-        if (!isAbsolute(path) && this.currentPath !== "") {
-            path = jointUrl(this.currentPath, path);
-        }
-        let result = this.findCache(path, type);
-        if (!result) {
-            const plugin = getLoaderPlugin(path, type);
-            result = await plugin.load(path, type, this);
-        }
-        return result;
-    }
-
-    async loadResourceBuffer(buffer: ArrayBuffer, format: string, dependencies: string[], type: ResourceType): Promise<any> {
-        const plugin = getLoaderPlugin(`file.${ format }`, type);
-        const result = await plugin.loadBuffer(buffer, format, dependencies, type, this);
-        return result;
-    }
-
-    async loadPolyList(path: string): Promise<PolyList> {
-        return await this.loadResource(path, ResourceType.PolyList);
-    }
-
-    async loadDrawable(path: string): Promise<any> {
-        return await this.loadResource(path, ResourceType.Drawable);
-    }
-
-    async loadDrawableBuffer(buffer: ArrayBuffer, format: string, dependencies: string[]): Promise<any> {
-        return await this.loadResourceBuffer(buffer, format, dependencies, ResourceType.Drawable);
-    }
-
-    async loadNode(path: string): Promise<any> {
-        return await this.loadResource(path, ResourceType.Node);
-    }
-
-    async loadTexture(path: string): Promise<Texture> {
-        return await this.loadResource(path, ResourceType.Texture);
-    }
-
-    async loadMaterial(path: string): Promise<any> {
-        return await this.loadResource(path, ResourceType.Material);
-    }
-}
-
+
+import { isAbsolute, jointUrl, ResourceType } from '../tools/Resource';
+import { 
+    PluginOperationType,
+    createPluginDatabase, 
+    registerPluginInDatabase, 
+    getPluginFromDatabase 
+} from './DBPluginApi';
+import Canvas from '../app/Canvas';
+import LoaderPlugin from './LoaderPlugin';
+import PolyList from '../base/PolyList';
+import Texture from '../base/Texture';
+
+const g_loadPluginDatabase = createPluginDatabase(PluginOperationType.Read);
+
+type ResourceCache = {
+    [ResourceType.PolyList]: Record<string, PolyList>;
+    [ResourceType.Drawable]: Record<string, any>;
+    [ResourceType.Node]: Record<string, any>;
+    [ResourceType.Texture]: Record<string, Texture>;
+    [ResourceType.Material]: Record<string, any>;
+}
+
+export const registerLoaderPlugin = (pluginInstance: LoaderPlugin): void => {
+    pluginInstance.dependencies.forEach(dep => registerPluginInDatabase(dep, g_loadPluginDatabase));
+    registerPluginInDatabase(pluginInstance, g_loadPluginDatabase);
+}
+
+export const getLoaderPlugin = (path: string, type: ResourceType): LoaderPlugin => {
+    return getPluginFromDatabase(path, type, g_loadPluginDatabase);
+}
+
+const getClearedCache = (): ResourceCache => {
+    return {
+        [ResourceType.PolyList]: {},
+        [ResourceType.Drawable]: {},
+        [ResourceType.Node]: {},
+        [ResourceType.Texture]: {},
+        [ResourceType.Material]: {}
+    }
+}
+
+export default class Loader {
+    private _canvas: Canvas;
+    private _cache: ResourceCache;
+    private _currentPath: string;
+
+    constructor(canvas?: Canvas | null) {
+        this._canvas = canvas || Canvas.FirstCanvas();
+        this._cache = getClearedCache();
+        this._currentPath = "";
+    }
+
+    get canvas(): Canvas {
+        return this._canvas;
+    }
+
+    get currentPath(): string {
+        return this._currentPath;
+    }
+
+    set currentPath(p: string) {
+        this._currentPath = p;
+    }
+
+    clearCache(): void {
+        this._cache = getClearedCache();
+    }
+
+    findCache(path: string, type: ResourceType): any {
+        return this._cache[type] && this._cache[type][path];
+    }
+
+    async loadResource(path: string, type: ResourceType): Promise<any> {
+        if (!isAbsolute(path) && this.currentPath !== "") {
+            path = jointUrl(this.currentPath, path);
+        }
+        let result = this.findCache(path, type);
+        if (!result) {
+            const plugin = getLoaderPlugin(path, type);
+            result = await plugin.load(path, type, this);
+        }
+        return result;
+    }
+
+    async loadResourceBuffer(buffer: ArrayBuffer, format: string, dependencies: string[], type: ResourceType): Promise<any> {
+        const plugin = getLoaderPlugin(`file.${ format }`, type);
+        const result = await plugin.loadBuffer(buffer, format, dependencies, type, this);
+        return result;
+    }
+
+    async loadPolyList(path: string): Promise<PolyList> {
+        return await this.loadResource(path, ResourceType.PolyList);
+    }
+
+    async loadDrawable(path: string): Promise<any> {
+        return await this.loadResource(path, ResourceType.Drawable);
+    }
+
+    async loadDrawableBuffer(buffer: ArrayBuffer, format: string, dependencies: string[]): Promise<any> {
+        return await this.loadResourceBuffer(buffer, format, dependencies, ResourceType.Drawable);
+    }
+
+    async loadNode(path: string): Promise<any> {
+        return await this.loadResource(path, ResourceType.Node);
+    }
+
+    async loadTexture(path: string): Promise<Texture> {
+        return await this.loadResource(path, ResourceType.Texture);
+    }
+
+    async loadMaterial(path: string): Promise<any> {
+        return await this.loadResource(path, ResourceType.Material);
+    }
+}
+

package/src/db/LoaderPlugin.ts

@@ -1,34 +1,34 @@
-import { ResourceType } from "../tools/Resource.js";
-
-export default class LoaderPlugin {
-    // Returns an array of valid file extensions for this plugin
-    //  example: ["obj","dae"]
-    get supportedExtensions(): string[] {
-        throw new Error("LoaderPlugin.supportedExtensions: attribute not implemented");
-    }
-
-    // Returns the resource types that the loader plugin can handle
-    // example: [ ResourceType.PolyList, ResourceType.Scene ]
-    get resourceTypes(): ResourceType[] {
-        throw new Error("LoaderPlugin.resourceTypes: attribute not implemented");
-    }
-
-    // Returns the resource loaded with the path. The resource type must be one
-    // of the specified in the resourceTypes attribute
-    async load(path: string, type: ResourceType, loader: any): Promise<any> {
-        throw new Error("LoaderPlugin.load(): method not implemented");
-    }
-
-    async loadBuffer(buffer: ArrayBuffer, format: string, dependencies: string[], type: ResourceType, loader: any): Promise<any> {
-        throw new Error("LoaderPlugin.loadBuffer(): method not implemented");
-    }
-
-    // Returns an array of LoaderPlugin objects that are necessary for this plugin to work.
-    get dependencies(): LoaderPlugin[] {
-        return [];
-    }
-
-    async write(path: string, data: any, type: ResourceType, writer: any): Promise<any> {
-        throw new Error("LoaderPlugin.write(): method not implemented");
-    }
-}
+import { ResourceType } from "../tools/Resource.js";
+
+export default class LoaderPlugin {
+    // Returns an array of valid file extensions for this plugin
+    //  example: ["obj","dae"]
+    get supportedExtensions(): string[] {
+        throw new Error("LoaderPlugin.supportedExtensions: attribute not implemented");
+    }
+
+    // Returns the resource types that the loader plugin can handle
+    // example: [ ResourceType.PolyList, ResourceType.Scene ]
+    get resourceTypes(): ResourceType[] {
+        throw new Error("LoaderPlugin.resourceTypes: attribute not implemented");
+    }
+
+    // Returns the resource loaded with the path. The resource type must be one
+    // of the specified in the resourceTypes attribute
+    async load(path: string, type: ResourceType, loader: any): Promise<any> {
+        throw new Error("LoaderPlugin.load(): method not implemented");
+    }
+
+    async loadBuffer(buffer: ArrayBuffer, format: string, dependencies: string[], type: ResourceType, loader: any): Promise<any> {
+        throw new Error("LoaderPlugin.loadBuffer(): method not implemented");
+    }
+
+    // Returns an array of LoaderPlugin objects that are necessary for this plugin to work.
+    get dependencies(): LoaderPlugin[] {
+        return [];
+    }
+
+    async write(path: string, data: any, type: ResourceType, writer: any): Promise<any> {
+        throw new Error("LoaderPlugin.write(): method not implemented");
+    }
+}

package/src/db/MtlParser.ts

@@ -1,7 +1,7 @@
-
-
-export default class MtlParser {
-    constructor(mtlText: string) {
-        
-    }
-}
+
+
+export default class MtlParser {
+    constructor(mtlText: string) {
+        
+    }
+}

package/src/db/ObjLoaderPlugin.ts

@@ -1,55 +1,55 @@
-import LoaderPlugin from './LoaderPlugin';
-import Resource, { getFileName, removeExtension, removeFileName, ResourceType } from './../tools/Resource';
-import ObjParser from './ObjParser';
-import Drawable from '../scene/Drawable';
-import Material from '../base/Material';
-import PolyList from '../base/PolyList';
-import Loader from './Loader';
-
-const buildDrawable = (polyListArray: PolyList[], mtlData: any, filePath: string): Drawable => {
-    const name = removeExtension(getFileName(filePath));
-    const drawable = new Drawable(name);
-
-    polyListArray.forEach((plist: PolyList) => {
-        // TODO: set mtl data
-        const mat = new Material();
-        drawable.addPolyList(plist,mat);
-    });
-
-    return drawable;
-}
-
-export default class ObjLoaderPlugin extends LoaderPlugin {
-    private _resource: Resource;
-
-    constructor() {
-        super();
-        this._resource = new Resource();
-    }
-
-    get supportedExtensions(): string[] { return ['obj']; }
-
-    get resourceTypes(): ResourceType[] {
-        return [
-            ResourceType.PolyList,
-            ResourceType.Drawable
-        ];
-    }
-
-    async load(path: string, resourceType: ResourceType, loader: Loader): Promise<PolyList[] | Drawable> {
-        const objText = await this._resource.load(path);
-        const parser = new ObjParser(objText);
-
-        // TODO: load material from mtl file
-        // const relativePath = removeFileName(filePath);
-
-        switch (resourceType) {
-        case ResourceType.PolyList:
-            return parser.polyListArray;
-        case ResourceType.Drawable:
-            return buildDrawable(parser.polyListArray, null, path);
-        default:
-            throw new Error(`ObjLoaderPlugin.load() unexpected resource type received: ${resourceType}`);
-        }
-    }
+import LoaderPlugin from './LoaderPlugin';
+import Resource, { getFileName, removeExtension, removeFileName, ResourceType } from './../tools/Resource';
+import ObjParser from './ObjParser';
+import Drawable from '../scene/Drawable';
+import Material from '../base/Material';
+import PolyList from '../base/PolyList';
+import Loader from './Loader';
+
+const buildDrawable = (polyListArray: PolyList[], mtlData: any, filePath: string): Drawable => {
+    const name = removeExtension(getFileName(filePath));
+    const drawable = new Drawable(name);
+
+    polyListArray.forEach((plist: PolyList) => {
+        // TODO: set mtl data
+        const mat = new Material();
+        drawable.addPolyList(plist,mat);
+    });
+
+    return drawable;
+}
+
+export default class ObjLoaderPlugin extends LoaderPlugin {
+    private _resource: Resource;
+
+    constructor() {
+        super();
+        this._resource = new Resource();
+    }
+
+    get supportedExtensions(): string[] { return ['obj']; }
+
+    get resourceTypes(): ResourceType[] {
+        return [
+            ResourceType.PolyList,
+            ResourceType.Drawable
+        ];
+    }
+
+    async load(path: string, resourceType: ResourceType, loader: Loader): Promise<PolyList[] | Drawable> {
+        const objText = await this._resource.load(path);
+        const parser = new ObjParser(objText);
+
+        // TODO: load material from mtl file
+        // const relativePath = removeFileName(filePath);
+
+        switch (resourceType) {
+        case ResourceType.PolyList:
+            return parser.polyListArray;
+        case ResourceType.Drawable:
+            return buildDrawable(parser.polyListArray, null, path);
+        default:
+            throw new Error(`ObjLoaderPlugin.load() unexpected resource type received: ${resourceType}`);
+        }
+    }
 }