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

Jump to bottom

Keep camera position during a morph when duration is 0.0 #3521

Merged
merged 29 commits into from
Mar 11, 2016
Merged

Keep camera position during a morph when duration is 0.0 #3521

merged 29 commits into from
Mar 11, 2016

Commits on Jan 29, 2016

  1. Keep same position/orientation when morphing from 3D to Columbus view.

    @bagnell
    bagnell committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    67953aa View commit details
    Browse the repository at this point in the history

  2. Update 3D to 2D that mostly works.

    @bagnell
    bagnell committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    e497bdb View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2016

  1. Merge branch 'master' into morph

    @bagnell
    bagnell committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    78453f1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into morph

    @bagnell
    bagnell committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    8362f2a View commit details
    Browse the repository at this point in the history

  3. Update CV to 2D and fix 3D to 2D.

    @bagnell
    bagnell committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    0521a81 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2016

  1. Update CV to 3D. WIP.

    @bagnell
    bagnell committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    bc767d2 View commit details
    Browse the repository at this point in the history

  2. Mirror morph from perspective to orthographic projections when doing … 

    …the opposite.
    @bagnell
    bagnell committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    e269e94 View commit details
    Browse the repository at this point in the history

  3. Fix end position when morphing from 2D to CV.

    @bagnell
    bagnell committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    22d1f62 View commit details
    Browse the repository at this point in the history

  4. Remove unnecessary code to set the frustum.

    @bagnell
    bagnell committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    06dd00c View commit details
    Browse the repository at this point in the history

  5. Update 2D to 3D.

    @bagnell
    bagnell committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    62d3f44 View commit details
    Browse the repository at this point in the history

  6. Remove precomputed camera position and orientation for each scene mode.

    @bagnell
    bagnell committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    9e56b1b View commit details
    Browse the repository at this point in the history

  7. Fix CV to 3D.

    @bagnell
    bagnell committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    77d51cf View commit details
    Browse the repository at this point in the history

  8. Fix 2D to 3D.

    @bagnell
    bagnell committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    6b17b77 View commit details
    Browse the repository at this point in the history

  9. Better fix for 2D to 3D (Remove duplicate code).

    @bagnell
    bagnell committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    ae6cde6 View commit details
    Browse the repository at this point in the history

  10. Fix picking and billboard collection tests.

    @bagnell
    bagnell committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    9d63107 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2016

  1. Fix LabelCollection, PointPrimitiveCollection, and SceneTransforms te… 

    …sts.
    @bagnell
    bagnell committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    549b60f View commit details
    Browse the repository at this point in the history

  2. Fix issue where morphing from 2D to 3D could not be cancelled. Fixes … 

    …remaining tests.
    @bagnell
    bagnell committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    988c32e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into morph

    @bagnell
    bagnell committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    4ead888 View commit details
    Browse the repository at this point in the history

  4. Reduce amount of garbage generated from morphs.

    @bagnell
    bagnell committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    a6c761b View commit details
    Browse the repository at this point in the history

  5. Fix height of camera when using orthographic projection that was caus… 

    …ing the terrain to disappear.
    @bagnell
    bagnell committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    532b601 View commit details
    Browse the repository at this point in the history

  6. Update quadtree primitive to not update tiles during a morph and rend… 

    …er the last tiles that were rendered before the morph was started.
    @bagnell
    bagnell committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    0df28c7 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2016

  1. Fix position change when morphing from 2D.

    @bagnell
    bagnell committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    023df2f View commit details
    Browse the repository at this point in the history

  2. Have the camera rotate to lokk down at the point intersecting the cam… 

    …era direction in the center of the screen when going from Columbus view to 2D.
    @bagnell
    bagnell committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    3786d18 View commit details
    Browse the repository at this point in the history

  3. Add rotate camera to top down view to morph from 3D to 2D.

    @bagnell
    bagnell committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    09c0374 View commit details
    Browse the repository at this point in the history

  4. Reduce garbage generated during morph.

    @bagnell
    bagnell committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    cb61b27 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2016

  1. Merge branch 'master' into morph

    @bagnell
    bagnell committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    472d512 View commit details
    Browse the repository at this point in the history

  2. Revert to morph to fly out but add option to jump straight to the end… 

    … without changing the scene position.
    @bagnell
    bagnell committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    58d57e5 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. Fix error when transitioning from CV to 3D.

    @bagnell
    bagnell committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    0c2833e View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2016

  1. Merge branch 'master' into morph

    @bagnell
    bagnell committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    b0e3a13 View commit details
    Browse the repository at this point in the history