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

Update vive controller model

Browse source
This commit is contained in:
Ryan Huffman 2016-09-01 10:54:01 -07:00
parent ea71ef91b6
commit a1280d0958
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tutorial/viveHandsv2.js
View file

@ -1,8 +1,8 @@
var PARENT_ID = MyAvatar.sessionUUID; var PARENT_ID = MyAvatar.sessionUUID;
var LEFT_JOINT_INDEX = MyAvatar.getJointIndex("_CONTROLLER_LEFTHAND"); var LEFT_JOINT_INDEX = MyAvatar.getJointIndex("_CONTROLLER_LEFTHAND");
var RIGHT_JOINT_INDEX = MyAvatar.getJointIndex("_CONTROLLER_RIGHTHAND"); var RIGHT_JOINT_INDEX = MyAvatar.getJointIndex("_CONTROLLER_RIGHTHAND");
var LEFT_JOINT_INDEX = MyAvatar.getJointIndex("LeftHand"); //var LEFT_JOINT_INDEX = MyAvatar.getJointIndex("LeftHand");
var RIGHT_JOINT_INDEX = MyAvatar.getJointIndex("RightHand"); //var RIGHT_JOINT_INDEX = MyAvatar.getJointIndex("RightHand");
var zeroPosition = { x: 0, y: 0, z: 0 }; var zeroPosition = { x: 0, y: 0, z: 0 };
var zeroRotation = { x: 0, y: 0, z: 0, w: 1 }; var zeroRotation = { x: 0, y: 0, z: 0, w: 1 };
@ -25,7 +25,6 @@ var naturalPositionR = {
z: 0.06380049744620919 z: 0.06380049744620919
}; };
// THe CONTROLLER_LEFTHAND
var leftBasePosition = { var leftBasePosition = {
x: CONTROLLER_LENGTH_OFFSET / 2, x: CONTROLLER_LENGTH_OFFSET / 2,
y: CONTROLLER_LENGTH_OFFSET * 2, y: CONTROLLER_LENGTH_OFFSET * 2,
@ -221,13 +220,13 @@ var viveNaturalPosition = {
y: -0.034076502197422087, y: -0.034076502197422087,
z: 0.06380049744620919 z: 0.06380049744620919
}; };
var viveModelURL = "https://hifi-public.s3.amazonaws.com/huffman/controllers/vive2.fbx";
var VIVE_CONTROLLER_CONFIGURATION = { var VIVE_CONTROLLER_CONFIGURATION = {
name: "Vive", name: "Vive",
controllers: [ controllers: [
{ {
modelURL: "https://hifi-public.s3.amazonaws.com/huffman/controllers/vr_controller_vive_1_5.obj", modelURL: viveModelURL,
modelURL: "C:\\Users\\Ryan\\Assets\\controller\\vive2.fbx",
jointIndex: MyAvatar.getJointIndex("_CONTROLLER_LEFTHAND"), jointIndex: MyAvatar.getJointIndex("_CONTROLLER_LEFTHAND"),
naturalPosition: viveNaturalPosition, naturalPosition: viveNaturalPosition,
rotation: leftBaseRotation, rotation: leftBaseRotation,
@ -331,15 +330,9 @@ var VIVE_CONTROLLER_CONFIGURATION = {
}, },
}, },
{ {
modelURL: "https://hifi-public.s3.amazonaws.com/huffman/controllers/vr_controller_vive_1_5.obj", modelURL: viveModelURL,
modelURL: "C:\\Users\\Ryan\\Assets\\controller\\vive2.fbx",
jointIndex: MyAvatar.getJointIndex("_CONTROLLER_RIGHTHAND"), jointIndex: MyAvatar.getJointIndex("_CONTROLLER_RIGHTHAND"),
//rotation: rightBaseRotation,
//position: rightBasePosition,
//position: Vec3.sum(Vec3.multiplyQbyV(rightBaseRotation, naturalPositionR), rightBasePositionVive),
//rotation: zeroRotation,
//position: zeroPosition,
rotation: rightBaseRotation, rotation: rightBaseRotation,
position: Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, 0, -45), rightBasePosition), position: Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, 0, -45), rightBasePosition),
@ -350,8 +343,6 @@ var VIVE_CONTROLLER_CONFIGURATION = {
y: -0.034076502197422087, y: -0.034076502197422087,
z: 0.06380049744620919 z: 0.06380049744620919
}, },
//rotation: touchRightBaseRotation,
//position: rightBasePosition,
annotationTextRotation: Quat.fromPitchYawRollDegrees(20, -90, 0), annotationTextRotation: Quat.fromPitchYawRollDegrees(20, -90, 0),
annotations: { annotations: {