Commit graph

2526 commits

Author SHA1 Message Date
Phil Palmer
2be87fe7dc Fix VR recentering cases that gave incorrect vertical position.
Fix for MyAvatar sometimes hovering off the ground after foot tracking was enabled.  MyAvatar's body is now recentered when foot-tracking starts or ends (in MyAvatar::update).
Repro:
- Start without foot tracking, 'Allow my avatar to stand: Always'.
- Crouch, and wait a few seconds for the avatar to pop back to the standing position.
- Slowly stand straight so that the avatar raises off the ground without recentering (PS: is this a bug?).  If it recenters, retry from previous step.
- Calibrate foot tracking.  Previously the avatar would remain hovering off the ground until MyAvatar::centerBody was called.

Fix for MyAvatar popping to a standing position if the left foot lost tracking.  The recentering now takes into account if either of the feet are tracked.
Repro:
- Enable foot tracking (and ideally hips tracking).
- Sit on the floor.
- Cover the left foot sensor so it loses tracking.  Previously the avatar and viewpoint would pop to a standing position.

Optimisation: MyAvatar::update now stores bools indicating which body parts are tracked (_isBodyPartTracked).  This avoid unnecessary computations that came from using getControllerPoseInAvatarFrame to convert controller::Pose from sensor space to world space and then to avatar space, only to check if the pose was valid.
2020-12-27 22:13:09 -05:00
Phil Palmer
3e25e32f18 Revert temporary "added pragmas" (optimize off)
This reverts commit 20e4f952ab.
2020-12-27 02:52:52 -05:00
Phil Palmer
dec9e9d338 VR fix for different avatar scales.
Previously, if the avatar scale wasn't 1, the body and viewpoint would given the wrong vertical position in some situations, eg: getting up from click-to-sit; changing the 'Allow my avatar to stand' setting.
The avatar scale was being taken into account where it shouldn't have in MyAvatar::deriveBodyFromHMDSensor.
The bug started in 8b839fe71b ("VR fixes for different user heights and avatar scales".
Repro:
1. Set 'Allow my avatar to stand: Always'
2. Reduce the avatar scale to the minumum.
3. Set 'Allow my avatar to stand: When I stand'
4. Previously, the viewpoint would suddenly be below the floor.
2020-12-27 02:50:29 -05:00
Phil Palmer
c9cf7eb75d Merge branch 'fix/vr-recenter-PRAGMAS' into fix/vr-recenter 2020-12-26 23:22:16 -05:00
Phil Palmer
20e4f952ab added pragmas 2020-12-26 23:19:21 -05:00
Phil Palmer
a489e9ddca Code style: made some little things more conformant with the coding standards and the rest of the codebase.
https://github.com/vircadia/vircadia/blob/master/CODING_STANDARD.md
2020-12-23 19:00:05 -05:00
Phil Palmer
8b839fe71b VR fixes for different user heights and avatar scales.
- The user's real-world height is now taken into account in MyAvatar::deriveBodyFromHMDSensor.  Therefore, for any user height, the floor stays correctly positioned in all modes of 'Allow my avatar to stand'.
- Whenever the user's real-world height is changed, centerBodyInternal is now called to position the body accordingly.  The floor therefore stays correctly positioned in all modes of 'Allow my avatar to stand'.  (MyAvatar::setUserHeight)
- Fix for walk speeds in VR being too fast at large avatar scale and too slow at small avatar scale.  The action motor velocity was being scaled once too many by the sensor-to-world scale.  The bug existed before this branch.  (MyAvatar::scaleMotorSpeed)
2020-12-23 07:54:59 -05:00
Phil Palmer
287f710ea1 Fix MyAvatar::centerBody breaking existing scripts (eg. away.js) by having a new parameter:
Moved the body of the function to a private internal method (centerBodyInternal), which takes the parameter instead.
Previously, when leaving 'away' state, the 'Away' overlay would stay on screen because of the bug.
The bug started in "VR fixes for: couldn't sit on the floor, wrong walk directions." (2179c153de).
2020-12-22 19:32:43 -05:00
Phil Palmer
2179c153de VR fixes for: couldn't sit on the floor, wrong walk directions.
- Divided the option "Avatar leaning behavior" into two options that work more usefully: "Allow my avatar to stand" and "Allow my avatar to lean" (PreferencesDialog.cpp).  Made the necessary fixes so that the avatar can be set to stand only when the user is standing (more details below).
- The logic controlling the direction of MyAvatar's action motor is now centralised in calculateScaledDirection (was previously split between there and updateMotors).  calculateScaledDirection now returns a velocity in world space.
- CharacterController::FollowHelper now uses separate follow timers for rotation, horizontal and vertical (previously followed all three based on the longest of their follow times).  Where appropriate, FollowHelper can now snap immediately to the desired rotation/horizontal/vertical independently (see FOLLOW_TIME_IMMEDIATE_SNAP).
- FollowHelper::FollowType has therefore moved to CharacterController::FollowType.
- MyAvatar::FollowHelper::postPhysicsUpdate: If MyAvatar is not allowed to stand when the user is sitting, this now avoids recentring the body based on the head height.
- Removed Q_PROPERTY(MyAvatar::SitStandModelType, as the sitting/standing/leaning model uses different enums now (see setAllowAvatarStandingPreference, setAllowAvatarLeaningPreference).
- Removed Q_PROPERTY(bool isSitStandStateLocked which is no longer used, because we now always track the user's real-world sit/stand state, regardless of what we're doing with it.
- MyAvatar::FollowHelper::shouldActivateHorizontal: If MyAvatar is not allowed to lean, this now returns true to recentre the footing if the head is outside the base of support.
- MyAvatar::FollowHelper::shouldActivateHorizontalCG: If MyAvatar is not allowed to lean, this now always returns true to recentre the footing.  Rearranged to avoid computing values that weren't used depending on the conditions.  Resolved some duplicated code.
- MyAvatar::setUserRecenterModel previously set HMDLeanRecenterEnabled based on the chosen mode, but it got reset when getting out of a sit.  Now HMDLeanRecenterEnabled is only controlled by the scripts.
- Added Rig::getUnscaledHipsHeight (like getUnscaledEyeHeight).  Refactored a little to avoid duplicated code.  Added DEFAULT_AVATAR_HIPS_HEIGHT which is the value that Rig::getUnscaledHipsHeight returns when using the default avatar.
- Fix for recentring not behaving as requested by the user after getting up from click-to-sit (always behaving like 'Auto') : MyAvatar::endSit now passes false to centerBody for 'forceFollowYPos'.
- Fix for incorrect vertical position of the avatar and viewpoint after changing lean recentre mode while not standing in the real world: MyAvatar::setAllowAvatarStandingPreference now calls centerBody with false for 'forceFollowYPos'.
- computeHipsInSensorFrame: The code now matches the comments in that it only skips the dampening of the hips rotation if the centre-of-gravity model is being used.
2020-12-22 14:22:27 -05:00
kasenvr
87d4fddb40
Merge branch 'master' into feature/transparent-web-entities 2020-09-26 01:25:02 -04:00
Kalila L
0d08254a07 Some updates to URLs in C++ 2020-09-20 23:37:29 -04:00
Kalila L
58c1518d0b Updating some .cpp and .h URLs. 2020-08-31 01:00:05 -04:00
Kalila L
26d4eb8e67 Updates per CR.
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
2020-08-24 18:43:03 -04:00
Kasen IO
ca97450464 Centralizing some more networking constants. 2020-08-17 02:44:26 -04:00
kasenvr
103fd8eef2
Merge branch 'master' into fix/revert-instancing-temporarily-1 2020-06-03 22:44:32 -04:00
kasenvr
d69c89583f
Merge pull request #394 from ctrlaltdavid/feature/enable-vr-flying
Enable flying in VR by default
2020-06-03 22:40:05 -04:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
kasenvr
4cca7f6f75
Merge pull request #281 from HifiExperiments/parenting2
Improve performance of MyAvatar::simulate when you have lots of descendants
2020-05-31 14:47:22 -04:00
David Rowe
d451012d08 Enable flying in VR by default 2020-05-28 09:12:17 +12:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
2020-04-09 16:46:27 +12:00
HifiExperiments
9b1635f9cc improve performance of MyAvatar::simulate when you have lots of entity descendants 2020-04-07 15:56:32 -07:00
David Rowe
7364ac5521 Fix scaled avatar walk speed 2020-01-04 11:43:28 +13:00
David Rowe
200ff2499e Include localVelocity etc. to match Entity.getEntityProperties() 2019-12-01 21:24:40 +13:00
David Rowe
c7f82a8264 Add new MyAvatar.getAvatarEntityData() implementation for API 2019-11-28 17:10:19 +13:00
David Rowe
9144e78cb9 Rename current getAvatarEntityData() method and use internally 2019-11-28 16:30:26 +13:00
Anthony Thibault
edfad97b64
Merge pull request #16517 from hyperlogic/feature/facecap-osc-plugin
Input plugin for streaming blendshapes from an iPhone
2019-11-23 11:49:51 -08:00
Anthony J. Thibault
98c951702d Added DEFAULT_GAZE_DISTANCE constant 2019-11-22 09:29:21 -08:00
Anthony J. Thibault
404d1a3c93 Fix several bugs for eye tracking from input plugins to function 2019-11-21 17:57:44 -08:00
DouglasWilcox
19aacde3a2 Fix case where Avatar could get stuck facing camera if rotating camera quickly and avatar faced backward. 2019-11-19 14:32:51 -08:00
DouglasWilcox
8ccdfaf220 Clamp rotation velocity if hit trigger angle, but only bounce forward if cameraYaw is true. 2019-11-19 12:05:25 -08:00
Brad Hefta-Gaub
0f428f0afb
Merge pull request #16498 from DouglasWilcox/improve_seated_rotation
Improve seated rotation
2019-11-19 10:22:08 -08:00
Sabrina Shanman
518d6a530a
Merge pull request #16507 from highfidelity/master
Merge master into instancing
2019-11-18 13:54:33 -08:00
DouglasWilcox
ddbb8d70ed Speed up acceleration and blends slightly per Joshua, add kicks to turn anim. 2019-11-15 17:04:51 -08:00
DouglasWilcox
d9065affad comment explaining seatedrot deceleration section, and transition-> turn works 2019-11-14 17:18:43 -08:00
DouglasWilcox
37010648be Abandon exponential acceleration and use constant acceleration. Hook up turn->sit transitions. 2019-11-14 13:12:01 -08:00
Andrew Meadows
7692e858a1 use EntityItemID rather than QUuid 2019-11-14 09:59:43 -08:00
Andrew Meadows
3546bab19a use std::vector<> instead of QVector<> 2019-11-14 09:59:43 -08:00
Andrew Meadows
9d92546a8b revert the revert of PR-16307 2019-11-14 09:59:43 -08:00
DouglasWilcox
11e1c4e6fe linear acceleration experiment 2019-11-14 09:23:16 -08:00
Anthony J. Thibault
365b132c30 Bugfix for t-pose avatar when moving
The android specific optimized IK animation graph was out of date, it was referencing
animations that have been deleted, hence the t-pose.  This PR updates and renames the
android/optimized ik animation graph to the latest.
2019-11-12 15:33:41 -08:00
DouglasWilcox
9d86e49a0b Pretty good exponential acceleration, need to simplify 2019-11-12 11:59:39 -08:00
DouglasWilcox
995f5f92cd Do not use turningSpeed when setting seatedTurn vars, and iterate acceleration formula 2019-11-12 11:11:19 -08:00
DouglasWilcox
c36c4a17b1 first pass hookup of seated rotation with acceleration and animation response 2019-11-11 11:31:34 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master
Merge master into instancing
2019-11-08 10:10:50 -08:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -08:00
luiscuenca
de2d2de938
Head woes in 1st person part 2 2019-11-04 13:33:00 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master
Merge master into instancing
2019-10-31 17:39:15 -07:00
Anthony J. Thibault
4b34311a0a Hooked up seated version of aim offset animation 2019-10-31 16:23:29 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes
Extended avatar blendshape support for ARKit compatiblity
2019-10-31 12:33:50 -07:00
Shannon Romano
9948a181dc
Merge pull request #16392 from kitely/load-avatar-entities-after-skeleton
In Bookmarks, attach avatar entities after the skeleton is loaded
2019-10-30 09:29:51 -07:00
Sabrina Shanman
e8b963b59a
Merge pull request #16425 from highfidelity/master
Merge master into instancing
2019-10-30 09:16:04 -07:00
Shannon Romano
8fc135d972
Merge pull request #16423 from hyperlogic/bug-fix/third-person-look-at-fix-2
DEV-2302: Fix for head not turning in third person look at camera mode
2019-10-29 13:41:13 -07:00
Brad Hefta-Gaub
206e519b5e
Merge pull request #16390 from kitely/fix-walk-speed
Fixed the sprint speeds of Desktop vs HMD
2019-10-29 13:04:45 -07:00
Anthony J. Thibault
e753010411 Fix for head not turning in third person look at camera mode
If MyAvatar::setSkeletonModelURL() is called with the same url that has already been loaded the
SkeletonModel::skeletonLoaded signal will not be triggered.  In this case the MyAvatar local variable
MyAvatar::_skeletonModelLoaded will be set to false and never re-set to true.  This, in turn,
caused MyAvatar::updateHeadLookAt() to skip setting the proper blend values that would turn the head.

Rather then try to make MyAvatar::_skeletonModelLoaded handle all the possible edge cases. It has
been removed.  All conditionals that used to use it have been replased with _skeletonModel->isLoaded().
2019-10-29 12:38:06 -07:00
luiscuenca
ab6631fae3
Fix look at update and allow to release control 2019-10-28 17:51:29 -07:00
Oren Hurvitz
70c3bb2748 Emit an event when failing to load an avatar.
Previously, MyAvatar only emitted an event (onLoadComplete) if the load succeeded.
Now it also emits an event (onLoadFailed) if the load failed.
2019-10-27 10:55:31 +02:00
Oren Hurvitz
62e5b50e24 Fixed the sprint speeds of Desktop vs HMD (they were flipped) 2019-10-27 09:33:59 +02:00
Sabrina Shanman
e74de214e2
Merge pull request #16404 from highfidelity/master
Merge master into instancing
2019-10-25 09:55:44 -07:00
Anthony J. Thibault
dc7b611e8e documentation and warning fixes 2019-10-24 09:53:11 -07:00
Anthony J. Thibault
d43d12dfa7 Merge branch 'master' into feature/arkit-blendshapes 2019-10-23 21:45:10 -07:00
Anthony Thibault
edb181bd16
Merge pull request #16317 from luiscuenca/setAvatarLookAtAPI
DEV-2285: Improve eyes look at
2019-10-23 20:42:27 -07:00
luiscuenca
bb0849d3a0
Move changes to Head and remove leftover code 2019-10-23 14:23:29 -07:00
luiscuenca
9849205ca0
Add perf timer to code block 2019-10-23 12:32:16 -07:00
luiscuenca
f6aa4a2dd4
Head look at should update before rig 2019-10-22 11:42:19 -07:00
luiscuenca
a4fcb2c39e
Add eyesLookAtTarget set/get API methods 2019-10-21 14:31:15 -07:00
Sabrina Shanman
5d91d22314
Merge pull request #16379 from highfidelity/master
Merge master into instancing
2019-10-18 10:24:35 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
luiscuenca
9000b4c7f8
Tweak camera position in first person to further hide neck 2019-10-16 17:31:10 -07:00
luiscuenca
9f0e82e1e6
Improve eye's look at and blinking. Fix look at update 2019-10-16 15:29:28 -07:00
Sam Gateau
af269a4720 Merge branch 'master' of github.com:highfidelity/hifi into upstream-instancing 2019-10-16 11:57:15 -07:00
Anthony Thibault
5115b52ca0
Merge pull request #16356 from luiscuenca/fixLookAtNoHead
DEV-2316: Fix camera position in first person
2019-10-16 10:52:53 -07:00
Anthony J. Thibault
389f5a1d33 ARKit Blendshape hookup work 2019-10-16 10:36:39 -07:00
Anthony J. Thibault
da0911e01b Delete legacy blendshape code
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
2019-10-16 10:36:37 -07:00
Anthony J. Thibault
8411e6b033 Blendshape script API work
* Moved hasScriptedBlendshapes, hasProceduralBlinkFaceMovement, hasProceduralEyeFaceMovement, hasAudioEnabledFaceMovement to AvatarData
  so they are accessable via agent scripts.
* Marked setForceFaceTrackerConnected as depricated.
* Updated jsdoc comments
2019-10-16 10:36:35 -07:00
luiscuenca
02837be13f
Get state using CharacterController 2019-10-16 09:04:03 -07:00
luiscuenca
93a1adc736
Fix camera position in first person 2019-10-15 18:25:33 -07:00
Anthony J. Thibault
288f9bfb16 Fix for HMD mode flying
In HMD mode you should fly/move in the direction you are looking.
2019-10-15 18:22:42 -07:00
Shannon Romano
f29d4aad1b
Merge pull request #16322 from Atlante45/feat/xcode-11-compatible-build
Add Bullet3 patch for Xcode 11 build
2019-10-14 16:28:17 -07:00
luiscuenca
505813b3c3
Fix blink async and other is talking bug 2019-10-14 10:44:55 -07:00
Brad Hefta-Gaub
51669e1ac3
Revert "DEV-1811: apply deletion rules to linked entities" 2019-10-11 11:06:10 -07:00
Clement
0df6661f5b Fix incorrect assert 2019-10-10 15:57:05 -07:00
Maia Hansen
07b916f0b7
Merge pull request #16307 from AndrewMeadows/colossal-cave
DEV-1811: apply deletion rules to linked entities
2019-10-10 13:24:43 -07:00
luiscuenca
fc018257e1
Select avatar to look using API. Blink when look at change 2019-10-09 12:20:35 -07:00
Sam Gateau
9df2186696 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-09 10:03:09 -07:00
Shannon Romano
b3d974504a
Merge pull request #16316 from luiscuenca/fixForwardEyeLookAt
DEV-2285: Fix eye look at forward vector
2019-10-09 09:13:02 -07:00
Sam Gateau
abaf0262a7 Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-08 18:55:51 -07:00
Sam Gateau
1f3993c308 getting the transform right for the rigid bodies 2019-10-08 18:13:24 -07:00
luiscuenca
68e287628c
Fix eye look at forward vector 2019-10-08 14:39:27 -07:00
Shannon Romano
0bf7fd0233
Merge pull request #16310 from luiscuenca/fixStrafeWhileFlying
DEV-2261: DEV-2320: Fix strafe while flying, and ramp up diagonal movement
2019-10-08 11:45:26 -07:00
luiscuenca
5576132df7
Fix strafe while flying, and ramp up diagonal movement 2019-10-08 10:13:58 -07:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
Andrew Meadows
8ab70225d9 apply delete rules down linked hierarchy 2019-10-07 14:38:36 -07:00
Andrew Meadows
470a45c012 EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities 2019-10-07 14:38:36 -07:00
luiscuenca
e0d0ec5852
Fix isInAir so takes into account the new seated state: 2019-10-03 10:36:23 -07:00
luiscuenca
75f0b4ea54
Fix First Person Camera issues 2019-10-02 14:17:57 -07:00
luiscuenca
059bcc10cc
merge master 2019-10-02 13:24:32 -07:00
luiscuenca
521aa50356
Set time and angle recentering parameters 2019-10-02 11:43:06 -07:00
luiscuenca
18af7c5d84
Add recenter timer and temp API 2019-10-01 13:44:27 -07:00
Shannon Romano
38574cd66b
Merge pull request #16245 from luiscuenca/implementPointAt
DEV-442: Implement directional blending node for point reaction
2019-10-01 11:46:30 -07:00
luiscuenca
d4a74f798c
aimToBlendValues to static function 2019-10-01 10:15:16 -07:00