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

remove prints, fix typo, formatting

Browse source
This commit is contained in:
James B. Pollack 2016-06-29 11:47:41 -07:00
parent 0e3b54c130
commit 6d3129899b
2 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
unpublishedScripts/DomainContent/Toybox/bow/bow.js
View file

@ -183,7 +183,6 @@
},
releaseEquip: function(entityID, args) {
// print('RELEASE GRAB EVENT')
Messages.sendMessage('Hifi-Hand-Disabler', "none")
this.stringDrawn = false;
@ -201,7 +200,6 @@
},
createArrow: function() {
// print('create arrow')
this.playArrowNotchSound();
var arrow = Entities.addEntity({
@ -226,25 +224,24 @@
var makeArrowStick = function(entityA, entityB, collision) {
Entities.editEntity(entityA, {
angularVelocity: {
x: 0,
y: 0,
z: 0
},
velocity: {
x: 0,
y: 0,
z: 0
},
gravity: {
x: 0,
y: 0,
z: 0
},
position: collision.contactPoint,
dynamic: false
})
// print('ARROW COLLIDED WITH::' + entityB);
angularVelocity: {
x: 0,
y: 0,
z: 0
},
velocity: {
x: 0,
y: 0,
z: 0
},
gravity: {
x: 0,
y: 0,
z: 0
},
position: collision.contactPoint,
dynamic: false
})
Script.removeEventHandler(arrow, "collisionWithEntity", makeArrowStick)
}
@ -300,7 +297,6 @@
},
updateStringPositions: function() {
// print('update string positions!!!')
var upVector = Quat.getUp(this.bowProperties.rotation);
var upOffset = Vec3.multiply(upVector, TOP_NOTCH_OFFSET);
var downVector = Vec3.multiply(-1, Quat.getUp(this.bowProperties.rotation));
@ -371,7 +367,6 @@
if (this.triggerValue < DRAW_STRING_THRESHOLD && this.stringDrawn === true) {
// firing the arrow
// print('HIT RELEASE LOOP IN CHECK');
this.drawStrings();
this.hasArrowNotched = false;
@ -381,7 +376,6 @@
} else if (this.triggerValue > DRAW_STRING_THRESHOLD && this.stringDrawn === true) {
// print('HIT CONTINUE LOOP IN CHECK')
//continuing to aim the arrow
this.aiming = true;
@ -389,7 +383,6 @@
this.updateArrowPositionInNotch();
} else if (this.triggerValue > DRAW_STRING_THRESHOLD && this.stringDrawn === false) {
// print('HIT START LOOP IN CHECK');
this.arrow = this.createArrow();
this.playStringPullSound();

2
unpublishedScripts/DomainContent/Toybox/bow/createBow.js
View file

@ -62,7 +62,7 @@ function makeBow() {
shapeType: 'compound',
compoundShapeURL: COLLISION_HULL_URL,
script: SCRIPT_URL,
collidesWith: 'dynamic,kinetmatic,static',
collidesWith: 'dynamic,kinematic,static',
userData: JSON.stringify({
grabbableKey: {
invertSolidWhileHeld: true