bg2e-js 2.3.11 → 2.3.13

package/src/base/index.ts

@@ -1,81 +1,81 @@
-import Color from './Color';
-import Environment from './Environment';
-import Light, {
-    LightType
-} from './Light';
-import Material from './Material';
-import PolyList, {
-    BufferType,
-    DrawMode,
-    RenderLayer,
-    getLayers,
-    PolyListFrontFace,
-    PolyListCullFace
-} from './PolyList';
-import Texture, {
-    TextureDataType,
-    TextureWrap,
-    TextureFilter,
-    TextureTarget,
-    ProceduralTextureFunction,
-    TextureRenderTargetAttachment,
-    TextureComponentFormat,
-    TextureChannel,
-    TextureDataTypeName,
-    TextureWrapName,
-    TextureFilterName,
-    TextureTargetName,
-    ProceduralTextureFunctionName,
-    TextureRenderTargetAttachmentNames,
-    TextureComponentFormatNames,
-    TextureChannelNames,
-    textureWrapString,
-    textureDataTypeString,
-    textureFilterString,
-    textureTargetString,
-    proceduralTextureFunctionString,
-    textureRenderTargetAttachmentString,
-    textureComponentFormatString,
-    textureChannelString,
-} from './Texture';
-
-export default {
-    Color,
-    Environment,
-    Light,
-    LightType,
-    Material,
-    PolyList,
-    BufferType,
-    DrawMode,
-    RenderLayer,
-    getLayers,
-    PolyListFrontFace,
-    PolyListCullFace,
-    Texture,
-    TextureDataType,
-    TextureWrap,
-    TextureFilter,
-    TextureTarget,
-    ProceduralTextureFunction,
-    TextureRenderTargetAttachment,
-    TextureComponentFormat,
-    TextureChannel,
-    TextureDataTypeName,
-    TextureWrapName,
-    TextureFilterName,
-    TextureTargetName,
-    ProceduralTextureFunctionName,
-    TextureRenderTargetAttachmentNames,
-    TextureComponentFormatNames,
-    TextureChannelNames,
-    textureWrapString,
-    textureDataTypeString,
-    textureFilterString,
-    textureTargetString,
-    proceduralTextureFunctionString,
-    textureRenderTargetAttachmentString,
-    textureComponentFormatString,
-    textureChannelString,
-}
-
+import Color from './Color';
+import Environment from './Environment';
+import Light, {
+    LightType
+} from './Light';
+import Material from './Material';
+import PolyList, {
+    BufferType,
+    DrawMode,
+    RenderLayer,
+    getLayers,
+    PolyListFrontFace,
+    PolyListCullFace
+} from './PolyList';
+import Texture, {
+    TextureDataType,
+    TextureWrap,
+    TextureFilter,
+    TextureTarget,
+    ProceduralTextureFunction,
+    TextureRenderTargetAttachment,
+    TextureComponentFormat,
+    TextureChannel,
+    TextureDataTypeName,
+    TextureWrapName,
+    TextureFilterName,
+    TextureTargetName,
+    ProceduralTextureFunctionName,
+    TextureRenderTargetAttachmentNames,
+    TextureComponentFormatNames,
+    TextureChannelNames,
+    textureWrapString,
+    textureDataTypeString,
+    textureFilterString,
+    textureTargetString,
+    proceduralTextureFunctionString,
+    textureRenderTargetAttachmentString,
+    textureComponentFormatString,
+    textureChannelString,
+} from './Texture';
+
+export default {
+    Color,
+    Environment,
+    Light,
+    LightType,
+    Material,
+    PolyList,
+    BufferType,
+    DrawMode,
+    RenderLayer,
+    getLayers,
+    PolyListFrontFace,
+    PolyListCullFace,
+    Texture,
+    TextureDataType,
+    TextureWrap,
+    TextureFilter,
+    TextureTarget,
+    ProceduralTextureFunction,
+    TextureRenderTargetAttachment,
+    TextureComponentFormat,
+    TextureChannel,
+    TextureDataTypeName,
+    TextureWrapName,
+    TextureFilterName,
+    TextureTargetName,
+    ProceduralTextureFunctionName,
+    TextureRenderTargetAttachmentNames,
+    TextureComponentFormatNames,
+    TextureChannelNames,
+    textureWrapString,
+    textureDataTypeString,
+    textureFilterString,
+    textureTargetString,
+    proceduralTextureFunctionString,
+    textureRenderTargetAttachmentString,
+    textureComponentFormatString,
+    textureChannelString,
+}
+

package/src/db/Bg2LoaderPlugin.ts

@@ -1,143 +1,143 @@
-import LoaderPlugin from "./LoaderPlugin";
-import { ResourceType, getFileName, removeExtension, removeFileName } from "./../tools/Resource";
-import Resource from "../tools/Resource";
-import PolyList from "../base/PolyList";
-import Drawable from "../scene/Drawable";
-import Node from "../scene/Node";
-import Material from "../base/Material";
-import { deserializeComponent } from "../scene/Component";
-
-// @ts-ignore: module not typed
-import Bg2ioWrapper from 'bg2io/Bg2ioBrowser';
-import Loader from './Loader';
-
-let g_bg2Wrapper: any = null;
-
-const bg2ioFactory = async (path?: string | null): Promise<any> => {
-    if (g_bg2Wrapper === null) {
-        const params = path ? { wasmPath: path } : {};
-        g_bg2Wrapper = await Bg2ioWrapper(params);
-        if (!g_bg2Wrapper) {
-            throw new Error("Bg2LoaderPlugin: unable to initialize bg2io library");
-        }
-    }
-    return g_bg2Wrapper;
-}
-
-const createPolyList = (jsonData: any, loader: Loader): Array<{ plist: PolyList, materialData: any }> => {
-    const result = jsonData.polyLists.map((plData: any) => {
-        const plist = new PolyList();
-        const materialData = jsonData.materials.find((m: any) => m.name === plData.matName);
-        plist.name = plData.name
-        plist.visible = plData.visible;
-        if (materialData) {
-            plist.groupName = materialData.groupName || "";
-            plist.enableCullFace = materialData.cullFace;
-        }
-        plist.vertex = plData.vertex;
-        plist.normal = plData.normal;
-        plist.texCoord0 = plData.texCoord0
-        plist.texCoord1 = plData.texCoord1
-        plist.texCoord2 = plData.texCoord2
-        plist.index = plData.index;
-        return { plist, materialData };
-    });
-
-    return result;
-}
-
-const createDrawable = async (jsonData: any, filePath: string, loader: Loader): Promise<Drawable> => {
-    const name = removeExtension(getFileName(filePath));
-    const relativePath = removeFileName(filePath);
-    const drawable = new Drawable(name);
-    for (const item of createPolyList(jsonData, loader)) {
-        const mat = new Material(loader.canvas);
-        await mat.deserialize(item.materialData, relativePath);
-        drawable.addPolyList(item.plist, mat);
-    }
-    //createPolyList(jsonData).forEach(item => {
-    //    const mat = new Material();
-    //    mat.deserialize(item.materialData, relativePath);
-    //    drawable.addPolyList(item.plist, mat);
-    //});
-    return drawable;
-}
-
-const createNode = async (jsonData: any, filePath: string, loader: Loader): Promise<Node> => {
-    const name = removeExtension(getFileName(filePath));
-    const drawable = await createDrawable(jsonData,filePath,loader);
-    const node = new Node(name);
-    node.addComponent(drawable);
-    for (const compData of jsonData.components) {
-        try {
-            const comp = await deserializeComponent(compData,loader);
-            comp && node.addComponent(comp);
-        }
-        catch (err: any) {
-            console.warn(err.message);
-        }
-    }
-    console.log(jsonData);
-    return node;
-}
-
-export type MaterialImportCallback = (matData: any) => any;
-
-export default class Bg2LoaderPlugin extends LoaderPlugin {
-    private _bg2ioPath: string | null;
-    private _resource: Resource;
-    private _materialImportCallback?: MaterialImportCallback;
-
-    constructor( {
-        bg2ioPath = null,
-        materialImportCallback
-    }: {
-        bg2ioPath?: string | null,
-        materialImportCallback?: MaterialImportCallback
-    } = {}) {
-        super();
-        this._bg2ioPath = bg2ioPath;
-        this._materialImportCallback = materialImportCallback;
-        this._resource = new Resource();
-    }
-
-    get supportedExtensions(): string[] { return ["bg2","vwglb"]; }
-
-    get resourceTypes(): ResourceType[] {
-        return [
-            ResourceType.PolyList, 
-            ResourceType.Drawable,
-            ResourceType.Node
-        ]; 
-    }
-
-    async load(path: string, resourceType: ResourceType, loader: Loader): Promise<any> {
-        const bg2io = await bg2ioFactory(this._bg2ioPath);
-
-        const buffer = await this._resource.load(path);
-        const jsonData = bg2io.loadBg2FileAsJson(buffer);
-
-        // Compatibility with 1.4 models
-        jsonData.materials.forEach((mat: any) => {
-            if (!mat.type) {
-                mat.type = mat["class"];
-                delete mat["class"];
-            }
-        });
-
-        if (this._materialImportCallback) {
-            jsonData.materials = jsonData.materials.map((mat: any) => this._materialImportCallback!(mat));
-        }
-        
-        switch (resourceType) {
-        case ResourceType.PolyList:
-            return createPolyList(jsonData,loader).map(item => item.plist);
-        case ResourceType.Drawable:
-            return createDrawable(jsonData,path,loader);
-        case ResourceType.Node:
-            return await createNode(jsonData,path,loader);
-        default:
-            throw new Error(`Bg2LoaderPlugin.load() unexpected resource type received: ${resourceType}`);
-        }
-    }
-}
+import LoaderPlugin from "./LoaderPlugin";
+import { ResourceType, getFileName, removeExtension, removeFileName } from "./../tools/Resource";
+import Resource from "../tools/Resource";
+import PolyList from "../base/PolyList";
+import Drawable from "../scene/Drawable";
+import Node from "../scene/Node";
+import Material from "../base/Material";
+import { deserializeComponent } from "../scene/Component";
+
+// @ts-ignore: module not typed
+import Bg2ioWrapper from 'bg2io/Bg2ioBrowser';
+import Loader from './Loader';
+
+let g_bg2Wrapper: any = null;
+
+const bg2ioFactory = async (path?: string | null): Promise<any> => {
+    if (g_bg2Wrapper === null) {
+        const params = path ? { wasmPath: path } : {};
+        g_bg2Wrapper = await Bg2ioWrapper(params);
+        if (!g_bg2Wrapper) {
+            throw new Error("Bg2LoaderPlugin: unable to initialize bg2io library");
+        }
+    }
+    return g_bg2Wrapper;
+}
+
+const createPolyList = (jsonData: any, loader: Loader): Array<{ plist: PolyList, materialData: any }> => {
+    const result = jsonData.polyLists.map((plData: any) => {
+        const plist = new PolyList();
+        const materialData = jsonData.materials.find((m: any) => m.name === plData.matName);
+        plist.name = plData.name
+        plist.visible = plData.visible;
+        if (materialData) {
+            plist.groupName = materialData.groupName || "";
+            plist.enableCullFace = materialData.cullFace;
+        }
+        plist.vertex = plData.vertex;
+        plist.normal = plData.normal;
+        plist.texCoord0 = plData.texCoord0
+        plist.texCoord1 = plData.texCoord1
+        plist.texCoord2 = plData.texCoord2
+        plist.index = plData.index;
+        return { plist, materialData };
+    });
+
+    return result;
+}
+
+const createDrawable = async (jsonData: any, filePath: string, loader: Loader): Promise<Drawable> => {
+    const name = removeExtension(getFileName(filePath));
+    const relativePath = removeFileName(filePath);
+    const drawable = new Drawable(name);
+    for (const item of createPolyList(jsonData, loader)) {
+        const mat = new Material(loader.canvas);
+        await mat.deserialize(item.materialData, relativePath);
+        drawable.addPolyList(item.plist, mat);
+    }
+    //createPolyList(jsonData).forEach(item => {
+    //    const mat = new Material();
+    //    mat.deserialize(item.materialData, relativePath);
+    //    drawable.addPolyList(item.plist, mat);
+    //});
+    return drawable;
+}
+
+const createNode = async (jsonData: any, filePath: string, loader: Loader): Promise<Node> => {
+    const name = removeExtension(getFileName(filePath));
+    const drawable = await createDrawable(jsonData,filePath,loader);
+    const node = new Node(name);
+    node.addComponent(drawable);
+    for (const compData of jsonData.components) {
+        try {
+            const comp = await deserializeComponent(compData,loader);
+            comp && node.addComponent(comp);
+        }
+        catch (err: any) {
+            console.warn(err.message);
+        }
+    }
+    console.log(jsonData);
+    return node;
+}
+
+export type MaterialImportCallback = (matData: any) => any;
+
+export default class Bg2LoaderPlugin extends LoaderPlugin {
+    private _bg2ioPath: string | null;
+    private _resource: Resource;
+    private _materialImportCallback?: MaterialImportCallback;
+
+    constructor( {
+        bg2ioPath = null,
+        materialImportCallback
+    }: {
+        bg2ioPath?: string | null,
+        materialImportCallback?: MaterialImportCallback
+    } = {}) {
+        super();
+        this._bg2ioPath = bg2ioPath;
+        this._materialImportCallback = materialImportCallback;
+        this._resource = new Resource();
+    }
+
+    get supportedExtensions(): string[] { return ["bg2","vwglb"]; }
+
+    get resourceTypes(): ResourceType[] {
+        return [
+            ResourceType.PolyList, 
+            ResourceType.Drawable,
+            ResourceType.Node
+        ]; 
+    }
+
+    async load(path: string, resourceType: ResourceType, loader: Loader): Promise<any> {
+        const bg2io = await bg2ioFactory(this._bg2ioPath);
+
+        const buffer = await this._resource.load(path);
+        const jsonData = bg2io.loadBg2FileAsJson(buffer);
+
+        // Compatibility with 1.4 models
+        jsonData.materials.forEach((mat: any) => {
+            if (!mat.type) {
+                mat.type = mat["class"];
+                delete mat["class"];
+            }
+        });
+
+        if (this._materialImportCallback) {
+            jsonData.materials = jsonData.materials.map((mat: any) => this._materialImportCallback!(mat));
+        }
+        
+        switch (resourceType) {
+        case ResourceType.PolyList:
+            return createPolyList(jsonData,loader).map(item => item.plist);
+        case ResourceType.Drawable:
+            return createDrawable(jsonData,path,loader);
+        case ResourceType.Node:
+            return await createNode(jsonData,path,loader);
+        default:
+            throw new Error(`Bg2LoaderPlugin.load() unexpected resource type received: ${resourceType}`);
+        }
+    }
+}

package/src/db/DBPluginApi.ts

@@ -1,48 +1,48 @@
-import { getExtension, ResourceType } from '../tools/Resource';
-import LoaderPlugin from './LoaderPlugin';
-
-export const PluginOperationType = {
-    Read: "read",
-    Write: "write"
-} as const;
-
-export type PluginOperationTypeValue = typeof PluginOperationType[keyof typeof PluginOperationType];
-
-export interface PluginDatabase {
-    operationType: PluginOperationTypeValue;
-    plugins: Partial<Record<ResourceType, LoaderPlugin[]>>;
-}
-
-export const createPluginDatabase = (operationType: PluginOperationTypeValue): PluginDatabase => {
-    return {
-        operationType,
-        plugins: {}
-    }
-}
-
-export const registerPluginInDatabase = (pluginInstance: LoaderPlugin, pluginDatabase: PluginDatabase): void => {
-    pluginInstance.resourceTypes.forEach(type => {
-        pluginDatabase.plugins[type] = pluginDatabase.plugins[type] || [];
-        pluginDatabase.plugins[type]!.push(pluginInstance);
-    });
-}
-
-export const getPluginFromDatabase = function(path: string, type: ResourceType, pluginDatabase: PluginDatabase): LoaderPlugin {
-    const ext = getExtension(path);
-    const extCheck = new RegExp(ext, "i");
-    const errMsg = `Could not find a plugin to ${pluginDatabase.operationType} file '${path}' of type '${type}'.`;
-
-    const plugins = pluginDatabase.plugins[type];
-    if (!plugins) {
-        throw new Error(errMsg);
-    }
-    else {
-        for (const plugin of plugins) {
-            if (plugin.supportedExtensions.find(e => extCheck.test(e))) {
-                return plugin;
-            }
-        }
-        throw new Error(errMsg);
-    }
-}
-
+import { getExtension, ResourceType } from '../tools/Resource';
+import LoaderPlugin from './LoaderPlugin';
+
+export const PluginOperationType = {
+    Read: "read",
+    Write: "write"
+} as const;
+
+export type PluginOperationTypeValue = typeof PluginOperationType[keyof typeof PluginOperationType];
+
+export interface PluginDatabase {
+    operationType: PluginOperationTypeValue;
+    plugins: Partial<Record<ResourceType, LoaderPlugin[]>>;
+}
+
+export const createPluginDatabase = (operationType: PluginOperationTypeValue): PluginDatabase => {
+    return {
+        operationType,
+        plugins: {}
+    }
+}
+
+export const registerPluginInDatabase = (pluginInstance: LoaderPlugin, pluginDatabase: PluginDatabase): void => {
+    pluginInstance.resourceTypes.forEach(type => {
+        pluginDatabase.plugins[type] = pluginDatabase.plugins[type] || [];
+        pluginDatabase.plugins[type]!.push(pluginInstance);
+    });
+}
+
+export const getPluginFromDatabase = function(path: string, type: ResourceType, pluginDatabase: PluginDatabase): LoaderPlugin {
+    const ext = getExtension(path);
+    const extCheck = new RegExp(ext, "i");
+    const errMsg = `Could not find a plugin to ${pluginDatabase.operationType} file '${path}' of type '${type}'.`;
+
+    const plugins = pluginDatabase.plugins[type];
+    if (!plugins) {
+        throw new Error(errMsg);
+    }
+    else {
+        for (const plugin of plugins) {
+            if (plugin.supportedExtensions.find(e => extCheck.test(e))) {
+                return plugin;
+            }
+        }
+        throw new Error(errMsg);
+    }
+}
+