Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 08:36:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't attach to joints in range when I grab

Browse source
This commit is contained in:
Atlante45 2014-05-29 15:50:23 -07:00
parent 73f7390eaa
commit c7b636365c
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
examples/editModels.js
View file

@ -88,6 +88,8 @@ function controller(wichSide) {
this.oldModelPosition; this.oldModelPosition;
this.oldModelRadius; this.oldModelRadius;
this.jointsIntersectingFronStart = [];
this.laser = Overlays.addOverlay("line3d", { this.laser = Overlays.addOverlay("line3d", {
position: { x: 0, y: 0, z: 0 }, position: { x: 0, y: 0, z: 0 },
end: { x: 0, y: 0, z: 0 }, end: { x: 0, y: 0, z: 0 },
@ -142,6 +144,14 @@ function controller(wichSide) {
this.oldModelPosition = properties.position; this.oldModelPosition = properties.position;
this.oldModelRotation = properties.modelRotation; this.oldModelRotation = properties.modelRotation;
this.oldModelRadius = properties.radius; this.oldModelRadius = properties.radius;
this.jointsIntersectingFronStart = [];
for (var i = 0; i < jointList.length; i++) {
var distance = Vec3.distance(MyAvatar.getJointPosition(jointList[i]), this.oldModelPosition);
if (distance < this.oldModelRadius) {
this.jointsIntersectingFronStart.push(i);
}
}
} }
} }
@ -161,27 +171,33 @@ function controller(wichSide) {
} }
} }
print("closestJoint: " + jojntList[closestJointIndex]); print("closestJoint: " + jointList[closestJointIndex]);
print("closestJointDistance (attach max distance): " + closestJointDistance + " (" + this.oldModelRadius + ")"); print("closestJointDistance (attach max distance): " + closestJointDistance + " (" + this.oldModelRadius + ")");
if (closestJointDistance < this.oldModelRadius) { if (closestJointDistance < this.oldModelRadius) {
print("Attaching to " + jointList[closestJointIndex]);
var jointPosition = MyAvatar.getJointPosition(jointList[closestJointIndex]);
var jointRotation = MyAvatar.getJointCombinedRotation(jointList[closestJointIndex]);
var attachmentOffset = Vec3.subtract(this.oldModelPosition, jointPosition); if (this.jointsIntersectingFronStart.indexOf(closestJointIndex) != -1) {
attachmentOffset = Vec3.multiplyQbyV(Quat.inverse(jointRotation), attachmentOffset); // Do nothing
var attachmentRotation = Quat.multiply(Quat.inverse(jointRotation), this.oldModelRotation); } else {
print("Attaching to " + jointList[closestJointIndex]);
MyAvatar.attach(this.modelURL, jointList[closestJointIndex], var jointPosition = MyAvatar.getJointPosition(jointList[closestJointIndex]);
attachmentOffset, attachmentRotation, 2.0 * this.oldModelRadius, var jointRotation = MyAvatar.getJointCombinedRotation(jointList[closestJointIndex]);
true, false);
Models.deleteModel(this.modelID); var attachmentOffset = Vec3.subtract(this.oldModelPosition, jointPosition);
attachmentOffset = Vec3.multiplyQbyV(Quat.inverse(jointRotation), attachmentOffset);
var attachmentRotation = Quat.multiply(Quat.inverse(jointRotation), this.oldModelRotation);
MyAvatar.attach(this.modelURL, jointList[closestJointIndex],
attachmentOffset, attachmentRotation, 2.0 * this.oldModelRadius,
true, false);
Models.deleteModel(this.modelID);
}
} }
} }
this.grabbing = false; this.grabbing = false;
this.modelID.isKnownID = false; this.modelID.isKnownID = false;
this.jointsIntersectingFronStart = [];
} }
this.checkTrigger = function () { this.checkTrigger = function () {