Code

Camera-Terrain interaction#1817

Code

Merged

pjcozzi merged 107 commits intomasterCesiumGS/cesium:masterfrom camera-terrainCesiumGS/cesium:camera-terrainCopy head branch name to clipboardJul 18, 2014

+1,875-484

Commits

Commits on Apr 17, 2014

• Do not release terrain mesh data after creating vertex array.

  bagnell

  committed
  c70cb42

  Copy full SHA for c70cb42

• Add ray-triangle intersection test.

  bagnell

  committed
  c84f71a

  Copy full SHA for c84f71a

Commits on Apr 18, 2014

• Add ray-triangle intersection tests.

  bagnell

  committed
  9105d24

  Copy full SHA for 9105d24

• Add ray-sphere intersection test.

  bagnell

  committed
  9602ee4

  Copy full SHA for 9602ee4

• Pick rendered tiles bounding spheres.

  bagnell

  committed
  2fbcfca

  Copy full SHA for 2fbcfca

Commits on Apr 22, 2014

• Pick terrain mesh.

  bagnell

  committed
  1ebae09

  Copy full SHA for 1ebae09

Commits on Apr 25, 2014

• Merge branch 'master' into pick-terrain

  bagnell

  committed
  2da8bb8

  Copy full SHA for 2da8bb8

• Updates after merge.

  bagnell

  committed
  1342a26

  Copy full SHA for 1342a26

Commits on May 1, 2014

• Merge branch 'master' into pick-terrain

  bagnell

  committed
  0265c35

  Copy full SHA for 0265c35

Commits on May 6, 2014

• Pan terrain in 3D.

  bagnell

  committed
  5a029eb

  Copy full SHA for 5a029eb

• Merge branch 'master' into pick-terrain

  bagnell

  committed
  0519daf

  Copy full SHA for 0519daf

• Pick terrain when tilting in 3D.

  bagnell

  committed
  ffd4b44

  Copy full SHA for ffd4b44

Commits on May 7, 2014

• Add picking terrain and use it when tilting in Columbus view.

  bagnell

  committed
  00c923f

  Copy full SHA for 00c923f

• Pick terrain in Columbus view when panning.

  bagnell

  committed
  24e7da0

  Copy full SHA for 24e7da0

• Some clean up.

  bagnell

  committed
  3f88921

  Copy full SHA for 3f88921

• Merge branch 'master' into pick-terrain

  bagnell

  committed
  811ca11

  Copy full SHA for 811ca11

• Some more clean up.

  bagnell

  committed
  76f2bf6

  Copy full SHA for 76f2bf6

• Fix Sandcastle examples, dynamic object view, and widgets.

  bagnell

  committed
  04c9464

  Copy full SHA for 04c9464

• Fix Geocoder and HomeButton after last change.

  bagnell

  committed
  b7271ca

  Copy full SHA for b7271ca

Commits on May 8, 2014

• Fix ScreenSpaceCameraController, Geocoder, and HomeButton specs.

  bagnell

  committed
  cbf3369

  Copy full SHA for cbf3369

• Merge branch 'master' into pick-terrain

  bagnell

  committed
  f4727fe

  Copy full SHA for f4727fe

• Fix tile tests and state machine.

  bagnell

  committed
  4ef69e5

  Copy full SHA for 4ef69e5

Commits on May 9, 2014

• Tilt around picked point.

  bagnell

  committed
  b8a993e

  Copy full SHA for b8a993e

• Remove tilt from grazing altitude. Fixes tilting for horizon views and the mouse starts from space.

  bagnell

  committed
  7ac5b6d

  Copy full SHA for 7ac5b6d

Commits on May 12, 2014

• Better mouse handling around the constrained axis.

  bagnell

  committed
  4bd2f54

  Copy full SHA for 4bd2f54

• Fix rolling over constrained axis when tilting.

  bagnell

  committed
  3d07697

  Copy full SHA for 3d07697

• Clean up allocations.

  bagnell

  committed
  086214c

  Copy full SHA for 086214c

• Add tilt around mouse position to Columbus view.

  bagnell

  committed
  4d3a8e3

  Copy full SHA for 4d3a8e3

Commits on May 13, 2014

• Merge branch 'master' into pick-terrain

  bagnell

  committed
  2fe8fc8

  Copy full SHA for 2fe8fc8

• Merge branch 'pick-terrain' into tilt-zoom

  bagnell

  committed
  7a7fad0

  Copy full SHA for 7a7fad0

Commits on May 15, 2014

• Merge branch 'pick-terrain' into camera-terrain

  Show description for f63f9ca
  bagnell

  committed
  f63f9ca

  Copy full SHA for f63f9ca

• Merge branch 'tilt-zoom' into camera-terrain

  bagnell

  committed
  fd8301b

  Copy full SHA for fd8301b

Commits on May 16, 2014

• Fix tests.

  bagnell

  committed
  ea85024

  Copy full SHA for ea85024

Commits on May 22, 2014

• Merge branch 'master' into camera-terrain

  Show description for 2ad5731
  bagnell

  committed
  2ad5731

  Copy full SHA for 2ad5731

• Merge branch 'master' into camera-terrain-merge

  Show description for 0766abe
  bagnell

  committed
  0766abe

  Copy full SHA for 0766abe

Commits on May 23, 2014

• Fix tilting in Columbus view after merge.

  bagnell

  committed
  5833629

  Copy full SHA for 5833629

Commits on May 28, 2014

• Merge branch 'master' into camera-terrain

  bagnell

  committed
  8c156b9

  Copy full SHA for 8c156b9

• Add terrain picking that goes through the quad tree instead of the list of rendered tiles.

  bagnell

  committed
  dd4b158

  Copy full SHA for dd4b158

Commits on May 31, 2014

• Initial camera collision detection/response with terrain. Only works with zooming and tilting in 3D.

  bagnell

  committed
  5f79912

  Copy full SHA for 5f79912

Commits on Jun 3, 2014

• Merge branch 'master' into camera-terrain

  Show description for 0da29d8
  bagnell

  committed
  0da29d8

  Copy full SHA for 0da29d8

• Merge branch 'camera-terrain' into pick-terrain

  bagnell

  committed
  52d6ff3

  Copy full SHA for 52d6ff3

Commits on Jun 4, 2014

• Fix tests.

  bagnell

  committed
  994fb44

  Copy full SHA for 994fb44

• Merge branch 'camera-terrain' into pick-terrain

  bagnell

  committed
  b4a4bd6

  Copy full SHA for b4a4bd6

• Add sphere-plane and circle-circle intersection tests.

  bagnell

  committed
  012a92f

  Copy full SHA for 012a92f

Commits on Jun 5, 2014

• Add plane-plane intersection and 2D line-circle intersection.

  bagnell

  committed
  2a506e0

  Copy full SHA for 2a506e0

• Merge branch 'master' into camera-terrain

  bagnell

  committed
  6ffd412

  Copy full SHA for 6ffd412

• Merge branch 'camera-terrain' into pick-terrain

  bagnell

  committed
  6beff5e

  Copy full SHA for 6beff5e

• Add triangle-circle arc intersection test.

  bagnell

  committed
  69f6483

  Copy full SHA for 69f6483

• Add terrain arc intersection test.

  bagnell

  committed
  edb0f7f

  Copy full SHA for edb0f7f

Commits on Jun 6, 2014

• Some terrain arc intersection fixes.

  bagnell

  committed
  658beab

  Copy full SHA for 658beab

• Merge branch 'camera-terrain' into use-ray-intersection

  bagnell

  committed
  7ed6e44

  Copy full SHA for 7ed6e44

Commits on Jun 7, 2014

• Discretize arc of circle into line segments to use for camera-terrain intersection.

  bagnell

  committed
  ecf42b0

  Copy full SHA for ecf42b0

Commits on Jun 9, 2014

• Fix intersection when tilting left. Add intersection tests when panning in 3D.

  bagnell

  committed
  4df3dde

  Copy full SHA for 4df3dde

• Merge branch 'use-ray-intersection' into pick-terrain

  Show description for 6b06e29
  bagnell

  committed
  6b06e29

  Copy full SHA for 6b06e29

• Clean up intersection tests.

  bagnell

  committed
  4aabf29

  Copy full SHA for 4aabf29

• Clean up and add doc.

  bagnell

  committed
  4ba6870

  Copy full SHA for 4ba6870

• Fix tests.

  bagnell

  committed
  faa232c

  Copy full SHA for faa232c

• Update doc and add intersection test specs.

  bagnell

  committed
  0596893

  Copy full SHA for 0596893

• Some fixes after renames and for 2D/CV.

  bagnell

  committed
  a41ea5d

  Copy full SHA for a41ea5d

• Merge branch 'master' into camera-terrain

  Show description for 9e1550e
  bagnell

  committed
  9e1550e

  Copy full SHA for 9e1550e

• Merge branch 'camera-terrain' into pick-terrain

  bagnell

  committed
  cf100aa

  Copy full SHA for cf100aa

Commits on Jun 10, 2014

• Add camera-terrain collision detection to Columbus view.

  bagnell

  committed
  4d8c4f4

  Copy full SHA for 4d8c4f4

• Clean up garbage.

  bagnell

  committed
  31bbebf

  Copy full SHA for 31bbebf

• Add minimum camera height for picking terrain and minimum height for collision detetction with terrain.

  bagnell

  committed
  2a2dbc2

  Copy full SHA for 2a2dbc2

• Tweak distance moved back from intersection. Use one ray.

  bagnell

  committed
  3ff77a7

  Copy full SHA for 3ff77a7

• Use a single line segment from camera position to end position after rotate for intersection testing.

  bagnell

  committed
  2be50be

  Copy full SHA for 2be50be

• Add line segment-sphere intersection to reduce the number of terrain tiles.

  bagnell

  committed
  ebe8cd8

  Copy full SHA for ebe8cd8

Commits on Jun 11, 2014

• Add a fast vector rotation by a quaternion.

  bagnell

  committed
  10916d5

  Copy full SHA for 10916d5

• Merge branch 'master' into camera-terrain

  Show description for 2de6ffc
  bagnell

  committed
  2de6ffc

  Copy full SHA for 2de6ffc

• Fix Sandcastle example after merge.

  bagnell

  committed
  d495ba7

  Copy full SHA for d495ba7

• Merge branch 'camera-terrain' into pick-terrain

  bagnell

  committed
  74dcd8a

  Copy full SHA for 74dcd8a

• Update CHANGES.md.

  bagnell

  committed
  4c4dda9

  Copy full SHA for 4c4dda9

Commits on Jun 12, 2014

• Merge branch 'master' into camera-terrain

  Show description for 6b96607
  bagnell

  committed
  6b96607

  Copy full SHA for 6b96607

• Fix tests after merge.

  bagnell

  committed
  eddce95

  Copy full SHA for eddce95

• Use a new method for camera collision response.

  bagnell

  committed
  a19f47c

  Copy full SHA for a19f47c

Commits on Jun 13, 2014

• Fix crash when tilting. Allow tilting below the point clicked. Remove unneeded code.

  bagnell

  committed
  493d57a

  Copy full SHA for 493d57a

• Adjust camera orientation after collision with terrain when tilting.

  bagnell

  committed
  3c5549e

  Copy full SHA for 3c5549e

• Adjust camera orientation after collision with terrain when tilting in Columbus view.

  bagnell

  committed
  5f08530

  Copy full SHA for 5f08530

Commits on Jun 16, 2014

• Adjust camera orientation after tilting without a contrained axis (the camera is already over it for example mouse clicks near the bottom of the screen). Fix a couple of crashes from undefined values.

  bagnell

  committed
  37aee14

  Copy full SHA for 37aee14

• Update CHANGES.md and remove unused code.

  bagnell

  committed
  74facc1

  Copy full SHA for 74facc1

Commits on Jun 17, 2014

• Fix panning when looking up at terrain.

  bagnell

  committed
  097a74c

  Copy full SHA for 097a74c

• Fix abrupt orientation change from tiltting when the camera direction and constrained axis are parallel.

  bagnell

  committed
  9833ca3

  Copy full SHA for 9833ca3

Commits on Jun 18, 2014

• Merge branch 'master' into camera-terrain

  bagnell

  committed
  caf1bf4

  Copy full SHA for caf1bf4

Commits on Jun 23, 2014

• Remove ScreenSpaceCameraController.globe. Fix panning when mouse is over the sky. Fix crash.

  bagnell

  committed
  9f94ee7

  Copy full SHA for 9f94ee7

• Fix Columbus view issue tilting in the wrong direction.

  bagnell

  committed
  b78d2ea

  Copy full SHA for b78d2ea

• Only roll up the terrain for horizontal tilts, not vertical.

  bagnell

  committed
  d29c9d2

  Copy full SHA for d29c9d2

Commits on Jun 24, 2014

• Adjust zoom speed to account for terrain. Fix pan direction in Columbus view when camera height is under the height of the terrain clicked.

  bagnell

  committed
  5adc1fe

  Copy full SHA for 5adc1fe

• Merge branch 'master' into camera-terrain

  Show description for 9222a30
  bagnell

  committed
  9222a30

  Copy full SHA for 9222a30

• Fix jsHint error and probably the 3D model Sandcastle example.

  bagnell

  committed
  56da73c

  Copy full SHA for 56da73c

Commits on Jun 25, 2014

• Merge branch 'master' into camera-terrain

  Show description for ab047fc
  bagnell

  committed
  ab047fc

  Copy full SHA for ab047fc

• Do not start a pan when clicking the sky, but continue to pan when terrain was clicked and mouse moves over the sky.

  bagnell

  committed
  e113629

  Copy full SHA for e113629

Commits on Jun 30, 2014

• Merge branch 'master' into camera-terrain

  Show description for a4a95ff
  bagnell

  committed
  a4a95ff

  Copy full SHA for a4a95ff

Commits on Jul 1, 2014

• Better panning when camera height is below terrain clicked.

  bagnell

  committed
  61c2564

  Copy full SHA for 61c2564

• Merge branch 'master' into camera-terrain

  Show description for 27ff51a
  bagnell

  committed
  27ff51a

  Copy full SHA for 27ff51a

• Code updates based on review.

  bagnell

  committed
  38e96fa

  Copy full SHA for 38e96fa

Commits on Jul 2, 2014

• Slightly better panning when camera height is less that the terrain clicked.

  bagnell

  committed
  f5f9bf1

  Copy full SHA for f5f9bf1

• Tweak CHANGES.md

  pjcozzi

  committed
  4d78093

  Copy full SHA for 4d78093

Commits on Jul 14, 2014

• Merge branch 'master' into camera-terrain

  Show description for 9357a4f
  bagnell

  committed
  9357a4f

  Copy full SHA for 9357a4f

• Fixes after merge.

  bagnell

  committed
  6eadfaf

  Copy full SHA for 6eadfaf

• Merge branch 'camera-terrain-merged' into camera-terrain

  Show description for 178ceab
  bagnell

  committed
  178ceab

  Copy full SHA for 178ceab

Commits on Jul 16, 2014

• Merge branch 'master' into camera-terrain

  Show description for a0c73f1
  bagnell

  committed
  a0c73f1

  Copy full SHA for a0c73f1

• Revert tilt behavior in columbus view to tilt about the center of the screen until the camera height is low enough to pick terrain.

  bagnell

  committed
  f448b38

  Copy full SHA for f448b38

Commits on Jul 17, 2014

• Move terrain picking from the quadtree to the globe.

  bagnell

  committed
  340af87

  Copy full SHA for 340af87

• Fix tilting wrong direction in 3D by using world coordinates.

  bagnell

  committed
  0d30629

  Copy full SHA for 0d30629

Commits on Jul 18, 2014

• Make tilt in 3D like Columbus view in that it uses the new tilt on terrain when its close enough to pick the terrain.

  bagnell

  committed
  d4627b2

  Copy full SHA for d4627b2

• Merge branch 'master' into camera-terrain

  bagnell

  committed
  3a749f8

  Copy full SHA for 3a749f8

• Fix tests.

  bagnell

  committed
  3add858

  Copy full SHA for 3add858