From 86e37f8fc2a0f86c4ba15eb4974eb8aa56474ad8 Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@highfidelity.io>
Date: Thu, 23 Jan 2014 11:53:46 -0800
Subject: [PATCH] new sounds for drumsticks

---
 examples/drumStick.js | 4 ++--
 examples/fountain.js  | 6 +++---
 examples/toyball.js   | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/examples/drumStick.js b/examples/drumStick.js
index 5224900414..955fddbdee 100644
--- a/examples/drumStick.js
+++ b/examples/drumStick.js
@@ -18,8 +18,8 @@ function vMinus(a, b) {
 
 //  First, load two percussion sounds to be used on the sticks
 
-var drum1 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/MusicalInstruments/drums/snare.raw");
-var drum2 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/MusicalInstruments/drums/snare.raw");
+var drum1 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Drums/RackTomHi.raw");
+var drum2 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Drums/RackTomLo.raw");
 
 //  State Machine:
 //  0 = not triggered 
diff --git a/examples/fountain.js b/examples/fountain.js
index 86c125a834..a095f91ed3 100644
--- a/examples/fountain.js
+++ b/examples/fountain.js
@@ -42,7 +42,7 @@ Voxels.setVoxel(position.x, 0, position.z, 0.5, 0, 0, 255);
 	
 var totalParticles = 0;
 function makeFountain() {
-	if (Math.random() < 0.06) {
+	if (Math.random() < 0.10) {
 	    //print("Made particle!\n");
         var properties = {
             position: position, 
@@ -51,9 +51,9 @@ function makeFountain() {
             velocity: { x: (Math.random() * 1.0 - 0.5),
                          y: (1.0 + (Math.random() * 2.0)),
                          z: (Math.random() * 1.0 - 0.5) }, 
-            gravity: {  x: 0, y: -0.5, z: 0 }, 
+            gravity: {  x: 0, y: -0.1, z: 0 }, 
             damping: 0.25, 
-            lifetime: 2
+            lifetime: 1
         }
 
         Particles.addParticle(properties);
diff --git a/examples/toyball.js b/examples/toyball.js
index 1682cbe3d4..ddb3ac9135 100644
--- a/examples/toyball.js
+++ b/examples/toyball.js
@@ -134,8 +134,9 @@ function checkControllerSide(whichSide) {
                 gravity: { x: 0, y: 0, z: 0}, 
                 inHand: true,
                 radius: 0.05,
+                damping: 0.999,
                 color: { red: 255, green: 0, blue: 0 },
-                lifetime: 10 // 10 seconds
+                lifetime: 10   // 10 seconds
             };
 
         newParticle = Particles.addParticle(properties);