Commit graph

46 commits

Author SHA1 Message Date
Seth Alves
de589a32f3 clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring 2017-05-08 16:36:51 -07:00
Seth Alves
7ce0ef2ec4 fix spring action so that it can be linear or rotational or both 2017-04-30 10:04:07 -07:00
Anthony J. Thibault
327fcc970b Remove frame lag from near grabbed physical objects.
In the game loop, physics occurs before avatar update.
Before this PR, when the avatar is moved during avatar update, near grabbed objects will not pick up this move until one frame later, when
the physics is run on the next update.

After this PR, near grabbed objects are adjusted to reflect any position or rotation change that occurred during the avatar update.
2016-10-03 16:01:54 -07:00
Seth Alves
53a366d4e8 measure velocity over 6 frames 2016-07-11 13:25:00 -07:00
Seth Alves
eac144f354 experimenting 2016-07-11 09:52:24 -07:00
Seth Alves
44beca1687 try having all spring derived actions agree on a target 2016-05-04 11:29:17 -07:00
Anthony J. Thibault
62ed5333e0 AvatarActionHold: compute velocities for other avatars 2016-02-24 15:14:56 -08:00
Zach Pomerantz
e78905a6d1 Rm previousDeltaTimeStep unused field from AvatarActionHold 2016-02-24 13:15:49 -08:00
Anthony Thibault
3b87cd0ea8 Improve hold action by using controller velocity
The AvatarHoldAction now derives the body velocity by using data from the controller::Pose.  Rather then trying to derive it based on previous positions.  This results in more acurate motion of the held object when the hold is released.

OpenVR input plugin: pass the velocity and angularVelocity directly from the controller pose to the controller::Pose.
2016-02-22 19:15:22 -08:00
Stephen Birarda
275fa1c5c7 fix for override warnings with clang on OS X 2016-01-15 15:41:34 -08:00
Seth Alves
b80fa1c806 code review 2015-12-17 11:46:41 -08:00
Seth Alves
d7affcf811 keep track of palm rotation vs avatar as well as palm translation 2015-12-16 15:41:27 -08:00
Seth Alves
8bfbb69316 clean up code, change try-locks to locks 2015-12-16 14:21:56 -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
fc77d6cd40 Fix grab behavior 2015-12-07 17:08:36 -08:00
Atlante45
70dd8ec19a Remove left/right relative pos/rot from c++ 2015-12-01 11:44:42 -08:00
Atlante45
8d9eeb3897 Have separate left/right hold action offset 2015-11-30 18:04:34 -08:00
Stephen Birarda
4573e5c59e resolve conflicts on merge with upstream/master 2015-11-30 13:32:38 -08:00
Seth Alves
ac635336b7 split AvatarActionHold's finding of its location target into a new function 2015-11-13 14:58:17 -08:00
Atlante45
d79221edd2 AvatarActionHold can ignore IK 2015-11-10 14:06:59 -08:00
Atlante45
8da8b4db8c Add option to ignore IK for my avatar's entity actions 2015-11-10 13:42:25 -08:00
Atlante45
7050139a56 Bit of code cleanup 2015-11-10 13:41:19 -08:00
James B. Pollack
8eea7ff67c Merge pull request #6329 from sethalves/fix-grab-release
send to server upon grab release
2015-11-06 14:33:08 -08:00
Seth Alves
46b7b92b2f prefix private member variables with _ 2015-11-06 11:54:51 -08:00
Seth Alves
4ed8a1e5d1 changes to send an update to entity-server when AvatarActionHold releases an entity 2015-11-06 09:25:53 -08:00
Seth Alves
28d4d29bb6 smooth hold action velocity over 2 frames 2015-11-05 15:07:00 -08:00
Seth Alves
4feb9dc8c6 prepare for possible future coding standard 2015-10-19 17:46:34 -07:00
Seth Alves
359a318568 fold kinematic hold into normal hold (disabled by default, an argument enables) 2015-10-15 20:23:06 -07:00
Seth Alves
1d8db13f41 switch to low-entity-server traffic hold 2015-10-15 10:56:47 -07:00
Seth Alves
8195145dc7 further unmangle branch split 2015-10-15 10:13:00 -07:00
Seth Alves
7ef5fc9613 remove line that leaked over from other branch 2015-10-15 09:19:47 -07:00
Seth Alves
742cc0f511 rename a function 2015-10-14 06:17:55 -07:00
Seth Alves
4402242c3c allow an action to suppress sending of physics related edits to the entity-server 2015-10-13 16:27:40 -07:00
Seth Alves
7c52849740 change how hold action works 2015-10-13 11:36:58 -07:00
Andrew Meadows
a0a1b01ea9 coalesce dupe action data members: _id and _type 2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7 make some arguments const, cleanup some #includes 2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821 some ObjectAction methods should be const 2015-07-07 17:50:08 -07:00
Seth Alves
0caa8be66e ignore incoming changes for a hold action that's flagged as 'mine' 2015-06-29 19:50:19 -07:00
Seth Alves
88fc74374b if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol 2015-06-29 19:27:10 -07:00
Seth Alves
0970f010a4 provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are 2015-06-27 13:31:00 -07:00
Seth Alves
c95db5672a include argument-packing version in serialized argument data 2015-06-26 10:01:45 -07:00
Seth Alves
5381e6e9bb entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion 2015-06-19 16:20:07 -07:00
Seth Alves
3c90c851e9 start on code to de/serialize actions 2015-06-18 15:01:34 -07:00
Seth Alves
8ed9a3ca02 add handedness setting to avatar-hold action. update stick.js to allow use of hydra 2015-06-11 11:04:19 -07:00
Seth Alves
eccf4eb8a8 hold action works 2015-06-10 17:05:49 -07:00
Seth Alves
3dcc6c9b8c make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus. 2015-06-10 12:04:44 -07:00