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 morphing from 2D to 3D #4388

Merged
merged 7 commits into from
Oct 19, 2016
Merged

Fix morphing from 2D to 3D #4388

merged 7 commits into from
Oct 19, 2016

Conversation

bagnell
Copy link
Contributor

@bagnell bagnell commented Sep 29, 2016

Fixes #4383.

Not just when tracking models. It also happens for any of the geometry Sandcastle examples. For example, double click one of the boxes in the box example to track it. When morphing to 3D from 2D, the camera position will remain the same when switching from an orthographic projection to a perspective projection. It was much more noticeable in the model example. This change adds back the flight to the home view.

@pjcozzi
Copy link
Contributor

pjcozzi commented Sep 30, 2016

Update CHANGES.md.

Does this need unit tests? I'm not sure how well the original code was covered.

@bagnell
Copy link
Contributor Author

bagnell commented Sep 30, 2016

Does this need unit tests? I'm not sure how well the original code was covered.

There are no tests for SceneTransitioner but the morph functions are called all over the tests to change the mode.

@pjcozzi
Copy link
Contributor

pjcozzi commented Oct 10, 2016

From #4383:

  1. Run the 3D Models Sandcastle example.
  2. Switch to 2D
  3. Double click the model to track it.
  4. Switch to 3D. (The morph is all screwy)

The final morph from 2D to 3D freezes for me.

@bagnell
Copy link
Contributor Author

bagnell commented Oct 18, 2016

@pjcozzi This is ready for another look. I fixed the freeze by not updating imagery or terrain during the morph, but there might be a deeper problem. The freeze was caused by the loops here: https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Source/Scene/ImageryLayer.js#L539

@pjcozzi
Copy link
Contributor

pjcozzi commented Oct 19, 2016

Looks good.

I fixed the freeze by not updating imagery or terrain during the morph, but there might be a deeper problem.

Submit an issue if there is a real problem.

@pjcozzi pjcozzi merged commit 11f2aa5 into master Oct 19, 2016
@pjcozzi pjcozzi deleted the morph-2d-to-3d branch October 19, 2016 12:31
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.

None yet

2 participants