Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-16 21:46:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initial Commit - more to do.

Browse source
This commit is contained in:
Cain Kilgore 2017-09-14 00:25:11 +01:00
parent 030b39050a
commit 72ca62c4af
4 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,8 @@
#include "MovingEntitiesOperator.h"
#include "SceneScriptingInterface.h"
#include "CharacterController.h"
using namespace std;
const float DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES = 30.0f;
@ -2259,6 +2261,10 @@ float MyAvatar::getDomainMaxScale() {
return _domainMaximumScale;
}
void MyAvatar::setGravity(float gravity) {
emit gravityChanged(gravity);
}
void MyAvatar::increaseSize() {
// make sure we're starting from an allowable scale
clampTargetScaleToDomainLimits();

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

@ -145,7 +145,9 @@ class MyAvatar : public Avatar {
Q_PROPERTY(bool hmdRollControlEnabled READ getHMDRollControlEnabled WRITE setHMDRollControlEnabled)
Q_PROPERTY(float hmdRollControlDeadZone READ getHMDRollControlDeadZone WRITE setHMDRollControlDeadZone)
Q_PROPERTY(float hmdRollControlRate READ getHMDRollControlRate WRITE setHMDRollControlRate)
Q_PROPERTY(float gravity WRITE updateGravity NOTIFY gravityChanged);
const QString DOMINANT_LEFT_HAND = "left";
const QString DOMINANT_RIGHT_HAND = "right";
@ -540,6 +542,8 @@ public slots:
float getDomainMinScale();
float getDomainMaxScale();
void setGravity(float gravity);
void goToLocation(const glm::vec3& newPosition,
bool hasOrientation = false, const glm::quat& newOrientation = glm::quat(),
bool shouldFaceLocation = false);
@ -592,6 +596,7 @@ signals:
void wentActive();
void skeletonChanged();
void dominantHandChanged(const QString& hand);
void gravityChanged(const float gravity);
private:

8
libraries/physics/src/CharacterController.cpp
View file

@ -20,6 +20,7 @@
const btVector3 LOCAL_UP_AXIS(0.0f, 1.0f, 0.0f);
const float JUMP_SPEED = 3.5f;
const float MAX_FALL_HEIGHT = 20.0f;
const float DEFAULT_CHARACTER_GRAVITY = -5.0f;
#ifdef DEBUG_STATE_CHANGE
#define SET_STATE(desiredState, reason) setState(desiredState, reason)
@ -371,19 +372,20 @@ void CharacterController::setState(State desiredState) {
}
}
void CharacterController::updateGravity() {
void CharacterController::updateGravity(float gravity = DEFAULT_CHARACTER_GRAVITY) {
int16_t collisionGroup = computeCollisionGroup();
if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) {
_gravity = 0.0f;
} else {
const float DEFAULT_CHARACTER_GRAVITY = -5.0f;
_gravity = DEFAULT_CHARACTER_GRAVITY;
_gravity = gravity;
}
if (_rigidBody) {
_rigidBody->setGravity(_gravity * _currentUp);
}
emit gravityChanged();
}
void CharacterController::setLocalBoundingBox(const glm::vec3& minCorner, const glm::vec3& scale) {
float x = scale.x;
float z = scale.z;

10
libraries/physics/src/CharacterController.h
View file

@ -42,10 +42,16 @@ const btScalar MAX_CHARACTER_MOTOR_TIMESCALE = 60.0f; // one minute
const btScalar MIN_CHARACTER_MOTOR_TIMESCALE = 0.05f;
class CharacterController : public btCharacterControllerInterface {
Q_PROPERTY(float gravity WRITE updateGravity NOTIFY gravityChanged);
signals:
void gravityChanged();
public:
CharacterController();
virtual ~CharacterController();
void updateGravity(float gravity);
bool needsRemoval() const;
bool needsAddition() const;
virtual void setDynamicsWorld(btDynamicsWorld* world);
@ -130,7 +136,7 @@ protected:
#endif
virtual void updateMassProperties() = 0;
void updateGravity();
void updateGravity(float gravity);
void updateUpAxis(const glm::quat& rotation);
bool checkForSupport(btCollisionWorld* collisionWorld);