new sounds for drumsticks

This commit is contained in:
Philip Rosedale 2014-01-23 11:53:46 -08:00
parent c882104046
commit 86e37f8fc2
3 changed files with 7 additions and 6 deletions

View file

@ -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

View file

@ -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);

View file

@ -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);