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

New Mouse Handling #92

Merged
merged 59 commits into from
Jul 5, 2012
Merged

New Mouse Handling #92

merged 59 commits into from
Jul 5, 2012

Commits on Jun 20, 2012

  1. Change default mouse handling.

    @bagnell
    bagnell committed Jun 20, 2012
    2 Configuration menu
    Copy the full SHA
    22a5d63 View commit details
    Browse the repository at this point in the history

  2. Mapped rotating around the last clicked point to the right mouse butt… 

    …on in 3D. Temporarily add keyboard bindings that morph to different modes to the Skeleton.
    @bagnell
    bagnell committed Jun 20, 2012
    Configuration menu
    Copy the full SHA
    b54795b View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2012

  1. Swap default zoom and rotate mouse buttons.

    @bagnell
    bagnell committed Jun 21, 2012
    Configuration menu
    Copy the full SHA
    6f75f71 View commit details
    Browse the repository at this point in the history

  2. Constrain Camera to map in 2D controller.

    @bagnell
    bagnell committed Jun 21, 2012
    Configuration menu
    Copy the full SHA
    d5bbd5a View commit details
    Browse the repository at this point in the history

  3. Constrain camera to viewing the map in Columbus View.

    @bagnell
    bagnell committed Jun 21, 2012
    Configuration menu
    Copy the full SHA
    0124587 View commit details
    Browse the repository at this point in the history

  4. Constrain 2D zoom level so that the map width is never less than the … 

    …width of the window.
    @bagnell
    bagnell committed Jun 21, 2012
    Configuration menu
    Copy the full SHA
    70dd455 View commit details
    Browse the repository at this point in the history

  5. Works better times two!

    @emackey
    emackey committed Jun 21, 2012
    Configuration menu
    Copy the full SHA
    081c4e6 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2012

  1. Add bounce-back inertia to 2D map when you zoom too far out.

    @bagnell
    bagnell committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    d6b93a2 View commit details
    Browse the repository at this point in the history

  2. Tweaking the new zoom bounce.

    @emackey
    emackey committed Jun 22, 2012
    1 Configuration menu
    Copy the full SHA
    29940eb View commit details
    Browse the repository at this point in the history

  3. Add bounce-back along the viewport edges to the 2D camera controller.

    @bagnell
    bagnell committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    39d6b23 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into mouse-handling

    @bagnell
    bagnell committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    8749e43 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'mouse-handling' into viewer-mouse

    @emackey
    emackey committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    56aaca5 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/viewer' into viewer-mouse

    @emackey
    emackey committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    7107ba3 View commit details
    Browse the repository at this point in the history

  7. Trying to get new mouse stuff working in Viewer. Known issue is right… 

    …-click to follow object is broken in this commit. @bagnell is on the case.
    @emackey
    emackey committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    1992747 View commit details
    Browse the repository at this point in the history

  8. Reduce zoom speed.

    @emackey
    emackey committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    5d5c436 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'mouse-handling' into viewer-mouse

    @emackey
    emackey committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    3171dcc View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into mouse-handling 

    Conflicts:
	Examples/Skeleton/Skeleton.js
    @bagnell
    bagnell committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    75e3b40 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'mouse-handling' of github.com:AnalyticalGraphicsInc/ces… 

    …ium into mouse-handling
    @bagnell
    bagnell committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    96914d8 View commit details
    Browse the repository at this point in the history

  12. Fix spindle controller following an object in the Viewer.

    @bagnell
    bagnell committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    278b3b9 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2012

  1. Tweak spindle camera to be able to be constrained on any axis.

    @bagnell
    bagnell committed Jun 23, 2012
    Configuration menu
    Copy the full SHA
    2abb22b View commit details
    Browse the repository at this point in the history

  2. Remove spindle controller methods that no longer make sense. Update t… 

    …ests.
    @bagnell
    bagnell committed Jun 23, 2012
    Configuration menu
    Copy the full SHA
    9e19d60 View commit details
    Browse the repository at this point in the history

  3. Fix 2D controller tests.

    @bagnell
    bagnell committed Jun 23, 2012
    Configuration menu
    Copy the full SHA
    128ea43 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into mouse-handling

    @bagnell
    bagnell committed Jun 23, 2012
    Configuration menu
    Copy the full SHA
    0eccb1c View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/viewer' into viewer-mouse 

    Conflicts:
	Examples/Skeleton/Skeleton.js
    @emackey
    emackey committed Jun 23, 2012
    Configuration menu
    Copy the full SHA
    0bd9ca9 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/mouse-handling' into viewer-mouse 

    Conflicts:
	Examples/Skeleton/Skeleton.js
    @emackey
    emackey committed Jun 23, 2012
    Configuration menu
    Copy the full SHA
    ad0f2f9 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2012

  1. Tweak middle mouse control.

    @bagnell
    bagnell committed Jun 25, 2012
    Configuration menu
    Copy the full SHA
    9db626f View commit details
    Browse the repository at this point in the history

  2. Add bounce-back from the edges of the screen to Columbus View Control… 

    …ler.
    @bagnell
    bagnell committed Jun 25, 2012
    Configuration menu
    Copy the full SHA
    23d66db View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2012

  1. Merge remote-tracking branch 'origin/master' into mouse-handling 

    Conflicts:
	Examples/Skeleton/Skeleton.js
    @emackey
    emackey committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    8fec9d2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/viewer' into viewer-mouse 

    Conflicts:
	Apps/CesiumViewer/CesiumViewer.js
	Examples/Skeleton/Skeleton.js
    @emackey
    emackey committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    fbb106f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/mouse-handling' into viewer-mouse

    @emackey
    emackey committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    40cd1d1 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/viewer' into viewer-mouse

    @emackey
    emackey committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    bfcdab6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into mouse-handling 

    Conflicts:
	Examples/Skeleton/Skeleton.js
    @bagnell
    bagnell committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    8239aeb View commit details
    Browse the repository at this point in the history

  6. Do not constrain camera in columbus view if it is over the map.

    @bagnell
    bagnell committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    1c66314 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'mouse-handling' of github.com:AnalyticalGraphicsInc/ces… 

    …ium into mouse-handling
    @bagnell
    bagnell committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    98cf86f View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2012

  1. Merge remote-tracking branch 'origin/viewer' into viewer-mouse

    @emackey
    emackey committed Jun 27, 2012
    Configuration menu
    Copy the full SHA
    8d94543 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/mouse-handling' into viewer-mouse

    @emackey
    emackey committed Jun 27, 2012
    Configuration menu
    Copy the full SHA
    7e0669b View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2012

  1. Merge remote-tracking branch 'origin/viewer' into viewer-mouse 

    Conflicts:
	Source/Scene/Camera2DController.js
	Source/Scene/CameraColumbusViewController.js
    @emackey
    emackey committed Jun 29, 2012
    Configuration menu
    Copy the full SHA
    4c25e83 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into mouse-handling 

    Conflicts:
	Source/Scene/Camera2DController.js
	Source/Scene/CameraColumbusViewController.js
	Source/Scene/CameraSpindleController.js
    @bagnell
    bagnell committed Jun 29, 2012
    Configuration menu
    Copy the full SHA
    600d084 View commit details
    Browse the repository at this point in the history

  3. Fix break after merge.

    @bagnell
    bagnell committed Jun 29, 2012
    Configuration menu
    Copy the full SHA
    9022875 View commit details
    Browse the repository at this point in the history

  4. Fix free look in normal 3D.

    @bagnell
    bagnell committed Jun 29, 2012
    Configuration menu
    Copy the full SHA
    a192680 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'mouse-handling' into viewer-mouse 

    Conflicts:
	CHANGES.md
    @bagnell
    bagnell committed Jun 29, 2012
    Configuration menu
    Copy the full SHA
    d1265e6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into viewer-mouse 

    Conflicts:
	CHANGES.md
    @bagnell
    bagnell committed Jun 29, 2012
    Configuration menu
    Copy the full SHA
    69c507f View commit details
    Browse the repository at this point in the history

  7. Keep track of when event modifiers are pressed in EventHandler. Add t… 

    …ests.
    @bagnell
    bagnell committed Jun 29, 2012
    Configuration menu
    Copy the full SHA
    61f18f6 View commit details
    Browse the repository at this point in the history

  8. Prevent inertia when two actions are mapped to a single mouse button … 

    …but one has a key modifier.
    @bagnell
    bagnell committed Jun 29, 2012
    Configuration menu
    Copy the full SHA
    2694985 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into viewer-mouse

    @bagnell
    bagnell committed Jun 29, 2012
    Configuration menu
    Copy the full SHA
    0f75dda View commit details
    Browse the repository at this point in the history

  10. Remove free-look controller by default in columbus view.

    @bagnell
    bagnell committed Jun 29, 2012
    Configuration menu
    Copy the full SHA
    3edac72 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2012

  1. Tweak free look controller.

    @bagnell
    bagnell committed Jun 30, 2012
    Configuration menu
    Copy the full SHA
    e7daabd View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2012

  1. Make spindleController a local variable. 

    Using 'this.' was incorrect in this location, the correct notation
would be 'widget.', but the widget doesn't know or need to know about
the particular controller being used here.  So, it's local now.
    @emackey
    emackey committed Jul 2, 2012
    2 Configuration menu
    Copy the full SHA
    0e92db8 View commit details
    Browse the repository at this point in the history

  2. Update CHANGES.md.

    @bagnell
    bagnell committed Jul 2, 2012
    Configuration menu
    Copy the full SHA
    3180519 View commit details
    Browse the repository at this point in the history

  3. Constrain z axis of camera in viewer when zooming to a satellite.

    @bagnell
    bagnell committed Jul 2, 2012
    Configuration menu
    Copy the full SHA
    ed06bac View commit details
    Browse the repository at this point in the history

  4. Add contains method to AnimationCollection and update 2D/Columbus Vie… 

    …w controllers.
    @bagnell
    bagnell committed Jul 2, 2012
    Configuration menu
    Copy the full SHA
    5027d57 View commit details
    Browse the repository at this point in the history

  5. Fix inertia and exception on mouse wheel zoom.

    @bagnell
    bagnell committed Jul 2, 2012
    Configuration menu
    Copy the full SHA
    6f32149 View commit details
    Browse the repository at this point in the history

  6. Use Date instead of JulianDate in the camera controllers.

    @bagnell
    bagnell committed Jul 2, 2012
    Configuration menu
    Copy the full SHA
    226db25 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2012

  1. Find map bounds using the current projection instead of estimating them.

    @bagnell
    bagnell committed Jul 3, 2012
    2 Configuration menu
    Copy the full SHA
    21d182f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into viewer-mouse

    @bagnell
    bagnell committed Jul 3, 2012
    Configuration menu
    Copy the full SHA
    def87b9 View commit details
    Browse the repository at this point in the history

  3. Update doc and tests. Add error checking. Remove unused includes, var… 

    …iables and functions.
    @bagnell
    bagnell committed Jul 3, 2012
    Configuration menu
    Copy the full SHA
    db75bde View commit details
    Browse the repository at this point in the history

  4. Add free look back to Columbus view. Attempt to loosen constraints wh… 

    …en map is not visible.
    @bagnell
    bagnell committed Jul 3, 2012
    Configuration menu
    Copy the full SHA
    e36b012 View commit details
    Browse the repository at this point in the history

  5. Reverse Cloumbus view mouse left click when looking away from the map.

    @bagnell
    bagnell committed Jul 3, 2012
    Configuration menu
    Copy the full SHA
    18ca3dd View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2012

  1. Change the 2D max latitude.

    @bagnell
    bagnell committed Jul 5, 2012
    Configuration menu
    Copy the full SHA
    36ded68 View commit details
    Browse the repository at this point in the history