Seth Alves
9088e288e0
don't worry about head controller being enabled, just check to see if head pose is valid
2017-06-02 13:57:53 -07:00
howard-stearns
6b2e4c5abc
zaru stuff
2017-06-01 17:08:22 -07:00
Seth Alves
7d21ab88b0
add some saftey checks. cleanups
2017-06-01 16:14:59 -07:00
Seth Alves
552b69bb1c
cleanups
2017-06-01 13:47:19 -07:00
howard-stearns
1068a4a9bd
remove the optimization for upperId == lowerId. Doesn't work in zaru
...
tunnels.
2017-06-01 13:21:24 -07:00
Seth Alves
eb94c48c5b
merge from upstream
2017-06-01 10:10:11 -07:00
Sam Cake
3c9b14ee94
Oene more fix
2017-05-31 23:26:20 -07:00
Sam Cake
03fdc1396c
Fixing the warnings
2017-05-31 23:20:10 -07:00
howard-stearns
1e1dd3a633
checkpoint with working detector
2017-05-31 17:10:37 -07:00
Seth Alves
e37387f45c
sync
2017-05-31 14:01:09 -07:00
Chris Howe
6edc6b2756
WL21317
...
New MyAvatar functions to support converting from avatar joint space to
world space and vice versa. Added some tests to support these functions.
2017-05-31 15:05:43 -04:00
howard-stearns
07ea2e271b
hook into location changes
2017-05-30 14:59:19 -07:00
Seth Alves
ffe844a8e7
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-05-30 13:42:20 -07:00
howard-stearns
92aeadd70f
rotation of local capsule offset
2017-05-26 16:34:08 -07:00
howard-stearns
f694691efb
add fixme comments and make isUp/isDown ordinary methods.
2017-05-26 16:15:18 -07:00
howard-stearns
4be31f1b18
thread safety
2017-05-26 15:31:59 -07:00
howard-stearns
7cee438298
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
2017-05-26 11:36:04 -07:00
howard-stearns
905b5261d1
If collisions are enabled, turn them off in safeLanding, and
...
restore.
2017-05-25 16:32:44 -07:00
Seth Alves
af5ba3a90a
ask display-plugins if they are head-controllers
2017-05-25 15:14:10 -07:00
howard-stearns
ac8cb63419
clean and DRY
2017-05-25 14:34:24 -07:00
Dante Ruiz
108c444cc7
clean up code
2017-05-25 21:59:06 +01:00
howard-stearns
9d73d0c931
works with nested enclosing entities
2017-05-25 12:09:22 -07:00
Seth Alves
3823ece153
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-05-25 10:57:46 -07:00
Seth Alves
bdbc6ddcc1
change some code to look at head-controller position rather than hmd position
2017-05-25 10:50:41 -07:00
howard-stearns
74c163d047
snapshot of safeLanding. Works as long as entities don't intersect.
2017-05-25 10:25:29 -07:00
Dante Ruiz
8cb9bfcc81
fixed merge conflict
2017-05-24 19:35:41 +01:00
Dante Ruiz
ac3c9655ec
added arms
2017-05-24 01:28:08 +01:00
Dante Ruiz
0cbdeaa1e8
Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks
2017-05-23 18:26:58 +01:00
Dante Ruiz
54d63f5155
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-23 18:19:38 +01:00
Anthony J. Thibault
06c26f029a
Merge branch 'master' into feature/faster-ik-iterations
2017-05-23 09:10:17 -07:00
Dante Ruiz
d98e7d5bc6
adding left and right arm
2017-05-23 00:26:12 +01:00
Andrew Meadows
7b879a7964
Model has a Rig rather than a RigPointer
2017-05-19 13:24:16 -07:00
Anthony J. Thibault
e99001d86c
debug draw ik chains, bug fix for flex coef on tips
...
And opened up hip constraints.
2017-05-18 16:29:55 -07:00
Dante Ruiz
984f9e1ba5
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-18 21:23:06 +01:00
Andrew Meadows
09433a93ba
Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
...
More correct avatar mass
2017-05-17 16:22:06 -07:00
Dante Ruiz
a18940142e
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-17 16:23:50 +01:00
Brad Hefta-Gaub
764bfe94f5
Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
...
Feature/snap turn smoothing 21270
2017-05-16 21:05:38 -07:00
Andrew Meadows
d065b569d3
support for variable avatar mass by size
2017-05-16 16:03:51 -07:00
Dante Ruiz
724f849d88
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
2017-05-16 00:15:18 +01:00
Dante Ruiz
975b1ab077
moved low velocity filter in the input system
2017-05-16 00:15:06 +01:00
Vladyslav Stelmakhovskyi
cc10fc81b7
Fix crash in sit script
2017-05-13 20:57:04 +02:00
Anthony J. Thibault
93b8dc550c
Merge branch 'master' into feature/ik-solver-init-config
2017-05-10 09:03:21 -07:00
trent
a3545661dc
Merged hifi/master into this PR and resolved merge conflicts.
2017-05-09 15:09:53 -04:00
Anthony J. Thibault
712fcbe27a
Removed cruft/debug code & comments
2017-05-08 15:06:30 -07:00
Anthony J. Thibault
7af93f9fea
Hooked up IK constraint rendering
2017-05-08 15:06:29 -07:00
Anthony J. Thibault
e992d6703a
WIP: debug render joint constraints.
2017-05-08 15:06:28 -07:00
Anthony J. Thibault
a260163aee
WIP commit, first pass at generating limit center joints + debug draw
2017-05-08 15:06:27 -07:00
Andrew Meadows
138a987a8f
_rotationChanged is a timestamp
2017-05-08 14:27:18 -07:00
Andrew Meadows
fe401c7488
improved management of collisionless avatar state
2017-05-05 09:37:00 -07:00
Andrew Meadows
0aa579225c
even more correct API: MyAvatar.collisionsEnabled
2017-05-05 09:35:49 -07:00
Andrew Meadows
559f5836c5
restore MyAvatar.setCharacterControllerEnabled()
2017-05-05 09:35:49 -07:00
Andrew Meadows
94ee6d6838
fix driving motion of collisionless avatars
2017-05-05 09:35:49 -07:00
Andrew Meadows
c47e26174c
support collisionless avatar when playing recording
2017-05-05 09:35:49 -07:00
Andrew Meadows
e21bd7a67a
help avatar walk up steps
2017-05-05 09:35:49 -07:00
Brad Davis
2d0bbf70ae
Migrate core avatar rendering functionality to library
2017-05-04 14:08:59 -07:00
trent
d7ed727faf
Adjustments based on PR feedback, though it looks like this snap-turn-snafu-story is not yet complete.
2017-05-03 16:56:18 -04:00
trent
fc3cce6b73
Fixed the silly and stupid subtle issue that was causing the bug in inconsistencies.
2017-05-03 12:35:35 -04:00
trent
24f2678cdd
Adjusted the smooth time for the snap-turn remote view. Fixed tab issue.
2017-05-03 12:05:21 -04:00
trent
557a8fffd7
Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D
2017-05-02 19:56:47 -04:00
Trent Polack
0a5dfbb9af
Changed l to interp.
...
In my defense, if anyone ever looked at it and thought the 'l' was a '1', they should never be programming unless they used a special language where you could reassign numbers.
2017-05-02 19:10:33 -04:00
trent
49881b5ea2
Actually the full set of changes. Kids: don't forget to pop your stash.
2017-05-02 13:55:32 -04:00
trent
8f34ec4c7f
Iteration on the snap-turn smoothing based on feedback from Andrew. Also additional cleanup.
2017-05-02 13:41:34 -04:00
trent
6317857e3d
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-02 12:11:39 -04:00
Seth Alves
a75544a9fb
Merge pull request #10319 from hyperlogic/feature/head-standard-action
...
Head, Hips and Chest IK can now be controlled from Controller inputs
2017-05-01 13:03:23 -07:00
trent
4d7eeed343
Marking MyAvatar's rotation as dirty if smoothing is going down.
2017-05-01 15:21:25 -04:00
trent
773563850c
Merge hifi/master with my branch, fixed merge issue.
2017-05-01 13:23:02 -04:00
Anthony J. Thibault
0c09823f67
clang warning fixes, unused variables...
2017-05-01 09:10:31 -07:00
Brad Davis
2b43a1989f
Moving face and eye trackers out of interface
2017-04-28 23:28:17 -07:00
Brad Davis
5e1bc0d908
Remove faceshift
2017-04-28 16:34:54 -07:00
Anthony J. Thibault
2120e63e3a
Merge branch 'master' into feature/head-standard-action
2017-04-27 17:51:13 -07:00
Anthony J. Thibault
764f6c69ea
Head input action will override the HMD for IK.
2017-04-27 17:39:25 -07:00
trent
53f47c132f
Avatar snap-turn rotation smoothing (sent out from the local client outward).
2017-04-27 16:12:25 -04:00
ZappoMan
834a447d62
remove debugging code
2017-04-26 18:36:44 -07:00
Anthony J. Thibault
ef43ff4b99
Add default pose matrices to InputCalibrationData structure
2017-04-26 11:55:24 -07:00
Seth Alves
23592f4a53
get rid of _trackedHeadPosition
...
(cherry picked from commit e909938b232e11400832ae7dd29de16968967668)
2017-04-25 11:03:43 -07:00
Seth Alves
0cd2863df4
start on routing HMD position and rotation through controller interface
...
(cherry picked from commit bca5241bae7674ff7e41c037d84bb78e5152046a)
2017-04-25 11:01:52 -07:00
ZappoMan
382645ddd0
more cleanup
2017-04-24 18:01:54 -07:00
ZappoMan
c9aad6b762
new approach to the tpose fix, as well as other improvements
2017-04-24 17:36:05 -07:00
Andrew Meadows
31bfc98b87
use const reference for ScenePointer when possible
2017-04-18 11:52:22 -07:00
Andrew Meadows
a3682a1a0e
cleanup includes in Avatar.cpp and remove cruft
2017-04-18 11:52:21 -07:00
Andrew Meadows
5a458c9923
remove last qApp usage from Avatar class
2017-04-18 11:52:21 -07:00
Andrew Meadows
685a01482c
remove Camera argument from Avatar::render()
2017-04-18 11:52:21 -07:00
Andrew Meadows
fbacbd74f7
pass shared pointers by ref in Avatar::render()
2017-04-18 11:52:21 -07:00
Andrew Meadows
1137bd1436
pull qApp spaghetti out of Avatar class
...
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
2017-04-18 11:52:21 -07:00
Zach Fox
6569de697d
Merge pull request #10187 from zfox23/fix/getAvatar_Fix
...
Fix FB3999; Fix crashes caused by getAvatar() design bug
2017-04-11 11:17:48 -07:00
Stephen Birarda
4ed22ad7ac
move audio loudness to AvatarData, change AvatarData to ScriptOwnership
2017-04-10 22:15:44 -07:00
Andrew Meadows
662c34c266
fix avatar scale animation and avatar render debug
2017-04-07 11:06:16 -07:00
ZappoMan
53c439ffba
add foot IK targets as actions
2017-03-30 19:11:16 -07:00
Anthony J. Thibault
49a95089d1
Remove hacks for debug rendering of IK targets
...
A AnimContext class was introduced. This context is passed into every node during evaluation/overlay.
It holds non-animVar "global" data passed from the application.
(cherry picked from commit a028d3ba58
2017-03-24 16:27:27 -07:00
Anthony J. Thibault
dd17b2e2f3
Added developer option to draw IK targets in world.
...
(cherry picked from commit 7e7803c648
2017-03-24 16:20:52 -07:00
Triplelexx
fd312f6bf8
rename fronts to forwards
2017-03-22 18:49:34 +00:00
Triplelexx
b7980569cc
change all references of IDENTITY_FRONT to IDENTITY_FORWARD
2017-03-21 22:13:33 +00:00
Brad Hefta-Gaub
af790d8474
Merge pull request #9875 from birarda/bug/spin-strafe
...
fix double snap turn strafing
2017-03-20 10:08:05 -07:00
Atlante45
698791295a
Expose DriveKeys enum to JS
2017-03-16 20:03:27 -07:00
Atlante45
5a1ce4bb05
CR
2017-03-16 17:46:47 -07:00
Atlante45
9155cc6334
Fix windows warnings
2017-03-16 17:44:56 -07:00
Atlante45
42316e713d
CR drive keys
2017-03-16 16:24:52 -07:00
Atlante45
7517f224a8
Add MyAvatar drive keys capture capability
2017-03-16 15:44:17 -07:00
Stephen Birarda
1fe02477b0
fix LX behaviour in snap/advanced/basic
2017-03-14 14:21:21 -07:00
Thijs Wenker
b54d6cb0e1
stop avatar controller while playing back a recording, which makes it not collide anymore
2017-03-08 00:07:49 +01:00
Clément Brisset
7f9437dcc5
Merge pull request #9690 from Atlante45/feat/sit
...
Add hips pinning / Sit script
2017-02-28 10:41:22 -08:00
Atlante45
9ce10742ec
Move avatar not joint
2017-02-27 16:38:57 -08:00
Atlante45
e9316d30d0
More IK smoothing experimentation
2017-02-27 16:38:56 -08:00
Atlante45
cbaaaa21c6
Use head orientation for sitting
2017-02-27 16:38:56 -08:00
Atlante45
e503542b6a
Fix transform computation
2017-02-27 16:38:55 -08:00
Atlante45
8c232b5abb
Initialize max offset to infinity
2017-02-27 16:38:55 -08:00
Atlante45
187cd0d5cf
Get IK error and stand up based on it
2017-02-27 16:38:55 -08:00
Atlante45
7132969083
Add hips pinning capability to MyAvatar
2017-02-27 16:38:54 -08:00
Atlante45
6821c8621f
More sit work
2017-02-27 16:38:54 -08:00
Seth Alves
a286c72b3b
cleanups
2017-02-23 15:12:45 -08:00
Seth Alves
84d9af14b0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-23 10:40:18 -08:00
Chris Collins
de84e07281
Merge pull request #9714 from thoys/fix-recorder-js-playback
...
Fix recorder.js playback in interface
2017-02-23 09:59:37 -08:00
Thijs Wenker
5033e7be11
CR fixes
2017-02-23 18:22:36 +01:00
Seth Alves
37004e4347
steps toward making mouse work on tablet
2017-02-23 08:11:31 -08:00
Seth Alves
1b26c3469f
fix signed/unsigned joint index problem
2017-02-22 20:39:34 -08:00
Chris Collins
c967f9383a
Merge pull request #9706 from ZappoMan/avatarMixerLoopImprovements
...
Multi-core Avatar Mixer
2017-02-22 11:20:28 -08:00
Thijs Wenker
13b2b6086f
Fix recorder.js playback in interface
2017-02-21 19:47:26 +01:00
Brad Hefta-Gaub
42d916a719
fix warnings
2017-02-17 21:58:48 -08:00
Brad Hefta-Gaub
291b823cfa
const cleanup and fix crash
2017-02-17 18:28:07 -08:00
Seth Alves
d7bb6f105b
make tablet part IDs available through qApp
2017-02-17 15:43:20 -08:00
Chris Collins
442e8d68ef
Merge pull request #9650 from kunalgosar/browserFix
...
Added isAway (paused) property to myAvatar
2017-02-14 11:16:07 -08:00
Kunal Gosar
c3f2f5779a
fix if else syntax
2017-02-11 15:46:49 -08:00
Kunal Gosar
975d844eee
syntax fix
2017-02-11 15:01:02 -08:00
Kunal Gosar
18e776bd29
emit signal only on change
2017-02-11 13:58:23 -08:00
kunalgosar
9c537726e5
Fix stuck in pause error with browsers
2017-02-10 18:13:09 -08:00
kunalgosar
691f61983a
added isAway property to MyAvatar
2017-02-10 17:28:12 -08:00
Andrew Meadows
ee702f945f
cleanup around when to send identityPacket
2017-02-10 13:14:20 -08:00
Seth Alves
b34341b48e
Merge pull request #9631 from AndrewMeadows/workaround-avatar-update-dos
...
Remove avatarEntityData cruft from settings
2017-02-09 10:40:00 -08:00
Andrew Meadows
e02810458b
clear old avatarEntityData when saving settings
2017-02-08 14:14:48 -08:00
Brad Hefta-Gaub
eedfc4fd38
fix various bot related bugs
2017-02-08 12:35:00 -08:00
Andrew Meadows
cc301d1c1a
remove legacy empty avatarEntityData settings
2017-02-08 11:50:15 -08:00
Seth Alves
fa61bbe2a6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 18:21:39 -08:00
ZappoMan
29fff2e556
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 13:09:59 -08:00
ZappoMan
292d472a59
checkpoint - got first cut at distance based rotation tolerance working
2017-01-23 13:06:29 -08:00
Seth Alves
be8bc9652b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-23 09:44:04 -08:00
Seth Alves
47b59ffae3
don't save tablet to Settings when logging out or switching domains
2017-01-19 14:10:48 -08:00
Andrew Meadows
bfbef91f53
re-enable cauterization of meshes for MyAvatar
2017-01-19 12:56:07 -08:00
Seth Alves
e76f1c5937
if another avatar has something hung from their camera, don't act like their camera is my camera
2017-01-17 13:28:13 -08:00
ZappoMan
c9c311e275
checkpoint for distance joints
2017-01-15 11:47:48 -08:00
ZappoMan
aed1b69ee0
make the avatar bounding box be avatar local and only change when it actually changes
2017-01-12 17:19:06 -08:00
ZappoMan
636ade9eb7
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-09 11:29:54 -08:00
Brad Davis
e5e9ab42ea
Encapsulate AnimPose members for easier optimizations
2016-12-28 12:11:24 -08:00
Brad Hefta-Gaub
73bfc069da
more work on only sending changes
2016-12-27 17:19:55 -08:00
Brad Hefta-Gaub
5e65e3991c
CR feedback
2016-12-20 21:03:10 -08:00
Brad Hefta-Gaub
8497ad1e29
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
2016-12-15 16:42:41 -08:00
Brad Hefta-Gaub
ed19b4b592
remove compression at the per avatar data buffer for now, since it gave no benefit
2016-12-15 14:13:38 -08:00
Seth Alves
26639aac15
Merge pull request #8789 from Atlante45/fix/settings
...
Use JSON for application Settings
2016-12-15 07:00:46 -08:00
Brad Hefta-Gaub
2290179281
add compression and minimal data flags to AvatarData
2016-12-14 11:47:45 -08:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
Anthony J. Thibault
89ae3b3d6e
Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
...
This reverts commit efe9571ab8333e9ec7f4
2016-12-05 15:18:03 -08:00
