Commit graph

67 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
ZappoMan
9cd76983a2 swith to using shape collider instead of spheres 2014-09-25 14:35:20 -07:00
Andrew Meadows
4da1ca22ba Add RayIntersectionInfo and use for shape-vs-ray 2014-09-09 17:35:06 -07:00
Andrew Meadows
a3b26582ba fix for nan in sphereVsAACubeHelper() 2014-09-03 15:39:26 -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
a0eb13f6db collision logic for capsule-side-vs-cube-face
with unit tests
2014-08-29 14:23:00 -07:00
Andrew Meadows
00913d4422 fixes for capsuleVsAACube() with unit tests 2014-08-28 16:51:16 -07:00
Andrew Meadows
921c8cfec3 fix broken build for using unititialized const float 2014-08-27 12:21:15 -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
681c526fe1 exploit symmetry of collision pairings 2014-08-25 08:52:45 -07:00
Andrew Meadows
f684608d1f Added AACubeShape with stubbed collision functions 2014-08-25 08:24:44 -07:00
Andrew Meadows
1bd7734ec1 sometimes swap order of shapes for simpler code 2014-08-22 18:07:11 -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
d1b2ba4a43 fix bug: false positive capsuleCapsule() collision
for capsules with parallel axes and negative pojection of
center-to-center separation

also replace fabs() with fabsf()
2014-08-04 17:30:23 -07:00
Andrew Meadows
66158cb8a2 fix capsule-vs-capule collision test 2014-07-17 09:19:17 -07:00
Andrew Meadows
c5a5f8c5d4 bug fix: bad logic in capsule-vs-capsule 2014-07-11 10:54:16 -07:00
Andrew Meadows
96eebec0fc unit tests for VerletShapes 2014-06-18 14:06:00 -07:00
Andrew Meadows
9e839f0980 Shape::getCenter() -> Shape::getTranslation() 2014-06-18 08:55:48 -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
92159a7ed5 Shape::get/setCenter() instead of get/setPosition() 2014-06-16 08:43:27 -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
5be470bcbc add PhysicalEntity class
Model and RagDoll derive from PhysicalEntity
Shape gets back pointer to its Entity (shape sharing not possible)
CollisionInfo gets backpointers the shapes involved
2014-06-12 13:13:00 -07:00
Andrew Meadows
0addf3bae4 cleaup: remove some unused collision code
remove CollisionInfo::_type
remove unused Avatar collision response stuff
comment out some code that works but will probably be replaced
2014-06-06 14:36:05 -07:00
Andrew Meadows
8ec493e85b fix bad penetration depth for interior of cube 2014-05-07 12:39:20 -07:00
Andrew Meadows
9fc1c765d3 overhaul of CollisionInfo
store Cube info for sphereAACube collisions
2014-05-07 11:40:00 -07:00
Andrew Meadows
f6b2b43376 forget collision for this failure case 2014-05-05 12:31:36 -07:00
Andrew Meadows
0cecef6441 fix "nearly but not quite" edge/corner collisions 2014-05-05 10:01:31 -07:00
Andrew Meadows
b097eed1aa fix sphere-cube collisions at edges (really) 2014-05-05 08:47:02 -07:00
Andrew Meadows
0e3d66caf6 fix incorrect rescale of vec3 2014-05-02 22:27:52 -07:00
Andrew Meadows
c8e56a97cc fix sphere-cube collisions, with tests 2014-05-02 21:47:27 -07:00
Andrew Meadows
9ceda573cc sphere-cube: add the penetration don't subtract it 2014-05-02 10:39:27 -07:00
Andrew Meadows
7464ca0879 non-rounded collision solution in comments 2014-04-23 08:38:58 -07:00
Andrew Meadows
1986ac6be3 collisions with cube get rounded normals at edges 2014-04-22 20:53:12 -07:00
Andrew Meadows
f3fd81ca59 use glm::modf() for less code 2014-04-22 14:26:52 -07:00
Andrew Meadows
62121b1232 remove include of StreamUtils.h again 2014-04-22 11:46:15 -07:00
Andrew Meadows
65d3b4dc39 fix penetration direction for sphere-vs-AACube 2014-04-22 11:43:23 -07:00
Andrew Meadows
7537d240bb toward working avatar-vs-voxel collisions again 2014-04-22 10:48:42 -07:00
Andrew Meadows
1782e803c9 remove include StreamUtils.h 2014-04-21 18:21:39 -07:00
Andrew Meadows
8d6fa8f904 fix sphere-vs-axis-aligned-cube logic 2014-04-21 18:19:59 -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
a12dd916fa More plane intersection bits. 2014-04-10 11:24:45 -07:00
Andrzej Kapolka
f61c746b4a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 09:45:23 -07:00
Andrew Meadows
4942e93daa replace .f with .0f as per coding standard 2014-04-10 07:53:11 -07:00
Andrzej Kapolka
9f58264cb6 Working on plane collisions, pushing back camera from intersecting avatars. 2014-04-09 18:07:56 -07:00