Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix model animation cache collision #5064

Merged
merged 1 commit into from
Mar 8, 2017
Merged

Fix model animation cache collision #5064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Source/Scene/ModelAnimationCache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ define([
function ModelAnimationCache() {
}

var dataUriRegex = /^data\:/i;

function getAccessorKey(model, accessor) {
var gltf = model.gltf;
var buffers = gltf.buffers;
Expand All @@ -38,8 +40,8 @@ define([
var byteOffset = bufferView.byteOffset + accessor.byteOffset;
var byteLength = accessor.count * getBinaryAccessor(accessor).componentsPerAttribute;

// buffer.path will be undefined when animations are embedded.
return model.cacheKey + '//' + defaultValue(buffer.path, '') + '/' + byteOffset + '/' + byteLength;
var uriKey = dataUriRegex.test(buffer.uri) ? '' : buffer.uri;
return model.cacheKey + '//' + uriKey + '/' + byteOffset + '/' + byteLength;
}

var cachedAnimationParameters = {
Expand Down