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

Fix GlobeSurfaceTileSpecs #3913

Merged
merged 2 commits into from
May 12, 2016
Merged

Fix GlobeSurfaceTileSpecs #3913

merged 2 commits into from
May 12, 2016

Conversation

mramato
Copy link
Contributor

@mramato mramato commented May 11, 2016

As part of #3900, vertexArraysToDestroy was added as a parameter to GlobeSurfaceTile.processStateMachine, but none of the tests actually pass that parameter. This happens to be OK in master because none of the tests end up using the parameter, but in the 3D Tiles branch, the parameter is required and merging in master results in failing tests.

Passing in an empty array fixes the issue (since we don't care about destroying the data in the specs), but we might possibly want to actually test that the parameter is being used correctly.

@bagnell any thoughts here?

mramato and others added 2 commits May 11, 2016 18:17
As part of #3900, `vertexArraysToDestroy` was added as a parameter to
`GlobeSurfaceTile.processStateMachine`, but none of the tests actually
pass that parameter.  This happens to be OK in master because none of
the tests end up using the parameter, but in the 3D Tiles branch, the
parameter is required and merging in master results in failing tests.

Passing in an empty array fixes the issue (since we don't care about
destroying the data in the specs), but we might possibly want to actually
test that the parameter is being used correctly.
@bagnell
Copy link
Contributor

bagnell commented May 12, 2016

I added to the tests to make sure they were the right length. The test child of upsampled tile is not re-upsampled if it is already loaded executes the code that was causing the problem, but I don't know how to replicate that state with camera movement and scene renders.

Since I added code here, someone else should review this.

@lilleyse
Copy link
Contributor

Looks good.

@lilleyse lilleyse merged commit cf4f016 into master May 12, 2016
@lilleyse lilleyse deleted the globe-surface-tile-specs branch May 12, 2016 18:53
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.

3 participants