Fix loading multiple draco models wit the same url #6673
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@ggetz, thanks for the pull request! Maintainers, we have a signed CLA from @ggetz, so you can review this at any time. I am a bot who helps you make Cesium awesome! Contributions to my configuration are welcome. 🌍 🌎 🌏 |
mramato
reviewed
Jun 9, 2018
Specs/Scene/ModelSpec.js
Outdated
| @@ -2380,14 +2380,14 @@ defineSuite([ | |||
| }); | |||
| }); | |||
|
|
|||
| it('loads a gltf with WEB3D_quantized_attributes SCALAR attribute', function() { | |||
| fit('loads a gltf with WEB3D_quantized_attributes SCALAR attribute', function() { | |||
There was a problem hiding this comment.
you left a couple of fit in the code.
lilleyse
reviewed
Jun 11, 2018
Source/Scene/DracoLoader.js
Outdated
| if (!DracoLoader.hasExtension(model)) { | ||
| return; | ||
| } | ||
|
|
||
| var loadResources = model._loadResources; | ||
| var cacheKey = model.cacheKey; | ||
| if (defined(cacheKey)) { | ||
| if (!define(DracoLoader._decodedModelResourceCache)) { |
| @@ -4585,6 +4587,7 @@ define([ | |||
|
|
|||
| this._rendererResources = undefined; | |||
| this._cachedRendererResources = this._cachedRendererResources && this._cachedRendererResources.release(); | |||
| DracoLoader.destroyCachedDataForModel(this); | |||
There was a problem hiding this comment.
Should the cached data be reference counted, similar to CachedRendererResources? This scenario isn't working for me:
- Load first model
- Load second model
- Destroy first model
- Load third model
mramato
reviewed
Jun 12, 2018
CHANGES.md
Outdated
| @@ -9,6 +9,7 @@ Change Log | |||
|
|
|||
| ##### Fixes :wrench: | |||
| * Fixed a bug causing crashes with custom vertex attributes on `Geometry` crossing the IDL. Attributes will be barycentrically interpolated. [#6644](https://github.com/AnalyticalGraphicsInc/cesium/pull/6644) | |||
| * Fixed a bug with loading two Draco models with the same url. [#6668](https://github.com/AnalyticalGraphicsInc/cesium/issues/6668) | |||
There was a problem hiding this comment.
Maybe mention that this also applies to draco encoded i3dm tiles, since that's where most users have run into it.
|
@lilleyse Fixed issue with #6673 (comment), ready for another look. |
|
The updates look good, thanks @ggetz! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #6668 by caching decoded Draco data for models with the same cache key (url).