Commit graph

3495 commits

Author SHA1 Message Date
Andrew Meadows
b3e336de3d remove cruft: unused function arguments 2017-01-11 15:02:18 -08:00
Chris Collins
30d5f70e11 Merge pull request #9278 from jherico/cpu_opt_scene
More low level optimizations
2017-01-09 10:10:40 -08:00
Zach Fox
dec41f67cc Fix bugs and generally fix behavior 2017-01-06 13:58:23 -08:00
Zach Fox
495925a017 This behavior was harder to change than expected... 2017-01-05 16:58:32 -08:00
Zach Fox
14def61eb8 More CR comments; 1 bug remaining re: sig slot 2017-01-03 17:32:47 -08:00
Zach Fox
800389cf20 Remove HRS logging 2016-12-28 14:37:19 -08:00
Brad Davis
e5e9ab42ea Encapsulate AnimPose members for easier optimizations 2016-12-28 12:11:24 -08:00
howard-stearns
7faa689d1d avatar body goes away when ignored, and comes back when unignored 2016-12-27 10:17:39 -08:00
howard-stearns
768b747b3a Make avatar go away when ignored, even when pal is up. (But currently, it
comes back!)
2016-12-27 10:17:39 -08:00
Andrew Meadows
a5efc08473 use PROFILE_COUNTER not SAMPLE_PROFILE_COUNTER 2016-12-22 15:32:30 -08:00
Andrew Meadows
b3be7f0f3e restore expensive version of Avatar::updatePalms() 2016-12-22 10:42:05 -08:00
Andrew Meadows
3830649990 remove debugging and profiling 2016-12-21 10:55:59 -08:00
Andrew Meadows
8ab6974233 optimizations for processing avatar joint data 2016-12-21 10:55:59 -08:00
Brad Hefta-Gaub
08cfd8a40e Merge pull request #9208 from ZappoMan/addViewFrustumToAvatarMixer
Optimize avatar-mixer bandwidth for out of view avatars
2016-12-21 10:22:56 -08:00
Brad Hefta-Gaub
5e65e3991c CR feedback 2016-12-20 21:03:10 -08:00
Brad Hefta-Gaub
d09afa9454 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
Conflicts:
	assignment-client/src/avatars/AvatarMixer.h
	assignment-client/src/avatars/AvatarMixerClientData.h
	libraries/avatars/src/AvatarData.cpp
	libraries/networking/src/udt/PacketHeaders.h
2016-12-20 16:25:12 -08:00
Andrew Meadows
e43efa74de use sampled counter 2016-12-20 16:16:31 -08:00
Andrew Meadows
fa18d548f7 use proper category for NumAvatarsPerSec trace 2016-12-20 15:28:25 -08:00
Andrew Meadows
4d711d869c cleanup 2016-12-20 14:45:11 -08:00
Andrew Meadows
991a61b722 fix data collection for AvatarsPerSec 2016-12-20 14:01:03 -08:00
Andrew Meadows
1788d19260 remove some debug code 2016-12-20 14:00:25 -08:00
Andrew Meadows
03114fa610 add AvatarsPerSec trace stats 2016-12-20 11:45:21 -08:00
howard-stearns
3adc78fecc Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de sessionDisplayName set at server and passed to all clients (including
oneself)
2016-12-16 14:15:20 -08:00
Andrew Meadows
ee6a9f4506 adding profile stats relating to avatar CPU costs 2016-12-16 13:41:31 -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
Brad Hefta-Gaub
e3bc49c302 drop avatar data rate to 45hz 2016-12-13 16:51:59 -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 efe9571ab8, reversing
changes made to 333e9ec7f4.
2016-12-05 15:18:03 -08:00
Anthony J. Thibault
0c8105b551 Revert "Merge pull request #9141 from hyperlogic/feature/my-avatar-docs-part-1"
This reverts commit 934148fea5, reversing
changes made to d2b32c3084.
2016-12-05 15:17:53 -08:00
Anthony J. Thibault
49ce04e214 Revert "Merge pull request #9150 from hyperlogic/bug-fix/driving-while-flying-in-hmd"
This reverts commit a69d77ffbe, reversing
changes made to 996d3f5875.
2016-12-05 15:17:32 -08:00
Anthony J. Thibault
e8b5b56df7 Revert "Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode"
This reverts commit 119653bceb, reversing
changes made to a69d77ffbe.
2016-12-05 15:16:49 -08:00
Andrew Meadows
119653bceb Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode
Fix for reset sensors while in desktop mode.
2016-12-05 13:46:53 -08:00
Anthony J. Thibault
6d82410bc5 Fix for away.js teleporting user when in desktop mode
away.js calls MyAvatar.centerBody, however centerBody is only meaningful in HMD mode.
To guard against this, MyAvatar::centerBody is now a no-op if the application is not in HMD mode.
2016-12-05 10:53:20 -08:00
Anthony J. Thibault
349f0355ae Fix for reset sensors while in desktop mode.
Previously hitting ' a.k.a. reset sensors, would teleport you to the last
position you were in before you switched into desktop mode, or the spawn location.

This fixes that behavior but not re-centering the avatar while in desktop mode.
2016-12-05 10:42:20 -08:00
Anthony J. Thibault
a0f93dad2c Fix for driving/turning while flying in HMD mode
The internal MyAvatar:_sensorToWorldMatrix was being updated properly, however
the MyAvatar::_sensorToWorldMatrixCache was not. To fix this I've introduced
a new "mode" to updateSensorToWorldMatrix that does not change the sensorToWorldMatrix at all,
but properly copies the value to the cache and also updates hand controller poses etc.
2016-12-05 10:14:03 -08:00
Anthony J. Thibault
35eeaad590 Added jsdocs for MyAvatar
Not complete by any means, but it's a start.
2016-12-01 17:38:43 -08:00
Seth Alves
efe9571ab8 Merge pull request #8691 from highfidelity/out-of-body-experience
Room Scale HMD comfort features.
2016-12-01 11:09:39 -08:00
Andrew Meadows
445c730ca3 remove cruft, fix formatting and spelling 2016-12-01 10:38:13 -08:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
Anthony J. Thibault
38ac6fff03 Hand Controller rendering is camera relative
Basically, when using the third person camera in HMD mode.  If the controllers are shown.
They should be shown in front of the users camera, not in front of the users avatar.

To accomplish this, two new faux joint indices are introduced.
CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX.

These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network).
They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call.

These new indices are now used by the controllerDisplay.js for the hand controller rendering.
They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.
2016-11-17 11:33:12 -08:00
Andrew Meadows
d749697c46 scan bottom points during hover-HMD-drive 2016-11-15 12:05:44 -08:00
Andrew Meadows
a04b7ae297 fix hover-drive in HMD 2016-11-15 11:45:09 -08:00
Andrew Meadows
6bb3dd6830 Merge hifi/master into hifi/out-of-body-experience 2016-11-14 15:08:04 -08:00
Andrew Meadows
5f0761598e Merge pull request #8926 from AndrewMeadows/drive-hmd2
improved driving for HMD
2016-11-14 14:40:19 -08:00
Seth Alves
15c247fc5e quiet warnings 2016-11-11 06:37:22 -08:00
Stephen Birarda
020942c826 better handling for a flipped min/max scale 2016-11-10 16:50:36 -08:00