X-Git-Url: http://git.treefish.org/~alex/seamulator.git/blobdiff_plain/ba8f356e863ed4a418f93c155e64eecaea0819bf..776129fef279847eb021c4657a6c0bece71c5d13:/src/dot.cpp?ds=inline

diff --git a/src/dot.cpp b/src/dot.cpp
index d052a24..6ff5bf1 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -15,21 +15,28 @@ void Dot::advance(double deltaT)
     //deltaT *= 10;
     
     auto posBefore = m_pos;
+    auto velBefore = m_vel;
 
-    m_vel += -std::pow(m_frequency / 440.0, 2.0) * 1.0 * ( m_pos - m_point.getHeight() ) * deltaT;
+    m_vel += -std::pow(m_frequency/440.0, 2.0) * 10.0 * ( m_pos - m_point.getHeight() ) * deltaT;
     m_vel -= m_vel * 0.01 * deltaT;
     m_pos += m_vel * deltaT;
 
     const auto absVel = std::fabs(m_vel);
+    m_maxAbsIntVel = std::max(m_maxAbsIntVel, absVel);
     m_maxAbsVel = std::max(absVel, m_maxAbsVel);
 
     //std::cout << m_pos << std::endl;
-    
-    if (posBefore * m_pos < 0.0) {
-// //        std::cout << m_vel / m_maxVel << std::endl;
-        m_noise.noteOn(m_pos >= 0 ? m_frequency : m_frequency*0.5, absVel / m_maxAbsVel);
-//         //m_noise.pluck(absVel / m_maxAbsVel);
-//         m_noise.controlChange(4, 1.0 * absVel / m_maxAbsVel);
+
+//     if (posBefore * m_pos < 0.0) {
+// // //        std::cout << m_vel / m_maxVel << std::endl;
+//          m_noise.noteOn(m_pos >= 0 ? m_frequency : m_frequency, absVel / m_maxAbsVel);
+//          // m_noise.pluck(absVel / m_maxAbsVel);
+// //         m_noise.controlChange(4, 1.0 * absVel / m_maxAbsVel);
+//     }
+
+    if (m_vel * velBefore < 0.0) {
+        m_noise.noteOn(m_frequency, m_maxAbsIntVel/m_maxAbsVel);
+        m_maxAbsIntVel = 0.0;
     }
 
 //    m_noise.controlChange(128, 128.0 * absVel / m_maxAbsVel);