@configura/web-core 3.0.0-alpha.1 → 3.0.0-alpha.2

package/dist/cm/core3D/GMaterialClassic.js

@@ -151,16 +151,15 @@ export class Bump3D extends GMaterialProp3D {
     }
 }
 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;
+    prop.uScale = obj.get("uScale") ?? prop.uScale;
+    prop.vScale = obj.get("vScale") ?? prop.vScale;
+    prop.uOffset = obj.get("uOffset") ?? prop.uOffset;
+    prop.vOffset = obj.get("vOffset") ?? prop.vOffset;
     const angleF = obj.get("rot");
     if (angleF !== undefined) {
         prop.rot = angleF.radians;

package/dist/cm/core3D/GMaterialPBR.js

@@ -5,7 +5,6 @@ import { GMaterial3D, GMaterial3DTexture, imageUrlFromDex, textureWrapFromDex, }
 // tslint:disable:max-classes-per-file
 export class GMaterialPBR extends GMaterial3D {
     constructor(log, obj) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         super(log, obj);
         if (obj === undefined) {
             return;
@@ -33,12 +32,12 @@ export class GMaterialPBR extends GMaterial3D {
                 log.warn(`Unsupported ${txtType} texture channel: ${channel}`, "Fallback to b.");
                 channel = "b"; // B channel in ORM texture
             }
-            this.metallic = new PBRMetallic((_a = loadNumber(log, txtType, prop, "factor")) !== null && _a !== void 0 ? _a : 1, texture, channel);
+            this.metallic = new PBRMetallic(loadNumber(log, txtType, prop, "factor") ?? 1, texture, channel);
         }
         txtType = "normal" /* pbrNormal */;
         prop = pbr.get(txtType);
         if (prop instanceof DexObj) {
-            this.normal = new PBRNormal((_b = loadNumber(log, txtType, prop, "scale")) !== null && _b !== void 0 ? _b : 1, loadTexture(log, txtType, prop), loadChannels(log, txtType, prop));
+            this.normal = new PBRNormal(loadNumber(log, txtType, prop, "scale") ?? 1, loadTexture(log, txtType, prop), loadChannels(log, txtType, prop));
         }
         txtType = "opacity" /* pbrOpacity */;
         prop = pbr.get(txtType);
@@ -49,7 +48,7 @@ export class GMaterialPBR extends GMaterial3D {
                 log.warn(`Unsupported ${txtType} texture channel: ${channel}`, "Fallback to a.");
                 channel = "a"; // Alpha channel, safest fallback
             }
-            this.opacity = new PBROpacity((_c = loadNumber(log, txtType, prop, "factor")) !== null && _c !== void 0 ? _c : 1, loadOpacityMode(log, txtType, prop), (_d = loadNumber(log, txtType, prop, "maskThreshold")) !== null && _d !== void 0 ? _d : 0.5, texture, channel, loadBool(log, txtType, prop, "useAlphaFromBase"));
+            this.opacity = new PBROpacity(loadNumber(log, txtType, prop, "factor") ?? 1, loadOpacityMode(log, txtType, prop), loadNumber(log, txtType, prop, "maskThreshold") ?? 0.5, texture, channel, loadBool(log, txtType, prop, "useAlphaFromBase"));
         }
         txtType = "occlusion" /* pbrOcclusion */;
         prop = pbr.get(txtType);
@@ -60,12 +59,12 @@ export class GMaterialPBR extends GMaterial3D {
                 log.warn(`Unsupported ${txtType} texture channel: ${channel}`, "Fallback to r.");
                 channel = "r"; // R channel in ORM texture
             }
-            this.occlusion = new PBROcclusion((_e = loadNumber(log, txtType, prop, "strength")) !== null && _e !== void 0 ? _e : 0, texture, channel);
+            this.occlusion = new PBROcclusion(loadNumber(log, txtType, prop, "strength") ?? 0, texture, channel);
         }
         txtType = "refraction" /* pbrRefraction */;
         prop = pbr.get(txtType);
         if (prop instanceof DexObj) {
-            this.refraction = new PBRRefraction((_f = loadNumber(log, txtType, prop, "ior")) !== null && _f !== void 0 ? _f : 1);
+            this.refraction = new PBRRefraction(loadNumber(log, txtType, prop, "ior") ?? 1);
         }
         txtType = "roughness" /* pbrRoughness */;
         prop = pbr.get(txtType);
@@ -76,7 +75,7 @@ export class GMaterialPBR extends GMaterial3D {
                 log.warn(`Unsupported ${txtType} texture channel: ${channel}`, "Fallback to g.");
                 channel = "g"; // G channel in ORM texture
             }
-            this.roughness = new PBRRoughness((_g = loadNumber(log, txtType, prop, "factor")) !== null && _g !== void 0 ? _g : 1, texture, channel);
+            this.roughness = new PBRRoughness(loadNumber(log, txtType, prop, "factor") ?? 1, texture, channel);
         }
         // PBRMaterial in CmSym will combine the Occlusion, Roughness and Metallness textures into a
         // combined "ORM" texture. This is important since Babylon (like glTF 2.0) does not support
@@ -84,8 +83,8 @@ export class GMaterialPBR extends GMaterial3D {
         //
         // The PBRMaterial specification in CmSym does not in itself guarantee this, so keep the
         // check below to notice if this requirement is no longer meet in the future.
-        const metallicUrl = (_j = (_h = this.metallic) === null || _h === void 0 ? void 0 : _h.texture) === null || _j === void 0 ? void 0 : _j.textureUrl;
-        const roughnessUrl = (_l = (_k = this.roughness) === null || _k === void 0 ? void 0 : _k.texture) === null || _l === void 0 ? void 0 : _l.textureUrl;
+        const metallicUrl = this.metallic?.texture?.textureUrl;
+        const roughnessUrl = this.roughness?.texture?.textureUrl;
         if (metallicUrl !== undefined &&
             roughnessUrl !== undefined &&
             metallicUrl.value !== roughnessUrl.value) {
@@ -172,7 +171,6 @@ export var MIPS_TEXTURE_LEVEL;
  * are optional) or there was an problem loading the texture.
  */
 function loadTexture(log, type, dex) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const scope = type + ".texture";
     const dexTxt = dex.get("texture");
     if (dexTxt === undefined) {
@@ -190,19 +188,19 @@ function loadTexture(log, type, dex) {
     const transform = dexTxt.get("transform");
     if (transform instanceof DexObj) {
         const inner = scope + ".transform";
-        txt.uScale = (_a = loadNumber(log, inner, transform, "uScale")) !== null && _a !== void 0 ? _a : txt.uScale;
-        txt.vScale = (_b = loadNumber(log, inner, transform, "vScale")) !== null && _b !== void 0 ? _b : txt.vScale;
-        txt.uOffset = (_c = loadNumber(log, inner, transform, "uOffset")) !== null && _c !== void 0 ? _c : txt.uOffset;
-        txt.vOffset = (_d = loadNumber(log, inner, transform, "vOffset")) !== null && _d !== void 0 ? _d : txt.vOffset;
-        txt.rot = (_e = loadAngle(log, inner, transform, "rot")) !== null && _e !== void 0 ? _e : txt.rot;
+        txt.uScale = loadNumber(log, inner, transform, "uScale") ?? txt.uScale;
+        txt.vScale = loadNumber(log, inner, transform, "vScale") ?? txt.vScale;
+        txt.uOffset = loadNumber(log, inner, transform, "uOffset") ?? txt.uOffset;
+        txt.vOffset = loadNumber(log, inner, transform, "vOffset") ?? txt.vOffset;
+        txt.rot = loadAngle(log, inner, transform, "rot") ?? txt.rot;
     }
     const sampler = dexTxt.get("sampler");
     if (sampler instanceof DexObj) {
         const inner = scope + ".sampler";
-        txt.wrapU = (_f = textureWrapFromDex(sampler)) !== null && _f !== void 0 ? _f : txt.wrapU;
-        txt.wrapV = (_g = textureWrapFromDex(sampler)) !== null && _g !== void 0 ? _g : txt.wrapV;
-        txt.minFilter = (_h = loadTextureFilter(log, inner, sampler, "minFilter")) !== null && _h !== void 0 ? _h : txt.minFilter;
-        txt.magFilter = (_j = loadTextureFilter(log, inner, sampler, "magFilter")) !== null && _j !== void 0 ? _j : txt.magFilter;
+        txt.wrapU = textureWrapFromDex(sampler) ?? txt.wrapU;
+        txt.wrapV = textureWrapFromDex(sampler) ?? txt.wrapV;
+        txt.minFilter = loadTextureFilter(log, inner, sampler, "minFilter") ?? txt.minFilter;
+        txt.magFilter = loadTextureFilter(log, inner, sampler, "magFilter") ?? txt.magFilter;
     }
     else if (sampler !== undefined) {
         // TODO: Verify with Jimmie that the Sampler is optional (spec not clear, examples
@@ -286,7 +284,7 @@ function loadAngle(log, scope, dex, name) {
         log.warn(`Angle property not valid (${scope}.${name}): ${obj}`);
         return undefined;
     }
-    return obj === null || obj === void 0 ? void 0 : obj.radians;
+    return obj?.radians;
 }
 /**
  * Loads and returns the ColorF specified by the name parameter.

package/dist/cm/core3D/uvmapper/UVMapperBox.js

@@ -107,7 +107,7 @@ export function createUVBoxCoordinates(env, positions, bounds, normals) {
     return createUV(env, positions, bounds, undefined, calculateSideMapFromNormals(normals));
 }
 export function createUVBoxCoordinatesForStretched(env, positions, bounds, normals, refPositions, refBounds, refUvs) {
-    const transforms = env === null || env === void 0 ? void 0 : env.transforms;
+    const transforms = env?.transforms;
     const xyzCount = positions.length;
     const vertexCount = xyzCount / 3;
     const uvCount = vertexCount * 2;
@@ -123,7 +123,7 @@ export function createUVBoxCoordinatesForStretched(env, positions, bounds, norma
     return createUV(env, positions, bounds, refBounds, calculateSideMapFromRefUvs(transforms, normals, refPositions, refBounds, refUvs));
 }
 function createUV(env, positions, bounds, refBounds, sideMap) {
-    const transforms = env === null || env === void 0 ? void 0 : env.transforms;
+    const transforms = env?.transforms;
     const xyzCount = positions.length;
     const vertexCount = xyzCount / 3;
     const uvCount = vertexCount * 2;

package/dist/cm/core3D/uvmapper/UVMapperCylinder.js

@@ -12,9 +12,9 @@ export function createUVCylinderCoordinatesForStretched(env, positions, bounds,
 }
 function createUV(env, positions, bounds, normals, refPositions, refBounds, refUvs) {
     const refPositionsFallbackToPositions = refPositions || positions;
-    const transforms = env === null || env === void 0 ? void 0 : env.transforms;
-    const transformSide = transforms === null || transforms === void 0 ? void 0 : transforms[0];
-    const transformTopBottom = transforms === null || transforms === void 0 ? void 0 : transforms[1];
+    const transforms = env?.transforms;
+    const transformSide = transforms?.[0];
+    const transformTopBottom = transforms?.[1];
     const xyzCount = positions.length;
     const vertexCount = xyzCount / 3;
     if (refPositions !== undefined && refPositions.length !== xyzCount) {

package/dist/cm/core3D/uvmapper/UVMapperPlane.js

@@ -40,7 +40,6 @@ export function createUVPlaneCoordinatesForStretched(env, positions, refPosition
     return createUV(env, positions, refPositions);
 }
 function createUV(env, positions, refPositions) {
-    var _a;
     if (env === undefined) {
         throw new Error("env needed for plane mapper");
     }
@@ -51,7 +50,7 @@ function createUV(env, positions, refPositions) {
     }
     refPositions = refPositions || positions;
     const normal = env.normal;
-    const transform = (_a = env.transforms) === null || _a === void 0 ? void 0 : _a[0];
+    const transform = env.transforms?.[0];
     const mappingPlaneVectors = calculateMappingPlaneVectors([normal.x, normal.y, normal.z]);
     let refMinU = Number.POSITIVE_INFINITY;
     let refMaxU = Number.NEGATIVE_INFINITY;

package/dist/cm/format/cmsym/SymNode.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { v4 } from "uuid";
 import { Semver } from "../../io/Semver.js";
 import { DexObj } from "../dex/DexObj.js";
@@ -595,11 +586,9 @@ function loadVersion(obj) {
     }
     throw Error(`obj: ${obj} can't load version`);
 }
-export function loadSymFile(logger, url, manager, abortSignal) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const root = yield manager.load(logger, url, abortSignal);
-        return makeSymFromDex(logger, root);
-    });
+export async function loadSymFile(logger, url, manager, abortSignal) {
+    const root = await manager.load(logger, url, abortSignal);
+    return makeSymFromDex(logger, root);
 }
 export function makeSymFromDex(logger, root) {
     const node = toSymNode(logger, root);

package/dist/cm/format/cmsym/components/SymBox.js

@@ -11,12 +11,10 @@ export class SymBox extends SymComponent {
         this.id = "symBox";
     }
     get p0() {
-        var _a;
-        return (_a = this._box) === null || _a === void 0 ? void 0 : _a.p0;
+        return this._box?.p0;
     }
     get p1() {
-        var _a;
-        return (_a = this._box) === null || _a === void 0 ? void 0 : _a.p1;
+        return this._box?.p1;
     }
     load(logger, obj, _env, force = false) {
         const p0 = Point.cast(obj.get("p0"));

package/dist/cm/format/cmsym/components/SymGMaterial.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { GMaterial3D } from "../../../core3D/GMaterial3D.js";
 import { GMaterialClassic } from "../../../core3D/GMaterialClassic.js";
 import { GMaterialPBR } from "../../../core3D/GMaterialPBR.js";
@@ -71,11 +62,9 @@ export function dexToMultiGMaterial3D(logger, obj) {
         throw logger.errorAsObject("unknown obj.type:", obj.type);
     }
 }
-export function loadMaterialFromUrl(logger, url, dexManager, abortSignal) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const root = yield dexManager.load(logger, url, abortSignal);
-        return finishMaterial(logger, url, root);
-    });
+export async function loadMaterialFromUrl(logger, url, dexManager, abortSignal) {
+    const root = await dexManager.load(logger, url, abortSignal);
+    return finishMaterial(logger, url, root);
 }
 export function makeMaterialFromBuffer(logger, buffer, dexManager) {
     const root = dexManager.arrayBufferToDexObj(logger, "", buffer);

package/dist/cm/format/cmsym/components/SymPlane.js

@@ -11,12 +11,10 @@ export class SymPlane extends SymComponent {
         return this._plane;
     }
     get vector() {
-        var _a;
-        return (_a = this._plane) === null || _a === void 0 ? void 0 : _a.vector;
+        return this._plane?.vector;
     }
     get distance() {
-        var _a;
-        return (_a = this._plane) === null || _a === void 0 ? void 0 : _a.distance;
+        return this._plane?.distance;
     }
     load(logger, obj, _env, force = false) {
         const plane = Plane.cast(obj.get("plane"));

package/dist/cm/format/dex/DexManager.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { DexGmImageLoader } from "./DexLoader.js";
 import { DexObj } from "./DexObj.js";
 import { DexReader } from "./DexReader.js";
@@ -44,20 +35,18 @@ export class DexManager {
             this.loaders.set(suffix, loader);
         }
     }
-    load(logger, url, abortSignal) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const params = {};
-            if (abortSignal) {
-                params.signal = abortSignal;
-            }
-            const response = yield fetch(url, params);
-            if (!response.ok) {
-                logger.error(response);
-                throw logger.errorAsObject("response not OK!");
-            }
-            const buffer = yield response.arrayBuffer();
-            return this.arrayBufferToDexObj(logger, url, buffer);
-        });
+    async load(logger, url, abortSignal) {
+        const params = {};
+        if (abortSignal) {
+            params.signal = abortSignal;
+        }
+        const response = await fetch(url, params);
+        if (!response.ok) {
+            logger.error(response);
+            throw logger.errorAsObject("response not OK!");
+        }
+        const buffer = await response.arrayBuffer();
+        return this.arrayBufferToDexObj(logger, url, buffer);
     }
     arrayBufferToDexObj(logger, url, buffer) {
         const slice = new Uint8Array(buffer);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/web-core",
-	"version": "3.0.0-alpha.1",
+	"version": "3.0.0-alpha.2",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -15,8 +15,8 @@
 		"test": "echo \"Error: run tests from root\" && exit 1"
 	},
 	"dependencies": {
-		"@configura/internal": "3.0.0-alpha.1",
-		"@configura/web-utilities": "3.0.0-alpha.1"
+		"@configura/internal": "3.0.0-alpha.2",
+		"@configura/web-utilities": "3.0.0-alpha.2"
 	},
 	"devDependencies": {
 		"@types/uuid": "^8.3.0",
@@ -27,5 +27,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "0d18e1a05f913a1367cba0293ee61c5a3320a509"
+	"gitHead": "5b72d2813b949b3ccef8f1864382b9153593962b"
 }