@configura/web-core 2.1.0-alpha.2 → 2.1.0-alpha.3

package/dist/cm/core3D/GMaterialClassic.js

@@ -1,171 +1,171 @@
-import { DexObj } from "../format/dex/DexObj.js";
-import { GMaterial3D, GMaterial3DTexture, imageUrlFromDex, textureWrapFromDex, } from "./GMaterial3D.js";
-// tslint:disable:max-classes-per-file
-export class GMaterialClassic extends GMaterial3D {
-    constructor(log, obj) {
-        super(log, obj);
-        if (obj === undefined) {
-            return;
-        }
-        let property = obj.get("diffuse");
-        if (property instanceof DexObj) {
-            this.diffuse = new Diffuse3D();
-            readBaseMaterialProps(log, this.diffuse, property);
-            const amount = property.get("amount");
-            if (typeof amount === "number") {
-                this.diffuse.amount = amount;
-            }
-        }
-        property = obj.get("ambient");
-        if (property instanceof DexObj) {
-            this.ambient = new Ambient3D();
-            readBaseMaterialProps(log, this.ambient, property);
-            const amount = property.get("amount");
-            if (typeof amount === "number") {
-                this.ambient.amount = amount;
-            }
-        }
-        property = obj.get("specular");
-        if (property instanceof DexObj) {
-            this.specular = new Specular3D();
-            readBaseMaterialProps(log, this.specular, property);
-            const amount = property.get("amount");
-            const exponent = property.get("exponent");
-            if (typeof amount === "number") {
-                this.specular.amount = amount;
-            }
-            if (typeof exponent === "number") {
-                this.specular.exponent = exponent;
-            }
-        }
-        property = obj.get("transparency");
-        if (property instanceof DexObj) {
-            const alpha = property.get("alphaThreshold");
-            if (alpha !== undefined && typeof alpha !== "number") {
-                throw log.errorAsObject("bad alpha:", alpha);
-            }
-            const opacity = property.get("opacity");
-            if (opacity !== undefined && typeof opacity !== "number") {
-                throw log.errorAsObject("bad opacity:", opacity);
-            }
-            this.transparency = new Transparency3D(alpha, opacity);
-            readBaseMaterialProps(log, this.transparency, property);
-        }
-        property = obj.get("reflection");
-        if (property instanceof DexObj) {
-            this.reflection = new Reflection3D();
-            readBaseMaterialProps(log, this.reflection, property);
-            const amount = property.get("amount");
-            if (typeof amount === "number") {
-                this.reflection.amount = amount;
-            }
-        }
-        property = obj.get("refraction");
-        if (property instanceof DexObj) {
-            this.refraction = new Refraction3D();
-            readBaseMaterialProps(log, this.refraction, property);
-            const index = property.get("index");
-            if (typeof index === "number") {
-                this.refraction.index = index;
-            }
-        }
-        else if (property !== undefined) {
-            log.warn("material property 'refraction' is of an unexpected type", property);
-        }
-        property = obj.get("bump");
-        if (property instanceof DexObj) {
-            this.bump = new Bump3D();
-            readBaseMaterialProps(log, this.bump, property);
-            const amount = property.get("amount");
-            const bumpEffectRR = property.get("effectRR");
-            const texturePrepared = property.get("prepared");
-            if (typeof amount === "number") {
-                this.bump.amount = amount;
-            }
-            if (typeof bumpEffectRR === "number") {
-                this.bump.effectRR = bumpEffectRR;
-            }
-            if (typeof texturePrepared === "boolean") {
-                this.bump.prepared = texturePrepared;
-            }
-        }
-        else if (property !== undefined) {
-            log.warn("material property 'bump' is of an unexpected type", property);
-        }
-    }
-}
-export class GMaterialProp3D extends GMaterial3DTexture {
-    setTextureUrl(url) {
-        if (url !== this.textureUrl) {
-            this._avgTextureColor = undefined;
-            this.textureUrl = url;
-        }
-    }
-}
-export class Diffuse3D extends GMaterialProp3D {
-    constructor(amount = 1) {
-        super(0 /* classicDiffuse */);
-        this.amount = amount;
-    }
-}
-export class Ambient3D extends GMaterialProp3D {
-    constructor(amount = 1) {
-        super(1 /* classicAmbient */);
-        this.amount = amount;
-    }
-}
-export class Emission3D extends GMaterialProp3D {
-}
-export class Specular3D extends GMaterialProp3D {
-    constructor(exponent, amount = 1) {
-        super(3 /* classicSpecular */);
-        this.exponent = exponent;
-        this.amount = amount;
-    }
-}
-export class Transparency3D extends GMaterialProp3D {
-    constructor(alphaThreshold, opacity) {
-        super(4 /* classicTransparency */);
-        this.alphaThreshold = alphaThreshold;
-        this.opacity = opacity;
-    }
-}
-export class Reflection3D extends GMaterialProp3D {
-    constructor(amount) {
-        super(5 /* classicReflection */);
-        this.amount = amount;
-    }
-}
-export class Refraction3D extends GMaterialProp3D {
-    constructor(index) {
-        super(6 /* classicRefraction */);
-        this.index = index;
-    }
-}
-export class Bump3D extends GMaterialProp3D {
-    constructor(amount, effectRR, prepared) {
-        super(7 /* classicBump */);
-        this.amount = amount;
-        this.effectRR = effectRR;
-        this.prepared = prepared;
-    }
-}
-function readBaseMaterialProps(log, prop, obj) {
-    var _a, _b, _c, _d;
-    const imageUrl = imageUrlFromDex(log, obj);
-    if (imageUrl !== undefined) {
-        prop.setTextureUrl(imageUrl);
-    }
-    prop.c = obj.get("c");
-    prop.uScale = (_a = obj.get("uScale")) !== null && _a !== void 0 ? _a : prop.uScale;
-    prop.vScale = (_b = obj.get("vScale")) !== null && _b !== void 0 ? _b : prop.vScale;
-    prop.uOffset = (_c = obj.get("uOffset")) !== null && _c !== void 0 ? _c : prop.uOffset;
-    prop.vOffset = (_d = obj.get("vOffset")) !== null && _d !== void 0 ? _d : prop.vOffset;
-    const angleF = obj.get("rot");
-    if (angleF !== undefined) {
-        prop.rot = angleF.radians;
-    }
-    const wrap = textureWrapFromDex(obj);
-    if (wrap !== undefined)
-        prop.wrapU = prop.wrapV = wrap;
-}
+import { DexObj } from "../format/dex/DexObj.js";
+import { GMaterial3D, GMaterial3DTexture, imageUrlFromDex, textureWrapFromDex, } from "./GMaterial3D.js";
+// tslint:disable:max-classes-per-file
+export class GMaterialClassic extends GMaterial3D {
+    constructor(log, obj) {
+        super(log, obj);
+        if (obj === undefined) {
+            return;
+        }
+        let property = obj.get("diffuse");
+        if (property instanceof DexObj) {
+            this.diffuse = new Diffuse3D();
+            readBaseMaterialProps(log, this.diffuse, property);
+            const amount = property.get("amount");
+            if (typeof amount === "number") {
+                this.diffuse.amount = amount;
+            }
+        }
+        property = obj.get("ambient");
+        if (property instanceof DexObj) {
+            this.ambient = new Ambient3D();
+            readBaseMaterialProps(log, this.ambient, property);
+            const amount = property.get("amount");
+            if (typeof amount === "number") {
+                this.ambient.amount = amount;
+            }
+        }
+        property = obj.get("specular");
+        if (property instanceof DexObj) {
+            this.specular = new Specular3D();
+            readBaseMaterialProps(log, this.specular, property);
+            const amount = property.get("amount");
+            const exponent = property.get("exponent");
+            if (typeof amount === "number") {
+                this.specular.amount = amount;
+            }
+            if (typeof exponent === "number") {
+                this.specular.exponent = exponent;
+            }
+        }
+        property = obj.get("transparency");
+        if (property instanceof DexObj) {
+            const alpha = property.get("alphaThreshold");
+            if (alpha !== undefined && typeof alpha !== "number") {
+                throw log.errorAsObject("bad alpha:", alpha);
+            }
+            const opacity = property.get("opacity");
+            if (opacity !== undefined && typeof opacity !== "number") {
+                throw log.errorAsObject("bad opacity:", opacity);
+            }
+            this.transparency = new Transparency3D(alpha, opacity);
+            readBaseMaterialProps(log, this.transparency, property);
+        }
+        property = obj.get("reflection");
+        if (property instanceof DexObj) {
+            this.reflection = new Reflection3D();
+            readBaseMaterialProps(log, this.reflection, property);
+            const amount = property.get("amount");
+            if (typeof amount === "number") {
+                this.reflection.amount = amount;
+            }
+        }
+        property = obj.get("refraction");
+        if (property instanceof DexObj) {
+            this.refraction = new Refraction3D();
+            readBaseMaterialProps(log, this.refraction, property);
+            const index = property.get("index");
+            if (typeof index === "number") {
+                this.refraction.index = index;
+            }
+        }
+        else if (property !== undefined) {
+            log.warn("material property 'refraction' is of an unexpected type", property);
+        }
+        property = obj.get("bump");
+        if (property instanceof DexObj) {
+            this.bump = new Bump3D();
+            readBaseMaterialProps(log, this.bump, property);
+            const amount = property.get("amount");
+            const bumpEffectRR = property.get("effectRR");
+            const texturePrepared = property.get("prepared");
+            if (typeof amount === "number") {
+                this.bump.amount = amount;
+            }
+            if (typeof bumpEffectRR === "number") {
+                this.bump.effectRR = bumpEffectRR;
+            }
+            if (typeof texturePrepared === "boolean") {
+                this.bump.prepared = texturePrepared;
+            }
+        }
+        else if (property !== undefined) {
+            log.warn("material property 'bump' is of an unexpected type", property);
+        }
+    }
+}
+export class GMaterialProp3D extends GMaterial3DTexture {
+    setTextureUrl(url) {
+        if (url !== this.textureUrl) {
+            this._avgTextureColor = undefined;
+            this.textureUrl = url;
+        }
+    }
+}
+export class Diffuse3D extends GMaterialProp3D {
+    constructor(amount = 1) {
+        super(0 /* classicDiffuse */);
+        this.amount = amount;
+    }
+}
+export class Ambient3D extends GMaterialProp3D {
+    constructor(amount = 1) {
+        super(1 /* classicAmbient */);
+        this.amount = amount;
+    }
+}
+export class Emission3D extends GMaterialProp3D {
+}
+export class Specular3D extends GMaterialProp3D {
+    constructor(exponent, amount = 1) {
+        super(3 /* classicSpecular */);
+        this.exponent = exponent;
+        this.amount = amount;
+    }
+}
+export class Transparency3D extends GMaterialProp3D {
+    constructor(alphaThreshold, opacity) {
+        super(4 /* classicTransparency */);
+        this.alphaThreshold = alphaThreshold;
+        this.opacity = opacity;
+    }
+}
+export class Reflection3D extends GMaterialProp3D {
+    constructor(amount) {
+        super(5 /* classicReflection */);
+        this.amount = amount;
+    }
+}
+export class Refraction3D extends GMaterialProp3D {
+    constructor(index) {
+        super(6 /* classicRefraction */);
+        this.index = index;
+    }
+}
+export class Bump3D extends GMaterialProp3D {
+    constructor(amount, effectRR, prepared) {
+        super(7 /* classicBump */);
+        this.amount = amount;
+        this.effectRR = effectRR;
+        this.prepared = prepared;
+    }
+}
+function readBaseMaterialProps(log, prop, obj) {
+    var _a, _b, _c, _d;
+    const imageUrl = imageUrlFromDex(log, obj);
+    if (imageUrl !== undefined) {
+        prop.setTextureUrl(imageUrl);
+    }
+    prop.c = obj.get("c");
+    prop.uScale = (_a = obj.get("uScale")) !== null && _a !== void 0 ? _a : prop.uScale;
+    prop.vScale = (_b = obj.get("vScale")) !== null && _b !== void 0 ? _b : prop.vScale;
+    prop.uOffset = (_c = obj.get("uOffset")) !== null && _c !== void 0 ? _c : prop.uOffset;
+    prop.vOffset = (_d = obj.get("vOffset")) !== null && _d !== void 0 ? _d : prop.vOffset;
+    const angleF = obj.get("rot");
+    if (angleF !== undefined) {
+        prop.rot = angleF.radians;
+    }
+    const wrap = textureWrapFromDex(obj);
+    if (wrap !== undefined)
+        prop.wrapU = prop.wrapV = wrap;
+}

package/dist/cm/core3D/GMaterialPBR.d.ts

@@ -1,74 +1,74 @@
-import { Logger } from "@configura/web-utilities";
-import { ColorF } from "../basic/ColorF.js";
-import { DexObj } from "../format/dex/DexObj.js";
-import { DexURL } from "../format/dex/DexURL.js";
-import { GMaterial3D, GMaterial3DTexture, TextureType } from "./GMaterial3D.js";
-export declare class GMaterialPBR extends GMaterial3D {
-    base?: PBRBase;
-    emissive?: PBREmissive;
-    metallic?: PBRMetallic;
-    normal?: PBRNormal;
-    occlusion?: PBROcclusion;
-    opacity?: PBROpacity;
-    refraction?: PBRRefraction;
-    roughness?: PBRRoughness;
-    constructor(log: Logger, obj?: DexObj);
-}
-export declare type PBRTextureChannel = "r" | "g" | "b" | "a";
-export declare type PBRTextureChannels = PBRTextureChannel | "rgb" | "rgba";
-export declare type PBROpacityMode = "opaque" | "mask" | "translucent" | "translucentAndMask";
-export declare type PBRTextureFilter = "linear" | "nearest";
-export declare class PBRTexture extends GMaterial3DTexture {
-    constructor(type: TextureType, imageUrl: DexURL);
-    textureUrl: DexURL;
-}
-export declare class PBRBase {
-    readonly factor: ColorF;
-    readonly texture?: PBRTexture | undefined;
-    constructor(factor: ColorF, texture?: PBRTexture | undefined);
-}
-export declare class PBREmissive {
-    readonly factor: ColorF;
-    readonly texture?: PBRTexture | undefined;
-    constructor(factor: ColorF, texture?: PBRTexture | undefined);
-}
-export declare class PBRMetallic {
-    readonly factor: number;
-    readonly texture?: PBRTexture | undefined;
-    readonly channel?: "b" | "r" | undefined;
-    constructor(factor: number, texture?: PBRTexture | undefined, channel?: "b" | "r" | undefined);
-}
-export declare class PBRNormal {
-    readonly scale: number;
-    readonly texture?: PBRTexture | undefined;
-    readonly channels?: PBRTextureChannels | undefined;
-    constructor(scale: number, texture?: PBRTexture | undefined, channels?: PBRTextureChannels | undefined);
-}
-export declare class PBROcclusion {
-    readonly strength: number;
-    readonly texture?: PBRTexture | undefined;
-    readonly channel?: "a" | "r" | undefined;
-    constructor(strength: number, // default 0
-    texture?: PBRTexture | undefined, channel?: "a" | "r" | undefined);
-}
-export declare class PBROpacity {
-    readonly factor: number;
-    readonly mode: PBROpacityMode;
-    maskThreshold: number;
-    readonly texture?: PBRTexture | undefined;
-    readonly channels?: "a" | "r" | undefined;
-    readonly useAlphaFromBase?: boolean | undefined;
-    constructor(factor: number, mode: PBROpacityMode, maskThreshold: number, texture?: PBRTexture | undefined, channels?: "a" | "r" | undefined, // Undocumented in CmSym-spec, r seem to mean rgb
-    useAlphaFromBase?: boolean | undefined);
-}
-export declare class PBRRefraction {
-    readonly ior: number;
-    constructor(ior: number);
-}
-export declare class PBRRoughness {
-    readonly factor: number;
-    readonly texture?: PBRTexture | undefined;
-    readonly channel?: "a" | "g" | undefined;
-    constructor(factor: number, texture?: PBRTexture | undefined, channel?: "a" | "g" | undefined);
-}
+import { Logger } from "@configura/web-utilities";
+import { ColorF } from "../basic/ColorF.js";
+import { DexObj } from "../format/dex/DexObj.js";
+import { DexURL } from "../format/dex/DexURL.js";
+import { GMaterial3D, GMaterial3DTexture, TextureType } from "./GMaterial3D.js";
+export declare class GMaterialPBR extends GMaterial3D {
+    base?: PBRBase;
+    emissive?: PBREmissive;
+    metallic?: PBRMetallic;
+    normal?: PBRNormal;
+    occlusion?: PBROcclusion;
+    opacity?: PBROpacity;
+    refraction?: PBRRefraction;
+    roughness?: PBRRoughness;
+    constructor(log: Logger, obj?: DexObj);
+}
+export declare type PBRTextureChannel = "r" | "g" | "b" | "a";
+export declare type PBRTextureChannels = PBRTextureChannel | "rgb" | "rgba";
+export declare type PBROpacityMode = "opaque" | "mask" | "translucent" | "translucentAndMask";
+export declare type PBRTextureFilter = "linear" | "nearest";
+export declare class PBRTexture extends GMaterial3DTexture {
+    constructor(type: TextureType, imageUrl: DexURL);
+    textureUrl: DexURL;
+}
+export declare class PBRBase {
+    readonly factor: ColorF;
+    readonly texture?: PBRTexture | undefined;
+    constructor(factor: ColorF, texture?: PBRTexture | undefined);
+}
+export declare class PBREmissive {
+    readonly factor: ColorF;
+    readonly texture?: PBRTexture | undefined;
+    constructor(factor: ColorF, texture?: PBRTexture | undefined);
+}
+export declare class PBRMetallic {
+    readonly factor: number;
+    readonly texture?: PBRTexture | undefined;
+    readonly channel?: "b" | "r" | undefined;
+    constructor(factor: number, texture?: PBRTexture | undefined, channel?: "b" | "r" | undefined);
+}
+export declare class PBRNormal {
+    readonly scale: number;
+    readonly texture?: PBRTexture | undefined;
+    readonly channels?: PBRTextureChannels | undefined;
+    constructor(scale: number, texture?: PBRTexture | undefined, channels?: PBRTextureChannels | undefined);
+}
+export declare class PBROcclusion {
+    readonly strength: number;
+    readonly texture?: PBRTexture | undefined;
+    readonly channel?: "a" | "r" | undefined;
+    constructor(strength: number, // default 0
+    texture?: PBRTexture | undefined, channel?: "a" | "r" | undefined);
+}
+export declare class PBROpacity {
+    readonly factor: number;
+    readonly mode: PBROpacityMode;
+    maskThreshold: number;
+    readonly texture?: PBRTexture | undefined;
+    readonly channels?: "a" | "r" | undefined;
+    readonly useAlphaFromBase?: boolean | undefined;
+    constructor(factor: number, mode: PBROpacityMode, maskThreshold: number, texture?: PBRTexture | undefined, channels?: "a" | "r" | undefined, // Undocumented in CmSym-spec, r seem to mean rgb
+    useAlphaFromBase?: boolean | undefined);
+}
+export declare class PBRRefraction {
+    readonly ior: number;
+    constructor(ior: number);
+}
+export declare class PBRRoughness {
+    readonly factor: number;
+    readonly texture?: PBRTexture | undefined;
+    readonly channel?: "a" | "g" | undefined;
+    constructor(factor: number, texture?: PBRTexture | undefined, channel?: "a" | "g" | undefined);
+}
 //# sourceMappingURL=GMaterialPBR.d.ts.map