From fbe640e351f0ebbff89fead7f19ca95dcdffe28e Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Mon, 7 Mar 2016 16:38:15 -0800
Subject: [PATCH] the model was different so adjust things

---
 examples/toybox/ping_pong_gun/createPingPongGun.js | 6 +++---
 examples/toybox/ping_pong_gun/pingPongGun.js       | 2 +-
 unpublishedScripts/hiddenEntityReset.js            | 6 +++---
 unpublishedScripts/masterReset.js                  | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/toybox/ping_pong_gun/createPingPongGun.js b/examples/toybox/ping_pong_gun/createPingPongGun.js
index 2315e4a4d7..467a05b5b6 100644
--- a/examples/toybox/ping_pong_gun/createPingPongGun.js
+++ b/examples/toybox/ping_pong_gun/createPingPongGun.js
@@ -30,9 +30,9 @@ var pingPongGun = Entities.addEntity({
   script: scriptURL,
   position: center,
   dimensions: {
-    x: 0.08,
-    y: 0.21,
-    z: 0.47
+    x: 0.125,
+    y: 0.3875,
+    z: 0.9931
   },
   dynamic: true,
   collisionSoundURL: COLLISION_SOUND_URL,
diff --git a/examples/toybox/ping_pong_gun/pingPongGun.js b/examples/toybox/ping_pong_gun/pingPongGun.js
index 32e9baa1c9..415913ea6d 100644
--- a/examples/toybox/ping_pong_gun/pingPongGun.js
+++ b/examples/toybox/ping_pong_gun/pingPongGun.js
@@ -23,7 +23,7 @@
     //if the trigger value goes below this value, reload the gun.
     var RELOAD_THRESHOLD = 0.95;
     var GUN_TIP_FWD_OFFSET = -0.35;
-    var GUN_TIP_UP_OFFSET = 0.040;
+    var GUN_TIP_UP_OFFSET = 0.12;
     var GUN_FORCE = 9;
     var BALL_RESTITUTION = 0.6;
     var BALL_LINEAR_DAMPING = 0.4;
diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index ef696258a7..08c5b5857a 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -1278,9 +1278,9 @@
                 },
                 restitution: 0,
                 dimensions: {
-                    x: 0.08,
-                    y: 0.21,
-                    z: 0.47
+                    x: 0.125,
+                    y: 0.3875,
+                    z: 0.9931
                 },
                 dynamic: true,
                 collisionSoundURL: COLLISION_SOUND_URL,
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index 90a9c710dc..cbcee30b0b 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -1266,9 +1266,9 @@ MasterReset = function() {
             },
             restitution: 0,
             dimensions: {
-                x: 0.08,
-                y: 0.21,
-                z: 0.47
+                x: 0.125,
+                y: 0.3875,
+                z: 0.9931
             },
             dynamic: true,
             collisionSoundURL: COLLISION_SOUND_URL,