mirror of
https://github.com/overte-org/overte.git
synced 2025-04-25 13:53:38 +02:00
Merge branch 'tony/mirrored-doppelganger' of github.com:hyperlogic/hifi into dressing-room
This commit is contained in:
Seth Alves
commit
a65ff76da1
1 changed files with 249 additions and 11 deletions
|
|
@ -15,6 +15,8 @@ var TEST_MODEL_URL = 'https://s3.amazonaws.com/hifi-public/ozan/avatars/albert/a
|
||||||
|
|
||||||
var doppelgangers = [];
|
var doppelgangers = [];
|
||||||
|
|
||||||
|
var MIRROR_JOINT_DATA = true;
|
||||||
|
|
||||||
function Doppelganger(avatar) {
|
function Doppelganger(avatar) {
|
||||||
this.initialProperties = {
|
this.initialProperties = {
|
||||||
name: 'Hifi-Doppelganger',
|
name: 'Hifi-Doppelganger',
|
||||||
|
|
@ -41,24 +43,248 @@ function getJointData(avatar) {
|
||||||
index: index,
|
index: index,
|
||||||
translation: translation,
|
translation: translation,
|
||||||
rotation: rotation
|
rotation: rotation
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
return allJointData;
|
return allJointData;
|
||||||
}
|
}
|
||||||
|
|
||||||
function setJointData(doppelganger, allJointData) {
|
function setJointData(doppelganger, relativeXforms) {
|
||||||
var jointRotations = [];
|
var jointRotations = [];
|
||||||
allJointData.forEach(function(jointData, index) {
|
var i, l = relativeXforms.length;
|
||||||
jointRotations.push(jointData.rotation);
|
for (i = 0; i < l; i++) {
|
||||||
});
|
jointRotations.push(relativeXforms[i].rot);
|
||||||
|
}
|
||||||
Entities.setAbsoluteJointRotationsInObjectFrame(doppelganger.id, jointRotations);
|
Entities.setAbsoluteJointRotationsInObjectFrame(doppelganger.id, jointRotations);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function mirrorJointData() {
|
// maps joint names to their mirrored joint
|
||||||
return mirroredJointData;
|
var JOINT_MIRROR_NAME_MAP = {
|
||||||
|
RightUpLeg: "LeftUpLeg",
|
||||||
|
RightLeg: "LeftLeg",
|
||||||
|
RightFoot: "LeftFoot",
|
||||||
|
LeftUpLeg: "RightUpLeg",
|
||||||
|
LeftLeg: "RightLeg",
|
||||||
|
LeftFoot: "RightFoot",
|
||||||
|
RightShoulder: "LeftShoulder",
|
||||||
|
RightArm: "LeftArm",
|
||||||
|
RightForeArm: "LeftForeArm",
|
||||||
|
RightHand: "LeftHand",
|
||||||
|
RightHandThumb1: "LeftHandThumb1",
|
||||||
|
RightHandThumb2: "LeftHandThumb2",
|
||||||
|
RightHandThumb3: "LeftHandThumb3",
|
||||||
|
RightHandThumb4: "LeftHandThumb4",
|
||||||
|
RightHandIndex1: "LeftHandIndex1",
|
||||||
|
RightHandIndex2: "LeftHandIndex2",
|
||||||
|
RightHandIndex3: "LeftHandIndex3",
|
||||||
|
RightHandIndex4: "LeftHandIndex4",
|
||||||
|
RightHandMiddle1: "LeftHandMiddle1",
|
||||||
|
RightHandMiddle2: "LeftHandMiddle2",
|
||||||
|
RightHandMiddle3: "LeftHandMiddle3",
|
||||||
|
RightHandMiddle4: "LeftHandMiddle4",
|
||||||
|
RightHandRing1: "LeftHandRing1",
|
||||||
|
RightHandRing2: "LeftHandRing2",
|
||||||
|
RightHandRing3: "LeftHandRing3",
|
||||||
|
RightHandRing4: "LeftHandRing4",
|
||||||
|
RightHandPinky1: "LeftHandPinky1",
|
||||||
|
RightHandPinky2: "LeftHandPinky2",
|
||||||
|
RightHandPinky3: "LeftHandPinky3",
|
||||||
|
RightHandPinky4: "LeftHandPinky4",
|
||||||
|
LeftShoulder: "RightShoulder",
|
||||||
|
LeftArm: "RightArm",
|
||||||
|
LeftForeArm: "RightForeArm",
|
||||||
|
LeftHand: "RightHand",
|
||||||
|
LeftHandThumb1: "RightHandThumb1",
|
||||||
|
LeftHandThumb2: "RightHandThumb2",
|
||||||
|
LeftHandThumb3: "RightHandThumb3",
|
||||||
|
LeftHandThumb4: "RightHandThumb4",
|
||||||
|
LeftHandIndex1: "RightHandIndex1",
|
||||||
|
LeftHandIndex2: "RightHandIndex2",
|
||||||
|
LeftHandIndex3: "RightHandIndex3",
|
||||||
|
LeftHandIndex4: "RightHandIndex4",
|
||||||
|
LeftHandMiddle1: "RightHandMiddle1",
|
||||||
|
LeftHandMiddle2: "RightHandMiddle2",
|
||||||
|
LeftHandMiddle3: "RightHandMiddle3",
|
||||||
|
LeftHandMiddle4: "RightHandMiddle4",
|
||||||
|
LeftHandRing1: "RightHandRing1",
|
||||||
|
LeftHandRing2: "RightHandRing2",
|
||||||
|
LeftHandRing3: "RightHandRing3",
|
||||||
|
LeftHandRing4: "RightHandRing4",
|
||||||
|
LeftHandPinky1: "RightHandPinky1",
|
||||||
|
LeftHandPinky2: "RightHandPinky2",
|
||||||
|
LeftHandPinky3: "RightHandPinky3",
|
||||||
|
LeftHandPinky4: "RightHandPinky4",
|
||||||
|
LeftHandPinky: "RightHandPinky",
|
||||||
|
};
|
||||||
|
|
||||||
|
// maps joint names to parent joint names.
|
||||||
|
var JOINT_PARENT_NAME_MAP = {
|
||||||
|
Hips: "",
|
||||||
|
RightUpLeg: "Hips",
|
||||||
|
RightLeg: "RightUpLeg",
|
||||||
|
RightFoot: "RightLeg",
|
||||||
|
LeftUpLeg: "Hips",
|
||||||
|
LeftLeg: "LeftUpLeg",
|
||||||
|
LeftFoot: "LeftLeg",
|
||||||
|
Spine: "Hips",
|
||||||
|
Spine1: "Spine",
|
||||||
|
Spine2: "Spine1",
|
||||||
|
Spine3: "Spine2",
|
||||||
|
Neck: "Spine3",
|
||||||
|
Head: "Neck",
|
||||||
|
RightShoulder: "Spine3",
|
||||||
|
RightArm: "RightShoulder",
|
||||||
|
RightForeArm: "RightArm",
|
||||||
|
RightHand: "RightForeArm",
|
||||||
|
RightHandThumb1: "RightHand",
|
||||||
|
RightHandThumb2: "RightHandThumb1",
|
||||||
|
RightHandThumb3: "RightHandThumb2",
|
||||||
|
RightHandThumb4: "RightHandThumb3",
|
||||||
|
RightHandIndex1: "RightHand",
|
||||||
|
RightHandIndex2: "RightHandIndex1",
|
||||||
|
RightHandIndex3: "RightHandIndex2",
|
||||||
|
RightHandIndex4: "RightHandIndex3",
|
||||||
|
RightHandMiddle1: "RightHand",
|
||||||
|
RightHandMiddle2: "RightHandMiddle1",
|
||||||
|
RightHandMiddle3: "RightHandMiddle2",
|
||||||
|
RightHandMiddle4: "RightHandMiddle3",
|
||||||
|
RightHandRing1: "RightHand",
|
||||||
|
RightHandRing2: "RightHandRing1",
|
||||||
|
RightHandRing3: "RightHandRing2",
|
||||||
|
RightHandRing4: "RightHandRing3",
|
||||||
|
RightHandPinky1: "RightHand",
|
||||||
|
RightHandPinky2: "RightHandPinky1",
|
||||||
|
RightHandPinky3: "RightHandPinky2",
|
||||||
|
RightHandPinky4: "RightHandPinky3",
|
||||||
|
LeftShoulder: "Spine3",
|
||||||
|
LeftArm: "LeftShoulder",
|
||||||
|
LeftForeArm: "LeftArm",
|
||||||
|
LeftHand: "LeftForeArm",
|
||||||
|
LeftHandThumb1: "LeftHand",
|
||||||
|
LeftHandThumb2: "LeftHandThumb1",
|
||||||
|
LeftHandThumb3: "LeftHandThumb2",
|
||||||
|
LeftHandThumb4: "LeftHandThumb3",
|
||||||
|
LeftHandIndex1: "LeftHand",
|
||||||
|
LeftHandIndex2: "LeftHandIndex1",
|
||||||
|
LeftHandIndex3: "LeftHandIndex2",
|
||||||
|
LeftHandIndex4: "LeftHandIndex3",
|
||||||
|
LeftHandMiddle1: "LeftHand",
|
||||||
|
LeftHandMiddle2: "LeftHandMiddle1",
|
||||||
|
LeftHandMiddle3: "LeftHandMiddle2",
|
||||||
|
LeftHandMiddle4: "LeftHandMiddle3",
|
||||||
|
LeftHandRing1: "LeftHand",
|
||||||
|
LeftHandRing2: "LeftHandRing1",
|
||||||
|
LeftHandRing3: "LeftHandRing2",
|
||||||
|
LeftHandRing4: "LeftHandRing3",
|
||||||
|
LeftHandPinky1: "LeftHand",
|
||||||
|
LeftHandPinky2: "LeftHandPinky1",
|
||||||
|
LeftHandPinky3: "LeftHandPinky2",
|
||||||
|
LeftHandPinky: "LeftHandPinky3",
|
||||||
|
};
|
||||||
|
|
||||||
|
// maps joint indices to parent joint indices.
|
||||||
|
var JOINT_PARENT_INDEX_MAP;
|
||||||
|
var JOINT_MIRROR_INDEX_MAP;
|
||||||
|
|
||||||
|
// ctor
|
||||||
|
function Xform(rot, pos) {
|
||||||
|
this.rot = rot;
|
||||||
|
this.pos = pos;
|
||||||
|
};
|
||||||
|
Xform.ident = function () {
|
||||||
|
return new Xform({x: 0, y: 0, z: 0, w: 1}, {x: 0, y: 0, z: 0});
|
||||||
|
}
|
||||||
|
Xform.mul = function (lhs, rhs) {
|
||||||
|
var rot = Quat.multiply(lhs.rot, rhs.rot);
|
||||||
|
var pos = Vec3.sum(lhs.pos, Vec3.multiplyQbyV(lhs.rot, rhs.pos));
|
||||||
|
return new Xform(rot, pos);
|
||||||
|
};
|
||||||
|
Xform.prototype.inv = function () {
|
||||||
|
var invRot = Quat.inverse(this.rot);
|
||||||
|
var invPos = Vec3.multiply(-1, this.pos);
|
||||||
|
return new Xform(invRot, Vec3.multiplyQbyV(invRot, invPos));
|
||||||
|
};
|
||||||
|
Xform.prototype.mirrorX = function () {
|
||||||
|
return new Xform({x: this.rot.x, y: -this.rot.y, z: -this.rot.z, w: this.rot.w},
|
||||||
|
{x: -this.pos.x, y: this.pos.y, z: this.pos.z});
|
||||||
|
}
|
||||||
|
Xform.prototype.toString = function () {
|
||||||
|
var rot = this.rot;
|
||||||
|
var pos = this.pos;
|
||||||
|
return "Xform rot = (" + rot.x + ", " + rot.y + ", " + rot.z + ", " + rot.w + "), pos = (" + pos.x + ", " + pos.y + ", " + pos.z + ")";
|
||||||
|
};
|
||||||
|
|
||||||
|
function buildAbsoluteXformsFromMyAvatar() {
|
||||||
|
var jointNames = MyAvatar.getJointNames();
|
||||||
|
|
||||||
|
// lazy init of JOINT_PARENT_INDEX_MAP
|
||||||
|
if (jointNames.length > 0 && !JOINT_PARENT_INDEX_MAP) {
|
||||||
|
JOINT_PARENT_INDEX_MAP = {};
|
||||||
|
var keys = Object.keys(JOINT_PARENT_NAME_MAP);
|
||||||
|
var i, l = keys.length;
|
||||||
|
var keyIndex, valueName, valueIndex;
|
||||||
|
for (i = 0; i < l; i++) {
|
||||||
|
keyIndex = MyAvatar.getJointIndex(keys[i]);
|
||||||
|
valueName = JOINT_PARENT_NAME_MAP[keys[i]];
|
||||||
|
if (valueName) {
|
||||||
|
valueIndex = MyAvatar.getJointIndex(valueName);
|
||||||
|
} else {
|
||||||
|
valueIndex = -1;
|
||||||
|
}
|
||||||
|
JOINT_PARENT_INDEX_MAP[keyIndex] = valueIndex;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// lazy init of JOINT_MIRROR_INDEX_MAP
|
||||||
|
if (jointNames.length > 0 && !JOINT_MIRROR_INDEX_MAP) {
|
||||||
|
JOINT_MIRROR_INDEX_MAP = {};
|
||||||
|
var keys = Object.keys(JOINT_MIRROR_NAME_MAP);
|
||||||
|
var i, l = keys.length;
|
||||||
|
var keyIndex, valueName, valueIndex;
|
||||||
|
for (i = 0; i < l; i++) {
|
||||||
|
keyIndex = MyAvatar.getJointIndex(keys[i]);
|
||||||
|
valueIndex = MyAvatar.getJointIndex(JOINT_MIRROR_NAME_MAP[keys[i]]);
|
||||||
|
if (valueIndex > 0) {
|
||||||
|
JOINT_MIRROR_INDEX_MAP[keyIndex] = valueIndex;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// build absolute xforms by multiplying by parent Xforms
|
||||||
|
var absoluteXforms = [];
|
||||||
|
var i, l = jointNames.length;
|
||||||
|
var parentXform;
|
||||||
|
for (i = 0; i < l; i++) {
|
||||||
|
var parentIndex = JOINT_PARENT_INDEX_MAP[i];
|
||||||
|
if (parentIndex >= 0) {
|
||||||
|
parentXform = absoluteXforms[parentIndex];
|
||||||
|
} else {
|
||||||
|
parentXform = Xform.ident();
|
||||||
|
}
|
||||||
|
var localXform = new Xform(MyAvatar.getJointRotation(i), MyAvatar.getJointTranslation(i));
|
||||||
|
absoluteXforms.push(Xform.mul(parentXform, localXform));
|
||||||
|
}
|
||||||
|
return absoluteXforms;
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildRelativeXformsFromAbsoluteXforms(absoluteXforms) {
|
||||||
|
|
||||||
|
// build relative xforms by multiplying by the inverse of the parent Xforms
|
||||||
|
var relativeXforms = [];
|
||||||
|
var i, l = absoluteXforms.length;
|
||||||
|
var parentXform;
|
||||||
|
for (i = 0; i < l; i++) {
|
||||||
|
var parentIndex = JOINT_PARENT_INDEX_MAP[i];
|
||||||
|
if (parentIndex >= 0) {
|
||||||
|
parentXform = absoluteXforms[parentIndex];
|
||||||
|
} else {
|
||||||
|
parentXform = Xform.ident();
|
||||||
|
}
|
||||||
|
relativeXforms.push(Xform.mul(parentXform.inv(), absoluteXforms[i]));
|
||||||
|
}
|
||||||
|
return relativeXforms;
|
||||||
}
|
}
|
||||||
|
|
||||||
function createDoppelganger(avatar) {
|
function createDoppelganger(avatar) {
|
||||||
|
|
@ -95,10 +321,22 @@ function disconnectDoppelgangerUpdates() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateDoppelganger() {
|
function updateDoppelganger() {
|
||||||
|
var absoluteXforms = buildAbsoluteXformsFromMyAvatar();
|
||||||
|
if (MIRROR_JOINT_DATA) {
|
||||||
|
var mirroredAbsoluteXforms = [];
|
||||||
|
var i, l = absoluteXforms.length;
|
||||||
|
for (i = 0; i < l; i++) {
|
||||||
|
var mirroredIndex = JOINT_MIRROR_INDEX_MAP[i];
|
||||||
|
if (mirroredIndex === undefined) {
|
||||||
|
mirroredIndex = i;
|
||||||
|
}
|
||||||
|
mirroredAbsoluteXforms[mirroredIndex] = absoluteXforms[i].mirrorX();
|
||||||
|
}
|
||||||
|
absoluteXforms = mirroredAbsoluteXforms;
|
||||||
|
}
|
||||||
|
var relativeXforms = buildRelativeXformsFromAbsoluteXforms(absoluteXforms);
|
||||||
doppelgangers.forEach(function(doppelganger) {
|
doppelgangers.forEach(function(doppelganger) {
|
||||||
var joints = getJointData(MyAvatar);
|
setJointData(doppelganger, relativeXforms);
|
||||||
//var mirroredJoints = mirrorJointData(joints);
|
|
||||||
setJointData(doppelganger, joints);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -111,7 +349,7 @@ function makeDoppelgangerForMyAvatar() {
|
||||||
makeDoppelgangerForMyAvatar();
|
makeDoppelgangerForMyAvatar();
|
||||||
|
|
||||||
function cleanup() {
|
function cleanup() {
|
||||||
disconnectDoppelgangerUpdates();
|
//disconnectDoppelgangerUpdates();
|
||||||
|
|
||||||
doppelgangers.forEach(function(doppelganger) {
|
doppelgangers.forEach(function(doppelganger) {
|
||||||
Entities.deleteEntity(doppelganger.id);
|
Entities.deleteEntity(doppelganger.id);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue