Update version

CHANGES.md

@@ -2,8 +2,10 @@ Change Log
 ==========
 
 ### Next Release
+
 * `modelMaterialsCommon` renamed to `processModelMaterialsCommon`.
 * Added `generateModelMaterialsCommon` and command line `kmc` flags for generating models with the `KHR_materials_common` extension.
+* Added `updateVersion` stage for transitioning assets between glTF version and migrated any glTF 0.8 code out of `addDefaults`
 
 ### 0.1.0-alpha6 - 2016-11-18
 

index.js

@@ -37,6 +37,7 @@ module.exports = {
     RemoveUnusedProperties : require('./lib/RemoveUnusedProperties'),
     removeUnusedVertices : require('./lib/removeUnusedVertices'),
     uninterleaveAndPackBuffers : require('./lib/uninterleaveAndPackBuffers'),
+    updateVersion : require('./lib/updateVersion'),
     writeAccessor : require('./lib/writeAccessor'),
     writeBinaryGltf : require('./lib/writeBinaryGltf'),
     writeBufferComponent : require('./lib/writeBufferComponent'),

lib/Pipeline.js

@@ -26,6 +26,7 @@ var removeDuplicatePrimitives = require('./removeDuplicatePrimitives');
 var removeNormals = require('./removeNormals');
 var removePipelineExtras = require('./removePipelineExtras');
 var quantizeAttributes = require('./quantizeAttributes');
+var updateVersion = require('./updateVersion');
 var writeGltf = require('./writeGltf');
 var writeBinaryGltf = require('./writeBinaryGltf');
 var writeSource = require('./writeSource');
@@ -84,6 +85,9 @@ Pipeline.processJSONWithExtras  = function(gltfWithExtras, options) {
     if (options.removeNormals) {
         removeNormals(gltfWithExtras);
     }
+    updateVersion(gltfWithExtras, {
+        targetVersion: '1.0'
+    });
     addDefaults(gltfWithExtras, options);
     RemoveUnusedProperties.removeAll(gltfWithExtras);
     generateNormals(gltfWithExtras, options);

lib/addDefaults.js

@@ -1,14 +1,11 @@
 'use strict';
 var Cesium = require('cesium');
 
-var Cartesian3 = Cesium.Cartesian3;
 var defaultValue = Cesium.defaultValue;
 var defined = Cesium.defined;
-var Quaternion = Cesium.Quaternion;
 var WebGLConstants = Cesium.WebGLConstants;
 
 var addExtensionsUsed = require('./addExtensionsUsed');
-var findAccessorMinMax = require('./findAccessorMinMax');
 var processModelMaterialsCommon = require('./processModelMaterialsCommon');
 
 module.exports = addDefaults;
@@ -23,11 +20,6 @@ function accessorDefaults(gltf) {
         if (accessors.hasOwnProperty(name)) {
             var accessor = accessors[name];
             accessor.byteStride = defaultValue(accessor.byteStride, 0);
-            if (!defined(accessor.min) || !defined(accessor.max)) {
-                var minMax = findAccessorMinMax(gltf, accessor);
-                accessor.min = defaultValue(accessor.min, minMax.min);
-                accessor.max = defaultValue(accessor.max, minMax.max);
-            }
         }
     }
 }
@@ -71,25 +63,13 @@ function assetDefaults(gltf) {
         gltf.asset = {};
     }
     var asset = gltf.asset;
-
-    // Backwards compatibility for glTF 0.8. profile was a string.
-    if (!defined(asset.profile) || (typeof asset.profile === 'string')) {
+    if (!defined(asset.profile)) {
         asset.profile = {};
     }
     var profile = asset.profile;
-
     asset.premultipliedAlpha = defaultValue(asset.premultipliedAlpha, false);
     profile.api = defaultValue(profile.api, 'WebGL');
-    profile.version = defaultValue(profile.version, '1.0.2');
-
-    // glTF 0.8 backward compatibility
-    if (defined(gltf.version)) {
-        asset.version = defaultValue(asset.version, gltf.version);
-        delete gltf.version;
-    }
-    if (typeof asset.version === 'number') {
-        asset.version = asset.version.toFixed(1).toString();
-    }
+    profile.version = defaultValue(profile.version, '1.0');
 }
 
 function bufferDefaults(gltf) {
@@ -201,15 +181,6 @@ function materialDefaults(gltf, options) {
     for (var name in materials) {
         if (materials.hasOwnProperty(name)) {
             var material = materials[name];
-            var instanceTechnique = material.instanceTechnique;
-            if (defined(instanceTechnique)) {
-                // glTF 0.8 backward compatibility
-                material.technique = instanceTechnique.technique;
-                material.values = instanceTechnique.values;
-
-                delete material.instanceTechnique;
-            }
-
             if (!defined(material.technique)) {
                 if (!defined(material.extensions) || Object.keys(material.extensions).length === 0) {
                     guessExtensionTechnique(gltf, material, options);
@@ -269,7 +240,6 @@ function meshDefaults(gltf) {
     for (var name in meshes) {
         if (meshes.hasOwnProperty(name)) {
             var mesh = meshes[name];
-
             if (!defined(mesh.primitives)) {
                 mesh.primitives = [];
             }
@@ -278,14 +248,11 @@ function meshDefaults(gltf) {
             var length = primitives.length;
             for (var i = 0; i < length; ++i) {
                 var primitive = primitives[i];
-
                 if (!defined(primitive.attributes)) {
                     primitive.attributes = {};
                 }
+                primitive.mode = defaultValue(primitive.mode, WebGLConstants.TRIANGLES);
 
-                // Backwards compatibility for glTF 0.8. primitive was renamed to mode.
-                var defaultMode = defaultValue(primitive.primitive, WebGLConstants.TRIANGLES);
-                primitive.mode = defaultValue(primitive.mode, defaultMode);
             }
         }
     }
@@ -296,10 +263,6 @@ function nodeDefaults(gltf) {
         gltf.nodes = {};
     }
     var nodes = gltf.nodes;
-    var hasAxisAngle = (parseFloat(gltf.asset.version) < 1.0);
-
-    var axis = new Cartesian3();
-    var quat = new Quaternion();
     for (var name in nodes) {
         if (nodes.hasOwnProperty(name)) {
             var node = nodes[name];
@@ -308,14 +271,6 @@ function nodeDefaults(gltf) {
                 node.children = [];
             }
 
-            if (hasAxisAngle && defined(node.rotation)) {
-                // glTF 0.8 backward compatibility
-                var rotation = node.rotation;
-                Cartesian3.fromArray(rotation, 0, axis);
-                Quaternion.fromAxisAngle(axis, rotation[3], quat);
-                node.rotation = [quat.x, quat.y, quat.z, quat.w];
-            }
-
             if (!defined(node.matrix)) {
                 // Add default identity matrix if there is no matrix property and no TRS properties
                 if (!defined(node.translation) && !defined(node.rotation) && !defined(node.scale)) {
@@ -339,14 +294,6 @@ function nodeDefaults(gltf) {
                     }
                 }
             }
-
-            var instanceSkin = node.instanceSkin;
-            if (defined(instanceSkin)) {
-                node.skeletons = instanceSkin.skeletons;
-                node.skin = instanceSkin.skin;
-                node.meshes = instanceSkin.meshes;
-                delete node.instanceSkin;
-            }
         }
     }
 }
@@ -459,25 +406,6 @@ function techniqueDefaults(gltf, options) {
                 parameters.diffuse.semantic = '_3DTILESDIFFUSE';
             }
 
-            var passes = technique.passes;
-            if (defined(passes)) {
-                // glTF 0.8 backward compatibility
-                var passName = defaultValue(technique.pass, 'defaultPass');
-                if (passes.hasOwnProperty(passName)) {
-                    var pass = passes[passName];
-                    var instanceProgram = pass.instanceProgram;
-
-                    technique.attributes = defaultValue(technique.attributes, instanceProgram.attributes);
-                    technique.program = defaultValue(technique.program, instanceProgram.program);
-                    technique.uniforms = defaultValue(technique.uniforms, instanceProgram.uniforms);
-
-                    technique.states = defaultValue(technique.states, pass.states);
-                }
-
-                technique.passes = undefined;
-                technique.pass = undefined;
-            }
-
             if (!defined(technique.attributes)) {
                 technique.attributes = {};
             }
@@ -527,11 +455,6 @@ function textureDefaults(gltf) {
  */
 function addDefaults(gltf, options) {
     options = defaultValue(options, {});
-
-    if (defined(gltf.allExtensions)) {
-        gltf.extensionsUsed = gltf.allExtensions;
-        gltf.allExtensions = undefined;
-    }
     gltf.extensionsUsed = defaultValue(gltf.extensionsUsed, []);
 
     accessorDefaults(gltf);

lib/getUniqueId.js

@@ -12,49 +12,18 @@ module.exports = getUniqueId;
  * @returns {String} A unique id beginning with prefix.
  */
 function getUniqueId(gltf, prefix) {
-    var prefixMatches = {};
-
-    // Check top level objects with ids for instances of the prefix
-    checkForPrefix(gltf.nodes, prefixMatches, prefix);
-    checkForPrefix(gltf.skins, prefixMatches, prefix);
-    checkForPrefix(gltf.cameras, prefixMatches, prefix);
-    checkForPrefix(gltf.meshes, prefixMatches, prefix);
-    checkForPrefix(gltf.accessors, prefixMatches, prefix);
-    checkForPrefix(gltf.materials, prefixMatches, prefix);
-    checkForPrefix(gltf.bufferViews, prefixMatches, prefix);
-    checkForPrefix(gltf.techniques, prefixMatches, prefix);
-    checkForPrefix(gltf.textures, prefixMatches, prefix);
-    checkForPrefix(gltf.buffers, prefixMatches, prefix);
-    checkForPrefix(gltf.programs, prefixMatches, prefix);
-    checkForPrefix(gltf.images, prefixMatches, prefix);
-    checkForPrefix(gltf.samplers, prefixMatches, prefix);
-    checkForPrefix(gltf.shaders, prefixMatches, prefix);
-
-    // Generate a new ID based on the prefix and any occurrences of the prefix throughout the json
-    // Case where the prefix is already unique
-    if (!prefixMatches[prefix]) {
-        return prefix;
-    }
-
-    // Impossible for prefixMatches to contain all strings of form 'prefix_X', 0 <= X < count, and 'prefix'
-    var prefixMatchCount = Object.keys(prefixMatches).length;
-    for (var i = 0; i < prefixMatchCount; i++) {
-        var newID = prefix + '_' + i;
-        if (!prefixMatches[newID]) {
-            return newID;
-        }
-    }
-}
-
-function checkForPrefix(topLevelObject, prefixMatches, prefix) {
-    if (defined(topLevelObject)) {
-        var objectIds = Object.keys(topLevelObject);
-        var objectIdCount = objectIds.length;
-        for (var j = 0; j < objectIdCount; j++) {
-            var idString = objectIds[j];
-            if (idString.startsWith(prefix)) {
-                prefixMatches[idString] = true;
+    var id = prefix;
+    var appendIndex = 0;
+    for (var topLevelGroupId in gltf) {
+        if (gltf.hasOwnProperty(topLevelGroupId)) {
+            var topLevelGroup = gltf[topLevelGroupId];
+            var match = topLevelGroup[id];
+            while (defined(match)) {
+                id = prefix + '_' + appendIndex;
+                match = topLevelGroup[id];
+                appendIndex++;
             }
         }
     }
-}
+    return id;
+}

lib/loadGltfUris.js

@@ -22,15 +22,15 @@ module.exports = loadGltfUris;
  * glTF must be initialized for the pipeline.
  *
  * @param {Object} gltf A javascript object containing a glTF asset.
- * @param {Object} options Options for loading uris.
- * @param {String} options.basePath The path to look in when loading external files.
+ * @param {Object} [options] Options for loading uris.
+ * @param {String} [options.basePath] The path to look in when loading external files.
  * @returns {Promise} A promise that resolves to the glTF asset when all uris are loaded.
  *
  * @see addPipelineExtras
  */
 function loadGltfUris(gltf, options) {
     options = defaultValue(options, {});
-    var basePath = options.basePath;
+    var basePath = defaultValue(options.basePath, '');
     var loadURIs = [
         loadURI(gltf, basePath, 'buffers'),
         loadURI(gltf, basePath, 'images'),
@@ -53,7 +53,9 @@ function loadURI(gltf, basePath, name) {
                 var object = objects[id];
                 var uri = object.uri;
                 object.extras = defaultValue(object.extras, {});
-                object.extras._pipeline = defaultValue(object.extras._pipeline, {});
+                object.extras._pipeline = defaultValue(object.extras._pipeline, {
+                    deleteExtras: true
+                });
                 //Load the uri into the extras object based on the uri type
                 if (isDataUri(uri)) {
                     if (!defined(object.extras._pipeline.source)) {