From 93482d9d1888dfbda410f813dcb7410c543a4b45 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 23 Jan 2014 16:41:03 -0800 Subject: [PATCH] Fixing indentation. --- libraries/particles/src/ParticleCollisionSystem.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/particles/src/ParticleCollisionSystem.cpp b/libraries/particles/src/ParticleCollisionSystem.cpp index 65ed8f1e2b..8eb525a388 100644 --- a/libraries/particles/src/ParticleCollisionSystem.cpp +++ b/libraries/particles/src/ParticleCollisionSystem.cpp @@ -303,10 +303,9 @@ void ParticleCollisionSystem::updateCollisionSound(Particle* particle, const glm // Noise is a function of the angle of collision // Duration of the sound is a function of both base frequency and velocity of impact float tangentialSpeed = glm::length(velocity) - normalSpeed; - _audio->startCollisionSound( - std::min(COLLISION_LOUDNESS * normalSpeed, 1.f), - frequency * (1.f + tangentialSpeed / normalSpeed), - std::min(tangentialSpeed / normalSpeed * NOISE_SCALING, 1.f), - 1.f - DURATION_SCALING * powf(frequency, 0.5f) / normalSpeed, false); + _audio->startCollisionSound( std::min(COLLISION_LOUDNESS * normalSpeed, 1.f), + frequency * (1.f + tangentialSpeed / normalSpeed), + std::min(tangentialSpeed / normalSpeed * NOISE_SCALING, 1.f), + 1.f - DURATION_SCALING * powf(frequency, 0.5f) / normalSpeed, false); } }