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

Added generateNormals stage #82

Merged
merged 32 commits into from
Jul 19, 2016
Merged

Added generateNormals stage #82

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
19b3982
Added generateNormals stage
lilleyse Jun 13, 2016
88162d0
Fix test
lilleyse Jun 14, 2016
409b61e
Begin to use geometryPipeline
Jun 28, 2016
837acf8
Merge branch 'master' of github.com:AnalyticalGraphicsInc/gltf-pipeli…
lasalvavida Jul 1, 2016
26b4fa5
Close but not perfect
lasalvavida Jul 1, 2016
a4d9ec2
Fix test
lasalvavida Jul 1, 2016
f114b5c
Handle 'hard' normal generation
Jul 6, 2016
98f2eca
Semicolon
Jul 6, 2016
426068e
Merge remote-tracking branch 'origin' into generate-normals
Jul 6, 2016
172d5ce
split primitives
Jul 7, 2016
b64e878
Add to pipeline, cleanup
Jul 11, 2016
3d507cd
Merge master
Jul 11, 2016
ba0cf72
Add spec data
Jul 11, 2016
10bbafa
Merge my-generate normals
Jul 11, 2016
2142790
Uncomment tests
Jul 11, 2016
ec98e3c
Merge master
Jul 11, 2016
25a391b
Remove unnecessary models. Fix jsHint errors
Jul 11, 2016
89491aa
Missed a line
Jul 11, 2016
0d002a6
Address comments
Jul 13, 2016
663ed31
Merge master
Jul 13, 2016
e973bb3
One day I will consistently remember to check jsHint before committing
Jul 13, 2016
1a0a912
Merge branch 'master' into generate-normals
Jul 14, 2016
a61dc0c
Merge master, fix small, unrelated spec issue
Jul 14, 2016
e53a92a
Fix overwriting issue
Jul 15, 2016
aaf55d2
parseInt so I'm not extending strings in getIdNumber
Jul 15, 2016
22079db
Remove unused code
Jul 18, 2016
8a3706d
Remove more duplicate code
Jul 18, 2016
a00c6ff
Move generateNormals to after combine stages, resolves above issues
Jul 18, 2016
64be9c7
Merge branch 'master' into generate-normals
Jul 18, 2016
061a81d
Spec fix
Jul 18, 2016
99ef424
Fix test I butchered
Jul 18, 2016
64777c4
Address above comments
Jul 19, 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
Prev Previous commit
Next Next commit
Spec fix
  • Loading branch information
JoshuaStorm committed Jul 18, 2016
commit 061a81d118ca3371e83e12bb3359c44c12384173
6 changes: 4 additions & 2 deletions specs/lib/gltfPipelineSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ describe('gltfPipeline', function() {
readGltf(gltfEmbeddedPath, options, function (gltf) {
var initialUri = gltf.buffers.CesiumTexturedBoxTest.uri;
processJSON(gltf, options, function () {
var finalUri = gltf.buffers.uri;
var finalUri = gltf.buffers.buffer_0.uri;
expect(gltf.buffers.CesiumTexturedBoxTest).toBeUndefined();
expect(initialUri).not.toEqual(finalUri);
done();
});
Expand All @@ -132,7 +133,8 @@ describe('gltfPipeline', function() {
readGltf(gltfEmbeddedPath, options, function (gltf) {
var initialUri = gltf.buffers.CesiumTexturedBoxTest.uri;
processFile(gltfEmbeddedPath, options, function (gltfFinal) {
var finalUri = gltfFinal.buffers.uri;
var finalUri = gltfFinal.buffers.buffer_0.uri;
expect(gltfFinal.buffers.CesiumTexturedBoxTest).toBeUndefined();
expect(initialUri).not.toEqual(finalUri);
done();
});
Expand Down