@loaders.gl/obj 3.0.9 → 3.0.13

package/dist/es5/lib/load-obj.js

@@ -13,25 +13,17 @@ var _parseObj = _interopRequireDefault(require("./parse-obj"));
 
 var _schemaAttributeUtils = require("./schema-attribute-utils");
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function loadOBJ(text, options) {
-  var _parseOBJ = (0, _parseObj.default)(text),
-      meshes = _parseOBJ.meshes;
-
-  var vertexCount = meshes.reduce(function (s, mesh) {
-    return s + mesh.header.vertexCount;
-  }, 0);
-  var attributes = mergeAttributes(meshes, vertexCount);
-  var header = {
-    vertexCount: vertexCount,
+  const {
+    meshes
+  } = (0, _parseObj.default)(text);
+  const vertexCount = meshes.reduce((s, mesh) => s + mesh.header.vertexCount, 0);
+  const attributes = mergeAttributes(meshes, vertexCount);
+  const header = {
+    vertexCount,
     boundingBox: (0, _schema.getMeshBoundingBox)(attributes)
   };
-  var schema = (0, _schemaAttributeUtils.makeSchemaFromAttributes)(attributes, {
+  const schema = (0, _schemaAttributeUtils.makeSchemaFromAttributes)(attributes, {
     mode: 4,
     boundingBox: header.boundingBox
   });
@@ -39,57 +31,48 @@ function loadOBJ(text, options) {
     loaderData: {
       header: {}
     },
-    schema: schema,
-    header: header,
+    schema,
+    header,
     mode: 4,
-    attributes: attributes
+    attributes
   };
 }
 
 function mergeAttributes(meshes, vertexCount) {
-  var positions = new Float32Array(vertexCount * 3);
-  var normals;
-  var colors;
-  var uvs;
-  var i = 0;
-
-  var _iterator = _createForOfIteratorHelper(meshes),
-      _step;
-
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var mesh = _step.value;
-      var _mesh$attributes = mesh.attributes,
-          POSITION = _mesh$attributes.POSITION,
-          NORMAL = _mesh$attributes.NORMAL,
-          COLOR_0 = _mesh$attributes.COLOR_0,
-          TEXCOORD_0 = _mesh$attributes.TEXCOORD_0;
-      positions.set(POSITION.value, i * 3);
-
-      if (NORMAL) {
-        normals = normals || new Float32Array(vertexCount * 3);
-        normals.set(NORMAL.value, i * 3);
-      }
-
-      if (COLOR_0) {
-        colors = colors || new Float32Array(vertexCount * 3);
-        colors.set(COLOR_0.value, i * 3);
-      }
-
-      if (TEXCOORD_0) {
-        uvs = uvs || new Float32Array(vertexCount * 2);
-        uvs.set(TEXCOORD_0.value, i * 2);
-      }
-
-      i += POSITION.value.length / 3;
+  const positions = new Float32Array(vertexCount * 3);
+  let normals;
+  let colors;
+  let uvs;
+  let i = 0;
+
+  for (const mesh of meshes) {
+    const {
+      POSITION,
+      NORMAL,
+      COLOR_0,
+      TEXCOORD_0
+    } = mesh.attributes;
+    positions.set(POSITION.value, i * 3);
+
+    if (NORMAL) {
+      normals = normals || new Float32Array(vertexCount * 3);
+      normals.set(NORMAL.value, i * 3);
+    }
+
+    if (COLOR_0) {
+      colors = colors || new Float32Array(vertexCount * 3);
+      colors.set(COLOR_0.value, i * 3);
+    }
+
+    if (TEXCOORD_0) {
+      uvs = uvs || new Float32Array(vertexCount * 2);
+      uvs.set(TEXCOORD_0.value, i * 2);
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+
+    i += POSITION.value.length / 3;
   }
 
-  var attributes = {};
+  const attributes = {};
   attributes.POSITION = {
     value: positions,
     size: 3

package/dist/es5/lib/load-obj.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/load-obj.js"],"names":["loadOBJ","text","options","meshes","vertexCount","reduce","s","mesh","header","attributes","mergeAttributes","boundingBox","schema","mode","loaderData","positions","Float32Array","normals","colors","uvs","i","POSITION","NORMAL","COLOR_0","TEXCOORD_0","set","value","length","size"],"mappings":"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","sourcesContent":["import {getMeshBoundingBox} from '@loaders.gl/schema';\nimport parseOBJ from './parse-obj';\nimport {makeSchemaFromAttributes} from './schema-attribute-utils';\n\nexport default function loadOBJ(text, options) {\n  const {meshes} = parseOBJ(text);\n\n  const vertexCount = meshes.reduce((s, mesh) => s + mesh.header.vertexCount, 0);\n  // TODO - render objects separately\n  const attributes = mergeAttributes(meshes, vertexCount);\n\n  const header = {\n    vertexCount,\n    // @ts-ignore Need to export Attributes type\n    boundingBox: getMeshBoundingBox(attributes)\n  };\n\n  const schema = makeSchemaFromAttributes(attributes, {\n    mode: 4,\n    boundingBox: header.boundingBox\n  });\n\n  return {\n    // Data return by this loader implementation\n    loaderData: {\n      header: {}\n    },\n\n    // Normalised data\n    schema,\n    header,\n    mode: 4, // TRIANGLES\n\n    attributes\n  };\n}\n\n// eslint-disable-next-line max-statements\nfunction mergeAttributes(meshes, vertexCount) {\n  const positions = new Float32Array(vertexCount * 3);\n  let normals;\n  let colors;\n  let uvs;\n  let i = 0;\n\n  for (const mesh of meshes) {\n    const {POSITION, NORMAL, COLOR_0, TEXCOORD_0} = mesh.attributes;\n\n    positions.set(POSITION.value, i * 3);\n\n    if (NORMAL) {\n      normals = normals || new Float32Array(vertexCount * 3);\n      normals.set(NORMAL.value, i * 3);\n    }\n    if (COLOR_0) {\n      colors = colors || new Float32Array(vertexCount * 3);\n      colors.set(COLOR_0.value, i * 3);\n    }\n    if (TEXCOORD_0) {\n      uvs = uvs || new Float32Array(vertexCount * 2);\n      uvs.set(TEXCOORD_0.value, i * 2);\n    }\n\n    i += POSITION.value.length / 3;\n  }\n\n  const attributes = {};\n  attributes.POSITION = {value: positions, size: 3};\n\n  if (normals) {\n    attributes.NORMAL = {value: normals, size: 3};\n  }\n  if (colors) {\n    attributes.COLOR_0 = {value: colors, size: 3};\n  }\n  if (uvs) {\n    attributes.TEXCOORD_0 = {value: uvs, size: 2};\n  }\n\n  return attributes;\n}\n"],"file":"load-obj.js"}
+{"version":3,"sources":["../../../src/lib/load-obj.js"],"names":["loadOBJ","text","options","meshes","vertexCount","reduce","s","mesh","header","attributes","mergeAttributes","boundingBox","schema","mode","loaderData","positions","Float32Array","normals","colors","uvs","i","POSITION","NORMAL","COLOR_0","TEXCOORD_0","set","value","length","size"],"mappings":"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","sourcesContent":["import {getMeshBoundingBox} from '@loaders.gl/schema';\nimport parseOBJ from './parse-obj';\nimport {makeSchemaFromAttributes} from './schema-attribute-utils';\n\nexport default function loadOBJ(text, options) {\n  const {meshes} = parseOBJ(text);\n\n  const vertexCount = meshes.reduce((s, mesh) => s + mesh.header.vertexCount, 0);\n  // TODO - render objects separately\n  const attributes = mergeAttributes(meshes, vertexCount);\n\n  const header = {\n    vertexCount,\n    // @ts-ignore Need to export Attributes type\n    boundingBox: getMeshBoundingBox(attributes)\n  };\n\n  const schema = makeSchemaFromAttributes(attributes, {\n    mode: 4,\n    boundingBox: header.boundingBox\n  });\n\n  return {\n    // Data return by this loader implementation\n    loaderData: {\n      header: {}\n    },\n\n    // Normalised data\n    schema,\n    header,\n    mode: 4, // TRIANGLES\n\n    attributes\n  };\n}\n\n// eslint-disable-next-line max-statements\nfunction mergeAttributes(meshes, vertexCount) {\n  const positions = new Float32Array(vertexCount * 3);\n  let normals;\n  let colors;\n  let uvs;\n  let i = 0;\n\n  for (const mesh of meshes) {\n    const {POSITION, NORMAL, COLOR_0, TEXCOORD_0} = mesh.attributes;\n\n    positions.set(POSITION.value, i * 3);\n\n    if (NORMAL) {\n      normals = normals || new Float32Array(vertexCount * 3);\n      normals.set(NORMAL.value, i * 3);\n    }\n    if (COLOR_0) {\n      colors = colors || new Float32Array(vertexCount * 3);\n      colors.set(COLOR_0.value, i * 3);\n    }\n    if (TEXCOORD_0) {\n      uvs = uvs || new Float32Array(vertexCount * 2);\n      uvs.set(TEXCOORD_0.value, i * 2);\n    }\n\n    i += POSITION.value.length / 3;\n  }\n\n  const attributes = {};\n  attributes.POSITION = {value: positions, size: 3};\n\n  if (normals) {\n    attributes.NORMAL = {value: normals, size: 3};\n  }\n  if (colors) {\n    attributes.COLOR_0 = {value: colors, size: 3};\n  }\n  if (uvs) {\n    attributes.TEXCOORD_0 = {value: uvs, size: 2};\n  }\n\n  return attributes;\n}\n"],"file":"load-obj.js"}