Fixes #36. Add NORMAL data only if given.

wnayes · Nov 13, 2022 · 6dacb78 · 6dacb78
1 parent ef4ff65
commit 6dacb78
Show file tree

Hide file tree

Showing 12 changed files with 756 additions and 327 deletions.
diff --git a/dist/gltfjsutils.d.ts b/dist/gltfjsutils.d.ts
@@ -216,15 +216,16 @@ declare module "src/material" {
 }
 declare module "src/vertex" {
     import { RGBColor, RGBAColor } from "src/types";
+    /** Represents a mesh vertex. */
     export class Vertex {
         x: number;
         y: number;
         z: number;
         u: number;
         v: number;
-        normalX: number;
-        normalY: number;
-        normalZ: number;
+        normalX?: number;
+        normalY?: number;
+        normalZ?: number;
         color?: RGBColor | RGBAColor;
     }
 }
@@ -239,7 +240,7 @@ declare module "src/mesh" {
         private _faceColors;
         private _materialIndices;
         addFace(v1: Vertex, v2: Vertex, v3: Vertex, color?: RGBColor | RGBAColor, materialIndex?: number): void;
-        forEachFace(fn: (v1: Vertex, v2: Vertex, v3: Vertex, color: RGBColor | RGBAColor | undefined, materialIndex: number) => void): void;
+        forEachFace(fn: (v1: Vertex, v2: Vertex, v3: Vertex, color: RGBColor | RGBAColor | undefined, materialIndex: number) => boolean | void): void;
     }
 }
 declare module "src/skin" {
@@ -598,7 +599,7 @@ declare module "src/index" {
     export { Skin } from "src/skin";
     export { Animation } from "src/animation";
     export { Vector3, Quaternion, Matrix, Matrix3x3, Matrix4x4 } from "src/math";
-    export { AlphaMode, ComponentType, DataType, MeshMode, RGBColor, RGBAColor, VertexColorMode, WrappingMode, InterpolationMode, Transformation } from "src/types";
+    export { AlphaMode, ComponentType, DataType, MeshMode, RGBColor, RGBAColor, VertexColorMode, WrappingMode, InterpolationMode, Transformation, } from "src/types";
     export { ImageOutputType, BufferOutputType } from "src/types";
     export { Buffer, BufferView } from "src/buffer";
     export type { BufferAccessorInfo } from "src/buffer";
@@ -670,3 +671,4 @@ declare module "test/math.spec" {
 declare module "test/texture.spec" {
     import "mocha";
 }
+declare module "test/integration/triangle.spec" { }
diff --git a/dist/gltfjsutils.js b/dist/gltfjsutils.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "build": "webpack & tsc --emitDeclarationOnly true --declaration --outFile \"./dist/gltfjsutils.d.ts\"",
-    "test": "cross-env TS_NODE_COMPILER_OPTIONS='{ \"module\": \"commonjs\" }' mocha --require ts-node/register test/*.spec.ts"
+    "test": "cross-env TS_NODE_COMPILER_OPTIONS='{ \"module\": \"commonjs\" }' mocha --require ts-node/register --recursive --extension spec.ts test"
   },
   "keywords": [
     "glTF"
@@ -26,6 +26,7 @@
     "chai": "^4.3.7",
     "cross-env": "^7.0.3",
     "eslint": "^8.27.0",
+    "gltf-validator": "^2.0.0-dev.3.9",
     "mocha": "^10.1.0",
     "ts-loader": "^9.4.1",
     "ts-node": "^10.9.1",