diff options
Diffstat (limited to 'js/ui/palette.js')
| -rw-r--r-- | js/ui/palette.js | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/js/ui/palette.js b/js/ui/palette.js index 7417316..3b5cb24 100644 --- a/js/ui/palette.js +++ b/js/ui/palette.js @@ -11,37 +11,37 @@ var palette = (function(){ palette.chars = " ▓▒░" palette.repaint = function(){ - var xw = use_experimental_palette ? 5 : 2 + var xw = use_experimental_palette ? 5 : 2 if (canvas.vertical) { - palette.resize( xw, 16 ) + palette.resize( xw, 16 ) } else { - palette.resize( 32, xw ) + palette.resize( 32, xw ) } - palette.forEach(function(lex,x,y){ - if (canvas.vertical) { x=x^y;y=x^y;x=x^y;x*=2 } - if (y < 2) { - lex.bg = palette_fn(x>>1) - lex.fg = palette_fn(x>>1) - } - else { - lex.bg = fillColor - lex.fg = palette_fn(x>>1) - } - lex.char = palette.chars[y] - lex.opacity = 1 - lex.build() - if (lex.char == "_") lex.char = " " - }) - } + palette.forEach(function(lex,x,y){ + if (canvas.vertical) { x=x^y;y=x^y;x=x^y;x*=2 } + if (y < 2) { + lex.bg = palette_fn(x>>1) + lex.fg = palette_fn(x>>1) + } + else { + lex.bg = fillColor + lex.fg = palette_fn(x>>1) + } + lex.char = palette.chars[y] + lex.opacity = 1 + lex.build() + if (lex.char == "_") lex.char = " " + }) + } palette.repaint() var use_experimental_palette = false palette.experimental = function(){ - use_experimental_palette = ! use_experimental_palette - use_experimental_palette ? palette.resize(32, 5) : palette.resize(32, 2) - palette.repaint() - return use_experimental_palette + use_experimental_palette = ! use_experimental_palette + use_experimental_palette ? palette.resize(32, 5) : palette.resize(32, 2) + palette.repaint() + return use_experimental_palette } palette.bind = function(){ @@ -60,19 +60,19 @@ var palette = (function(){ } if (e.ctrlKey || e.which == 3) return if (brush.char == " " && lex.char == " ") { - brush.fg = lex.fg - brush.bg = lex.bg - brush.char = lex.char + brush.fg = lex.fg + brush.bg = lex.bg + brush.char = lex.char } else if (lex.char != " ") { - brush.fg = lex.bg - brush.bg = lex.fg - brush.char = lex.char + brush.fg = lex.bg + brush.bg = lex.fg + brush.char = lex.char } else { - brush.fg = lex.bg - brush.bg = fillColor -// brush.char = lex.char + brush.fg = lex.bg + brush.bg = fillColor +// brush.char = lex.char } brush.opacity = lex.opacity if (! brush.modified) { @@ -86,14 +86,14 @@ var palette = (function(){ lex.span.addEventListener('contextmenu', function(e){ e.preventDefault() - fillColor = y ? lex.fg : lex.bg - palette.repaint() + fillColor = y ? lex.fg : lex.bg + palette.repaint() brush.fg = lex.fg brush.char = lex.char brush.opacity = lex.opacity - brush.generate() - brush_rapper.style.borderColor = css_reverse_lookup[fillColor] - return + brush.generate() + brush_rapper.style.borderColor = css_reverse_lookup[fillColor] + return }) }) |
