Make batch tables and CESIUM_RTC work with KHR_Materials_Common

CesiumGS · Nov 25, 2016 · 4fe0b98 · 4fe0b98
1 parent ceb6827
commit 4fe0b98
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 deletions.
diff --git a/Source/Scene/Batched3DModel3DTileContent.js b/Source/Scene/Batched3DModel3DTileContent.js
@@ -302,7 +302,8 @@ define([
             uniformMapLoaded : batchTable.getUniformMapCallback(),
             pickVertexShaderLoaded : getPickVertexShaderCallback(this),
             pickFragmentShaderLoaded : batchTable.getPickFragmentShaderCallback(),
-            pickUniformMapLoaded : batchTable.getPickUniformMapCallback()
+            pickUniformMapLoaded : batchTable.getPickUniformMapCallback(),
+            addBatchIdToGeneratedShaders : (batchLength > 0) // If the batch table has values in it, generated shaders will need a batchId attribute
         });
 
         this._model = model;

diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js
@@ -233,7 +233,9 @@ define([
     // Note that this is a global cache, compared to renderer resources, which
     // are cached per context.
     function CachedGltf(options) {
-        this._gltf = modelMaterialsCommon(gltfDefaults(options.gltf));
+        this._gltf = modelMaterialsCommon(gltfDefaults(options.gltf), {
+            addBatchIdToGeneratedShaders : options.addBatchIdToGeneratedShaders
+        });
         this._bgltf = options.bgltf;
         this.ready = options.ready;
         this.modelsToLoad = [];
@@ -333,6 +335,7 @@ define([
      * @param {HeightReference} [options.heightReference] Determines how the model is drawn relative to terrain.
      * @param {Scene} [options.scene] Must be passed in for models that use the height reference property.
      * @param {DistanceDisplayCondition} [options.istanceDisplayCondition] The condition specifying at what distance from the camera that this model will be displayed.
+     * @param {Boolean} [options.addBatchIdToGeneratedShaders=false] Determines if shaders generated for materials using the KHR_materials_common extension should include a batchId attribute. For models contained in B3DM tiles.
      *
      * @exception {DeveloperError} bgltf is not a valid Binary glTF file.
      * @exception {DeveloperError} Only glTF Binary version 1 is supported.
@@ -376,13 +379,15 @@ define([
                     cachedGltf = new CachedGltf({
                         gltf : result.glTF,
                         bgltf : gltf,
-                        ready : true
+                        ready : true,
+                        addBatchIdToGeneratedShaders : options.addBatchIdToGeneratedShaders
                     });
                 } else {
                     // Normal glTF (JSON)
                     cachedGltf = new CachedGltf({
                         gltf : options.gltf,
-                        ready : true
+                        ready : true,
+                        addBatchIdToGeneratedShaders : options.addBatchIdToGeneratedShaders
                     });
                 }
 

diff --git a/Source/Scene/modelMaterialsCommon.js b/Source/Scene/modelMaterialsCommon.js
@@ -167,7 +167,7 @@ define([
     var vertexShaderCount = 0;
     var fragmentShaderCount = 0;
     var programCount = 0;
-    function generateTechnique(gltf, khrMaterialsCommon, lightParameters) {
+    function generateTechnique(gltf, khrMaterialsCommon, lightParameters, options) {
         var techniques = gltf.techniques;
         var shaders = gltf.shaders;
         var programs = gltf.programs;
@@ -195,7 +195,7 @@ define([
         var techniqueParameters = {
             // Add matrices
             modelViewMatrix: {
-                semantic: 'MODELVIEW',
+                semantic: options.useCesiumRTCMatrixInShaders ? 'CESIUM_RTC_MODELVIEW' : 'MODELVIEW',
                 type: WebGLConstants.FLOAT_MAT4
             },
             projectionMatrix: {
@@ -349,6 +349,16 @@ define([
             vertexShader += 'attribute vec4 a_joint;\n';
             vertexShader += 'attribute vec4 a_weight;\n';
         }
+
+        if (options.addBatchIdToGeneratedShaders)
+        {
+            techniqueAttributes.a_batchId = 'batchId';
+            techniqueParameters.batchId = {
+                semantic: 'BATCHID',
+                type: WebGLConstants.UNSIGNED_SHORT
+            };
+            vertexShader += 'attribute float a_batchId;\n';
+        }
 
         var hasSpecular = hasNormals && ((lightingModel === 'BLINN') || (lightingModel === 'PHONG')) &&
                           defined(techniqueParameters.specular) && defined(techniqueParameters.shininess);
@@ -683,10 +693,12 @@ define([
      *
      * @private
      */
-    function modelMaterialsCommon(gltf) {
+    function modelMaterialsCommon(gltf, options) {
         if (!defined(gltf)) {
             return undefined;
         }
+
+        options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         var hasExtension = false;
         var extensionsUsed = gltf.extensionsUsed;
@@ -713,6 +725,9 @@ define([
             }
 
             var lightParameters = generateLightParameters(gltf);
+
+            var hasCesiumRTCExtension = defined(gltf.extensions) && defined(gltf.extensions.CESIUM_RTC);
+            var addBatchIdToGeneratedShaders = defaultValue(options.addBatchIdToGeneratedShaders, false);
 
             var techniques = {};
             var materials = gltf.materials;
@@ -724,7 +739,10 @@ define([
                         var techniqueKey = getTechniqueKey(khrMaterialsCommon);
                         var technique = techniques[techniqueKey];
                         if (!defined(technique)) {
-                            technique = generateTechnique(gltf, khrMaterialsCommon, lightParameters);
+                            technique = generateTechnique(gltf, khrMaterialsCommon, lightParameters, {
+                                addBatchIdToGeneratedShaders : addBatchIdToGeneratedShaders,
+                                useCesiumRTCMatrixInShaders : hasCesiumRTCExtension
+                            });
                             techniques[techniqueKey] = technique;
                         }