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

debugging prints

Browse source
This commit is contained in:
Seth Alves 2016-03-31 16:26:54 -07:00
parent a8b4d1a379
commit 0e643a1555
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
examples/controllers/handControllerGrab.js
View file

@ -123,7 +123,8 @@ var GRABBABLE_PROPERTIES = [
"parentID", "parentID",
"parentJointIndex", "parentJointIndex",
"density", "density",
"dimensions" "dimensions",
"userData"
]; ];
var GRABBABLE_DATA_KEY = "grabbableKey"; // shared with grab.js var GRABBABLE_DATA_KEY = "grabbableKey"; // shared with grab.js
@ -1108,10 +1109,12 @@ function MyController(hand) {
this.distanceHolding = function() { this.distanceHolding = function() {
// controller pose is in avatar frame // controller pose is in avatar frame
var avatarControllerPose = Controller.getPoseValue((this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand); var avatarControllerPose =
Controller.getPoseValue((this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand);
// transform it into world frame // transform it into world frame
var controllerPosition = Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, avatarControllerPose.translation)); var controllerPosition = Vec3.sum(MyAvatar.position,
Vec3.multiplyQbyV(MyAvatar.orientation, avatarControllerPose.translation));
var controllerRotation = Quat.multiply(MyAvatar.orientation, avatarControllerPose.rotation); var controllerRotation = Quat.multiply(MyAvatar.orientation, avatarControllerPose.rotation);
var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, GRABBABLE_PROPERTIES); var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, GRABBABLE_PROPERTIES);
@ -1127,7 +1130,7 @@ function MyController(hand) {
this.grabRadialVelocity = 0.0; this.grabRadialVelocity = 0.0;
// compute a constant based on the initial conditions which we use below to exagerate hand motion onto the held object // compute a constant based on the initial conditions which we use below to exagerate hand motion onto the held object
this.radiusScalar = Math.log(Vec3.distance(this.currentObjectPosition, controllerPosition) + 1.0); this.radiusScalar = Math.log(grabRadius + 1.0);
if (this.radiusScalar < 1.0) { if (this.radiusScalar < 1.0) {
this.radiusScalar = 1.0; this.radiusScalar = 1.0;
} }
@ -1187,7 +1190,7 @@ function MyController(hand) {
var deltaTime = (now - this.currentObjectTime) / MSEC_PER_SEC; // convert to seconds var deltaTime = (now - this.currentObjectTime) / MSEC_PER_SEC; // convert to seconds
this.currentObjectTime = now; this.currentObjectTime = now;
// the action was set up on a previous call. update the targets. // the action was set up when this.distanceHolding was called. update the targets.
var radius = Vec3.distance(this.currentObjectPosition, controllerPosition) * var radius = Vec3.distance(this.currentObjectPosition, controllerPosition) *
this.radiusScalar * DISTANCE_HOLDING_RADIUS_FACTOR; this.radiusScalar * DISTANCE_HOLDING_RADIUS_FACTOR;
if (radius < 1.0) { if (radius < 1.0) {
@ -1395,13 +1398,13 @@ function MyController(hand) {
this.overlayLineOff(); this.overlayLineOff();
if (this.entityActivated) { if (this.entityActivated) {
print("HERE: release before grab " + (this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"));
var saveGrabbedID = this.grabbedEntity; var saveGrabbedID = this.grabbedEntity;
this.release(); this.release();
this.grabbedEntity = saveGrabbedID; this.grabbedEntity = saveGrabbedID;
} }
var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, GRABBABLE_PROPERTIES); var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, GRABBABLE_PROPERTIES);
print("USERDATA FOR " + this.grabbedEntity + " IS " + grabbedProperties.userData);
this.activateEntity(this.grabbedEntity, grabbedProperties, false); this.activateEntity(this.grabbedEntity, grabbedProperties, false);
// if (grabbedProperties.dynamic && NEAR_GRABBING_KINEMATIC) { // if (grabbedProperties.dynamic && NEAR_GRABBING_KINEMATIC) {
// Entities.editEntity(this.grabbedEntity, { // Entities.editEntity(this.grabbedEntity, {
@ -1416,6 +1419,7 @@ function MyController(hand) {
var hasPresetPosition = false; var hasPresetPosition = false;
if ((this.state == STATE_EQUIP || this.state == STATE_HOLD) && this.hasPresetOffsets()) { if ((this.state == STATE_EQUIP || this.state == STATE_HOLD) && this.hasPresetOffsets()) {
print("HAS PRESET");
var grabbableData = getEntityCustomData(GRABBABLE_DATA_KEY, this.grabbedEntity, DEFAULT_GRABBABLE_DATA); var grabbableData = getEntityCustomData(GRABBABLE_DATA_KEY, this.grabbedEntity, DEFAULT_GRABBABLE_DATA);
// if an object is "equipped" and has a predefined offset, use it. // if an object is "equipped" and has a predefined offset, use it.
this.ignoreIK = grabbableData.ignoreIK ? grabbableData.ignoreIK : false; this.ignoreIK = grabbableData.ignoreIK ? grabbableData.ignoreIK : false;
@ -1423,6 +1427,8 @@ function MyController(hand) {
this.offsetRotation = this.getPresetRotation(); this.offsetRotation = this.getPresetRotation();
hasPresetPosition = true; hasPresetPosition = true;
} else { } else {
print("NO PRESET");
this.ignoreIK = false; this.ignoreIK = false;
var objectRotation = grabbedProperties.rotation; var objectRotation = grabbedProperties.rotation;