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

Merge branch 'vive' of github.com:Atlante45/hifi into baseball

Browse source
This commit is contained in:
Atlante45 2015-11-03 11:40:45 -08:00
commit 2bdd282708
3 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@ void AvatarActionHold::updateActionWorker(float deltaTimeStep) {
if (it != std::end(plugins)) { if (it != std::end(plugins)) {
const auto& vive = it->dynamicCast<ViveControllerManager>(); const auto& vive = it->dynamicCast<ViveControllerManager>();
auto index = (_hand == "right") ? 0 : 1; auto index = (_hand == "left") ? 0 : 1;
auto userInputMapper = DependencyManager::get<UserInputMapper>(); auto userInputMapper = DependencyManager::get<UserInputMapper>();
auto translation = extractTranslation(userInputMapper->getSensorToWorldMat()); auto translation = extractTranslation(userInputMapper->getSensorToWorldMat());
auto rotation = glm::quat_cast(userInputMapper->getSensorToWorldMat()); auto rotation = glm::quat_cast(userInputMapper->getSensorToWorldMat());
@ -71,16 +71,16 @@ void AvatarActionHold::updateActionWorker(float deltaTimeStep) {
const glm::quat quarterX = glm::angleAxis(PI / 2.0f, glm::vec3(1.0f, 0.0f, 0.0f)); const glm::quat quarterX = glm::angleAxis(PI / 2.0f, glm::vec3(1.0f, 0.0f, 0.0f));
const glm::quat yFlip = glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f)); const glm::quat yFlip = glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f));
palmPosition = translation + rotation * vive->getPosition(index); palmPosition = translation + rotation * vive->getPosition(index);
palmRotation = rotation * vive->getRotation(index) * yFlip * quarterX; palmRotation = rotation * vive->getRotation(index) * yFlip * quarterX * glm::angleAxis(PI, glm::vec3(1.0f, 0.0f, 0.0f)) * glm::angleAxis(PI_OVER_TWO, glm::vec3(0.0f, 0.0f, 1.0f));
} else } else
#endif #endif
if (_hand == "right") { if (_hand == "right") {
palmPosition = holdingAvatar->getRightPalmPosition(); palmPosition = holdingAvatar->getRightPalmPosition();
palmRotation = holdingAvatar->getRightPalmRotation(); palmRotation = holdingAvatar->getRightPalmRotation();
} else { } else {
palmPosition = holdingAvatar->getLeftPalmPosition(); palmPosition = holdingAvatar->getLeftPalmPosition();
palmRotation = holdingAvatar->getLeftPalmRotation(); palmRotation = holdingAvatar->getLeftPalmRotation();
} }
rotation = palmRotation * _relativeRotation; rotation = palmRotation * _relativeRotation;
offset = rotation * _relativePosition; offset = rotation * _relativePosition;

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

@ -285,11 +285,17 @@ void ViveControllerManager::update(float deltaTime, bool jointsCaptured) {
handleButtonEvent(i, pressed, left); handleButtonEvent(i, pressed, left);
} }
for (uint32_t i = 0; i < vr::k_unControllerStateAxisCount; i++) { for (uint32_t i = 0; i < vr::k_unControllerStateAxisCount; i++) {
handleAxisEvent(i, controllerState.rAxis[i].x, controllerState.rAxis[i].y, left); auto mask = vr::ButtonMaskFromId((vr::EVRButtonId)(i + vr::k_EButton_Axis0));
bool pressed = 0 != (controllerState.ulButtonPressed & mask);
if (pressed || true) {
handleAxisEvent(i, controllerState.rAxis[i].x, controllerState.rAxis[i].y, left);
} else {
handleAxisEvent(i, 0.0f, 0.0f, left);
}
} }
} }
} }
auto userInputMapper = DependencyManager::get<controller::UserInputMapper>(); auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
if (numTrackedControllers == 0) { if (numTrackedControllers == 0) {
@ -422,7 +428,6 @@ void ViveControllerManager::handlePoseEvent(const mat4& mat, bool left) {
position += rotation * translationOffset; position += rotation * translationOffset;
rotation = rotation * rotationOffset; rotation = rotation * rotationOffset;
//{quat, x = 0.653281, y = -0.270598, z = 0.653281, w = 0.270598}{vec3, x = 0.0381, y = -0.0381, z = -0.1524}
_poseStateMap[left ? controller::LEFT_HAND : controller::RIGHT_HAND] = controller::Pose(position, rotation); _poseStateMap[left ? controller::LEFT_HAND : controller::RIGHT_HAND] = controller::Pose(position, rotation);
} }

20
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -120,16 +120,16 @@ static bool hadUncaughtExceptions(QScriptEngine& engine, const QString& fileName
} }
ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString, bool wantSignals) : ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString, bool wantSignals) :
_scriptContents(scriptContents), _scriptContents(scriptContents),
_isFinished(false), _isFinished(false),
_isRunning(false), _isRunning(false),
_isInitialized(false), _isInitialized(false),
_timerFunctionMap(), _timerFunctionMap(),
_wantSignals(wantSignals), _wantSignals(wantSignals),
_fileNameString(fileNameString), _fileNameString(fileNameString),
_isUserLoaded(false), _isUserLoaded(false),
_isReloading(false), _isReloading(false),
_arrayBufferClass(new ArrayBufferClass(this)) _arrayBufferClass(new ArrayBufferClass(this))
{ {
_allScriptsMutex.lock(); _allScriptsMutex.lock();
_allKnownScriptEngines.insert(this); _allKnownScriptEngines.insert(this);