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.

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

Instancing billboards #3056

Merged
merged 15 commits into from
Oct 5, 2015
Merged

Conversation

lilleyse
Copy link
Contributor

@lilleyse lilleyse commented Oct 5, 2015

This is merged with the billboard size-in-meters changes.

For #3001

@pjcozzi
Copy link
Contributor

pjcozzi commented Oct 5, 2015

In Firefox, I get six test failures in master, and 22 in this branch. The new ones are BillboardCollection and friends.

@pjcozzi
Copy link
Contributor

pjcozzi commented Oct 5, 2015

The vast majority of this code has already been reviewed and is in the instancing-ready-for-master branch (merged in #3048). This pull request is to bring those changes into master along with fixing merge conflicts from #3043 (billboard size in meters).

@pjcozzi
Copy link
Contributor

pjcozzi commented Oct 5, 2015

@lilleyse please update the task list in #3001 when this is merged (and in general as needed).

@pjcozzi
Copy link
Contributor

pjcozzi commented Oct 5, 2015

This is ready to merge once the test failures in Firefox are fixed.

@lilleyse
Copy link
Contributor Author

lilleyse commented Oct 5, 2015

This should fix the errors.

@pjcozzi
Copy link
Contributor

pjcozzi commented Oct 5, 2015

Looks good, thanks!

pjcozzi added a commit that referenced this pull request Oct 5, 2015
@pjcozzi pjcozzi merged commit 82e8105 into CesiumGS:master Oct 5, 2015
@pjcozzi pjcozzi deleted the instancing-billboards branch October 5, 2015 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants