diff --git a/conf.lua b/conf.lua index 712bb63..8715999 100644 --- a/conf.lua +++ b/conf.lua @@ -13,7 +13,7 @@ function love.conf(t) } t.window.title = "Hexpress" t.window.width, t.window.height = unpack(resolutions[5]) - t.window.fullscreen = not true + t.window.fullscreen = true t.window.resizable = true t.window.vsync = false end diff --git a/efx.lua b/efx.lua index c44912c..6cd5b5c 100644 --- a/efx.lua +++ b/efx.lua @@ -17,11 +17,6 @@ local defaults = { type = 'ringmodulator', frequency = 0.6 }, - wah = { - volume = 0.0, - type = 'crybaby', - position = 0.5, - }, } efx.activeEffects = {} diff --git a/hexpad.lua b/hexpad.lua index cd57758..11e3d10 100644 --- a/hexpad.lua +++ b/hexpad.lua @@ -24,7 +24,7 @@ function hexpad.new(displayNoteNames, noteOffset, radius) surfaceC = {l.hsl(0.67, 0.08, 0.23)}, background = {l.hsl(0.68, 0.12, 0.31)}, highlight = {l.hsl(0.05, 0.72, 0.58)}, - bright = {l.hsl(0.68, 0.12, 0.31)}, + text = {l.hsl(0.68, 0.12, 0.31)}, }, }, hexpad) -- would like to keep cell size constant across different devices, so have to @@ -121,7 +121,7 @@ function hexpad:drawCell(q, r, s, touch) love.graphics.setFont(self.font) local h = self.font:getHeight() local w = self.font:getWidth(text) - love.graphics.setColor(self.colorScheme.bright) + love.graphics.setColor(self.colorScheme.text) love.graphics.print(text, -w / 2, -h / 2) end end diff --git a/media/instruments_explaned.svg b/media/instruments_explaned.svg index 3ad9464..b0a1607 100644 --- a/media/instruments_explaned.svg +++ b/media/instruments_explaned.svg @@ -15,7 +15,7 @@ viewBox="0 0 498.07353 257.43077" version="1.1" id="svg8" - inkscape:version="0.92.3 (unknown)" + inkscape:version="0.92.4 (unknown)" sodipodi:docname="instruments_explaned.svg" inkscape:export-filename="/home/josip/hexpress/media/instruments_explaned.png" inkscape:export-xdpi="70" @@ -27,9 +27,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.57081796" - inkscape:cx="831.80308" - inkscape:cy="590.84718" + inkscape:zoom="0.4681805" + inkscape:cx="1054.6836" + inkscape:cy="477.66269" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -45,6 +45,21 @@ fit-margin-bottom="0" /> + + + + inkscape:isstock="true" + inkscape:collect="always"> + style="display:inline" + sodipodi:insensitive="true"> + height="208.35866" + width="370.41458" + style="display:inline;stroke-width:1.37143075" /> tilting to the right allows change of key ANALOG SYNTHSvertical tilt selects sound and controls wahhorizontal tilt selects sound BRASS INSTRUMENTSfretboard tuned in 4thsvertical tilt adds buzz to soundhorizontal tilt selects trumpet / brass section fretboard tuned in 4thsvertical tilt triggers sustainhorizontal tilt controls wah vertical tilt controls fade-in/outhorizontal tilt selects between chello and tremolo strings horizontal tilt selects betweenchello and tremolo strings DRUM KITDRUM KIThorizontal tilt controls reverb ELECTRIC PIANOvertical tilt affects note actionhorizontal tilt controls vibrato horizontal tilt controls reverb SUSTAINED STRINGSall touched notes are sustained indefinitelyuseful as drone note for practicing other instrument SUSTAINED STRINGSall touched notes are sustainedvertical tilt controls fade-in/outvertical tilt controls fade-in/outhorizontal tilt controls volume BASS VARIATIONfretboard tuned in 4thshorizontal tilt controls wah BASS VARIATIONfretboard tuned in 4ths ELECTRIC PIANOvertical tilt affects note actionhorizontal tilt controls vibrato @@ -581,63 +561,127 @@ sodipodi:nodetypes="cc" /> - + + ANALOG SYNTHSvertical tilt selects soundhorizontal tilt selects sound + - BRASS INSTRUMENTSfretboard tuned in 4thsvertical tilt adds buzz to soundhorizontal tilt selects trumpet / brass section + SUSTAINED CHOIRall touched notes are sustainedvertical tilt controls fade-in/outhorizontal tilt controls volume diff --git a/patches/analog/analog.lua b/patches/analog/analog.lua index 15d3268..5a7ef13 100755 --- a/patches/analog/analog.lua +++ b/patches/analog/analog.lua @@ -10,7 +10,7 @@ local hexgrid = require('hexgrid') local colorScheme = { background = {l.hsl(0.21, 0.13, 0.28)}, - bright = {l.hsl(0.19, 0.26, 0.45)}, + text = {l.hsl(0.19, 0.26, 0.45)}, highlight = {l.hsl(0.04, 0.63, 0.50)}, surface = {l.hsl(0.20, 0.48, 0.63)}, surfaceC = {l.hsl(0.20, 0.30, 0.50)}, @@ -26,10 +26,6 @@ local filter = { function patch.load() patch.keyboard = hexpad.new(true) - if love.system.getOS() == 'Android' then - efx.setDryVolume(0.2) - efx.addEffect(efx.wah) - end efx.reverb.decaytime = 2 patch.chorus_synth = sampler.new({ @@ -58,7 +54,7 @@ function patch.load() patch.keyboard.colorScheme.highlight = colorScheme.highlight patch.keyboard.colorScheme.surface = colorScheme.surface patch.keyboard.colorScheme.surfaceC = colorScheme.surfaceC - patch.keyboard.colorScheme.bright = colorScheme.bright + patch.keyboard.colorScheme.text = colorScheme.text love.graphics.setBackgroundColor(colorScheme.background) function patch.keyboard:drawCell(q, r, s, touch) @@ -107,7 +103,6 @@ function patch.process(s) patch.chorus_synth.masterVolume = l.remap(s.tilt.lp[1], -0.1, 0.0, 0, 1, 'clamp') patch.melanc_synth.masterVolume = l.remap(s.tilt.lp[1], 0.1, 0.0, 0, 1, 'clamp') patch.sawsaw_synth.masterVolume = l.remap(s.tilt.lp[2], 0.7, 0.2, 1, 0, 'clamp') - efx.wah.position = l.remap(math.abs(s.tilt[2]), 0.7, 0, 0.3, 1.0, 'clamp') patch.chorus_synth:processTouches(s.dt, s.touches) patch.melanc_synth:processTouches(s.dt, s.touches) diff --git a/patches/broom/broom.lua b/patches/broom/broom.lua index 7602706..442b28d 100644 --- a/patches/broom/broom.lua +++ b/patches/broom/broom.lua @@ -17,12 +17,8 @@ local colorScheme = { function patch.load() patch.keyboard = fretboard.new(false, {-29, -24, -19, -14, -9, -4, 1, 6}) patch.keyboard.fretWidth = 0.4 - if efx.addEffect(efx.wah) then - efx.setDryVolume(0) - end patch.tone = sampler.new({ - {path='patches/broom/acbass_A21.ogg', note = notes.toIndex['A2']}, {path='patches/broom/acbass_B21.ogg', note = notes.toIndex['B2']}, {path='patches/broom/acbass_B31.ogg', note = notes.toIndex['B3']}, @@ -50,8 +46,6 @@ end function patch.process(s) patch.keyboard:interpret(s) - efx.wah.position = l.remap(s.tilt[1], -.2, .2, 0, 1, 'camp') - patch.tone.masterVolume = l.remap(efx.wah.position, 0, 0.5, .2, 1, 'clamp') efx.reverb.decaytime = l.remap(s.tilt.lp[2], 0.7, -0.1, 0.2, 2.0, 'clamp') -- sustain pedal patch.tone.envelope.release = l.remap(s.tilt[2], .0, -0.2, 0.05, 5, 'clamp') diff --git a/patches/choir/choir.lua b/patches/choir/choir.lua index 68295f0..d00eb31 100644 --- a/patches/choir/choir.lua +++ b/patches/choir/choir.lua @@ -33,7 +33,7 @@ function patch.load() patch.keyboard.colorScheme.background = {l.rgba(0x2d2734ff)} patch.keyboard.colorScheme.highlight = {l.rgba(0xe86630ff)} - patch.keyboard.colorScheme.bright = {l.rgba(0xa7a2b8ff)} + patch.keyboard.colorScheme.text = {l.rgba(0xa7a2b8ff)} patch.keyboard.colorScheme.surface = {l.hsl(0.62, 0.16, 0.49)} patch.keyboard.colorScheme.surfaceC = {l.hsl(0.62, 0.10, 0.40)} end diff --git a/patches/chromakey/chromakey.lua b/patches/chromakey/chromakey.lua index 85d7a35..01d197b 100644 --- a/patches/chromakey/chromakey.lua +++ b/patches/chromakey/chromakey.lua @@ -15,7 +15,7 @@ local colorScheme = { surface = {l.hsl(0.66, 0.25, 0.26)}, surfaceC = {l.hsl(0.66, 0.20, 0.23)}, knob = {l.hsl(0.67, 0.09, 0.15)}, - bright = {l.hsl(0.66, 0.18, 0.38)}, + text = {l.hsl(0.66, 0.18, 0.38)}, text = {l.hsl(0.24, 0.09, 0.72)}, shiny = {l.hsl(0.24, 0.09, 0.96, 0.5)}, noteColors = { @@ -59,7 +59,7 @@ function patch.load() patch.keyboard.colorScheme.highlight = colorScheme.highlight patch.keyboard.colorScheme.surface = colorScheme.surface patch.keyboard.colorScheme.surfaceC = colorScheme.surfaceC - patch.keyboard.colorScheme.bright = colorScheme.bright + patch.keyboard.colorScheme.text = colorScheme.text love.graphics.setBackgroundColor(colorScheme.background) patch.keyboard.drawCell = patch.drawCell diff --git a/patches/fretless/fretless.lua b/patches/fretless/fretless.lua index 6bade46..27eb2ab 100644 --- a/patches/fretless/fretless.lua +++ b/patches/fretless/fretless.lua @@ -18,9 +18,7 @@ function patch.load() local tapePath = 'patches/broom/seventies-pop-funk-groove.ogg' patch.keyboard = fretboard.new(false, {-47, -42, -37, -32, -27, -22, -17, -12}) patch.keyboard.fretWidth = 0.4 - if efx.addEffect(efx.wah) then - efx.setDryVolume(0) - end + patch.tone = sampler.new({ {path='patches/fretless/C1.ogg', note = notes.toIndex['C1']}, {path='patches/fretless/D#1.ogg', note = notes.toIndex['D#1']}, @@ -45,8 +43,6 @@ end function patch.process(s) patch.keyboard:interpret(s) - efx.wah.position = l.remap(s.tilt[1], -0.2, 0.2, 0.2, 1.0, 'clamp') - patch.tone.masterVolume = l.remap(efx.wah.position, 0, 0.5, .2, 1, 'clamp') efx.reverb.decaytime = l.remap(s.tilt.lp[2], -.1, 2, 0.5, 2) patch.tone:processTouches(s.dt, s.touches) end diff --git a/patches/organ/organ.lua b/patches/organ/organ.lua index f109472..3f757ea 100644 --- a/patches/organ/organ.lua +++ b/patches/organ/organ.lua @@ -50,7 +50,7 @@ function patch.load() love.graphics.setBackgroundColor(colorScheme.background) patch.keyboard.colorScheme.background = {l.rgba(0x000000ff)} patch.keyboard.colorScheme.highlight = {l.rgba(0xd3660aff)} - patch.keyboard.colorScheme.bright = {l.rgba(0x3e3c23ff)} + patch.keyboard.colorScheme.text = {l.rgba(0x3e3c23ff)} patch.keyboard.colorScheme.surface = {l.rgba(0x302e19ff)} patch.keyboard.colorScheme.surfaceC = {l.rgba(0x2a2510ff)} diff --git a/patches/riders/riders.lua b/patches/riders/riders.lua index 2b6926c..4047daa 100755 --- a/patches/riders/riders.lua +++ b/patches/riders/riders.lua @@ -12,8 +12,8 @@ local colorScheme = { surface = {l.hsl(0.66, 0.25, 0.26)}, surfaceC = {l.hsl(0.66, 0.20, 0.23)}, knob = {l.hsl(0.67, 0.09, 0.15)}, - bright = {l.hsl(0.66, 0.18, 0.38)}, - text = {l.hsl(0.24, 0.09, 0.72)}, + text = {l.hsl(0.66, 0.18, 0.38)}, + label = {l.hsl(0.24, 0.09, 0.72)}, shiny = {l.hsl(0.24, 0.09, 0.96, 0.5)}, } @@ -62,7 +62,7 @@ function patch.load() patch.keyboard.colorScheme.highlight = colorScheme.highlight patch.keyboard.colorScheme.surface = colorScheme.surface patch.keyboard.colorScheme.surfaceC = colorScheme.surfaceC - patch.keyboard.colorScheme.bright = colorScheme.bright + patch.keyboard.colorScheme.text = colorScheme.text love.graphics.setBackgroundColor(colorScheme.background) end @@ -90,7 +90,7 @@ function patch.icon(time) love.graphics.rectangle('fill', -1, -1, 2, 2) love.graphics.translate(0, 0.4) - love.graphics.setColor(colorScheme.text) + love.graphics.setColor(colorScheme.label) love.graphics.arc('fill', 0, -0.78, 0.18, -math.pi / 2 - math.pi / 5, -math.pi / 2 + math.pi / 5) love.graphics.setColor(colorScheme.knob) love.graphics.circle('fill', 0, 0, 0.8) diff --git a/patches/scat/scat.lua b/patches/scat/scat.lua index 83efa36..2adb662 100644 --- a/patches/scat/scat.lua +++ b/patches/scat/scat.lua @@ -48,7 +48,7 @@ function patch.load() }) patch.keyboard.colorScheme.background = {l.rgba(0x2d2734ff)} patch.keyboard.colorScheme.highlight = {l.rgba(0xe86630ff)} - patch.keyboard.colorScheme.bright = {l.rgba(0xa7a2b8ff)} + patch.keyboard.colorScheme.text = {l.rgba(0xa7a2b8ff)} patch.keyboard.colorScheme.surface = {l.hsl(0.62, 0.16, 0.49)} patch.keyboard.colorScheme.surfaceC = {l.hsl(0.62, 0.10, 0.40)} end diff --git a/patches/sustain-choir/sustain-choir.lua b/patches/sustain-choir/sustain-choir.lua index 108eb17..f00fa1e 100755 --- a/patches/sustain-choir/sustain-choir.lua +++ b/patches/sustain-choir/sustain-choir.lua @@ -6,21 +6,11 @@ local hexpad = require('hexpad') local hexgrid = require('hexgrid') local colorScheme = { - wood = {l.color('#8c3c00')}, - neck = {l.color('#302400')}, - strings = { - {l.color('#a69b87')}, - {l.color('#988c75')}, - {l.color('#847965')}, - }, - hair = {l.color('#a39782')}, - stick = {l.color('#5e2400')}, - - background = {l.rgba(0x262626ff)}, - highlight = {l.hsl(0.66, 0.20, 0.23)}, - surface = {l.rgba(0x444444ff)}, - surfaceC = {l.rgba(0x353535ff)}, - bright = {l.rgba(0x75ade699)}, + background = {l.rgba(0x957037ff)}, + highlight = {l.rgba(0xcd8e43ff)}, + surface = {l.rgba(0xdfb558e5)}, + surfaceC = {l.rgba(0xe3bd6bff)}, + text = {l.rgba(0x846b43ff)}, } function patch.load() @@ -44,7 +34,7 @@ function patch.load() patch.keyboard.colorScheme.highlight = colorScheme.highlight patch.keyboard.colorScheme.surface = colorScheme.surface patch.keyboard.colorScheme.surfaceC = colorScheme.surfaceC - patch.keyboard.colorScheme.bright = colorScheme.bright + patch.keyboard.colorScheme.text = colorScheme.text love.graphics.setBackgroundColor(colorScheme.background) end @@ -107,16 +97,15 @@ function patch.draw(s) end function patch.icon(time) - -- TODO: meaningful icon - love.graphics.setColor(colorScheme.background) + love.graphics.setColor(colorScheme.text) love.graphics.rectangle('fill', -1, -1, 2, 2) local i = 0 love.graphics.rotate(time/5 + 0.2*math.sin(time)) for q, r in hexgrid.spiralIter(0, 0, 1) do if i % 2 == 0 then - love.graphics.setColor(colorScheme.highlight) + love.graphics.setColor(colorScheme.surfaceC) else - love.graphics.setColor(colorScheme.surface) + love.graphics.setColor(colorScheme.highlight) end love.graphics.push() local x, y = hexgrid.hexToPixel(q, r) diff --git a/patches/sustain-strings/sustain-strings.lua b/patches/sustain-strings/sustain-strings.lua index 0933736..d5113a7 100755 --- a/patches/sustain-strings/sustain-strings.lua +++ b/patches/sustain-strings/sustain-strings.lua @@ -22,7 +22,7 @@ local colorScheme = { highlight = {l.rgba(0x44617bff)}, surface = {l.rgba(0x444444ff)}, surfaceC = {l.rgba(0x353535ff)}, - bright = {l.rgba(0x75ade699)}, + text = {l.rgba(0x75ade699)}, } function patch.load() @@ -49,7 +49,7 @@ function patch.load() patch.keyboard.colorScheme.highlight = colorScheme.highlight patch.keyboard.colorScheme.surface = colorScheme.surface patch.keyboard.colorScheme.surfaceC = colorScheme.surfaceC - patch.keyboard.colorScheme.bright = colorScheme.bright + patch.keyboard.colorScheme.text = colorScheme.text love.graphics.setBackgroundColor(colorScheme.background) end @@ -112,7 +112,6 @@ function patch.draw(s) end function patch.icon(time) - -- TODO: meaningful icon love.graphics.setColor(colorScheme.background) love.graphics.rectangle('fill', -1, -1, 2, 2) local i = 0