From f22c7396429e66f2bd5e1999eb66c69fbe5ac284 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Wed, 1 Apr 2015 16:26:55 +0200
Subject: [PATCH] updated gunscript

---
 examples/controllers/hydra/gun.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/examples/controllers/hydra/gun.js b/examples/controllers/hydra/gun.js
index 8bea5d623e..da10b48634 100644
--- a/examples/controllers/hydra/gun.js
+++ b/examples/controllers/hydra/gun.js
@@ -4,6 +4,7 @@
 //
 //  Created by Brad Hefta-Gaub on 12/31/13.
 //  Modified by Philip on 3/3/14
+//  Modified by Thijs Wenker on 3/31/15
 //  Copyright 2013 High Fidelity, Inc.
 //
 //  This is an example script that turns the hydra controllers and mouse into a entity gun.
@@ -66,7 +67,7 @@ var impactSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guns/BulletIm
 var targetHitSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/hit.raw");
 var targetLaunchSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/shoot.raw");
 
-var gunModel = "http://public.highfidelity.io/models/attachments/HaloGun.fst";
+var gunModel = "https://s3.amazonaws.com/hifi-public/cozza13/gun/m1911-handgun+1.fbx?v=4";
 
 var audioOptions = {
   volume: 0.9
@@ -97,7 +98,7 @@ var reticle = Overlays.addOverlay("image", {
                     y: screenSize.y / 2 - 16,
                     width: 32,
                     height: 32,
-                    imageURL: HIFI_PUBLIC_BUCKET + "images/billiardsReticle.png",
+                    imageURL: HIFI_PUBLIC_BUCKET + "images/gun/crosshairs.svg",
                     color: { red: 255, green: 255, blue: 255},
                     alpha: 1
                 });
@@ -107,7 +108,7 @@ var offButton = Overlays.addOverlay("image", {
                     y: 96,
                     width: 32,
                     height: 32,
-                    imageURL: HIFI_PUBLIC_BUCKET + "images/close.png",
+                    imageURL: HIFI_PUBLIC_BUCKET + "images/gun/close.svg",
                     color: { red: 255, green: 255, blue: 255},
                     alpha: 1
                 });
@@ -117,7 +118,7 @@ var platformButton = Overlays.addOverlay("image", {
                     y: 130,
                     width: 32,
                     height: 32,
-                    imageURL: HIFI_PUBLIC_BUCKET + "images/city.png",
+                    imageURL: HIFI_PUBLIC_BUCKET + "images/gun/platform-targets.svg",
                     color: { red: 255, green: 255, blue: 255},
                     alpha: 1
                 });
@@ -126,7 +127,7 @@ var gridButton = Overlays.addOverlay("image", {
                     y: 164,
                     width: 32,
                     height: 32,
-                    imageURL: HIFI_PUBLIC_BUCKET + "images/blocks.png",
+                    imageURL: HIFI_PUBLIC_BUCKET + "images/gun/floating-targets.svg",
                     color: { red: 255, green: 255, blue: 255},
                     alpha: 1
                 });
@@ -163,7 +164,7 @@ function shootBullet(position, velocity, grenade) {
         { type: "Sphere",
           position: position, 
           dimensions: { x: bSize, y: bSize, z: bSize }, 
-          color: {  red: 255, green: 0, blue: 0 },  
+          color: {  red: 0, green: 0, blue: 0 },  
           velocity: bVelocity, 
           lifetime: BULLET_LIFETIME,
           gravity: {  x: 0, y: bGravity, z: 0 },
@@ -260,6 +261,7 @@ function makeGrid(type, scale, size) {
         }
     }
 }
+
 function makePlatform(gravity, scale, size) {
     var separation = scale * 2; 
     var pos = Vec3.sum(Camera.getPosition(), Vec3.multiply(10.0 * scale * separation, Quat.getFront(Camera.getOrientation())));
@@ -372,8 +374,8 @@ function takeFiringPose() {
     }
 }
 
-MyAvatar.attach(gunModel, "RightHand", {x:0.02, y: 0.11, z: 0.04}, Quat.fromPitchYawRollDegrees(-0, -160, -79), 0.20);
-MyAvatar.attach(gunModel, "LeftHand", {x:-0.02, y: 0.11, z: 0.04}, Quat.fromPitchYawRollDegrees(0, 0, 79), 0.20);
+MyAvatar.attach(gunModel, "RightHand", {x:0.04, y: 0.22, z: 0.02}, Quat.fromPitchYawRollDegrees(-172, -85, 79), 0.40);
+MyAvatar.attach(gunModel, "LeftHand", {x:-0.04, y: 0.22, z: 0.02}, Quat.fromPitchYawRollDegrees(-172, 85, -79), 0.40);
 
 //  Give a bit of time to load before playing sound
 Script.setTimeout(playLoadSound, 2000);