change damp minimum
This commit is contained in:
parent
2237128a84
commit
9080dd7607
1 changed files with 3 additions and 3 deletions
|
@ -34,17 +34,17 @@ table.insert(self, {'inverse', function(t) return t * t * (1 - t) * (1 - t) / (0
|
||||||
|
|
||||||
table.insert(self, {'popElastic', function(t, damp, count)
|
table.insert(self, {'popElastic', function(t, damp, count)
|
||||||
return (1000 ^ -(t ^ damp) - 0.001) * sin(count * pi * t)
|
return (1000 ^ -(t ^ damp) - 0.001) * sin(count * pi * t)
|
||||||
end, {1, 10, 1.4, 'damp'}, {1, 25, 6, 'count'}, type = 'pulse'})
|
end, {0, 10, 1.4, 'damp'}, {1, 25, 6, 'count'}, type = 'pulse'})
|
||||||
table.insert(self, {'tapElastic', function(t, damp, count)
|
table.insert(self, {'tapElastic', function(t, damp, count)
|
||||||
return (1000 ^ -((1 - t) ^ damp) - 0.001) * sin(count * pi * (1 - t))
|
return (1000 ^ -((1 - t) ^ damp) - 0.001) * sin(count * pi * (1 - t))
|
||||||
end, {1, 10, 1.4, 'damp'}, {1, 25, 6, 'count'}, type = 'pulse'})
|
end, {0, 10, 1.4, 'damp'}, {1, 25, 6, 'count'}, type = 'pulse'})
|
||||||
table.insert(self, {'pulseElastic', function(t, damp, count)
|
table.insert(self, {'pulseElastic', function(t, damp, count)
|
||||||
if t < .5 then
|
if t < .5 then
|
||||||
return self.tapElastic(t * 2, damp, count)
|
return self.tapElastic(t * 2, damp, count)
|
||||||
else
|
else
|
||||||
return -self.popElastic(t * 2 - 1, damp, count)
|
return -self.popElastic(t * 2 - 1, damp, count)
|
||||||
end
|
end
|
||||||
end, {1, 10, 1.4, 'damp'}, {1, 25, 6, 'count'}, type = 'pulse'})
|
end, {0, 10, 1.4, 'damp'}, {1, 25, 6, 'count'}, type = 'pulse'})
|
||||||
|
|
||||||
table.insert(self, {'impulse', function(t, damp)
|
table.insert(self, {'impulse', function(t, damp)
|
||||||
t = t ^ damp
|
t = t ^ damp
|
||||||
|
|
Loading…
Reference in a new issue