Reverted previous commit, now share the same Model but create unique …

…vertex arrays
CesiumGS · Oct 21, 2015 · 948ad72 · 948ad72
1 parent bc10897
commit 948ad72
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js
@@ -2848,6 +2848,11 @@ define([
             resources.textures = cachedResources.textures;
             resources.samplers = cachedResources.samplers;
             resources.renderStates = cachedResources.renderStates;
+
+            // Vertex arrays are unique to this model, create instead of using the cache.
+            if (defined(model._precreatedAttributes)) {
+                createVertexArrays(model, context);
+            }
         } else {
             createDecompressedViews(model, context);
             createBuffers(model, context, frameState); // using glTF bufferViews
@@ -3302,6 +3307,11 @@ define([
                 cachedResources.renderStates = resources.renderStates;
                 cachedResources.ready = true;
 
+                // Vertex arrays are unique to this model, do not store in cache.
+                if (defined(this._precreatedAttributes)) {
+                    cachedResources.vertexArrays = {};
+                }
+
                 if (this.releaseGltfJson) {
                     releaseCachedGltf(this);
                 }
@@ -3422,6 +3432,11 @@ define([
      * model = model && model.destroy();
      */
     Model.prototype.destroy = function() {
+        // Vertex arrays are unique to this model, destroy here.
+        if (defined(this._precreatedAttributes)) {
+            destroy(this._rendererResources.vertexArrays);
+        }
+
         this._rendererResources = undefined;
         this._cachedRendererResources = this._cachedRendererResources && this._cachedRendererResources.release();
 

diff --git a/Source/Scene/ModelInstanceCollection.js b/Source/Scene/ModelInstanceCollection.js
@@ -526,7 +526,6 @@ define([
             cacheKey : undefined,
             asynchronous : collection._asynchronous,
             allowPicking : collection._allowPicking,
-            releaseGltfJson : false,
             precreatedAttributes : undefined,
             vertexShaderLoaded : undefined,
             fragmentShaderLoaded : undefined,
@@ -594,10 +593,10 @@ define([
             modelOptions.pickFragmentShaderLoaded = getPickFragmentShaderCallback(collection);
             modelOptions.pickUniformMapLoaded = getPickUniformMapCallback(collection);
             modelOptions.ignoreCommands = true;
-            modelOptions.releaseGltfJson = true;
 
-            // Collections cannot share the same models, so create a unique cache key
-            modelOptions.cacheKey = 'ModelInstanceCollection' + Math.random();
+            if (defined(collection._url)) {
+                modelOptions.cacheKey = collection._url + '#instanced';
+            }
         } else {
             modelOptions.fragmentShaderLoaded = getFragmentShaderNonInstancedCallback();
         }