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

moved barrel point forward so ray doesnt hit gun

Browse source
This commit is contained in:
ericrius1 2015-11-18 15:26:30 -08:00
parent d4c7b6b9b9
commit 53f75e305a
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
examples/weapons/pistol/pistol.js
View file

@ -22,8 +22,11 @@
this.equipped = false; this.equipped = false;
this.forceMultiplier = 1; this.forceMultiplier = 1;
this.laserOffsets = { this.laserOffsets = {
y: .15 y: .15,
}; };
this.firingOffsets = {
z: 0.3
}
}; };
Pistol.prototype = { Pistol.prototype = {
@ -48,13 +51,14 @@
var gunProps = Entities.getEntityProperties(this.entityID, ['position', 'rotation']); var gunProps = Entities.getEntityProperties(this.entityID, ['position', 'rotation']);
var position = gunProps.position; var position = gunProps.position;
var rotation = gunProps.rotation; var rotation = gunProps.rotation;
var direction = Quat.getFront(rotation); this.firingDirection = Quat.getFront(rotation);
var upVec = Quat.getUp(rotation); var upVec = Quat.getUp(rotation);
position = Vec3.sum(position, Vec3.multiply(upVec, this.laserOffsets.y)); this.barrelPoint = Vec3.sum(position, Vec3.multiply(upVec, this.laserOffsets.y));
var tip = Vec3.sum(position, Vec3.multiply(direction, 10)); var laserTip = Vec3.sum(this.barrelPoint, Vec3.multiply(this.firingDirection, 10));
this.barrelPoint = Vec3.sum(this.barrelPoint, Vec3.multiply(this.firingDirection, this.firingOffsets.z))
Overlays.editOverlay(this.laser, { Overlays.editOverlay(this.laser, {
start: position, start: this.barrelPoint,
end: tip, end: laserTip,
alpha: 1 alpha: 1
}); });
}, },
@ -89,7 +93,11 @@
}, },
fire: function() { fire: function() {
print("FIRE!"); var pickRay = {origin: this.barrelPoint, direction: this.firingDirection};
var intersection = Entities.findRayIntersectionBlocking(pickRay, true);
if(intersection.intersects) {
print('intersection!');
}
}, },
initControllerMapping: function() { initControllerMapping: function() {

2
examples/weapons/pistol/pistolSpawner.js
View file

@ -1,4 +1,4 @@
var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1.5, Quat.getFront(Camera.getOrientation()))); var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1, Quat.getFront(Camera.getOrientation())));
var scriptURL = Script.resolvePath('pistol.js'); var scriptURL = Script.resolvePath('pistol.js');
var modelURL = "https://s3.amazonaws.com/hifi-public/eric/models/gun.fbx"; var modelURL = "https://s3.amazonaws.com/hifi-public/eric/models/gun.fbx";
print("SJDJDJ") print("SJDJDJ")