Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 04:38:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed the transition times to make the sit longer and the stand shorter

Browse source
This commit is contained in:
amantley 2018-10-16 17:45:55 -07:00
parent 02f499e9f7
commit baeccebfb9
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/avatar/MyAvatar.cpp
View file

@ -467,8 +467,8 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) {
void MyAvatar::updateSitStandState(float newHeightReading, float angleHeadUp) {
const float STANDING_HEIGHT_MULTIPLE = 1.2f;
const float SITTING_HEIGHT_MULTIPLE = 0.833f;
const int SITTING_COUNT_THRESHOLD = 180;
const int STANDING_COUNT_THRESHOLD = 60;
const int SITTING_COUNT_THRESHOLD = 240;
const int STANDING_COUNT_THRESHOLD = 20;
const int SQUATTY_COUNT_THRESHOLD = 600;
const float SITTING_UPPER_BOUND = 1.52f;
@ -495,7 +495,7 @@ void MyAvatar::updateSitStandState(float newHeightReading, float angleHeadUp) {
} else {
// sanity check if average height greater than 5ft they are not sitting(or get off your dangerous barstool please)
if (_sumUserHeightSensorSpace > SITTING_UPPER_BOUND) {
setIsInSittingState(true);
setIsInSittingState(false);
} else {
// tipping point is average height when sitting.
_tippingPoint = _sumUserHeightSensorSpace;
@ -4192,7 +4192,6 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
if (myAvatar.getHMDLeanRecenterEnabled() &&
qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) {
if (!isActive(Rotation) && (shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) {
activate(Rotation);
myAvatar.setHeadControllerFacingMovingAverage(myAvatar.getHeadControllerFacing());