mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-05-28 20:50:35 +02:00
2179c153de
- 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.
95 lines
3.2 KiB
C++
95 lines
3.2 KiB
C++
//
|
|
// MyCharacterController.h
|
|
// interface/src/avatar
|
|
//
|
|
// Created by AndrewMeadows 2015.10.21
|
|
// Copyright 2015 High Fidelity, Inc.
|
|
//
|
|
// Distributed under the Apache License, Version 2.0.
|
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
|
//
|
|
|
|
|
|
#ifndef hifi_MyCharacterController_h
|
|
#define hifi_MyCharacterController_h
|
|
|
|
#include <CharacterController.h>
|
|
//#include <SharedUtil.h>
|
|
#include <PhysicsEngine.h>
|
|
|
|
class btCollisionShape;
|
|
class MyAvatar;
|
|
class DetailedMotionState;
|
|
|
|
class MyCharacterController : public CharacterController {
|
|
public:
|
|
explicit MyCharacterController(std::shared_ptr<MyAvatar> avatar, const FollowTimePerType& followTimeRemainingPerType);
|
|
~MyCharacterController ();
|
|
|
|
void addToWorld() override;
|
|
void updateShapeIfNecessary() override;
|
|
|
|
// Sweeping a convex shape through the physics simulation can be expensive when the obstacles are too
|
|
// complex (e.g. small 20k triangle static mesh) so instead we cast several rays forward and if they
|
|
// don't hit anything we consider it a clean sweep. Hence this "Shotgun" code.
|
|
class RayShotgunResult {
|
|
public:
|
|
void reset();
|
|
float hitFraction { 1.0f };
|
|
bool walkable { true };
|
|
};
|
|
|
|
/// return true if RayShotgun hits anything
|
|
bool testRayShotgun(const glm::vec3& position, const glm::vec3& step, RayShotgunResult& result);
|
|
|
|
void setDensity(btScalar density) { _density = density; }
|
|
|
|
const btCollisionShape* createDetailedCollisionShapeForJoint(int32_t jointIndex);
|
|
DetailedMotionState* createDetailedMotionStateForJoint(int32_t jointIndex);
|
|
std::vector<DetailedMotionState*>& getDetailedMotionStates() { return _detailedMotionStates; }
|
|
void clearDetailedMotionStates();
|
|
|
|
void buildPhysicsTransaction(PhysicsEngine::Transaction& transaction);
|
|
|
|
struct RayAvatarResult {
|
|
bool _intersect { false };
|
|
bool _isBound { false };
|
|
QUuid _intersectWithAvatar;
|
|
int32_t _intersectWithJoint { -1 };
|
|
float _distance { 0.0f };
|
|
float _maxDistance { 0.0f };
|
|
QVariantMap _extraInfo;
|
|
glm::vec3 _intersectionPoint;
|
|
glm::vec3 _intersectionNormal;
|
|
std::vector<int32_t> _boundJoints;
|
|
};
|
|
std::vector<RayAvatarResult> rayTest(const btVector3& origin, const btVector3& direction, const btScalar& length,
|
|
const QVector<uint>& jointsToExclude) const;
|
|
|
|
int32_t computeCollisionMask() const override;
|
|
void handleChangedCollisionMask() override;
|
|
|
|
void setCollideWithOtherAvatars(bool collideWithOtherAvatars) { _collideWithOtherAvatars = collideWithOtherAvatars; }
|
|
|
|
bool needsSafeLandingSupport() const;
|
|
|
|
protected:
|
|
void initRayShotgun(const btCollisionWorld* world);
|
|
void updateMassProperties() override;
|
|
|
|
private:
|
|
btConvexHullShape* computeShape() const;
|
|
|
|
protected:
|
|
std::shared_ptr<MyAvatar> _avatar { nullptr };
|
|
|
|
// shotgun scan data
|
|
btAlignedObjectArray<btVector3> _topPoints;
|
|
btAlignedObjectArray<btVector3> _bottomPoints;
|
|
btScalar _density { 1.0f };
|
|
|
|
std::vector<DetailedMotionState*> _detailedMotionStates;
|
|
bool _collideWithOtherAvatars { true };
|
|
};
|
|
|
|
#endif // hifi_MyCharacterController_h
|