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

Comment out combinePrimitives and add a TODO for now #107

Merged
merged 2 commits into from
Jun 24, 2016
Merged

Comment out combinePrimitives and add a TODO for now #107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f40b98c
Comment out combinePrimitives and add a TODO for now
lasalvavida Jun 24, 2016
f9661cf
Comment out the require
lasalvavida Jun 24, 2016
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
7 changes: 4 additions & 3 deletions lib/gltfPipeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var addPipelineExtras = require('./addPipelineExtras');
var removeUnused = require('./removeUnused');
var convertDagToTree = require('./convertDagToTree');
var combineMeshes = require('./combineMeshes');
var combinePrimitives = require('./combinePrimitives');
// var combinePrimitives = require('./combinePrimitives');
var mergeDuplicateVertices = require('./mergeDuplicateVertices');
var mergeDuplicateAccessors = require('./mergeDuplicateAccessors');
var removeDuplicatePrimitives = require('./removeDuplicatePrimitives');
Expand Down Expand Up @@ -67,9 +67,10 @@ function processJSONWithExtras(gltfWithExtras, options, callback) {
removeDuplicatePrimitives(gltfWithExtras);
convertDagToTree(gltfWithExtras);
combineMeshes(gltfWithExtras);
combinePrimitives(gltfWithExtras);
// TODO: Combine primitives can be uncommented and added back into the pipeline once it is fixed, but right now there are too many issues with it to allow in the main pipeline.
// combinePrimitives(gltfWithExtras);
// Merging duplicate vertices again to prevent repeat data in newly combined primitives
mergeDuplicateVertices(gltfWithExtras);
// mergeDuplicateVertices(gltfWithExtras);
cacheOptimizeIndices(gltfWithExtras);
// Run removeUnused stage again after all pipeline stages have been run to remove objects that become unused
removeUnused(gltfWithExtras);
Expand Down