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

through arrow in notch with rotation

Browse source
This commit is contained in:
James B. Pollack 2015-10-29 12:23:32 -07:00
parent 028ea584b8
commit 7166c6ddd2
4 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
examples/controllers/handControllerGrab.js
View file

@ -645,21 +645,23 @@ function MyController(hand, triggerAction) {
this.currentHandControllerTipPosition = handControllerPosition;
this.currentObjectTime = now;
Entities.callEntityMethod(this.grabbedEntity, "continueNearGrab");
var properties = Entities.getEntityProperties(this.grabbedEntity, ["userData","name"]);
var properties = Entities.getEntityProperties(this.grabbedEntity, ["userData", "name"]);
var userData = JSON.parse(properties.userData);
if (userData.hasOwnProperty('hifiBowKey')) {
if (userData.hifiBowKey.shouldRelease === true && userData.hifiBowKey.didRelease===false) {
this.setState(STATE_RELEASE);
setEntityCustomData('hifiBowKey', this.grabbedEntity, {
shouldRelease:false,
if (userData.hasOwnProperty('releaseGrabKey')) {
if (userData.releaseGrabKey.shouldRelease === true && userData.releaseGrabKey.didRelease === false) {
setEntityCustomData('releaseGrabKey', this.grabbedEntity, {
shouldRelease: false,
didRelease: true
});
this.setState(STATE_RELEASE);
return;
}
}
if (this.actionTimeout - now < ACTION_LIFETIME_REFRESH * MSEC_PER_SEC) {
// if less than a 5 seconds left, refresh the actions lifetime
Entities.updateAction(this.grabbedEntity, this.actionID, {

2
examples/toybox/bow/arrow.js
View file

@ -96,7 +96,7 @@
},
tellBowArrowIsNotched: function(bowID) {
setEntityCustomData('hifiBowKey', this.entityID, {
setEntityCustomData('releaseGrabKey', this.entityID, {
shouldRelease: true,
didRelease: false
});

24
examples/toybox/bow/bow.js
View file

@ -9,7 +9,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
// TODO:
// to do:
// make arrows more visible
// make arrow rotate toward ground as it flies
// add noise when you release arrow -> add the sound to the arrow and keep it with position so you hear it whizz by
@ -131,12 +131,14 @@
setEntityCustomData('grabbableKey', this.entityID, {
turnOffOtherHand: false,
turnOffOppositeBeam: false
turnOffOppositeBeam: false,
invertSolidWhileHeld: true
});
},
continueNearGrab: function() {
print('GRABBING BOW!!')
this.bowProperties = Entities.getEntityProperties(this.entityID, ["position", "rotation", "userData"]);
this.updateNotchDetectorPosition();
@ -154,7 +156,8 @@
setEntityCustomData('grabbableKey', this.entityID, {
turnOffOtherHand: true,
turnOffOppositeBeam: false
turnOffOppositeBeam: true,
invertSolidWhileHeld: true
});
}
@ -199,7 +202,8 @@
Entities.deleteEntity(this.arrow);
setEntityCustomData('grabbableKey', this.entityID, {
turnOffOtherHand: false,
turnOffOppositeBeam: false
turnOffOppositeBeam: false,
invertSolidWhileHeld: true
});
Entities.deleteEntity(this.notchDetector);
this.notchDetector = null;
@ -370,7 +374,7 @@
//continuing to aim the arrow
this.stringData.handPosition = this.getStringHandPosition();
this.stringData.handRotation = this.getStringHandRotation();
this.initialHand === 'right' ? this.stringData.grabHandPosition = Controller.getSpatialControlPosition(RIGHT_TIP) : this.stringData.grabHandPosition = Controller.getSpatialControlPosition(LEFT_TIP);
// this.initialHand === 'right' ? this.stringData.grabHandPosition = Controller.getSpatialControlPosition(RIGHT_TIP) : this.stringData.grabHandPosition = Controller.getSpatialControlPosition(LEFT_TIP);
this.stringData.grabHandRotation = this.getGrabHandRotation();
this.drawStrings();
this.updateArrowPositionInNotch();
@ -381,7 +385,7 @@
this.createStrings();
this.stringData.handPosition = this.getStringHandPosition();
this.stringData.handRotation = this.getStringHandRotation();
this.initialHand === 'right' ? this.stringData.grabHandPosition = Controller.getSpatialControlPosition(RIGHT_TIP) : this.stringData.grabHandPosition = Controller.getSpatialControlPosition(LEFT_TIP);
// this.initialHand === 'right' ? this.stringData.grabHandPosition = Controller.getSpatialControlPosition(RIGHT_TIP) : this.stringData.grabHandPosition = Controller.getSpatialControlPosition(LEFT_TIP);
this.stringData.grabHandRotation = this.getGrabHandRotation();
this.drawStrings();
@ -472,9 +476,9 @@
Entities.editEntity(this.arrow, {
ignoreForCollisions: false,
collisionsWillMove: true,
gravity: ARROW_GRAVITY,
gravity: ARROW_GRAVITY
});
}, 100)
}, 100);
this.arrow = null;
this.fire = null;
@ -499,7 +503,7 @@
var detectorProperties = {
name: 'Hifi-NotchDetector',
type: 'Box',
visible: true,
visible: false,
collisionsWillMove: false,
ignoreForCollisions: true,
dimensions: NOTCH_DETECTOR_DIMENSIONS,
@ -596,7 +600,7 @@
y: 0.01,
z: 0.1
},
lifespan: 1,
lifespan: 1
});
setEntityCustomData('hifiFireArrowKey', this.arrow, {

4
examples/toybox/bow/createBow.js
View file

@ -46,9 +46,7 @@ var bow = Entities.addEntity({
script: SCRIPT_URL,
userData: JSON.stringify({
grabbableKey: {
turnOffOppositeBeam: false
},
grabKey: {
turnOffOppositeBeam: false,
invertSolidWhileHeld: true
}
})