Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 06:33:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

working non kinematic release

Browse source
This commit is contained in:
James B. Pollack 2015-12-17 10:58:14 -08:00
parent cd911b31d2
commit 5cc5a2ab33
4 changed files with 54 additions and 34 deletions

71
examples/controllers/handControllerGrab.js
View file

@ -817,26 +817,35 @@ function MyController(hand) {
Entities.callEntityMethod(this.grabbedEntity, "continueDistantGrab");
var defaultMoveWithHeadData = {
disableMoveWithHead: false
};
var handControllerData = getEntityCustomData('handControllerKey', this.grabbedEntity, defaultMoveWithHeadData);
// mix in head motion
if (MOVE_WITH_HEAD) {
var objDistance = Vec3.length(objectToAvatar);
var before = Vec3.multiplyQbyV(this.currentCameraOrientation, {
x: 0.0,
y: 0.0,
z: objDistance
});
var after = Vec3.multiplyQbyV(Camera.orientation, {
x: 0.0,
y: 0.0,
z: objDistance
});
var change = Vec3.subtract(before, after);
this.currentCameraOrientation = Camera.orientation;
this.currentObjectPosition = Vec3.sum(this.currentObjectPosition, change);
if (handControllerData.disableMoveWithHead !== true) {
// mix in head motion
if (MOVE_WITH_HEAD) {
var objDistance = Vec3.length(objectToAvatar);
var before = Vec3.multiplyQbyV(this.currentCameraOrientation, {
x: 0.0,
y: 0.0,
z: objDistance
});
var after = Vec3.multiplyQbyV(Camera.orientation, {
x: 0.0,
y: 0.0,
z: objDistance
});
var change = Vec3.subtract(before, after);
this.currentCameraOrientation = Camera.orientation;
this.currentObjectPosition = Vec3.sum(this.currentObjectPosition, change);
}
} else {
print('should not head move!');
}
var defaultConstraintData = {
axisStart: false,
axisEnd: false,
@ -846,7 +855,6 @@ function MyController(hand) {
var clampedVector;
var targetPosition;
if (constraintData.axisStart !== false) {
print('CONSTRAINING OBJECT')
clampedVector = this.projectVectorAlongAxis(this.currentObjectPosition, constraintData.axisStart, constraintData.axisEnd);
targetPosition = clampedVector;
} else {
@ -1249,15 +1257,29 @@ function MyController(hand) {
disableReleaseVelocity: false
};
var releaseVelocityData = getEntityCustomData('releaseVelocityKey', this.grabbedEntity, defaultReleaseVelocityData);
var releaseVelocityData = getEntityCustomData('handControllerKey', this.grabbedEntity, defaultReleaseVelocityData);
if (releaseVelocityData.disableReleaseVelocity === true) {
Entities.updateAction(this.grabbedEntity, this.actionID, {
ttl: 1,
kinematic: false,
kinematicSetVelocity: false,
print('SHOULD NOT BE KINEMATIC AT RELEASE')
// Entities.updateAction(this.grabbedEntity, this.actionID, {
// ttl: 1,
// kinematic: false,
// kinematicSetVelocity: false,
// });
Entities.deleteAction(this.grabbedEntity, this.actionID);
});
// Entities.deleteAction(this.grabbedEntity, this.actionID);
Entities.editEntity(this.grabbedEntity,{
velocity:{
x:0,
y:0,
z:0
},
angularVelocity:{
x:0,
y:0,
z:0
}
})
Entities.deleteAction(this.grabbedEntity, this.actionID);
} else {
//don't make adjustments
@ -1266,7 +1288,6 @@ function MyController(hand) {
}
}
}
this.deactivateEntity(this.grabbedEntity);
this.grabbedEntity = null;

6
examples/light_modifier/lightLoader.js
View file

@ -10,11 +10,11 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
var grabScript = Script.resolvePath('../controllers/handControllerGrab.js');
var grabScript = Script.resolvePath('../controllers/handControllerGrab.js?' + Math.random(0 - 100));
Script.load(grabScript);
var lightModifier = Script.resolvePath('lightModifier.js');
var lightModifier = Script.resolvePath('lightModifier.js?' + Math.random(0 - 100));
Script.load(lightModifier);
Script.setTimeout(function() {
var lightModifierTestScene = Script.resolvePath('lightModifierTestScene.js');
var lightModifierTestScene = Script.resolvePath('lightModifierTestScene.js?' + Math.random(0 - 100));
Script.load(lightModifierTestScene);
}, 750)

8
examples/light_modifier/lightModifier.js
View file

@ -251,15 +251,15 @@ entitySlider.prototype = {
axisStart: position,
axisEnd: this.endOfAxis,
},
releaseVelocityKey: {
disableReleaseVelocity: true
handControllerKey: {
disableReleaseVelocity: true,
disableMoveWithHead: true
}
})
}),
};
this.sliderIndicator = Entities.addEntity(properties);
},
setValueFromMessage: function(message) {
//message is not for our light

3
examples/light_modifier/lightModifierTestScene.js
View file

@ -75,8 +75,7 @@ function createBlock() {
},
position: position,
userData: JSON.stringify({
releaseVelocityKey: {
handControllerKey: {
disableReleaseVelocity: true
}
})