Commit graph

30 commits

Author SHA1 Message Date
Andrew Meadows
fb7a5e64cf fix file path in header text: physcis --> shared 2014-12-03 11:15:44 -08:00
Andrew Meadows
1df6c32a4e moving Shape* back into shared lib
removing dependency of entities lib on physics lib
physics lib now depends on entities lib
2014-12-01 16:03:14 -08:00
Andrew Meadows
4c3cdf5b7a move stuff out of shared and into physics library 2014-10-28 13:51:45 -07:00
Andrew Meadows
4da1ca22ba Add RayIntersectionInfo and use for shape-vs-ray 2014-09-09 17:35:06 -07:00
Andrew Meadows
aeb355e3da re-enabling legacy avatar-vs-voxel collisions
so that I don't break anything when this merges with upstream
2014-08-29 15:53:20 -07:00
Andrew Meadows
e133a696f5 merge andrew/ragdoll into some ShapeCollider work 2014-08-27 12:12:08 -07:00
Andrew Meadows
c6253bb51a AACube vs Sphere and Capsule collision tests
Sphere is unit tested.
Also removed the shape collision query against Octree
2014-08-27 12:09:41 -07:00
Andrew Meadows
7a5c4fdb16 remove commented out #includes 2014-08-25 15:25:46 -07:00
Andrew Meadows
f684608d1f Added AACubeShape with stubbed collision functions 2014-08-25 08:24:44 -07:00
Andrew Meadows
1be922f986 add shapeVsList etc to dispatch table
renamed some functions for more readability
2014-08-22 11:20:53 -07:00
Andrew Meadows
3ebd8c1969 use dispatchTable for shape-vs-shape collisions 2014-08-21 16:40:25 -07:00
Andrew Meadows
b9d4545aef merge upstream/master into andrew/ragdoll
Conflicts:
	libraries/shared/src/Shape.h
	libraries/shared/src/ShapeCollider.h
2014-06-17 17:03:16 -07:00
Andrew Meadows
f18864bd72 Moved findRayIntersection() to the Shape classes 2014-06-17 12:36:36 -07:00
Andrew Meadows
ab3d582d79 Add ray intersection tests against most shapes. 2014-06-17 10:49:14 -07:00
Andrew Meadows
6d27987226 Add shape vs list-of-shapes collision method
and list-of-shapes vs list-of-shapes
2014-06-15 17:56:02 -07:00
Andrew Meadows
06784aa960 move AABox back to octree lib
Fleshing out ShapeCollider::collideShapeWithAACube()
2014-04-21 14:07:40 -07:00
Andrew Meadows
241df7a767 Move AABox from octree lib to shared lib
Stubbed out Shape vs Octree collisions
2014-04-21 10:27:20 -07:00
Andrzej Kapolka
f61c746b4a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 09:45:23 -07:00
Andrzej Kapolka
9f58264cb6 Working on plane collisions, pushing back camera from intersecting avatars. 2014-04-09 18:07:56 -07:00
Andrew Meadows
22d2f84cff merge upstream/master into andrew/scripting 2014-04-09 15:38:56 -07:00
Andrew Meadows
635f832dfe rename shapeShape() to be collideShapes()
Also add collideShapesCoarse()
2014-04-09 13:04:17 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
2d755adfc0 repairs to good code blown away by regex 2014-04-09 10:46:20 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Andrew Meadows
5954bb91d4 ListShape now handled by ShapeCollider 2014-02-26 15:36:19 -08:00
Andrew Meadows
07eb366138 stubbed out collision handlers for ListShape 2014-02-26 14:32:46 -08:00
Andrew Meadows
da0276ac7e ShapeCollider takes CollisionList argument
Also, adding first pass at ListShape
2014-02-26 12:10:16 -08:00
Andrew Meadows
8a3640f016 Adding CapsuleSphere collisions with tests. 2014-02-24 11:38:27 -08:00
Andrew Meadows
0e28e0947c Adding ShapeColliderTests.* 2014-02-22 13:20:47 -08:00
Andrew Meadows
8c1dc40d39 Adding basic physics shapes (unfinished) 2014-02-21 16:29:07 -08:00