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

bow stuff

Browse source
This commit is contained in:
James B. Pollack 2015-10-20 10:54:24 -07:00
parent f32a5a5333
commit a4166fd1c3
3 changed files with 50 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
examples/controllers/handControllerGrab.js
View file

@ -249,6 +249,9 @@ function MyController(hand, triggerAction) {
}
this.search = function() {
if(this.hasGrabbedEntity===true){
return;
}
if (this.triggerSmoothedReleased()) {
this.setState(STATE_RELEASE);
return;
@ -465,11 +468,21 @@ function MyController(hand, triggerAction) {
this.nearGrabbing = function() {
var now = Date.now();
var grabbableData = getEntityCustomData(GRABBABLE_DATA_KEY, this.grabbedEntity, DEFAULT_GRABBABLE_DATA);
var turnOffOtherHand = grabbableData["turnOffOtherHand"];
if (turnOffOtherHand === true) {
this.hasGrabbedEntity = true;
print('DONT ACTIVATE SECOND HAND GRAB BECAUSE THE SCRIPT HAS GOT IT')
return;
}
if (this.triggerSmoothedReleased()) {
this.setState(STATE_RELEASE);
return;
}
this.lineOff();
var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity,
@ -690,6 +703,8 @@ function MyController(hand, triggerAction) {
this.release = function() {
this.hasGrabbedEntity=false;
this.lineOff();
if (this.grabbedEntity !== null) {

44
examples/toys/bow/bow.js
View file

@ -169,6 +169,13 @@
}
this.isGrabbed = true;
this.initialHand = this.hand;
Entities.editEntity(this.entityID, {
userData: JSON.stringify({
grabbableKey: {
turnOffOtherHand: true
}
})
});
},
continueNearGrab: function() {
@ -182,6 +189,13 @@
this.stringDrawn = false;
this.deleteStrings();
this.hasArrow = false;
Entities.editEntity(this.entityID, {
userData: JSON.stringify({
grabbableKey: {
turnOffOtherHand: false
}
})
});
}
},
@ -200,24 +214,24 @@
this.triggerValue = Controller.getActionValue(this.stringTriggerAction);
if (this.triggerValue < DRAW_STRING_THRESHOLD && this.stringDrawn === true) {
print('TRIGGER 1')
//let it fly
// print('TRIGGER 1');
//let it fly
this.stringDrawn = false;
this.deleteStrings();
this.hasArrow = false;
//this.releaseArrow();
} else if (this.triggerValue >= DRAW_STRING_THRESHOLD && this.stringDrawn === true) {
print('TRIGGER 2')
//update
//print('TRIGGER 2');
//update
this.stringData.handPosition = this.getStringHandPosition();
this.stringData.handRotation = this.getStringHandRotation();
this.drawStrings();
this.updateArrowPosition();
} else if (this.triggerValue >= DRAW_STRING_THRESHOLD && this.stringDrawn === false) {
print('TRIGGER 3')
//create
//print('TRIGGER 3');
//create
this.stringDrawn = true;
this.createStrings();
this.stringData.handPosition = this.getStringHandPosition();
@ -233,25 +247,27 @@
},
getArrowPosition: function() {
var arrowVector = Vec3.subtract(this.bowProperties.position,this.stringData.handPosition);
var arrowVector = Vec3.subtract(this.bowProperties.position, this.stringData.handPosition);
arrowVector = Vec3.normalize(arrowVector);
arrowVector = Vec3.multiply(arrowVector,ARROW_OFFSET);
var arrowPosition = Vec3.sum(this.stringData.handPosition,arrowVector);
arrowVector = Vec3.multiply(arrowVector, ARROW_OFFSET);
var arrowPosition = Vec3.sum(this.stringData.handPosition, arrowVector);
return arrowPosition;
},
updateArrowPosition: function() {
var arrowPosition = this.getArrowPosition();
print('ARROW POSITION:::' + JSON.stringify(arrowPosition));
var arrowPosition = this.getArrowPosition();
var arrowRotation = Quat.getFront(this.bowProperties.rotation);
// print('ARROW POSITION:::' + JSON.stringify(arrowPosition));
Entities.editEntity(this.arrow, {
position: arrowPosition,
rotation: this.bowProperties.rotation
rotation: arrowRotation
});
},
createArrow: function() {
print('CREATING ARROW');
// print('CREATING ARROW');
var arrowProperties = {
name: 'Hifi-Arrow',
type: 'Model',

10
examples/toys/bow/createBow.js
View file

@ -46,11 +46,11 @@ var bow = Entities.addEntity({
shapeType: 'compound',
compoundShapeURL: COLLISION_HULL_URL,
script: SCRIPT_URL,
// userData: JSON.stringify({
// grabbableKey: {
// invertSolidWhileHeld: true
// }
// })
userData: JSON.stringify({
grabbableKey: {
invertSolidWhileHeld: true
}
})
});
function cleanup() {