summaryrefslogtreecommitdiff
path: root/js/ui
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-22 18:32:08 -0500
committerJules Laplace <jules@okfoc.us>2014-11-22 18:32:08 -0500
commit5907322e23673884ceb48d2a07f930337bdf18db (patch)
treeb4135ed5c0dca4959d0c618484af40cfcf980fcd /js/ui
parent8c544b08e8a855635007147cf21e795d74876025 (diff)
stroking brush
Diffstat (limited to 'js/ui')
-rw-r--r--js/ui/canvas.js11
-rw-r--r--js/ui/palette.js3
2 files changed, 9 insertions, 5 deletions
diff --git a/js/ui/canvas.js b/js/ui/canvas.js
index 7e85fcf..1ee6e1c 100644
--- a/js/ui/canvas.js
+++ b/js/ui/canvas.js
@@ -5,15 +5,16 @@ var canvas = (function(){
var exports = new Matrix (cols, rows, function(x,y){
var lex = new Lex (x,y)
-// lex.build()
+ lex.build()
return lex
})
exports.bind = function(){
+ var last_point = [0,0]
exports.forEach(function(lex, x, y){
if (lex.bound) return
lex.bound = true
-
+ var point = [x,y]
lex.span.addEventListener('contextmenu', function(e){
e.preventDefault()
})
@@ -23,13 +24,17 @@ var canvas = (function(){
if (drawing) {
erasing = (e.which == "3" || e.ctrlKey)
draw(lex, x, y, erasing)
+ last_point[0] = x
+ last_point[1] = y
}
lex.focus()
})
lex.span.addEventListener("mousemove", function(){
if (! dragging) return
if (drawing) {
- draw(lex, x, y, erasing)
+ line(lex, last_point, point, erasing)
+ last_point[0] = x
+ last_point[1] = y
}
lex.focus()
})
diff --git a/js/ui/palette.js b/js/ui/palette.js
index 605c08b..2a648a8 100644
--- a/js/ui/palette.js
+++ b/js/ui/palette.js
@@ -1,10 +1,9 @@
var palette = (function(){
-console.log("hi")
+
var palette = new Matrix (32, 2, function(x,y){
var lex = new Lex (x,y)
lex.bg = hue(x>>1)
lex.build()
- console.log(lex.bg, lex.css())
return lex
})