Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated viveControllerConfiguration.js with new controller offset

Browse source 
(cherry picked from commit ec2bc3495082dfb0b472948efa9d6881562ed3f9)
This commit is contained in:
Anthony J. Thibault 2016-10-18 15:47:53 -07:00
parent bcd31e3d99
commit ca9d497159
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/openvr/src/OpenVrHelpers.cpp
View file

@ -299,10 +299,11 @@ controller::Pose openVrControllerPoseToHandPose(bool isLeftHand, const mat4& mat
static const glm::quat leftRotationOffset = glm::inverse(leftQuarterZ * eighthX) * touchToHand;
static const glm::quat rightRotationOffset = glm::inverse(rightQuarterZ * eighthX) * touchToHand;
static const float CONTROLLER_X_OFFSET = 0.0381f; // sideways
static const float CONTROLLER_Y_OFFSET = 0.0495f; // forwards
static const float CONTROLLER_Z_OFFSET = 0.1371f; // upwards
static const glm::vec3 CONTROLLER_OFFSET(CONTROLLER_X_OFFSET, CONTROLLER_Y_OFFSET, CONTROLLER_Z_OFFSET);
// this needs to match the leftBasePosition in tutorial/viveControllerConfiguration.js:21
static const float CONTROLLER_LATERAL_OFFSET = 0.0381f;
static const float CONTROLLER_VERTICAL_OFFSET = 0.0495f;
static const float CONTROLLER_FORWARD_OFFSET = 0.1371f;
static const glm::vec3 CONTROLLER_OFFSET(CONTROLLER_LATERAL_OFFSET, CONTROLLER_VERTICAL_OFFSET, CONTROLLER_FORWARD_OFFSET);
static const glm::vec3 leftTranslationOffset = glm::vec3(-1.0f, 1.0f, 1.0f) * CONTROLLER_OFFSET;
static const glm::vec3 rightTranslationOffset = CONTROLLER_OFFSET;

18
tutorial/viveControllerConfiguration.js
View file

@ -16,16 +16,20 @@ var rightBaseRotation = Quat.multiply(
Quat.fromPitchYawRollDegrees(0, 0, -90)
)
);
var CONTROLLER_LENGTH_OFFSET = 0.0762;
// keep these in sync with the values from plugins/openvr/src/OpenVrHelpers.cpp:303
var CONTROLLER_LATERAL_OFFSET = 0.0381;
var CONTROLLER_VERTICAL_OFFSET = 0.0495;
var CONTROLLER_FORWARD_OFFSET = 0.1371;
var leftBasePosition = {
x: CONTROLLER_LENGTH_OFFSET / 2,
y: CONTROLLER_LENGTH_OFFSET * 2,
z: CONTROLLER_LENGTH_OFFSET / 2
x: CONTROLLER_VERTICAL_OFFSET,
y: CONTROLLER_FORWARD_OFFSET,
z: CONTROLLER_LATERAL_OFFSET
};
var rightBasePosition = {
x: -CONTROLLER_LENGTH_OFFSET / 2,
y: CONTROLLER_LENGTH_OFFSET * 2,
z: CONTROLLER_LENGTH_OFFSET / 2
x: -CONTROLLER_VERTICAL_OFFSET,
y: CONTROLLER_FORWARD_OFFSET,
z: CONTROLLER_LATERAL_OFFSET
};
var viveNaturalDimensions = {