Merge branch 'master' of ssh://github.com/highfidelity/hifi into zero-length-penetrations

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 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/MusicalInstruments/drums/snare.raw");
+var drum2 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Drums/RackTomLo.raw");
 
 //  State Machine:
 //  0 = not triggered 

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

examples/toyball.js

@@ -134,8 +134,10 @@ 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 - same as default, not needed but here as an example
             };
 
         newParticle = Particles.addParticle(properties);

interface/src/Application.cpp

@@ -2008,15 +2008,9 @@ void Application::updateMyAvatarLookAtPosition(glm::vec3& lookAtSpot, glm::vec3&
         _viewFrustum.computePickRay(0.5f, 0.5f, rayOrigin, rayDirection);
         lookAtSpot = rayOrigin + rayDirection * FAR_AWAY_STARE;
 
-    } else if (!_lookatTargetAvatar) {
+    } else {
-        if (_isHoverVoxel) {
+        // just look in direction of the mouse ray
-            //  Look at the hovered voxel
+        lookAtSpot = lookAtRayOrigin + lookAtRayDirection * FAR_AWAY_STARE;
-            lookAtSpot = getMouseVoxelWorldCoordinates(_hoverVoxel);
-
-        } else {
-            //  Just look in direction of the mouse ray
-            lookAtSpot = lookAtRayOrigin + lookAtRayDirection * FAR_AWAY_STARE;
-        }
     }
     if (_faceshift.isActive()) {
         // deflect using Faceshift gaze data
@@ -2872,10 +2866,10 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) {
 
     if (!selfAvatarOnly) {
         // draw a red sphere
-        float sphereRadius = 0.25f;
+        float originSphereRadius = 0.05f;
         glColor3f(1,0,0);
         glPushMatrix();
-            glutSolidSphere(sphereRadius, 15, 15);
+            glutSolidSphere(originSphereRadius, 15, 15);
         glPopMatrix();
 
         // disable specular lighting for ground and voxels

interface/src/Util.cpp

@@ -332,27 +332,29 @@ void renderWorldBox() {
     glVertex3f(TREE_SCALE, 0, TREE_SCALE);
     glVertex3f(TREE_SCALE, 0, 0);
     glEnd();
-    //  Draw marker dots at very end
+    //  Draw meter markers along the 3 axis to help with measuring things
+    const float MARKER_DISTANCE = 1.f;
+    const float MARKER_RADIUS = 0.05f;
     glEnable(GL_LIGHTING);
     glPushMatrix();
-    glTranslatef(TREE_SCALE, 0, 0);
+    glTranslatef(MARKER_DISTANCE, 0, 0);
     glColor3fv(red);
-    glutSolidSphere(0.125, 10, 10);
+    glutSolidSphere(MARKER_RADIUS, 10, 10);
     glPopMatrix();
     glPushMatrix();
-    glTranslatef(0, TREE_SCALE, 0);
+    glTranslatef(0, MARKER_DISTANCE, 0);
     glColor3fv(green);
-    glutSolidSphere(0.125, 10, 10);
+    glutSolidSphere(MARKER_RADIUS, 10, 10);
     glPopMatrix();
     glPushMatrix();
-    glTranslatef(0, 0, TREE_SCALE);
+    glTranslatef(0, 0, MARKER_DISTANCE);
     glColor3fv(blue);
-    glutSolidSphere(0.125, 10, 10);
+    glutSolidSphere(MARKER_RADIUS, 10, 10);
     glPopMatrix();
     glPushMatrix();
     glColor3fv(gray);
-    glTranslatef(TREE_SCALE, 0, TREE_SCALE);
+    glTranslatef(MARKER_DISTANCE, 0, MARKER_DISTANCE);
-    glutSolidSphere(0.125, 10, 10);
+    glutSolidSphere(MARKER_RADIUS, 10, 10);
     glPopMatrix();
 
 }

libraries/particles/src/Particle.cpp

@@ -682,7 +682,7 @@ void Particle::update(const uint64_t& now) {
     const uint64_t REALLY_OLD = 30 * USECS_PER_SECOND; // 30 seconds
     bool isReallyOld = ((now - _created) > REALLY_OLD);
     bool isInHand = getInHand();
-    bool shouldDie = getShouldDie() || (!isInHand && isStopped && isReallyOld);
+    bool shouldDie = (getAge() > getLifetime()) || getShouldDie() || (!isInHand && isStopped && isReallyOld);
     setShouldDie(shouldDie);
 
     runUpdateScript(); // allow the javascript to alter our state

libraries/particles/src/Particle.h

@@ -42,7 +42,7 @@ const uint16_t PACKET_CONTAINS_INHAND = 128;
 const uint16_t PACKET_CONTAINS_SCRIPT = 256;
 const uint16_t PACKET_CONTAINS_SHOULDDIE = 512;
 
-const float DEFAULT_LIFETIME = 60.0f * 60.0f * 24.0f; // particles live for 1 day by default
+const float DEFAULT_LIFETIME = 10.0f; // particles live for 10 seconds by default
 const float DEFAULT_DAMPING = 0.99f;
 const float DEFAULT_RADIUS = 0.1f / TREE_SCALE;
 const float MINIMUM_PARTICLE_ELEMENT_SIZE = (1.0f / 100000.0f) / TREE_SCALE; // smallest size container

libraries/particles/src/ParticleCollisionSystem.cpp

@@ -275,7 +275,7 @@ void ParticleCollisionSystem::applyHardCollision(Particle* particle, float elast
 void ParticleCollisionSystem::updateCollisionSound(Particle* particle, const glm::vec3 &penetration, float frequency) {
 
     //  consider whether to have the collision make a sound
-    const float AUDIBLE_COLLISION_THRESHOLD = 0.1f;
+    const float AUDIBLE_COLLISION_THRESHOLD = 0.3f;
     const float COLLISION_LOUDNESS = 1.f;
     const float DURATION_SCALING = 0.004f;
     const float NOISE_SCALING = 0.1f;

libraries/particles/src/ParticleTree.cpp

@@ -391,17 +391,26 @@ bool ParticleTree::encodeParticlesDeletedSince(uint64_t& sinceTime, unsigned cha
 // called by the server when it knows all nodes have been sent deleted packets
 void ParticleTree::forgetParticlesDeletedBefore(uint64_t sinceTime) {
     //qDebug() << "forgetParticlesDeletedBefore()";
+    QSet<uint64_t> keysToRemove;
+
     _recentlyDeletedParticlesLock.lockForWrite();
     QMultiMap<uint64_t, uint32_t>::iterator iterator = _recentlyDeletedParticleIDs.begin();
+    // First find all the keys in the map that are older and need to be deleted    
     while (iterator != _recentlyDeletedParticleIDs.end()) {
         //qDebug() << "considering... time/key:" << iterator.key();
         if (iterator.key() <= sinceTime) {
             //qDebug() << "YES older... time/key:" << iterator.key();
-            _recentlyDeletedParticleIDs.remove(iterator.key());
+            keysToRemove << iterator.key();
         }
-        //qDebug() << "about to ++iterator";
         ++iterator;
     }
+
+    // Now run through the keysToRemove and remove them    
+    foreach (uint64_t value, keysToRemove) {
+        //qDebug() << "removing the key, _recentlyDeletedParticleIDs.remove(value); time/key:" << value;
+        _recentlyDeletedParticleIDs.remove(value);
+    }
+    
     _recentlyDeletedParticlesLock.unlock();
     //qDebug() << "DONE forgetParticlesDeletedBefore()";
 }