Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:37:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bit of code cleanup

Browse source
This commit is contained in:
Atlante45 2015-11-10 13:41:19 -08:00
parent 765bca9a7b
commit 7050139a56
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/src/avatar/AvatarActionHold.cpp
View file

@ -9,31 +9,28 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include "QVariantGLM.h" #include "AvatarActionHold.h"
#include <QVariantGLM.h>
#include "avatar/MyAvatar.h" #include "avatar/MyAvatar.h"
#include "avatar/AvatarManager.h" #include "avatar/AvatarManager.h"
#include "AvatarActionHold.h"
const uint16_t AvatarActionHold::holdVersion = 1; const uint16_t AvatarActionHold::holdVersion = 1;
AvatarActionHold::AvatarActionHold(const QUuid& id, EntityItemPointer ownerEntity) : AvatarActionHold::AvatarActionHold(const QUuid& id, EntityItemPointer ownerEntity) :
ObjectActionSpring(id, ownerEntity), ObjectActionSpring(id, ownerEntity)
_relativePosition(glm::vec3(0.0f)),
_relativeRotation(glm::quat()),
_hand("right"),
_holderID(QUuid())
{ {
_type = ACTION_TYPE_HOLD; _type = ACTION_TYPE_HOLD;
#if WANT_DEBUG #if WANT_DEBUG
qDebug() << "AvatarActionHold::AvatarActionHold"; qDebug() << "AvatarActionHold::AvatarActionHold";
#endif #endif
} }
AvatarActionHold::~AvatarActionHold() { AvatarActionHold::~AvatarActionHold() {
#if WANT_DEBUG #if WANT_DEBUG
qDebug() << "AvatarActionHold::~AvatarActionHold"; qDebug() << "AvatarActionHold::~AvatarActionHold";
#endif #endif
} }
void AvatarActionHold::updateActionWorker(float deltaTimeStep) { void AvatarActionHold::updateActionWorker(float deltaTimeStep) {

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

@ -35,12 +35,13 @@ public:
private: private:
static const uint16_t holdVersion; static const uint16_t holdVersion;
glm::vec3 _relativePosition; void doKinematicUpdate(float deltaTimeStep);
glm::vec3 _relativePosition { 0.0f };
glm::quat _relativeRotation; glm::quat _relativeRotation;
QString _hand; QString _hand { "right" };
QUuid _holderID; QUuid _holderID;
void doKinematicUpdate(float deltaTimeStep);
bool _kinematic { false }; bool _kinematic { false };
bool _kinematicSetVelocity { false }; bool _kinematicSetVelocity { false };
bool _previousSet { false }; bool _previousSet { false };

18
libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
View file

@ -35,17 +35,19 @@ vr::IVRSystem* acquireOpenVrSystem();
void releaseOpenVrSystem(); void releaseOpenVrSystem();
const float CONTROLLER_LENGTH_OFFSET = 0.0762f; // three inches static const float CONTROLLER_LENGTH_OFFSET = 0.0762f; // three inches
const glm::vec3 CONTROLLER_OFFSET = glm::vec3(CONTROLLER_LENGTH_OFFSET / 2.0f, CONTROLLER_LENGTH_OFFSET / 2.0f, 2.0f * CONTROLLER_LENGTH_OFFSET); // three inches static const glm::vec3 CONTROLLER_OFFSET = glm::vec3(CONTROLLER_LENGTH_OFFSET / 2.0f,
const QString CONTROLLER_MODEL_STRING = "vr_controller_05_wireless_b"; CONTROLLER_LENGTH_OFFSET / 2.0f,
CONTROLLER_LENGTH_OFFSET * 2.0f);
static const QString CONTROLLER_MODEL_STRING = "vr_controller_05_wireless_b";
static const QString MENU_PARENT = "Avatar";
static const QString MENU_NAME = "Vive Controllers";
static const QString MENU_PATH = MENU_PARENT + ">" + MENU_NAME;
static const QString RENDER_CONTROLLERS = "Render Hand Controllers";
const QString ViveControllerManager::NAME = "OpenVR"; const QString ViveControllerManager::NAME = "OpenVR";
const QString MENU_PARENT = "Avatar";
const QString MENU_NAME = "Vive Controllers";
const QString MENU_PATH = MENU_PARENT + ">" + MENU_NAME;
const QString RENDER_CONTROLLERS = "Render Hand Controllers";
bool ViveControllerManager::isSupported() const { bool ViveControllerManager::isSupported() const {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
auto hmd = acquireOpenVrSystem(); auto hmd = acquireOpenVrSystem();