@loaders.gl/ply 3.4.0-alpha.2 → 3.4.0-alpha.4

package/dist/dist.min.js

@@ -680,15 +680,36 @@
   }
   function getMeshAttributes(attributes) {
     const accessors = {};
-    accessors.POSITION = { value: new Float32Array(attributes.vertices), size: 3 };
-    if (attributes.normals.length > 0) {
-      accessors.NORMAL = { value: new Float32Array(attributes.normals), size: 3 };
-    }
-    if (attributes.uvs.length > 0) {
-      accessors.TEXCOORD_0 = { value: new Float32Array(attributes.uvs), size: 2 };
-    }
-    if (attributes.colors.length > 0) {
-      accessors.COLOR_0 = { value: new Uint8Array(attributes.colors), size: 3, normalized: true };
+    for (const attributeName of Object.keys(attributes)) {
+      switch (attributeName) {
+        case "vertices":
+          if (attributes.vertices.length > 0) {
+            accessors.POSITION = { value: new Float32Array(attributes.vertices), size: 3 };
+          }
+          break;
+        case "normals":
+          if (attributes.normals.length > 0) {
+            accessors.NORMAL = { value: new Float32Array(attributes.normals), size: 3 };
+          }
+          break;
+        case "uvs":
+          if (attributes.uvs.length > 0) {
+            accessors.TEXCOORD_0 = { value: new Float32Array(attributes.uvs), size: 2 };
+          }
+          break;
+        case "colors":
+          if (attributes.colors.length > 0) {
+            accessors.COLOR_0 = { value: new Uint8Array(attributes.colors), size: 3, normalized: true };
+          }
+          break;
+        case "indices":
+          break;
+        default:
+          if (attributes[attributeName].length > 0) {
+            accessors[attributeName] = { value: new Float32Array(attributes[attributeName]), size: 1 };
+          }
+          break;
+      }
     }
     return accessors;
   }
@@ -763,35 +784,72 @@
           };
           break;
         case "property":
-          if (!currentElement2) {
-            break;
+          if (currentElement2) {
+            const property = makePLYElementProperty(lineValues);
+            if (options?.propertyNameMapping && property.name in options?.propertyNameMapping) {
+              property.name = options?.propertyNameMapping[property.name];
+            }
+            currentElement2.properties.push(property);
           }
-          currentElement2.properties.push(makePLYElementProperty(lineValues, options.propertyNameMapping));
           break;
         default:
           console.log("unhandled", lineType, lineValues);
       }
     }
-    if (currentElement2 !== void 0) {
+    if (currentElement2) {
       header.elements.push(currentElement2);
     }
     return header;
   }
-  function makePLYElementProperty(propertValues, propertyNameMapping) {
-    const property = {
-      type: propertValues[0]
+  function getPLYAttributes(header) {
+    const attributes = {
+      indices: [],
+      vertices: [],
+      normals: [],
+      uvs: [],
+      colors: []
     };
-    if (property.type === "list") {
-      property.name = propertValues[3];
-      property.countType = propertValues[1];
-      property.itemType = propertValues[2];
-    } else {
-      property.name = propertValues[1];
+    for (const element of header.elements) {
+      if (element.name === "vertex") {
+        for (const property of element.properties) {
+          switch (property.name) {
+            case "x":
+            case "y":
+            case "z":
+            case "nx":
+            case "ny":
+            case "nz":
+            case "s":
+            case "t":
+            case "red":
+            case "green":
+            case "blue":
+              break;
+            default:
+              attributes[property.name] = [];
+              break;
+          }
+        }
+      }
     }
-    if (propertyNameMapping && property.name in propertyNameMapping) {
-      property.name = propertyNameMapping[property.name];
+    return attributes;
+  }
+  function makePLYElementProperty(propertyValues) {
+    const type = propertyValues[0];
+    switch (type) {
+      case "list":
+        return {
+          type,
+          name: propertyValues[3],
+          countType: propertyValues[1],
+          itemType: propertyValues[2]
+        };
+      default:
+        return {
+          type,
+          name: propertyValues[1]
+        };
     }
-    return property;
   }
   function parseASCIINumber(n, type) {
     switch (type) {
@@ -817,7 +875,7 @@
         throw new Error(type);
     }
   }
-  function parseASCIIElement(properties, line) {
+  function parsePLYElement(properties, line) {
     const values = line.split(/\s+/);
     const element = {};
     for (let i = 0; i < properties.length; i++) {
@@ -835,13 +893,7 @@
     return element;
   }
   function parseASCII(data, header) {
-    const attributes = {
-      indices: [],
-      vertices: [],
-      normals: [],
-      uvs: [],
-      colors: []
-    };
+    const attributes = getPLYAttributes(header);
     let result;
     const patternBody = /end_header\s([\s\S]*)$/;
     let body = "";
@@ -859,7 +911,7 @@
           currentElement2++;
           currentElementCount = 0;
         }
-        const element = parseASCIIElement(header.elements[currentElement2].properties, line);
+        const element = parsePLYElement(header.elements[currentElement2].properties, line);
         handleElement(attributes, header.elements[currentElement2].name, element);
         currentElementCount++;
       }
@@ -868,15 +920,40 @@
   }
   function handleElement(buffer, elementName, element = {}) {
     if (elementName === "vertex") {
-      buffer.vertices.push(element.x, element.y, element.z);
-      if ("nx" in element && "ny" in element && "nz" in element) {
-        buffer.normals.push(element.nx, element.ny, element.nz);
-      }
-      if ("s" in element && "t" in element) {
-        buffer.uvs.push(element.s, element.t);
-      }
-      if ("red" in element && "green" in element && "blue" in element) {
-        buffer.colors.push(element.red, element.green, element.blue);
+      for (const propertyName of Object.keys(element)) {
+        switch (propertyName) {
+          case "x":
+            buffer.vertices.push(element.x, element.y, element.z);
+            break;
+          case "y":
+          case "z":
+            break;
+          case "nx":
+            if ("nx" in element && "ny" in element && "nz" in element) {
+              buffer.normals.push(element.nx, element.ny, element.nz);
+            }
+            break;
+          case "ny":
+          case "nz":
+            break;
+          case "s":
+            if ("s" in element && "t" in element) {
+              buffer.uvs.push(element.s, element.t);
+            }
+            break;
+          case "t":
+            break;
+          case "red":
+            if ("red" in element && "green" in element && "blue" in element) {
+              buffer.colors.push(element.red, element.green, element.blue);
+            }
+            break;
+          case "green":
+          case "blue":
+            break;
+          default:
+            buffer[propertyName].push(element[propertyName]);
+        }
       }
     } else if (elementName === "face") {
       const vertexIndices = element.vertex_indices || element.vertex_index;
@@ -943,13 +1020,7 @@
     return [element, read];
   }
   function parseBinary(data, header) {
-    const attributes = {
-      indices: [],
-      vertices: [],
-      normals: [],
-      uvs: [],
-      colors: []
-    };
+    const attributes = getPLYAttributes(header);
     const littleEndian = header.format === "binary_little_endian";
     const body = new DataView(data, header.headerLength);
     let result;
@@ -1089,21 +1160,22 @@
     }
     return header;
   }
-  function makePLYElementProperty2(propertValues, propertyNameMapping) {
-    const property = {
-      type: propertValues[0]
-    };
-    if (property.type === "list") {
-      property.name = propertValues[3];
-      property.countType = propertValues[1];
-      property.itemType = propertValues[2];
-    } else {
-      property.name = propertValues[1];
-    }
-    if (propertyNameMapping && property.name in propertyNameMapping) {
-      property.name = propertyNameMapping[property.name];
+  function makePLYElementProperty2(propertyValues, propertyNameMapping) {
+    const type = propertyValues[0];
+    switch (type) {
+      case "list":
+        return {
+          type,
+          name: propertyValues[3],
+          countType: propertyValues[1],
+          itemType: propertyValues[2]
+        };
+      default:
+        return {
+          type,
+          name: propertyValues[1]
+        };
     }
-    return property;
   }
   async function parseASCII2(lineIterator, header) {
     const attributes = {
@@ -1122,7 +1194,7 @@
           currentElement2++;
           currentElementCount = 0;
         }
-        const element = parseASCIIElement2(header.elements[currentElement2].properties, line);
+        const element = parsePLYElement2(header.elements[currentElement2].properties, line);
         handleElement2(attributes, header.elements[currentElement2].name, element);
         currentElementCount++;
       }
@@ -1153,7 +1225,7 @@
         throw new Error(type);
     }
   }
-  function parseASCIIElement2(properties, line) {
+  function parsePLYElement2(properties, line) {
     const values = line.split(/\s+/);
     const element = {};
     for (let i = 0; i < properties.length; i++) {
@@ -1220,10 +1292,10 @@
       init_parse_ply_in_batches();
       PLYLoader2 = {
         ...PLYLoader,
-        parse: async (arrayBuffer, options) => parsePLY(arrayBuffer, options),
-        parseTextSync: parsePLY,
-        parseSync: parsePLY,
-        parseInBatches: parsePLYInBatches
+        parse: async (arrayBuffer, options) => parsePLY(arrayBuffer, options?.ply),
+        parseTextSync: (arrayBuffer, options) => parsePLY(arrayBuffer, options?.ply),
+        parseSync: (arrayBuffer, options) => parsePLY(arrayBuffer, options?.ply),
+        parseInBatches: (arrayBuffer, options) => parsePLYInBatches(arrayBuffer, options?.ply)
       };
       _typecheckPLYLoader = PLYLoader2;
     }

package/dist/es5/index.js

@@ -16,22 +16,20 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _plyLoader = require("./ply-loader");
-var _parsePly = _interopRequireDefault(require("./lib/parse-ply"));
-var _parsePlyInBatches = _interopRequireDefault(require("./lib/parse-ply-in-batches"));
+var _parsePly = require("./lib/parse-ply");
+var _parsePlyInBatches = require("./lib/parse-ply-in-batches");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var PLYLoader = _objectSpread(_objectSpread({}, _plyLoader.PLYLoader), {}, {
   parse: function () {
     var _parse = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(arrayBuffer, options) {
       return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              return _context.abrupt("return", (0, _parsePly.default)(arrayBuffer, options));
-            case 1:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            return _context.abrupt("return", (0, _parsePly.parsePLY)(arrayBuffer, options === null || options === void 0 ? void 0 : options.ply));
+          case 1:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -40,9 +38,15 @@ var PLYLoader = _objectSpread(_objectSpread({}, _plyLoader.PLYLoader), {}, {
     }
     return parse;
   }(),
-  parseTextSync: _parsePly.default,
-  parseSync: _parsePly.default,
-  parseInBatches: _parsePlyInBatches.default
+  parseTextSync: function parseTextSync(arrayBuffer, options) {
+    return (0, _parsePly.parsePLY)(arrayBuffer, options === null || options === void 0 ? void 0 : options.ply);
+  },
+  parseSync: function parseSync(arrayBuffer, options) {
+    return (0, _parsePly.parsePLY)(arrayBuffer, options === null || options === void 0 ? void 0 : options.ply);
+  },
+  parseInBatches: function parseInBatches(arrayBuffer, options) {
+    return (0, _parsePlyInBatches.parsePLYInBatches)(arrayBuffer, options === null || options === void 0 ? void 0 : options.ply);
+  }
 });
 exports.PLYLoader = PLYLoader;
 var _typecheckPLYLoader = PLYLoader;

package/dist/es5/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["PLYLoader","PLYWorkerLoader","parse","arrayBuffer","options","parsePLY","parseTextSync","parseSync","parseInBatches","parsePLYInBatches","_typecheckPLYLoader"],"sources":["../../src/index.ts"],"sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {PLYLoader as PLYWorkerLoader} from './ply-loader';\nimport parsePLY from './lib/parse-ply';\nimport parsePLYInBatches from './lib/parse-ply-in-batches';\n\n// PLYLoader\n\nexport {PLYWorkerLoader};\n\n/**\n * Loader for PLY - Polygon File Format\n */\nexport const PLYLoader = {\n  ...PLYWorkerLoader,\n  // Note: parsePLY supports both text and binary\n  parse: async (arrayBuffer, options) => parsePLY(arrayBuffer, options), // TODO - this may not detect text correctly?\n  parseTextSync: parsePLY,\n  parseSync: parsePLY,\n  parseInBatches: parsePLYInBatches\n};\n\nexport const _typecheckPLYLoader: LoaderWithParser = PLYLoader;\n"],"mappings":";;;;;;;;;;;;;;;;;AACA;AACA;AACA;AAA2D;AAAA;AASpD,IAAMA,SAAS,mCACjBC,oBAAe;EAElBC,KAAK;IAAA,uEAAE,iBAAOC,WAAW,EAAEC,OAAO;MAAA;QAAA;UAAA;YAAA;cAAA,iCAAK,IAAAC,iBAAQ,EAACF,WAAW,EAAEC,OAAO,CAAC;YAAA;YAAA;cAAA;UAAA;QAAA;MAAA;IAAA;IAAA;MAAA;IAAA;IAAA;EAAA;EACrEE,aAAa,EAAED,iBAAQ;EACvBE,SAAS,EAAEF,iBAAQ;EACnBG,cAAc,EAAEC;AAAiB,EAClC;AAAC;AAEK,IAAMC,mBAAqC,GAAGV,SAAS;AAAC"}
+{"version":3,"file":"index.js","names":["_plyLoader","require","_parsePly","_parsePlyInBatches","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","PLYLoader","PLYWorkerLoader","parse","_parse","_asyncToGenerator2","_regenerator","mark","_callee","arrayBuffer","options","wrap","_callee$","_context","prev","next","abrupt","parsePLY","ply","stop","_x","_x2","parseTextSync","parseSync","parseInBatches","parsePLYInBatches","exports","_typecheckPLYLoader"],"sources":["../../src/index.ts"],"sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {PLYLoader as PLYWorkerLoader} from './ply-loader';\nimport {parsePLY} from './lib/parse-ply';\nimport {parsePLYInBatches} from './lib/parse-ply-in-batches';\n\n// PLYLoader\n\nexport {PLYWorkerLoader};\n\n/**\n * Loader for PLY - Polygon File Format\n */\nexport const PLYLoader = {\n  ...PLYWorkerLoader,\n  // Note: parsePLY supports both text and binary\n  parse: async (arrayBuffer, options) => parsePLY(arrayBuffer, options?.ply), // TODO - this may not detect text correctly?\n  parseTextSync: (arrayBuffer, options) => parsePLY(arrayBuffer, options?.ply),\n  parseSync: (arrayBuffer, options) => parsePLY(arrayBuffer, options?.ply),\n  parseInBatches: (arrayBuffer, options) => parsePLYInBatches(arrayBuffer, options?.ply)\n};\n\nexport const _typecheckPLYLoader: LoaderWithParser = PLYLoader;\n"],"mappings":"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"}

package/dist/es5/lib/get-ply-schema.js

@@ -10,7 +10,6 @@ function getPLYSchema(plyHeader, attributes) {
   var schema = (0, _schema.deduceMeshSchema)(attributes, metadataMap);
   return schema;
 }
-
 function makeMetadataFromPlyHeader(plyHeader) {
   var metadataMap = new Map();
   metadataMap.set('ply_comments', JSON.stringify(plyHeader.comments));

package/dist/es5/lib/get-ply-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-ply-schema.js","names":["getPLYSchema","plyHeader","attributes","metadataMap","makeMetadataFromPlyHeader","schema","deduceMeshSchema","Map","set","JSON","stringify","comments","elements","format","undefined","version","headerLength","toString"],"sources":["../../../src/lib/get-ply-schema.ts"],"sourcesContent":["import {Schema, MeshAttributes, deduceMeshSchema} from '@loaders.gl/schema';\nimport type {PLYHeader} from './ply-types';\n\n/**\n * Gets schema from PLY header\n * @param plyHeader\n * @param metadata\n * @returns Schema\n */\nexport function getPLYSchema(plyHeader: PLYHeader, attributes: MeshAttributes): Schema {\n  const metadataMap = makeMetadataFromPlyHeader(plyHeader);\n  const schema = deduceMeshSchema(attributes, metadataMap);\n  return schema;\n}\n\n/**\n * Make arrow like schema metadata by PlyHeader properties\n * @param plyHeader\n * @returns\n */\nfunction makeMetadataFromPlyHeader(plyHeader: PLYHeader): Map<string, string> {\n  const metadataMap = new Map();\n  metadataMap.set('ply_comments', JSON.stringify(plyHeader.comments));\n  metadataMap.set('ply_elements', JSON.stringify(plyHeader.elements));\n  if (plyHeader.format !== undefined) {\n    metadataMap.set('ply_format', plyHeader.format);\n  }\n  if (plyHeader.version !== undefined) {\n    metadataMap.set('ply_version', plyHeader.version);\n  }\n  if (plyHeader.headerLength !== undefined) {\n    metadataMap.set('ply_headerLength', plyHeader.headerLength.toString(10));\n  }\n  return metadataMap;\n}\n"],"mappings":";;;;;;AAAA;AASO,SAASA,YAAY,CAACC,SAAoB,EAAEC,UAA0B,EAAU;EACrF,IAAMC,WAAW,GAAGC,yBAAyB,CAACH,SAAS,CAAC;EACxD,IAAMI,MAAM,GAAG,IAAAC,wBAAgB,EAACJ,UAAU,EAAEC,WAAW,CAAC;EACxD,OAAOE,MAAM;AACf;;AAOA,SAASD,yBAAyB,CAACH,SAAoB,EAAuB;EAC5E,IAAME,WAAW,GAAG,IAAII,GAAG,EAAE;EAC7BJ,WAAW,CAACK,GAAG,CAAC,cAAc,EAAEC,IAAI,CAACC,SAAS,CAACT,SAAS,CAACU,QAAQ,CAAC,CAAC;EACnER,WAAW,CAACK,GAAG,CAAC,cAAc,EAAEC,IAAI,CAACC,SAAS,CAACT,SAAS,CAACW,QAAQ,CAAC,CAAC;EACnE,IAAIX,SAAS,CAACY,MAAM,KAAKC,SAAS,EAAE;IAClCX,WAAW,CAACK,GAAG,CAAC,YAAY,EAAEP,SAAS,CAACY,MAAM,CAAC;EACjD;EACA,IAAIZ,SAAS,CAACc,OAAO,KAAKD,SAAS,EAAE;IACnCX,WAAW,CAACK,GAAG,CAAC,aAAa,EAAEP,SAAS,CAACc,OAAO,CAAC;EACnD;EACA,IAAId,SAAS,CAACe,YAAY,KAAKF,SAAS,EAAE;IACxCX,WAAW,CAACK,GAAG,CAAC,kBAAkB,EAAEP,SAAS,CAACe,YAAY,CAACC,QAAQ,CAAC,EAAE,CAAC,CAAC;EAC1E;EACA,OAAOd,WAAW;AACpB"}
+{"version":3,"file":"get-ply-schema.js","names":["_schema","require","getPLYSchema","plyHeader","attributes","metadataMap","makeMetadataFromPlyHeader","schema","deduceMeshSchema","Map","set","JSON","stringify","comments","elements","format","undefined","version","headerLength","toString"],"sources":["../../../src/lib/get-ply-schema.ts"],"sourcesContent":["import {Schema, MeshAttributes, deduceMeshSchema} from '@loaders.gl/schema';\nimport type {PLYHeader} from './ply-types';\n\n/**\n * Gets schema from PLY header\n * @param plyHeader\n * @param metadata\n * @returns Schema\n */\nexport function getPLYSchema(plyHeader: PLYHeader, attributes: MeshAttributes): Schema {\n  const metadataMap = makeMetadataFromPlyHeader(plyHeader);\n  const schema = deduceMeshSchema(attributes, metadataMap);\n  return schema;\n}\n\n/**\n * Make arrow like schema metadata by PlyHeader properties\n * @param plyHeader\n * @returns\n */\nfunction makeMetadataFromPlyHeader(plyHeader: PLYHeader): Map<string, string> {\n  const metadataMap = new Map();\n  metadataMap.set('ply_comments', JSON.stringify(plyHeader.comments));\n  metadataMap.set('ply_elements', JSON.stringify(plyHeader.elements));\n  if (plyHeader.format !== undefined) {\n    metadataMap.set('ply_format', plyHeader.format);\n  }\n  if (plyHeader.version !== undefined) {\n    metadataMap.set('ply_version', plyHeader.version);\n  }\n  if (plyHeader.headerLength !== undefined) {\n    metadataMap.set('ply_headerLength', plyHeader.headerLength.toString(10));\n  }\n  return metadataMap;\n}\n"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AASO,SAASC,YAAYA,CAACC,SAAoB,EAAEC,UAA0B,EAAU;EACrF,IAAMC,WAAW,GAAGC,yBAAyB,CAACH,SAAS,CAAC;EACxD,IAAMI,MAAM,GAAG,IAAAC,wBAAgB,EAACJ,UAAU,EAAEC,WAAW,CAAC;EACxD,OAAOE,MAAM;AACf;AAOA,SAASD,yBAAyBA,CAACH,SAAoB,EAAuB;EAC5E,IAAME,WAAW,GAAG,IAAII,GAAG,CAAC,CAAC;EAC7BJ,WAAW,CAACK,GAAG,CAAC,cAAc,EAAEC,IAAI,CAACC,SAAS,CAACT,SAAS,CAACU,QAAQ,CAAC,CAAC;EACnER,WAAW,CAACK,GAAG,CAAC,cAAc,EAAEC,IAAI,CAACC,SAAS,CAACT,SAAS,CAACW,QAAQ,CAAC,CAAC;EACnE,IAAIX,SAAS,CAACY,MAAM,KAAKC,SAAS,EAAE;IAClCX,WAAW,CAACK,GAAG,CAAC,YAAY,EAAEP,SAAS,CAACY,MAAM,CAAC;EACjD;EACA,IAAIZ,SAAS,CAACc,OAAO,KAAKD,SAAS,EAAE;IACnCX,WAAW,CAACK,GAAG,CAAC,aAAa,EAAEP,SAAS,CAACc,OAAO,CAAC;EACnD;EACA,IAAId,SAAS,CAACe,YAAY,KAAKF,SAAS,EAAE;IACxCX,WAAW,CAACK,GAAG,CAAC,kBAAkB,EAAEP,SAAS,CAACe,YAAY,CAACC,QAAQ,CAAC,EAAE,CAAC,CAAC;EAC1E;EACA,OAAOd,WAAW;AACpB"}

package/dist/es5/lib/normalize-ply.js

@@ -10,7 +10,6 @@ function normalizePLY(plyHeader, plyAttributes, options) {
   var attributes = getMeshAttributes(plyAttributes);
   var boundingBox = (0, _schema.getMeshBoundingBox)(attributes);
   var vertexCount = plyAttributes.indices.length || plyAttributes.vertices.length / 3;
-
   var isTriangles = plyAttributes.indices && plyAttributes.indices.length > 0;
   var mode = isTriangles ? 4 : 0;
   var topology = isTriangles ? 'triangle-list' : 'point-list';
@@ -39,32 +38,55 @@ function normalizePLY(plyHeader, plyAttributes, options) {
   }
   return plyMesh;
 }
-
 function getMeshAttributes(attributes) {
   var accessors = {};
-  accessors.POSITION = {
-    value: new Float32Array(attributes.vertices),
-    size: 3
-  };
-
-  if (attributes.normals.length > 0) {
-    accessors.NORMAL = {
-      value: new Float32Array(attributes.normals),
-      size: 3
-    };
-  }
-  if (attributes.uvs.length > 0) {
-    accessors.TEXCOORD_0 = {
-      value: new Float32Array(attributes.uvs),
-      size: 2
-    };
-  }
-  if (attributes.colors.length > 0) {
-    accessors.COLOR_0 = {
-      value: new Uint8Array(attributes.colors),
-      size: 3,
-      normalized: true
-    };
+  for (var _i = 0, _Object$keys = Object.keys(attributes); _i < _Object$keys.length; _i++) {
+    var attributeName = _Object$keys[_i];
+    switch (attributeName) {
+      case 'vertices':
+        if (attributes.vertices.length > 0) {
+          accessors.POSITION = {
+            value: new Float32Array(attributes.vertices),
+            size: 3
+          };
+        }
+        break;
+      case 'normals':
+        if (attributes.normals.length > 0) {
+          accessors.NORMAL = {
+            value: new Float32Array(attributes.normals),
+            size: 3
+          };
+        }
+        break;
+      case 'uvs':
+        if (attributes.uvs.length > 0) {
+          accessors.TEXCOORD_0 = {
+            value: new Float32Array(attributes.uvs),
+            size: 2
+          };
+        }
+        break;
+      case 'colors':
+        if (attributes.colors.length > 0) {
+          accessors.COLOR_0 = {
+            value: new Uint8Array(attributes.colors),
+            size: 3,
+            normalized: true
+          };
+        }
+        break;
+      case 'indices':
+        break;
+      default:
+        if (attributes[attributeName].length > 0) {
+          accessors[attributeName] = {
+            value: new Float32Array(attributes[attributeName]),
+            size: 1
+          };
+        }
+        break;
+    }
   }
   return accessors;
 }

package/dist/es5/lib/normalize-ply.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-ply.js","names":["normalizePLY","plyHeader","plyAttributes","options","attributes","getMeshAttributes","boundingBox","getMeshBoundingBox","vertexCount","indices","length","vertices","isTriangles","mode","topology","schema","getPLYSchema","plyMesh","loader","loaderData","header","value","Uint32Array","size","accessors","POSITION","Float32Array","normals","NORMAL","uvs","TEXCOORD_0","colors","COLOR_0","Uint8Array","normalized"],"sources":["../../../src/lib/normalize-ply.ts"],"sourcesContent":["import type {MeshAttributes} from '@loaders.gl/schema';\nimport {getMeshBoundingBox} from '@loaders.gl/schema';\nimport type {PLYMesh, PLYHeader, PLYAttributes, MeshHeader} from './ply-types';\nimport {getPLYSchema} from './get-ply-schema';\n\n/**\n * @param header\n * @param attributes\n * @returns data and header\n */\nexport default function normalizePLY(\n  plyHeader: MeshHeader & PLYHeader,\n  plyAttributes: PLYAttributes,\n  options?: {}\n): PLYMesh {\n  const attributes = getMeshAttributes(plyAttributes);\n  const boundingBox = getMeshBoundingBox(attributes);\n  const vertexCount = plyAttributes.indices.length || plyAttributes.vertices.length / 3;\n\n  // TODO - how to detect POINT CLOUDS vs MESHES?\n  // TODO - For Meshes, PLY quadrangles must be split?\n  const isTriangles = plyAttributes.indices && plyAttributes.indices.length > 0;\n  const mode = isTriangles ? 4 : 0; // TRIANGLES vs POINTS\n  const topology = isTriangles ? 'triangle-list' : 'point-list';\n\n  const schema = getPLYSchema(plyHeader, attributes);\n\n  const plyMesh: PLYMesh = {\n    loader: 'ply',\n    loaderData: plyHeader,\n    header: {\n      vertexCount,\n      boundingBox\n    },\n    schema,\n    attributes,\n    indices: {value: new Uint32Array(0), size: 0},\n    mode,\n    topology\n  };\n\n  if (plyAttributes.indices.length > 0) {\n    plyMesh.indices = {value: new Uint32Array(plyAttributes.indices), size: 1};\n  }\n\n  return plyMesh;\n}\n\n/**\n * @param attributes\n * @returns accessors []\n */\nfunction getMeshAttributes(attributes: PLYAttributes): MeshAttributes {\n  const accessors: MeshAttributes = {};\n\n  accessors.POSITION = {value: new Float32Array(attributes.vertices), size: 3};\n\n  // optional attributes data\n\n  if (attributes.normals.length > 0) {\n    accessors.NORMAL = {value: new Float32Array(attributes.normals), size: 3};\n  }\n\n  if (attributes.uvs.length > 0) {\n    accessors.TEXCOORD_0 = {value: new Float32Array(attributes.uvs), size: 2};\n  }\n\n  if (attributes.colors.length > 0) {\n    // TODO - normalized shoud be based on `uchar` flag in source data?\n    accessors.COLOR_0 = {value: new Uint8Array(attributes.colors), size: 3, normalized: true};\n  }\n\n  return accessors;\n}\n"],"mappings":";;;;;;AACA;AAEA;AAOe,SAASA,YAAY,CAClCC,SAAiC,EACjCC,aAA4B,EAC5BC,OAAY,EACH;EACT,IAAMC,UAAU,GAAGC,iBAAiB,CAACH,aAAa,CAAC;EACnD,IAAMI,WAAW,GAAG,IAAAC,0BAAkB,EAACH,UAAU,CAAC;EAClD,IAAMI,WAAW,GAAGN,aAAa,CAACO,OAAO,CAACC,MAAM,IAAIR,aAAa,CAACS,QAAQ,CAACD,MAAM,GAAG,CAAC;;EAIrF,IAAME,WAAW,GAAGV,aAAa,CAACO,OAAO,IAAIP,aAAa,CAACO,OAAO,CAACC,MAAM,GAAG,CAAC;EAC7E,IAAMG,IAAI,GAAGD,WAAW,GAAG,CAAC,GAAG,CAAC;EAChC,IAAME,QAAQ,GAAGF,WAAW,GAAG,eAAe,GAAG,YAAY;EAE7D,IAAMG,MAAM,GAAG,IAAAC,0BAAY,EAACf,SAAS,EAAEG,UAAU,CAAC;EAElD,IAAMa,OAAgB,GAAG;IACvBC,MAAM,EAAE,KAAK;IACbC,UAAU,EAAElB,SAAS;IACrBmB,MAAM,EAAE;MACNZ,WAAW,EAAXA,WAAW;MACXF,WAAW,EAAXA;IACF,CAAC;IACDS,MAAM,EAANA,MAAM;IACNX,UAAU,EAAVA,UAAU;IACVK,OAAO,EAAE;MAACY,KAAK,EAAE,IAAIC,WAAW,CAAC,CAAC,CAAC;MAAEC,IAAI,EAAE;IAAC,CAAC;IAC7CV,IAAI,EAAJA,IAAI;IACJC,QAAQ,EAARA;EACF,CAAC;EAED,IAAIZ,aAAa,CAACO,OAAO,CAACC,MAAM,GAAG,CAAC,EAAE;IACpCO,OAAO,CAACR,OAAO,GAAG;MAACY,KAAK,EAAE,IAAIC,WAAW,CAACpB,aAAa,CAACO,OAAO,CAAC;MAAEc,IAAI,EAAE;IAAC,CAAC;EAC5E;EAEA,OAAON,OAAO;AAChB;;AAMA,SAASZ,iBAAiB,CAACD,UAAyB,EAAkB;EACpE,IAAMoB,SAAyB,GAAG,CAAC,CAAC;EAEpCA,SAAS,CAACC,QAAQ,GAAG;IAACJ,KAAK,EAAE,IAAIK,YAAY,CAACtB,UAAU,CAACO,QAAQ,CAAC;IAAEY,IAAI,EAAE;EAAC,CAAC;;EAI5E,IAAInB,UAAU,CAACuB,OAAO,CAACjB,MAAM,GAAG,CAAC,EAAE;IACjCc,SAAS,CAACI,MAAM,GAAG;MAACP,KAAK,EAAE,IAAIK,YAAY,CAACtB,UAAU,CAACuB,OAAO,CAAC;MAAEJ,IAAI,EAAE;IAAC,CAAC;EAC3E;EAEA,IAAInB,UAAU,CAACyB,GAAG,CAACnB,MAAM,GAAG,CAAC,EAAE;IAC7Bc,SAAS,CAACM,UAAU,GAAG;MAACT,KAAK,EAAE,IAAIK,YAAY,CAACtB,UAAU,CAACyB,GAAG,CAAC;MAAEN,IAAI,EAAE;IAAC,CAAC;EAC3E;EAEA,IAAInB,UAAU,CAAC2B,MAAM,CAACrB,MAAM,GAAG,CAAC,EAAE;IAEhCc,SAAS,CAACQ,OAAO,GAAG;MAACX,KAAK,EAAE,IAAIY,UAAU,CAAC7B,UAAU,CAAC2B,MAAM,CAAC;MAAER,IAAI,EAAE,CAAC;MAAEW,UAAU,EAAE;IAAI,CAAC;EAC3F;EAEA,OAAOV,SAAS;AAClB"}
+{"version":3,"file":"normalize-ply.js","names":["_schema","require","_getPlySchema","normalizePLY","plyHeader","plyAttributes","options","attributes","getMeshAttributes","boundingBox","getMeshBoundingBox","vertexCount","indices","length","vertices","isTriangles","mode","topology","schema","getPLYSchema","plyMesh","loader","loaderData","header","value","Uint32Array","size","accessors","_i","_Object$keys","Object","keys","attributeName","POSITION","Float32Array","normals","NORMAL","uvs","TEXCOORD_0","colors","COLOR_0","Uint8Array","normalized"],"sources":["../../../src/lib/normalize-ply.ts"],"sourcesContent":["import type {MeshAttributes} from '@loaders.gl/schema';\nimport {getMeshBoundingBox} from '@loaders.gl/schema';\nimport type {PLYMesh, PLYHeader, PLYAttributes, MeshHeader} from './ply-types';\nimport {getPLYSchema} from './get-ply-schema';\n\n/**\n * @param header\n * @param attributes\n * @returns data and header\n */\nexport default function normalizePLY(\n  plyHeader: MeshHeader & PLYHeader,\n  plyAttributes: PLYAttributes,\n  options?: {}\n): PLYMesh {\n  const attributes = getMeshAttributes(plyAttributes);\n  const boundingBox = getMeshBoundingBox(attributes);\n  const vertexCount = plyAttributes.indices.length || plyAttributes.vertices.length / 3;\n\n  // TODO - how to detect POINT CLOUDS vs MESHES?\n  // TODO - For Meshes, PLY quadrangles must be split?\n  const isTriangles = plyAttributes.indices && plyAttributes.indices.length > 0;\n  const mode = isTriangles ? 4 : 0; // TRIANGLES vs POINTS\n  const topology = isTriangles ? 'triangle-list' : 'point-list';\n\n  const schema = getPLYSchema(plyHeader, attributes);\n\n  const plyMesh: PLYMesh = {\n    loader: 'ply',\n    loaderData: plyHeader,\n    header: {\n      vertexCount,\n      boundingBox\n    },\n    schema,\n    attributes,\n    indices: {value: new Uint32Array(0), size: 0},\n    mode,\n    topology\n  };\n\n  if (plyAttributes.indices.length > 0) {\n    plyMesh.indices = {value: new Uint32Array(plyAttributes.indices), size: 1};\n  }\n\n  return plyMesh;\n}\n\n/**\n * @param attributes\n * @returns accessors []\n */\n// eslint-disable-next-line complexity\nfunction getMeshAttributes(attributes: PLYAttributes): MeshAttributes {\n  const accessors: MeshAttributes = {};\n\n  for (const attributeName of Object.keys(attributes)) {\n    switch (attributeName) {\n      case 'vertices':\n        if (attributes.vertices.length > 0) {\n          accessors.POSITION = {value: new Float32Array(attributes.vertices), size: 3};\n        }\n        break;\n\n      // optional attributes data\n      case 'normals':\n        if (attributes.normals.length > 0) {\n          accessors.NORMAL = {value: new Float32Array(attributes.normals), size: 3};\n        }\n        break;\n\n      case 'uvs':\n        if (attributes.uvs.length > 0) {\n          accessors.TEXCOORD_0 = {value: new Float32Array(attributes.uvs), size: 2};\n        }\n        break;\n\n      case 'colors':\n        if (attributes.colors.length > 0) {\n          // TODO - normalized shoud be based on `uchar` flag in source data?\n          accessors.COLOR_0 = {value: new Uint8Array(attributes.colors), size: 3, normalized: true};\n        }\n        break;\n\n      case 'indices':\n        break;\n\n      default:\n        if (attributes[attributeName].length > 0) {\n          accessors[attributeName] = {value: new Float32Array(attributes[attributeName]), size: 1};\n        }\n        break;\n    }\n  }\n  return accessors;\n}\n"],"mappings":"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"}