Remove wah effect; change color name bright -> text

jmiskovic · Aug 3, 2019 · 3c03661 · 3c03661
1 parent 8024540
commit 3c03661
Show file tree

Hide file tree

Showing 14 changed files with 187 additions and 175 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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