41 commits

Author	SHA1	Message	Date
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	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
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	2d755adfc0	repairs to good code blown away by regex	2014-04-09 10:46:20 -07:00
Stephen Birarda	684c6b5372	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
Andrew Meadows	5934a17475	fix sphere-capsule collisions at the capsule caps	2014-03-25 15:27:28 -07:00
Brad Hefta-Gaub	0e7e337807	fixed uninitialized variable warning	2014-03-14 18:05:40 -07:00
Andrew Meadows	e22e022252	Fixing warnings and out-of-range index.	2014-03-04 09:55:32 -08:00
Andrew Meadows	25bdfd7677	Update to comment.	2014-02-26 15:38:33 -08: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	362708be60	fix another missing semicolon	2014-02-25 11:19:07 -08:00
Andrew Meadows	28d9fb9747	fix missing semicolon	2014-02-25 11:17:48 -08:00
Andrew Meadows	9a70a50bdb	capsuleCapsule() collision with preliminary tests	2014-02-25 10:59:12 -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