library-mirrors/sfxr.lua
1
0
Fork 0
mirror of https://github.com/nucular/sfxrlua.git synced 2024-12-24 18:44:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed issues #1, #2, #3, #4

Browse Source
This commit is contained in:
Iliyas Jorio 2014-08-21 20:08:03 +02:00
parent f10ef4f3da
commit 997f2f3b96
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sfxr.lua
View File

@ -41,8 +41,13 @@ sfxr.BITS_8 = 8
-- Utilities -- Utilities
-- Simulates a C int cast
local function trunc(n) local function trunc(n)
return math.floor(n - 0.5) if n >= 0 then
return math.floor(n)
else
return -math.floor(-n)
end
end end
local function random(low, high) local function random(low, high)
@ -57,14 +62,6 @@ local function clamp(n, min, max)
return math.max(min or -math.huge, math.min(max or math.huge, n)) return math.max(min or -math.huge, math.min(max or math.huge, n))
end end
local function cpypol(a, b)
if b < 0 then
return -a
else
return a
end
end
local function shallowcopy(t) local function shallowcopy(t)
if type(t) == "table" then if type(t) == "table" then
local t2 = {} local t2 = {}
@ -194,8 +191,7 @@ function sfxr.Sound:generate(freq, bits)
end end
local function reset() local function reset()
-- subtract 0.017 to match the pitch of the original fperiod = 100 / (self.frequency.start^2 + 0.001)
fperiod = 100 / ((self.frequency.start - 0.017)^2 + 0.001)
maxperiod = 100 / (self.frequency.min^2 + 0.001) maxperiod = 100 / (self.frequency.min^2 + 0.001)
period = trunc(fperiod) period = trunc(fperiod)
@ -208,17 +204,17 @@ function sfxr.Sound:generate(freq, bits)
if self.change.amount >= 0 then if self.change.amount >= 0 then
chg_mod = 1.0 - self.change.amount^2 * 0.9 chg_mod = 1.0 - self.change.amount^2 * 0.9
else else
chg_mod = 1.0 - self.change.amount^2 * 10 chg_mod = 1.0 + self.change.amount^2 * 10
end end
chg_time = 0 chg_time = 0
chg_limit = 0
if self.change.speed == 1 then if self.change.speed == 1 then
chg_limit = 0 chg_limit = 0
else else
chg_limit = trunc((1 - self.change.speed)^2 * 20000 + 32) chg_limit = trunc((1 - self.change.speed)^2 * 20000 + 32)
end end
end end
local phase = 0
reset() reset()
local second_sample = false local second_sample = false
@ -230,13 +226,13 @@ function sfxr.Sound:generate(freq, bits)
self.envelope.sustain^2 * 100000, self.envelope.sustain^2 * 100000,
self.envelope.decay^2 * 100000} self.envelope.decay^2 * 100000}
local phase = self.phaser.offset^2 * 1020 local fphase = self.phaser.offset^2 * 1020
phase = cpypol(phase, self.phaser.offset) if self.phaser.offset < 0 then fphase = -fphase end
local dphase = self.phaser.sweep^2 local dphase = self.phaser.sweep^2
dphase = cpypol(dphase, self.phaser.sweep) if self.phaser.sweep < 0 then dphase = -dphase end
local ipp = 0 local ipp = 0
local iphase = math.abs(trunc(phase)) local iphase = math.abs(trunc(fphase))
local fltp = 0 local fltp = 0
local fltdp = 0 local fltdp = 0
@ -324,8 +320,8 @@ function sfxr.Sound:generate(freq, bits)
-- Phaser -- Phaser
phase = phase + dphase fphase = fphase + dphase
iphase = clamp(math.abs(trunc(phase)), nil, 1023) iphase = clamp(math.abs(trunc(fphase)), nil, 1023)
-- Filter stuff -- Filter stuff