From da3b3feedfe3a928dec6ac615579538a9ab5b582 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 9 Dec 2014 16:15:37 -0500 Subject: less-destructive resize; stub out selection --- js/ui/controls.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'js/ui/controls.js') diff --git a/js/ui/controls.js b/js/ui/controls.js index d575725..aadd3c9 100644 --- a/js/ui/controls.js +++ b/js/ui/controls.js @@ -154,9 +154,10 @@ var controls = (function(){ } controls.canvas_width.char = ""+n controls.canvas_width.build() - canvas.w = n - canvas.rebuild() - canvas.build() + canvas.resize(n, canvas.h) + // canvas.w = n + // canvas.rebuild() + // canvas.build() }) controls.canvas_height.key = int_key(function(n, keyCode){ controls.canvas_height.read() @@ -165,9 +166,10 @@ var controls = (function(){ } controls.canvas_height.char = ""+n controls.canvas_height.build() - canvas.h = n - canvas.rebuild() - canvas.build() + canvas.resize(canvas.w, n) + // canvas.h = n + // canvas.rebuild() + // canvas.build() }) } -- cgit v1.2.3-70-g09d2 From 6f151fef14c41ed1c4d65c2013224e0af37b7964 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 9 Dec 2014 17:13:38 -0500 Subject: non-destructive resize --- js/app.js | 8 -------- js/lex.js | 1 + js/ui/controls.js | 38 ++++++++++++++++++++++++++++---------- js/ui/keys.js | 7 ++----- 4 files changed, 31 insertions(+), 23 deletions(-) (limited to 'js/ui/controls.js') diff --git a/js/app.js b/js/app.js index fd375cf..de399bc 100644 --- a/js/app.js +++ b/js/app.js @@ -49,12 +49,4 @@ function bind () { }) } - -function int_key (f) { - return function (key, keyCode) { - var n = parseInt(key) - ! isNaN(n) && f(n) - } -} - init() diff --git a/js/lex.js b/js/lex.js index 18ca4c5..2dc1dd5 100644 --- a/js/lex.js +++ b/js/lex.js @@ -91,6 +91,7 @@ Lex.prototype.focus = function(){ Lex.prototype.blur = function(){ this.span.classList.remove('focused') focused = null + this.onBlur && this.onBlur() } Lex.prototype.demolish = function(){ if (this.span.parentNode) { this.span.parentNode.removeChild(this.span) } diff --git a/js/ui/controls.js b/js/ui/controls.js index aadd3c9..e8c9abd 100644 --- a/js/ui/controls.js +++ b/js/ui/controls.js @@ -110,7 +110,12 @@ var controls = (function(){ // bind controls.bind = function(){ - [controls.width, controls.height, controls.canvas_width, controls.canvas_height].forEach(function(lex){ + [ + controls.width, + controls.height, + controls.canvas_width, + controls.canvas_height + ].forEach(function(lex){ lex.span.addEventListener('mousedown', function(e){ lex.focus() }) @@ -133,14 +138,14 @@ var controls = (function(){ }) controls.width.key = int_key(function(n, keyCode){ - controls.width.blur() + controls.width.blur() controls.width.char = ""+n controls.width.build() brush.w = n brush.rebuild() }) controls.height.key = int_key(function(n, keyCode){ - controls.height.blur() + controls.height.blur() controls.height.char = ""+n controls.height.build() brush.h = n @@ -154,11 +159,20 @@ var controls = (function(){ } controls.canvas_width.char = ""+n controls.canvas_width.build() - canvas.resize(n, canvas.h) - // canvas.w = n - // canvas.rebuild() - // canvas.build() }) + controls.canvas_width.onBlur = function(){ + var w = parseInt(controls.canvas_width.char) || 1 + controls.canvas_width.char = w+"" + controls.canvas_width.build() + canvas.resize(w, canvas.h) + } + controls.canvas_height.onBlur = function(){ + var h = parseInt(controls.canvas_height.char) || 1 + controls.canvas_height.char = h+"" + controls.canvas_height.build() + canvas.resize(canvas.w, h) + } + controls.canvas_height.key = int_key(function(n, keyCode){ controls.canvas_height.read() if (controls.canvas_height.char.length == 1) { @@ -167,11 +181,15 @@ var controls = (function(){ controls.canvas_height.char = ""+n controls.canvas_height.build() canvas.resize(canvas.w, n) - // canvas.h = n - // canvas.rebuild() - // canvas.build() }) } + function int_key (f) { + return function (key, keyCode) { + var n = parseInt(key) + ! isNaN(n) && f(n) + } + } + return controls })() \ No newline at end of file diff --git a/js/ui/keys.js b/js/ui/keys.js index d1badf6..0070dff 100644 --- a/js/ui/keys.js +++ b/js/ui/keys.js @@ -74,11 +74,8 @@ var keys = (function(){ if (focused && char) { var y = focused.y, x = focused.x focused.key(char, e.keyCode) - if (! ('y' in focused && 'x' in focused) ) { - return - } - console.log(focused) - console.log(y, direction[0], x, direction[1]) + if (! ('y' in focused && 'x' in focused) ) { return } + // console.log(y, direction[0], x, direction[1]) current_canvas.focusLex(y + direction[0], x + direction[1]) } }) -- cgit v1.2.3-70-g09d2 From d63f63cf41e5fdb0ba609d6aec4d25585d5ac068 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 9 Dec 2014 20:13:26 -0500 Subject: tool.el --- index.html | 1 - js/app.js | 2 ++ js/tool.js | 1 + js/ui/controls.js | 12 +++--------- 4 files changed, 6 insertions(+), 10 deletions(-) (limited to 'js/ui/controls.js') diff --git a/index.html b/index.html index a8b95bb..935cfa7 100644 --- a/index.html +++ b/index.html @@ -51,7 +51,6 @@ - diff --git a/js/app.js b/js/app.js index de399bc..6deab95 100644 --- a/js/app.js +++ b/js/app.js @@ -25,6 +25,8 @@ function build () { brush.bg = colors.red brush.generate() brush.build() + + controls.grid.use() } function bind () { canvas.bind() diff --git a/js/tool.js b/js/tool.js index b0bc536..9cbc107 100644 --- a/js/tool.js +++ b/js/tool.js @@ -1,4 +1,5 @@ function Tool (span) { + this.el = span this.lex = new Lex (span) this.name = span.innerHTML this.span = span diff --git a/js/ui/controls.js b/js/ui/controls.js index e8c9abd..bd475c1 100644 --- a/js/ui/controls.js +++ b/js/ui/controls.js @@ -2,7 +2,6 @@ var controls = (function(){ var controls = {} - controls.circle = new Tool (circle_el) controls.circle.use = function(){ brush.generate = controls.circle.generate @@ -35,8 +34,7 @@ var controls = (function(){ var fg = brush.fg, bg = brush.bg brush.fill(fg,bg) } - - + controls.text = new Tool (text_el) controls.text.use = function(){ brush.generate = controls.text.generate @@ -46,19 +44,16 @@ var controls = (function(){ controls.text.generate = function(){ } - controls.clear = new Tool (clear_el) controls.clear.use = function(){ canvas.clear() } - controls.grid = new Tool (grid_el) controls.grid.use = function(){ document.body.classList.toggle('grid') } - controls.shader = new Tool (shader_el) controls.shader.use = function(){ shader_textarea.style.display = "block" @@ -97,11 +92,10 @@ var controls = (function(){ controls.animate = new Tool (animate_checkbox) controls.animate.use = function(){ var state = shader.toggle() - if (state) animate_checkbox.innerHTML = "x animate" - else animate_checkbox.innerHTML = "_ animate" + if (state) this.el.innerHTML = "x animate" + else this.el.innerHTML = "_ animate" } - controls.width = new Lex (width_el) controls.height = new Lex (height_el) controls.canvas_width = new Lex (canvas_width_el) -- cgit v1.2.3-70-g09d2 From 2de4442f9aeb6a4fc5d49fab8a15b41d87ff2fe4 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 11 Dec 2014 16:15:06 -0500 Subject: starting to write this stuff the fishbone thing is screwing me up --- index.html | 3 ++ js/app.js | 12 ++++++-- js/draw.js | 87 ++++++++++++++++++++++++++++++++++++------------------ js/ui/canvas.js | 23 ++++++--------- js/ui/controls.js | 67 ++++++++++++++++++++++++----------------- js/ui/keys.js | 4 +-- js/ui/selection.js | 71 ++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 191 insertions(+), 76 deletions(-) (limited to 'js/ui/controls.js') diff --git a/index.html b/index.html index 935cfa7..b45000f 100644 --- a/index.html +++ b/index.html @@ -14,6 +14,8 @@ square
circle
text
+ select
+
clear
grid

@@ -76,5 +78,6 @@ + diff --git a/js/app.js b/js/app.js index 6deab95..65c883b 100644 --- a/js/app.js +++ b/js/app.js @@ -1,7 +1,8 @@ var dragging = false -var drawing = true +var drawing = false var erasing = false +var selecting = false var focused var canvas, tools, palette, controls, brush, mode, current_tool, current_canvas @@ -35,9 +36,14 @@ function bind () { controls.bind() keys.bind() - window.addEventListener('mouseup', function(){ + window.addEventListener('mouseup', function(e){ dragging = erasing = false - if (current_tool.name != 'shader' && current_tool.name != 'load' && current_tool.name != 'save') { cursor_input.focus() } + if (current_tool.name != 'shader' && current_tool.name != 'load' && current_tool.name != 'save') { + cursor_input.focus() + } + if (selecting) { + selection.up(e) + } }); window.addEventListener('mousedown', function(e){ diff --git a/js/draw.js b/js/draw.js index 09e660b..d6b5d73 100644 --- a/js/draw.js +++ b/js/draw.js @@ -1,32 +1,63 @@ +var draw = (function(){ -function draw (lex, x, y, erasing) { - stamp (canvas, brush, x, y, erasing) -} + var last_point = [0,0] + + function down (e, lex, point) { + erasing = (e.which == "3" || e.ctrlKey) + if (e.shiftKey) { + line (lex, last_point, point, erasing) + } + else { + stamp (canvas, brush, point[0], point[1], erasing) + } + last_point[0] = point[0] + last_point[1] = point[1] + } + + function move (e, lex, point) { + line(lex, last_point, point, erasing) + last_point[0] = point[0] + last_point[1] = point[1] + } + + function point (lex, x, y, erasing) { + stamp (canvas, brush, x, y, erasing) + } -function line (lex, a, b, erasing) { - var len = dist(a[0], a[1], b[0], b[1]) - var bw = 1 - var x, y, i; - for (var i = 0; i < len; i += bw) { - x = lerp(i / len, a[0], b[0]) - y = lerp(i / len, a[1], b[1]) - stamp (canvas, brush, x, y, erasing) - } -} + function line (lex, a, b, erasing) { + var len = dist(a[0], a[1], b[0], b[1]) + var bw = 1 + var x, y, i; + for (var i = 0; i < len; i += bw) { + x = lerp(i / len, a[0], b[0]) + y = lerp(i / len, a[1], b[1]) + stamp (canvas, brush, x, y, erasing) + } + } -function stamp (canvas, brush, x, y, erasing) { - hh = brush.w/2|0 - brush.forEach(function(lex, s, t){ - s = round( s + x-hh ) - t = round( t + y-hh ) - if (lex.opacity > 0 && s >= 0 && s < canvas.w && t >= 0 && t < canvas.h) { - if (erasing) { - canvas.aa[t][s].erase(lex) - } - else { - canvas.aa[t][s].clone(lex) - } - } - }) -} + function stamp (canvas, brush, x, y, erasing) { + hh = brush.w/2|0 + brush.forEach(function(lex, s, t){ + s = round( s + x-hh ) + t = round( t + y-hh ) + if (lex.opacity > 0 && s >= 0 && s < canvas.w && t >= 0 && t < canvas.h) { + if (erasing) { + canvas.aa[t][s].erase(lex) + } + else { + canvas.aa[t][s].clone(lex) + } + } + }) + } + + var draw = {} + draw.down = down + draw.move = move + draw.stamp = stamp + draw.line = line + draw.point = point + return draw + +})() diff --git a/js/ui/canvas.js b/js/ui/canvas.js index 7e75ef6..c70b135 100644 --- a/js/ui/canvas.js +++ b/js/ui/canvas.js @@ -2,7 +2,6 @@ var canvas = current_canvas = (function(){ var cols = 80 var rows = 24 - var last_point = [0,0] var exports = new Matrix (cols, rows, function(x,y){ var lex = new Lex (x,y) @@ -25,24 +24,20 @@ var canvas = current_canvas = (function(){ dragging = true current_canvas = canvas if (drawing) { - erasing = (e.which == "3" || e.ctrlKey) - if (e.shiftKey) { - line(lex, last_point, point, erasing) - } - else { - draw(lex, x, y, erasing) - } - last_point[0] = x - last_point[1] = y + draw.down(e, lex, point) + } + else if (selecting) { + selection.down(e, lex, point) } lex.focus() }) - lex.span.addEventListener("mousemove", function(){ + lex.span.addEventListener("mousemove", function(e){ if (! dragging) return if (drawing) { - line(lex, last_point, point, erasing) - last_point[0] = x - last_point[1] = y + draw.move(e, lex, point) + } + else if (selecting) { + selection.move(e, lex, point) } lex.focus() }) diff --git a/js/ui/controls.js b/js/ui/controls.js index bd475c1..ecaa875 100644 --- a/js/ui/controls.js +++ b/js/ui/controls.js @@ -7,6 +7,7 @@ var controls = (function(){ brush.generate = controls.circle.generate brush.generate() drawing = true + selection.hide() brush.modified = false } controls.circle.generate = function(){ @@ -27,8 +28,9 @@ var controls = (function(){ controls.square.use = function(){ brush.generate = controls.square.generate brush.generate() - drawing = true brush.modified = false + drawing = true + selection.hide() } controls.square.generate = function(){ var fg = brush.fg, bg = brush.bg @@ -40,6 +42,15 @@ var controls = (function(){ brush.generate = controls.text.generate brush.generate() drawing = false + selection.hide() + } + controls.text.generate = function(){ + } + + controls.select = new Tool (select_el) + controls.select.use = function(){ + drawing = false + selection.show() } controls.text.generate = function(){ } @@ -54,40 +65,41 @@ var controls = (function(){ document.body.classList.toggle('grid') } - controls.shader = new Tool (shader_el) - controls.shader.use = function(){ - shader_textarea.style.display = "block" - // setTimeout(function(){ shader_textarea.focus() }) - shader_textarea.focus() - } - controls.shader.blur = function(){ - Tool.prototype.blur.call(this) - shader_textarea.style.display = "none" - } + ClipboardTool = Tool.extend({ + blur: function(){ + this.__blur() + clipboard.hide() + } + }) + ShaderTool = Tool.extend({ + use: function(){ + shader_textarea.style.display = "block" + shader_textarea.focus() + }, + blur: function(){ + this.__blur() + shader_textarea.style.display = "none" + } + }) + + controls.shader = new ShaderTool (shader_el) + shader_textarea.value = demo_shader.innerHTML shader_textarea.addEventListener("input", function(){ var fn = shader.build(shader_textarea.value) fn && shader.run(canvas) }) - controls.save = new Tool (save_el) + controls.save = new ClipboardTool (save_el) controls.save.use = function(){ clipboard.show() clipboard.export_mode() } - controls.save.blur = function(){ - Tool.prototype.blur.call(this) - clipboard.hide() - } - controls.load = new Tool (load_el) + controls.load = new ClipboardTool (load_el) controls.load.use = function(){ clipboard.show() clipboard.import_mode() } - controls.load.blur = function(){ - Tool.prototype.blur.call(this) - clipboard.hide() - } controls.animate = new Tool (animate_checkbox) controls.animate.use = function(){ @@ -119,6 +131,7 @@ var controls = (function(){ controls.square, controls.circle, controls.text, + controls.select, controls.clear, controls.grid, controls.shader, @@ -160,12 +173,6 @@ var controls = (function(){ controls.canvas_width.build() canvas.resize(w, canvas.h) } - controls.canvas_height.onBlur = function(){ - var h = parseInt(controls.canvas_height.char) || 1 - controls.canvas_height.char = h+"" - controls.canvas_height.build() - canvas.resize(canvas.w, h) - } controls.canvas_height.key = int_key(function(n, keyCode){ controls.canvas_height.read() @@ -176,6 +183,12 @@ var controls = (function(){ controls.canvas_height.build() canvas.resize(canvas.w, n) }) + controls.canvas_height.onBlur = function(){ + var h = parseInt(controls.canvas_height.char) || 1 + controls.canvas_height.char = h+"" + controls.canvas_height.build() + canvas.resize(canvas.w, h) + } } function int_key (f) { diff --git a/js/ui/keys.js b/js/ui/keys.js index 0070dff..1915333 100644 --- a/js/ui/keys.js +++ b/js/ui/keys.js @@ -5,7 +5,7 @@ var keys = (function(){ keys.bind = function(){ cursor_input.addEventListener('keydown', function(e){ - console.log("keycode:", e.keyCode) + // console.log("keycode:", e.keyCode) switch (e.keyCode) { case 27: // esc @@ -69,7 +69,7 @@ var keys = (function(){ var char = cursor_input.value cursor_input.value = "" - console.log("input:", char) + // console.log("input:", char) if (focused && char) { var y = focused.y, x = focused.x diff --git a/js/ui/selection.js b/js/ui/selection.js index cbeb051..f1e7e5e 100644 --- a/js/ui/selection.js +++ b/js/ui/selection.js @@ -1,6 +1,8 @@ var selection = (function(){ - var selection = new Matrix (1, 1, function(x,y){ + var creating = false, moving = false, copying = false + + var selection_canvas = new Matrix (1, 1, function(x,y){ var lex = new Lex (x,y) lex.build() return lex @@ -15,7 +17,72 @@ var selection = (function(){ // - drag the selection to move it -- this "cuts" it and leaves a blank space on the canvas. // - shift-drag the selection to copy it - + var corner = [-1, -1] + var dimensions = [0, 0] + + function contains (point) { + var contains_x = corner[0] < point[0] && point[0] < corner[0] + dimensions[0] + var contains_y = corner[1] < point[1] && point[1] < corner[1] + dimensions[1] + return (contains_x && contains_y) + } + function reposition () { + var top_left = canvas.aa[corner[1]][corner[0]].span + var left = top_left.offsetLeft + var top = top_left.offsetTop + var width = top_left.offsetWidth + var height = top_left.offsetHeight + } + function down (e, lex, point){ + if (contains(point)) { + copying = false + moving = true + creating = false + } + else { + copying = false + moving = false + creating = true + corner[0] = point[0] + corner[1] = point[1] + dimensions[0] = 1 + dimensions[1] = 1 + } + show() + reposition() + } + function move (e, lex, point){ + if (creating) { + var x = point[0] - corner[0] + var y = point[1] - corner[1] + if (x < 0) { + corner[0] = point[0] + } + if (y < 0) { + corner[0] = point[0] + } + dimensions[0] = abs(x) + reposition() + } + else if (moving) { + } + } + function up (e) { + } + + function show () { + selecting = true + } + function hide () { + selecting = false + } + + var selection = {} + selection.down = down + selection.move = move + selection.up = up + selection.canvas = selection_canvas + selection.show = show + selection.hide = hide return selection })() -- cgit v1.2.3-70-g09d2 From 4c7134419292002e1ff4c6b6100a7a9ec37ced43 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 11 Dec 2014 22:38:41 -0500 Subject: fishbone working again not sure what i did lol --- js/tool.js | 2 +- js/ui/controls.js | 6 ++++++ js/ui/selection.js | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'js/ui/controls.js') diff --git a/js/tool.js b/js/tool.js index e1c6adb..190f29f 100644 --- a/js/tool.js +++ b/js/tool.js @@ -20,5 +20,5 @@ var Tool = Model({ } }) -var Checkbox = Tool({ +var Checkbox = Tool.extend({ }) diff --git a/js/ui/controls.js b/js/ui/controls.js index ecaa875..293cd1d 100644 --- a/js/ui/controls.js +++ b/js/ui/controls.js @@ -64,6 +64,12 @@ var controls = (function(){ controls.grid.use = function(){ document.body.classList.toggle('grid') } + controls.grid.show = function(){ + document.body.classList.add('grid') + } + controls.grid.hide = function(){ + document.body.classList.remove('grid') + } ClipboardTool = Tool.extend({ blur: function(){ diff --git a/js/ui/selection.js b/js/ui/selection.js index 6f8f7db..cbd15bf 100644 --- a/js/ui/selection.js +++ b/js/ui/selection.js @@ -125,6 +125,7 @@ var selection = (function(){ function show () { selecting = true + controls.grid.show() } function hide () { reset() -- cgit v1.2.3-70-g09d2 From a0b65f2e1a81b6fec30b4c1c2b2764c8dbcd64a9 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 12 Dec 2014 00:05:37 -0500 Subject: flood fill --- index.html | 1 + js/app.js | 2 +- js/draw.js | 43 +++++++++++++++++++++++++++++++++++++++++++ js/lex.js | 10 +++++++++- js/ui/brush.js | 2 ++ js/ui/canvas.js | 3 +++ js/ui/controls.js | 12 +++++++++++- 7 files changed, 70 insertions(+), 3 deletions(-) (limited to 'js/ui/controls.js') diff --git a/index.html b/index.html index b45000f..2cdb580 100644 --- a/index.html +++ b/index.html @@ -15,6 +15,7 @@ circle
text
select
+ fill

clear
grid
diff --git a/js/app.js b/js/app.js index 6c234c0..ab2c1ab 100644 --- a/js/app.js +++ b/js/app.js @@ -3,6 +3,7 @@ var dragging = false var drawing = false var erasing = false var selecting = false +var filling = false var focused var canvas, tools, palette, controls, brush, mode, current_tool, current_canvas @@ -28,7 +29,6 @@ function build () { brush.build() controls.grid.use() - controls.select.use() } function bind () { canvas.bind() diff --git a/js/draw.js b/js/draw.js index 8a12467..6bf55bd 100644 --- a/js/draw.js +++ b/js/draw.js @@ -51,6 +51,48 @@ var draw = (function(){ } }) } + + function fill (lex, x, y) { + var q = [ [x,y] ] + var target = canvas.aa[y][x].copy() + var n, w = 0, e = 0, j = 0 + var kk = 0 + // gets into a weird infinite loop if we don't break here.. :\ + if (target.eq(lex)) { return } + LOOP: while (q.length) { + n = q.shift() + if (canvas.aa[n[1]][n[0]].ne(target)) { + continue LOOP + } + w = e = n[0] + j = n[1] + WEST: while (w > 0) { + if (canvas.aa[j][w-1].eq(target)) { + w = w-1 + } + else { + break WEST + } + } + EAST: while (e < canvas.w-1) { + if (canvas.aa[j][e+1].eq(target)) { + e = e+1 + } + else { + break EAST + } + } + for (var i = w; i <= e; i++) { + canvas.aa[j][i].clone(lex) + if (j > 0 && canvas.aa[j-1][i].eq(target)) { + q.push([ i, j-1 ]) + } + if (j < canvas.h-1 && canvas.aa[j+1][i].eq(target)) { + q.push([ i, j+1 ]) + } + } + } + } var draw = {} draw.down = down @@ -58,6 +100,7 @@ var draw = (function(){ draw.stamp = stamp draw.line = line draw.point = point + draw.fill = fill return draw })() diff --git a/js/lex.js b/js/lex.js index 2dc1dd5..8c3b0f1 100644 --- a/js/lex.js +++ b/js/lex.js @@ -57,6 +57,11 @@ Lex.prototype.clone = function (lex){ this.opacity = lex.opacity this.build() } +Lex.prototype.copy = function () { + var lex = new Lex (0,0) + lex.clone(this) + return lex +} Lex.prototype.erase = function (){ this.fg = colors.white this.bg = colors.black @@ -71,7 +76,10 @@ Lex.prototype.fill = function(fg, bg){ this.build() } Lex.prototype.eq = function(lex){ - return lex && this.fg == lex.fg && this.bg == lex.fg && this.char == lex.char + return lex && this.fg == lex.fg && this.bg == lex.bg && this.char == lex.char +} +Lex.prototype.ne = function(lex){ + return ! this.eq(lex) } Lex.prototype.clear = function(){ this.bg = 1 diff --git a/js/ui/brush.js b/js/ui/brush.js index c7cf583..50f6e07 100644 --- a/js/ui/brush.js +++ b/js/ui/brush.js @@ -68,8 +68,10 @@ var brush = (function(){ this.expand(-i) } + brush.char = " " brush.fg = 0 brush.bg = 1 + brush.opacity = 1 return brush diff --git a/js/ui/canvas.js b/js/ui/canvas.js index c70b135..206cbee 100644 --- a/js/ui/canvas.js +++ b/js/ui/canvas.js @@ -29,6 +29,9 @@ var canvas = current_canvas = (function(){ else if (selecting) { selection.down(e, lex, point) } + else if (filling) { + draw.fill(brush, x, y) + } lex.focus() }) lex.span.addEventListener("mousemove", function(e){ diff --git a/js/ui/controls.js b/js/ui/controls.js index 293cd1d..bbf93cc 100644 --- a/js/ui/controls.js +++ b/js/ui/controls.js @@ -7,6 +7,7 @@ var controls = (function(){ brush.generate = controls.circle.generate brush.generate() drawing = true + filling = false selection.hide() brush.modified = false } @@ -30,6 +31,7 @@ var controls = (function(){ brush.generate() brush.modified = false drawing = true + filling = false selection.hide() } controls.square.generate = function(){ @@ -42,6 +44,7 @@ var controls = (function(){ brush.generate = controls.text.generate brush.generate() drawing = false + filling = false selection.hide() } controls.text.generate = function(){ @@ -50,9 +53,15 @@ var controls = (function(){ controls.select = new Tool (select_el) controls.select.use = function(){ drawing = false + filling = false selection.show() } - controls.text.generate = function(){ + + controls.fill = new Tool (fill_el) + controls.fill.use = function(){ + drawing = false + filling = true + selection.hide() } controls.clear = new Tool (clear_el) @@ -137,6 +146,7 @@ var controls = (function(){ controls.square, controls.circle, controls.text, + controls.fill, controls.select, controls.clear, controls.grid, -- cgit v1.2.3-70-g09d2 From 8746a003b0226cd7bd67eca8fcf3774313021093 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 12 Dec 2014 22:20:34 -0500 Subject: fix resize height --- js/ui/controls.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'js/ui/controls.js') diff --git a/js/ui/controls.js b/js/ui/controls.js index bbf93cc..81403db 100644 --- a/js/ui/controls.js +++ b/js/ui/controls.js @@ -192,12 +192,11 @@ var controls = (function(){ controls.canvas_height.key = int_key(function(n, keyCode){ controls.canvas_height.read() - if (controls.canvas_height.char.length == 1) { + if (controls.canvas_height.char.length < 3) { n = parseInt(controls.canvas_height.char) * 10 + n } controls.canvas_height.char = ""+n controls.canvas_height.build() - canvas.resize(canvas.w, n) }) controls.canvas_height.onBlur = function(){ var h = parseInt(controls.canvas_height.char) || 1 -- cgit v1.2.3-70-g09d2