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

Z-Ordering #2960

Merged
merged 8 commits into from
Aug 24, 2015
+227 −134
Merged

Z-Ordering #2960

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
57345a5
Add z-ordering for ground primitives.
bagnell Aug 21, 2015
5c3c831
Merge branch 'ground-primitive' into z-ordering
bagnell Aug 21, 2015
6cb1579
Add new ground primitives collection to scene for z-ordering. Update …
bagnell Aug 21, 2015
c30b554
Merge branch 'master' into z-ordering
bagnell Aug 21, 2015
2f31130
Update GroundPrimitive tests.
bagnell Aug 21, 2015
50de292
Update CHANGES.md.
bagnell Aug 21, 2015
c1177f3
Update ground primitives before other primitives.
bagnell Aug 24, 2015
c8f2bde
Merge remote-tracking branch 'origin/master' into z-ordering
pjcozzi Aug 24, 2015
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
Update ground primitives before other primitives.
  • Loading branch information
@bagnell
bagnell committed Aug 24, 2015
commit c1177f3e46864ad1b9bfa1544d72f8e7d17245b9
2 changes: 1 addition & 1 deletion Source/Scene/Scene.js
View file
Original file line number Diff line number Diff line change
@@ -1619,8 +1619,8 @@ define([
scene._globe.update(context, frameState, commandList);
}

scene._primitives.update(context, frameState, commandList);
scene._groundPrimitives.update(context, frameState, commandList);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think we should do this before _primitives.update so all ground primitives are drawn below all primitives if both were to have GroundPrimitives?

scene._primitives.update(context, frameState, commandList);
}

function callAfterRenderFunctions(frameState) {