Changeset 36869

Timestamp:

02/27/10 20:21:21 (3 years ago)

Author:

arche

Message:

ノートオンされている間にエンベロープ設定を変更した際の挙動が変わっていたのを修正

Location:

lang/actionscript/flmml/trunk/src

Files:

• com/txt_nifty/sketch/flmml/MEnvelope.as (modified) (1 diff)
• flmml.swf (modified) (previous)

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MEnvelope.as

@@ -55 +55 @@
                                 m_counter = m_timeInSamples;
                                 m_currentPoint = m_envelopePoint;
-                                while(m_counter >= m_currentPoint.next.time){
+                                while(m_currentPoint.next != null && m_counter >= m_currentPoint.next.time){
                                         m_currentPoint = m_currentPoint.next;
                                         m_counter -= m_currentPoint.time;
-                                        if(m_currentPoint.next == null){
-                                                m_currentVal = m_currentPoint.level;
-                                                break;
-                                        }else{
-                                                m_step = (m_currentPoint.next.level - m_currentPoint.level) / m_currentPoint.next.time;
-                                                m_currentVal = m_currentPoint.level;
-                                        }
+                                }
+                                if(m_currentPoint.next == null){
+                                        m_currentVal = m_currentPoint.level;
+                                }else{
+                                        m_step = (m_currentPoint.next.level - m_currentPoint.level) / m_currentPoint.next.time;
+                                        m_currentVal = m_currentPoint.level + (m_step * m_counter);
                                 }
                         }