Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 20:58:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup from Merge

Browse source
This commit is contained in:
Cain Kilgore 2017-09-20 23:37:33 +01:00
parent a4655b9c73
commit 322b7fc060
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -150,6 +150,9 @@ class MyAvatar : public Avatar {
Q_PROPERTY(float hmdRollControlDeadZone READ getHMDRollControlDeadZone WRITE setHMDRollControlDeadZone) Q_PROPERTY(float hmdRollControlDeadZone READ getHMDRollControlDeadZone WRITE setHMDRollControlDeadZone)
Q_PROPERTY(float hmdRollControlRate READ getHMDRollControlRate WRITE setHMDRollControlRate) Q_PROPERTY(float hmdRollControlRate READ getHMDRollControlRate WRITE setHMDRollControlRate)
Q_PROPERTY(float userHeight READ getUserHeight WRITE setUserHeight)
Q_PROPERTY(float userEyeHeight READ getUserEyeHeight)
const QString DOMINANT_LEFT_HAND = "left"; const QString DOMINANT_LEFT_HAND = "left";
const QString DOMINANT_RIGHT_HAND = "right"; const QString DOMINANT_RIGHT_HAND = "right";

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

@ -393,9 +393,6 @@ void CharacterController::setState(State desiredState) {
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD
=======
void CharacterController::updateGravity() { void CharacterController::updateGravity() {
int16_t collisionGroup = computeCollisionGroup(); int16_t collisionGroup = computeCollisionGroup();
if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) { if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) {
@ -408,9 +405,6 @@ void CharacterController::updateGravity() {
} }
} }
>>>>>>> 5e5b77fbaaeff61a26144a240329eca70765c1a9
=======
>>>>>>> 4d904bd5ce7d7b1a805c2f8fbdda630afc27576f
void CharacterController::setLocalBoundingBox(const glm::vec3& minCorner, const glm::vec3& scale) { void CharacterController::setLocalBoundingBox(const glm::vec3& minCorner, const glm::vec3& scale) {
float x = scale.x; float x = scale.x;
float z = scale.z; float z = scale.z;