Commit graph

779 commits

Author SHA1 Message Date
Anthony J. Thibault
ca8a832818 CharacterController: added hard limit to follow displacement
To prevent tunneling when the rigid body cannot reach it's target due to being blocked by a wall or some other obstacle.

Also, added unit tests for physics/BulletUtil rotateVector and clampLength functions.
2016-01-21 17:27:45 -08:00
Anthony J. Thibault
a91c181a89 MyAvatar: Recenter when the head turns away from the hips
Compute HMD facing moving average.
When the moving average diverges from the hips by more then 45 degrees, recenter the body.

Also, the follow code has been changed, instead of a follow velocity being passed to the CharacterController
a desired target is passed.  The CharacterController homes toward it's target based on the time remaining.
Any follow deltas applied to move the avatar's position closer to it's target is stored and re-applied
to the bodySensorMatrix.  This centralizes the moving/homing code to one place, the CharacterContoller.

A new FollowHelper class was also introduced, it groups together the data and logic necessary to perform the
re-centering/follow procedure.  This "hopefully" makes it easier to maintain.
2016-01-21 16:38:42 -08:00
Leonardo Murillo
098b7a4ff3 Merge pull request #6870 from birarda/console
Your Stack Manager is now a Server Console
2016-01-21 14:31:34 -06:00
Stephen Birarda
8bc063e758 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-19 16:21:19 -08:00
Seth Alves
09dd3e2a56 merge from upstream, respond to code review 2016-01-19 14:38:22 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
Stephen Birarda
275fa1c5c7 fix for override warnings with clang on OS X 2016-01-15 15:41:34 -08:00
Andrew Meadows
952f5b23f6 namechange collisionsWillMove --> dynamic 2016-01-15 15:21:25 -08:00
Andrew Meadows
8b420adbc8 namechange MotionType to PhysicsMotionType 2016-01-15 15:21:25 -08:00
Andrew Meadows
b9352d3eaa prevent nan inside spring action 2016-01-15 08:44:52 -08:00
Andrew Meadows
72928fdbd6 fix problem where grab stops on slow movement 2016-01-14 10:42:27 -08:00
U-GAPOS\andrew
0126684a96 collisionMask shouldn't override ignoreForCollisions 2016-01-13 16:58:34 -08:00
Andrew Meadows
6a5a74700f activate sprung objects when action strong enough 2016-01-12 15:11:27 -08:00
Andrew Meadows
2288d96868 fix CharacterController ray cast for floor 2016-01-12 15:11:27 -08:00
Andrew Meadows
6c49d81475 collision mask bit reinterpretation
also cache sessionID in static methods inside PhysicsEngine
2016-01-12 15:08:52 -08:00
Andrew Meadows
502921e877 more consistency for collision group values 2016-01-12 15:08:52 -08:00
Andrew Meadows
c9b125612c fix bugs 2016-01-12 15:08:52 -08:00
Andrew Meadows
e1ba4ff0a8 add CollisionMask entity property 2016-01-12 15:08:52 -08:00
Seth Alves
bc538a0f7d Merge pull request #6756 from AndrewMeadows/physics-cleanup-003
more correct management of MotionState pointers
2016-01-07 11:04:28 -08:00
Seth Alves
cf9af462b5 replace some logging with an assert 2016-01-07 10:21:39 -08:00
Andrew Meadows
42711e5bad remove unused variable 2016-01-07 10:20:03 -08:00
Andrew Meadows
36e19b43c9 add some comments; specify const and overrides 2016-01-07 10:19:46 -08:00
Andrew Meadows
4f29156da1 fixing asserts for EntityItem delete pipeline 2016-01-07 10:19:46 -08:00
Andrew Meadows
6a642bdcf8 fix misusage of smart-pointers 2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b overhaul of MotionState cleanup
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
Andrew Meadows
8886f48c78 minor cleanup 2016-01-07 10:19:46 -08:00
Andrew Meadows
f5d24a87ca remove entities from physics before we delete them 2016-01-07 10:19:46 -08:00
Andrew Meadows
b34df211df cleanup API for removal from EntitySimulation 2016-01-07 10:19:46 -08:00
Andrew Meadows
4208380d1c namechange 2016-01-07 10:19:46 -08:00
Seth Alves
b873d92469 try harder to ensure that a held object is active in bullet 2016-01-06 14:12:58 -08:00
Seth Alves
cd82383d33 Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability 2016-01-05 11:13:38 -08:00
Seth Alves
96f506a98d code review 2016-01-05 07:27:27 -08:00
Seth Alves
f5bc58f606 back out off-brand change 2016-01-03 08:00:31 -08:00
Seth Alves
2c21092808 be more careful about locking 2016-01-03 07:59:49 -08:00
Seth Alves
1d9f3097da trying to track down why equips fail after a few minutes 2015-12-21 15:16:55 -08:00
Seth Alves
c84fa5f821 cleanups 2015-12-21 14:45:18 -08:00
Seth Alves
1d9a81d5d4 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-21 09:14:37 -08:00
Seth Alves
d71cecbc61 Merge pull request #6675 from AndrewMeadows/crash-fix
fix crash when visiting new domain with gun in hand
2015-12-20 06:24:44 -08:00
Seth Alves
701f99d28e only send a queryAACube for entities to entity-server 2015-12-18 16:28:11 -08:00
Seth Alves
688448fe41 more queryAABox experimenting 2015-12-17 16:18:41 -08:00
Seth Alves
473212e5b7 try to be more coherent about queryAABox meaning 2015-12-17 14:29:41 -08:00
Seth Alves
b83579e6e5 include queryAABox in physics-induced sends 2015-12-16 17:25:49 -08:00
Andrew Meadows
ff83f8fc37 fix crash mode when leaving domain with handgun 2015-12-16 15:11:47 -08:00
Seth Alves
d3c57821c0 call a method on actions before each physics simulation step. use this to attempt to dejitter held objects 2015-12-16 14:00:04 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Atlante45
a07d7494f0 More OS X warning cleanup 2015-12-11 14:20:36 -08:00
Andrew Meadows
9e99bff250 fix avatar upward drift after shape change 2015-12-09 18:09:55 -08:00
Andrew Meadows
8c109fd623 move raw bullet code from interface to physics lib 2015-12-08 17:21:43 -08:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
Seth Alves
6eae98fb28 merge from upstream 2015-12-02 14:38:26 -08:00