bg2e-js 2.5.1 → 2.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bg2e-js",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "description": "a graphics engine for productivity applications",
   "main": "./dist/bg2e-js.js",
   "types": "./src/index.ts",

package/src/base/PolyList.ts

@@ -109,12 +109,19 @@ interface Vertex {
 }
 
 function buildTangents(plist: PolyList): void {
-    const result: number[] = [];
-
+    // `index` is a vertex index: positions live in the flat vertex array at
+    // offset index*3 and texture coordinates at offset index*2.
     const createVertex = (index: number): Vertex => {
         return {
-            pos: new Vec(plist.vertex[index] * 3, plist.vertex[index + 1] * 3, plist.vertex[index + 2] * 3 ),
-            uv: new Vec(plist.texCoord0[index] * 2, plist.texCoord0[index + 1] * 2 )
+            pos: new Vec(
+                plist.vertex[index * 3],
+                plist.vertex[index * 3 + 1],
+                plist.vertex[index * 3 + 2]
+            ),
+            uv: new Vec(
+                plist.texCoord0[index * 2],
+                plist.texCoord0[index * 2 + 1]
+            )
         }
     }
 
@@ -123,13 +130,21 @@ function buildTangents(plist: PolyList): void {
     const calcR = (uv1: Vec, uv2: Vec): number =>  1.0 / (uv1.x * uv2.y - uv1.y * uv2.x);
 
     if (plist.index.length % 3 === 0) {
-        for (let i = 0; i < plist.index.length - 2; i += 3) {
-            let v0 = createVertex(plist.index[i]);
-            let v1 = createVertex(plist.index[i + 1]);
-            let v2 = createVertex(plist.index[i + 2]);
+        // One tangent per vertex, parallel to the vertex array. Tangents from
+        // every triangle sharing a vertex are accumulated, then normalized.
+        const result: number[] = new Array(plist.vertex.length).fill(0);
+
+        for (let i = 0; i < plist.index.length; i += 3) {
+            const i0 = plist.index[i];
+            const i1 = plist.index[i + 1];
+            const i2 = plist.index[i + 2];
 
-            let edge1 = Vec.Sub(v1.pos, v0.pos);
-            let edge2 = Vec.Sub(v2.pos, v1.pos);
+            let v0 = createVertex(i0);
+            let v1 = createVertex(i1);
+            let v2 = createVertex(i2);
+
+            const edge1 = Vec.Sub(v1.pos, v0.pos);
+            const edge2 = Vec.Sub(v2.pos, v0.pos);
 
             let uv1 = createUV(v1, v0);
             let uv2 = createUV(v2, v0);
@@ -151,35 +166,52 @@ function buildTangents(plist: PolyList): void {
                 r = calcR(uv1, uv2);
             }
 
+            if (!isFinite(r)) {
+                r = 0;
+            }
+
             const tangent = new Vec(
                 ((edge1.x * uv2.y) - (edge2.x * uv1.y)) * r,
                 ((edge1.y * uv2.y) - (edge2.y * uv1.y)) * r,
                 ((edge1.z * uv2.y) - (edge2.z * uv1.y)) * r
             );
-            tangent.normalize();
-            
-            result.push(tangent.x);
-            result.push(tangent.y);
-            result.push(tangent.z);
-            
-            result.push(tangent.x);
-            result.push(tangent.y);
-            result.push(tangent.z);
-            
-            result.push(tangent.x);
-            result.push(tangent.y);
-            result.push(tangent.z);
+
+            // Accumulate the (unnormalized) tangent on each vertex of the triangle
+            for (const index of [i0, i1, i2]) {
+                result[index * 3]     += tangent.x;
+                result[index * 3 + 1] += tangent.y;
+                result[index * 3 + 2] += tangent.z;
+            }
         }
+
+        // Normalize the accumulated tangents
+        for (let i = 0; i < result.length; i += 3) {
+            const t = new Vec(result[i], result[i + 1], result[i + 2]);
+            if (Vec.Magnitude(t) > 0) {
+                t.normalize();
+                result[i] = t.x;
+                result[i + 1] = t.y;
+                result[i + 2] = t.z;
+            }
+            else {
+                result[i] = 0;
+                result[i + 1] = 0;
+                result[i + 2] = 1;
+            }
+        }
+
+        (plist as any)._tangent = result;
     }
     else {
+        const result: number[] = [];
         for (let i=0; i<plist.vertex.length; i+=3) {
             result.push(0,0,1);
         }
 
         console.warn("Could not generate tangents: invalid type of faces found.");
-    }
 
-    (plist as any)._tangent = result;
+        (plist as any)._tangent = result;
+    }
 }
 
 export default class PolyList {

package/src/db/Loader.ts

@@ -134,7 +134,7 @@ export default class Loader {
         return result;
     }
 
-    async loadPolyList(path: string): Promise<PolyList> {
+    async loadPolyList(path: string): Promise<PolyList[]> {
         return await this.loadResource(path, ResourceType.PolyList);
     }