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

moved pistol to toybox

Browse source
This commit is contained in:
ericrius1 2015-11-30 17:57:01 -08:00
parent 706a67b9a1
commit 8992f6bb44
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
examples/example/painting/hydraPaint.js
View file

@ -67,12 +67,12 @@ var colorPalette = [{
var MIN_STROKE_WIDTH = 0.002; var MIN_STROKE_WIDTH = 0.002;
var MAX_STROKE_WIDTH = 0.05; var MAX_STROKE_WIDTH = 0.05;
function controller(side, cycleColorButton) { function controller(side, triggerAction) {
this.triggerHeld = false; this.triggerHeld = false;
this.triggerThreshold = 0.9; this.triggerThreshold = 0.9;
this.side = side; this.side = side;
this.trigger = side == LEFT ? Controller.Stantard.LT : Controller.Standard.RT; this.triggerAction = triggerAction;
this.cycleColorButton = side == LEFT ? Controller.Stantard.LeftPrimaryThumb : Controller.Standard.RightPrimaryThumb; this.cycleColorButton = side == LEFT ? Controller.Standard.LeftPrimaryThumb : Controller.Standard.RightPrimaryThumb;
this.points = []; this.points = [];
this.normals = []; this.normals = [];
@ -116,6 +116,7 @@ function controller(side, cycleColorButton) {
y: LINE_DIMENSIONS, y: LINE_DIMENSIONS,
z: LINE_DIMENSIONS z: LINE_DIMENSIONS
}, },
textures: "http://localhost:8080/trails.png",
lifetime: LIFETIME lifetime: LIFETIME
}); });
this.points = []; this.points = [];
@ -174,7 +175,7 @@ function controller(side, cycleColorButton) {
this.cycleColorButtonPressed = Controller.getValue(this.cycleColorButton); this.cycleColorButtonPressed = Controller.getValue(this.cycleColorButton);
this.palmPosition = this.side == RIGHT ? MyAvatar.rightHandPose.translation : MyAvatar.leftHandPose.translation; this.palmPosition = this.side == RIGHT ? MyAvatar.rightHandPose.translation : MyAvatar.leftHandPose.translation;
this.tipPosition = this.side == RIGHT ? MyAvatar.rightHandTipPose.translation : MyAvatar.leftHandTipPose.translation; this.tipPosition = this.side == RIGHT ? MyAvatar.rightHandTipPose.translation : MyAvatar.leftHandTipPose.translation;
this.triggerValue = Controller.getValue(this.trigger); this.triggerValue = Controller.getActionValue(this.triggerAction);
if (this.prevCycleColorButtonPressed === true && this.cycleColorButtonPressed === false) { if (this.prevCycleColorButtonPressed === true && this.cycleColorButtonPressed === false) {
@ -212,8 +213,8 @@ function vectorIsZero(v) {
} }
var rightController = new controller(RIGHT); var rightController = new controller(RIGHT, Controller.findAction("RIGHT_HAND_CLICK"));
var leftController = new controller(LEFT); var leftController = new controller(LEFT, Controller.findAction("LEFT_HAND_CLICK"));
Script.update.connect(update); Script.update.connect(update);
Script.scriptEnding.connect(scriptEnding); Script.scriptEnding.connect(scriptEnding);

0
examples/weapons/pistol/pistol.js → examples/toybox/pistol/pistol.js
View file

0
examples/weapons/pistol/pistolSpawner.js → examples/toybox/pistol/pistolSpawner.js
View file