@yschindel/ara3d-webgl 1.3.14 → 1.3.16

package/README.md

@@ -1,6 +1,6 @@
 # Ara 3D WebGL - BIM Open Schema Viewer
 
-![NPM Version](https://img.shields.io/npm/v/%40ara3d%2Fara3d-webgl)
+[![NPM Version](https://img.shields.io/npm/v/%40ara3d%2Fara3d-webgl)](https://www.npmjs.com/package/@ara3d/ara3d-webgl)
 
 ## [Live Demo](https://ara3d.github.io/ara3d-webgl/)
 

package/dist/ara3d-webgl.mjs

@@ -24580,7 +24580,7 @@ class US extends sf {
     super(t);
     Q(this, "_idleDelayMs", 150);
     Q(this, "zoomSpeed", 1);
-    Q(this, "panSpeed", 100);
+    Q(this, "panSpeed", 1);
     Q(this, "rotateSpeed", 1);
     Q(this, "orbitSpeed", 1);
     Q(this, "_buttonDown");
@@ -24674,7 +24674,7 @@ class US extends sf {
         this.camera.do().rotate(this.toRotation(t, this.rotateSpeed));
         break;
       case "pan":
-        this.camera.do().move2(t.multiplyScalar(this.panSpeed), "XY");
+        this.camera.do().move2(this.toPanDelta(t).multiplyScalar(this.panSpeed), "XY");
         break;
       case "zoom":
         this.camera.do().zoom(1 + t.y * this.zoomSpeed);
@@ -24682,7 +24682,7 @@ class US extends sf {
     }
   }
   onMouseMiddleDrag(t) {
-    this.camera.do().move2(t.multiplyScalar(100), "XY");
+    this.camera.do().move2(this.toPanDelta(t).multiplyScalar(this.panSpeed), "XY");
   }
   onMouseRightDrag(t) {
     this.camera.do().rotate(this.toRotation(t, this.rotateSpeed));
@@ -24693,6 +24693,10 @@ class US extends sf {
   getModifier(t) {
     return t.ctrlKey ? "ctrl" : t.shiftKey ? "shift" : "none";
   }
+  toPanDelta(t) {
+    const n = this.viewport.getSize(), i = n.y === 0 ? 1 : n.y, s = n.x / i, a = this.camera.frustrumSizeAt(this.camera.target).y * 2, c = a * s;
+    return new he(t.x * c, t.y * a);
+  }
 }
 var dg = {}, Cs = {};
 Object.defineProperty(Cs, "__esModule", { value: !0 });
@@ -35515,15 +35519,15 @@ const ZT = {
   LZ4: qT,
   LZ4_RAW: XT
 };
-function Kg(r, e) {
+function Kg(r) {
   console.time("Building geometry");
-  const t = new Yn(), n = KT(r), i = jT(n), s = JT(n), o = YT(i);
-  let a = 0;
-  for (const c of s)
-    a += c.geometry.index.count / 3 * c.count, t.add(c);
-  for (const c of o)
-    a += c.geometry.index.count / 3, t.add(c);
-  return (e?.applyZUpToYUpRotation ?? !0) && (t.rotation.x = -Math.PI / 2), console.timeEnd("Building geometry"), t;
+  const e = new Yn(), t = KT(r), n = jT(t), i = JT(t), s = YT(n);
+  let o = 0;
+  for (const a of i)
+    o += a.geometry.index.count / 3 * a.count, e.add(a);
+  for (const a of s)
+    o += a.geometry.index.count / 3, e.add(a);
+  return e.rotation.x = -Math.PI / 2, console.timeEnd("Building geometry"), e;
 }
 function YT(r) {
   const e = [];
@@ -35715,14 +35719,13 @@ class i2 {
     Q(this, "EntityParameters");
     Q(this, "SingleParameters");
     Q(this, "PointParameters");
-    Q(this, "geometryOptions", { applyZUpToYUpRotation: !0 });
   }
   rebuildGeometry(e) {
-    return Kg(e, this.geometryOptions);
+    return Kg(e);
   }
 }
 class r2 {
-  constructor(e, t) {
+  constructor(e) {
     Q(this, "Descriptors");
     Q(this, "Strings");
     Q(this, "Entities");
@@ -35731,7 +35734,7 @@ class r2 {
     Q(this, "BimGeometry");
     Q(this, "DescriptorCount");
     Q(this, "ParameterMap");
-    this.Data = e, this.Entities = e.Entities ?? {}, this.Strings = e.Strings ?? [], this.BimGeometry = e.BimGeometry, this.InstanceCount = this.BimGeometry?.InstanceEntityIndex?.length ?? 0, this.EntityCount = this.Entities?.Category?.length ?? 0, this.Descriptors = t?.skipDescriptorsAndParameters ? {} : e.Descriptors ?? {}, this.DescriptorCount = t?.skipDescriptorsAndParameters ? 0 : this.Descriptors?.Name?.length ?? 0, this.ParameterMap = /* @__PURE__ */ new Map(), t?.skipDescriptorsAndParameters || (console.time("Computing parameters"), e.IntegerParameters && this.ProcessParameters(e.IntegerParameters), e.SingleParameters && this.ProcessParameters(e.SingleParameters), e.StringParameters && this.ProcessParameters(e.StringParameters), e.EntityParameters && this.ProcessParameters(e.EntityParameters), console.timeEnd("Computing parameters"));
+    this.Data = e, this.Entities = e.Entities ?? {}, this.Strings = e.Strings ?? [], this.BimGeometry = e.BimGeometry, this.InstanceCount = this.BimGeometry.InstanceEntityIndex.length, this.EntityCount = this.Entities.Category.length, this.Descriptors = e.Descriptors, this.DescriptorCount = 0, this.ParameterMap = /* @__PURE__ */ new Map(), this.Descriptors && (console.time("Computing parameters"), this.DescriptorCount = this.Descriptors.Name.length, this.ProcessParameters(e.IntegerParameters), this.ProcessParameters(e.SingleParameters), this.ProcessParameters(e.StringParameters), this.ProcessParameters(e.EntityParameters), console.timeEnd("Computing parameters"));
   }
   GetVal(e, t) {
     return t == 3 ? this.Strings[e] : t == 2 ? e >= 0 ? this.GetEntityName(e) : "" : e;
@@ -35829,8 +35832,6 @@ class s2 {
   constructor(e) {
     Q(this, "Resolver");
     this.Data = e, this.Resolver = new r2(e);
-    let t = this.Resolver.FindDescriptor("Rvt:Element:Level");
-    console.log("The level descriptor is ", t), e.EntityParameters.Descriptor;
   }
   FuncToInstances(e) {
     const t = /* @__PURE__ */ new Map();
@@ -35873,9 +35874,7 @@ class f2 {
         `Failed to fetch BOS from ${e}: ${n.status} ${n.statusText}`
       );
     const i = await n.arrayBuffer(), s = await UM.loadAsync(i), o = await o2(s, t);
-    return o.Instances = $T(o.BimGeometry), o.Query = new s2(o), o.Resolver = o.Query.Resolver, o.geometryOptions = {
-      applyZUpToYUpRotation: t?.applyZUpToYUpRotation ?? !0
-    }, o.ThreeGeometry = Kg(o.Instances, o.geometryOptions), o;
+    return o.Instances = $T(o.BimGeometry), o.Query = new s2(o), o.Resolver = o.Query.Resolver, o.ThreeGeometry = Kg(o.Instances), o;
   }
 }
 async function o2(r, e) {
@@ -35913,13 +35912,14 @@ async function o2(r, e) {
       metadata: f,
       onChunk(d) {
         let m = d.columnData;
-        m instanceof BigInt64Array ? c === Int32Array ? m = Int32Array.from(m, (_) => Number(_)) : c === Float32Array ? m = Float32Array.from(m, (_) => Number(_)) : c === Uint32Array ? m = Uint32Array.from(m, (_) => Number(_)) : m = Array.from(m, (_) => Number(_)) : c && m.constructor.name != c.name && (m = new c(m)), a[d.columnName] = m;
+        const g = typeof (m?.length ? m[0] : void 0) == "bigint";
+        c && m.constructor.name != c.name && !g && (m = new c(m)), a[d.columnName] = m;
       }
     });
   }
   console.time("Reading parquet tables");
   const i = new i2(), s = {};
-  return await n("Instances", s, Int32Array), await n("VertexBuffer", s, Int32Array), await n("IndexBuffer", s, Uint32Array), await n("Meshes", s, Int32Array), await n("Materials", s, Uint8Array), await n("Transforms", s, Float32Array), i.BimGeometry = s, await n("Entities", i.Entities = {}, Int32Array), i.Descriptors = {}, e?.skipDescriptorsAndParameters || await n("Descriptors", i.Descriptors, void 0, !0), i.IntegerParameters = {}, i.SingleParameters = {}, i.StringParameters = {}, i.EntityParameters = {}, i.PointParameters = {}, e?.skipDescriptorsAndParameters || (await n("IntegerParameters", i.IntegerParameters, Int32Array, !0), await n("SingleParameters", i.SingleParameters, Int32Array, !0), await n("StringParameters", i.StringParameters, Int32Array, !0), await n("EntityParameters", i.EntityParameters, Int32Array, !0), await n("PointParameters", i.PointParameters, Int32Array, !0)), await n("Strings", i), i;
+  return await n("Instances", s, Int32Array), await n("VertexBuffer", s, Int32Array), await n("IndexBuffer", s, Uint32Array), await n("Meshes", s, Int32Array), await n("Materials", s, Uint8Array), await n("Transforms", s, Float32Array), i.BimGeometry = s, await n("Entities", i.Entities = {}, Int32Array), e && e.loadParameters && (await n("Descriptors", i.Descriptors = {}), await n("IntegerParameters", i.IntegerParameters = {}, Int32Array), await n("SingleParameters", i.SingleParameters = {}, Int32Array), await n("StringParameters", i.StringParameters = {}, Int32Array), await n("EntityParameters", i.EntityParameters = {}, Int32Array), await n("PointParameters", i.PointParameters = {}, Int32Array)), await n("Strings", i), i;
 }
 export {
   f2 as BimOpenSchemaLoader,