Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:43:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

going to add kickback decay

Browse source
This commit is contained in:
ericrius1 2015-11-12 10:28:51 -08:00
parent 1bf8ced2c4
commit d43c63c109
1 changed files with 15 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
examples/weapons/pistol.js
View file

@ -63,27 +63,9 @@ var mapping = Controller.newMapping();
var validPoses = [false, false]; var validPoses = [false, false];
var barrelVectors = [0, 0]; var barrelVectors = [0, 0];
var barrelTips = [0, 0]; var barrelTips = [0, 0];
var pointer = [];
var shootAnything = false;
pointer.push(Overlays.addOverlay("line3d", { var shootAnything = true;
start: ZERO_VECTOR,
end: ZERO_VECTOR,
color: COLORS.RED,
alpha: 1,
visible: true,
lineWidth: LASER_WIDTH
}));
pointer.push(Overlays.addOverlay("line3d", {
start: ZERO_VECTOR,
end: ZERO_VECTOR,
color: COLORS.RED,
alpha: 1,
visible: true,
lineWidth: LASER_WIDTH
}));
// For transforming between world space and our avatar's model space. // For transforming between world space and our avatar's model space.
@ -122,13 +104,6 @@ function update(deltaTime) {
// First check if the controller is valid // First check if the controller is valid
var controllerPose = Controller.getPoseValue(POSE_CONTROLS[side]); var controllerPose = Controller.getPoseValue(POSE_CONTROLS[side]);
validPoses[side] = controllerPose.valid; validPoses[side] = controllerPose.valid;
if (!controllerPose.valid) {
Overlays.editOverlay(pointer[side], {
visible: false
});
continue;
}
// Need to adjust the laser // Need to adjust the laser
var tipPose = tipPoses[side]; var tipPose = tipPoses[side];
var handRotation = tipPoses[side].rotation; var handRotation = tipPoses[side].rotation;
@ -140,21 +115,13 @@ function update(deltaTime) {
z: 0 z: 0
}); });
var laserTip = Vec3.sum(Vec3.multiply(100.0, barrelVectors[side]), barrelTips[side]);
// Update Lasers
Overlays.editOverlay(pointer[side], {
start: barrelTips[side],
end: laserTip,
alpha: 1,
visible: true
});
} }
} }
var kickback = function(animationProperties) { var kickback = function(animationProperties) {
var modelHandPosition = animationProperties[animVarName]; var modelHandPosition = animationProperties[animVarName];
var worldHandPosition = modelToWorld(modelHandPosition); var worldHandPosition = modelToWorld(modelHandPosition);
var targetHandWorldPosition = Vec3.sum(worldHandPosition, {x: 0, y: .1, z: 0}); var targetHandWorldPosition = Vec3.sum(worldHandPosition, {x: 0, y: .05, z: 0});
var targetHandModelPosition = worldToModel(targetHandWorldPosition); var targetHandModelPosition = worldToModel(targetHandWorldPosition);
var result = {}; var result = {};
result[animVarName] = targetHandModelPosition; result[animVarName] = targetHandModelPosition;
@ -201,22 +168,22 @@ function triggerChanged(side, value) {
} }
function startKickback() { function startKickback() {
handlerId = MyAvatar.addAnimationStateHandler(kickback, [animVarName]); if (!handlerId) {
Script.setTimeout(function() { handlerId = MyAvatar.addAnimationStateHandler(kickback, [animVarName]);
kickBackForce *= -1;
Script.setTimeout(function() { Script.setTimeout(function() {
MyAvatar.removeAnimationStateHandler(handlerId); kickBackForce *= -1;
}, 100) Script.setTimeout(function() {
}, 100); MyAvatar.removeAnimationStateHandler(handlerId);
handlerId = null;
}, 100)
}, 100);
}
} }
function scriptEnding() { function scriptEnding() {
mapping.disable(); mapping.disable();
for (var i = 0; i < pointer.length; ++i) {
Overlays.deleteOverlay(pointer[i]);
}
MyAvatar.detachOne(GUN_MODEL); MyAvatar.detachOne(GUN_MODEL);
MyAvatar.detachOne(GUN_MODEL); MyAvatar.detachOne(GUN_MODEL);
clearPose(); clearPose();
@ -250,7 +217,7 @@ function createWallHit(position) {
blue: 12 blue: 12
}, },
"maxParticles": 1000, "maxParticles": 1000,
"lifespan": 0.1, "lifespan": 0.15,
"emitRate": 1000, "emitRate": 1000,
"emitSpeed": 1, "emitSpeed": 1,
"speedSpread": 0, "speedSpread": 0,
@ -279,10 +246,10 @@ function createWallHit(position) {
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
"particleRadius": 0.01, "particleRadius": 0.03,
"radiusSpread": 0.01, "radiusSpread": 0.02,
"radiusStart": 0.02, "radiusStart": 0.02,
"radiusFinish": 0.02, "radiusFinish": 0.03,
"colorSpread": { "colorSpread": {
red: 100, red: 100,
green: 100, green: 100,