Skip to content

Commit

Permalink
Removed isPointCloud parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
lilleyse committed May 8, 2018
1 parent b153553 commit 845846c
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 7 deletions.
1 change: 0 additions & 1 deletion Source/Scene/DracoLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ define([
var bufferView = gltf.bufferViews[compressionData.bufferView];
var typedArray = arraySlice(gltf.buffers[bufferView.buffer].extras._pipeline.source, bufferView.byteOffset, bufferView.byteOffset + bufferView.byteLength);
loadResources.primitivesToDecode.enqueue({
isPointCloud : false,
mesh : meshId,
primitive : primitiveId,
array : typedArray,
Expand Down
1 change: 0 additions & 1 deletion Source/Scene/PointCloud3DTileContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,6 @@ define([
batchIds : batchIds,
styleableProperties : styleableProperties,
draco : {
isPointCloud : true,
buffer : dracoBuffer,
semantics : dracoSemantics,
dequantizeInShader : content._dequantizeInShader
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/decodeDraco.js
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,10 @@ define([
}

function decode(parameters) {
if (parameters.isPointCloud) {
return decodePointCloud(parameters);
if (defined(parameters.primitive)) {
return decodePrimitive(parameters);
}
return decodePrimitive(parameters);
return decodePointCloud(parameters);
}

function initWorker(dracoModule) {
Expand Down
2 changes: 0 additions & 2 deletions Source/Workers/decodeDracoPointCloud.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ define([
return vertexArray;
}

f

function decodeDraco(parameters) {
var dequantizeInShader = parameters.dequantizeInShader;
var results = {};
Expand Down

0 comments on commit 845846c

Please sign in to comment.