Added layer select with arrows

This commit is contained in:
Devine Lu Linvega 2017-01-02 17:07:06 -07:00
parent 808ba43345
commit bf2cc0cda3
5 changed files with 43 additions and 11 deletions

View File

@ -11,6 +11,7 @@ canvas:hover { cursor: crosshair;}
#widget .module { float:left; margin-right:10px; } #widget .module { float:left; margin-right:10px; }
#widget .module .highlight { color:#e7fff8; } #widget .module .highlight { color:#e7fff8; }
#widget .cursor { float:right; text-align: right} #widget .cursor { float:right; text-align: right}
#widget .layer:hover { cursor:pointer;}
#commander { display:none; z-index: 2000; position:fixed; } #commander { display:none; z-index: 2000; position:fixed; }
#commander.visible { display:block; } #commander.visible { display:block; }

View File

@ -12,7 +12,7 @@ commander.hint.element = document.getElementById('commander_hint');
document.addEventListener('mousedown', function(e){ ronin.cursor.mouse_down(ronin.position_in_canvas(e));}, false); document.addEventListener('mousedown', function(e){ ronin.cursor.mouse_down(ronin.position_in_canvas(e));}, false);
document.addEventListener('mousemove', function(e){ ronin.cursor.mouse_move(ronin.position_in_canvas(e));}, false); document.addEventListener('mousemove', function(e){ ronin.cursor.mouse_move(ronin.position_in_canvas(e));}, false);
document.addEventListener('mouseup', function(e){ ronin.cursor.mouse_up(ronin.position_in_canvas(e));}, false); document.addEventListener('mouseup', function(e){ ronin.cursor.mouse_up(ronin.position_in_canvas(e));}, false);
// document.addEventListener('contextmenu', function(ev){ ev.preventDefault(); return false;}, false); document.addEventListener('contextmenu', function(ev){ ev.preventDefault(); return false;}, false);
window.addEventListener('resize', function(){ ronin.on_resize(); }, true); window.addEventListener('resize', function(){ ronin.on_resize(); }, true);
// Keyboard // Keyboard
@ -33,6 +33,7 @@ starting_canvas.height = parseInt(starting_canvas.height/40) * 40;
commander.query("~ "+ronin.timestamp()); commander.query("~ "+ronin.timestamp());
commander.query("# "+starting_canvas.render()); commander.query("# "+starting_canvas.render());
commander.query("# layer=render"); commander.query("# layer=background");
commander.query("# #efefef");
commander.query("# layer=main"); commander.query("# layer=main");
commander.query("> 1 0,0 #000000"); commander.query("> 1 0,0 #000000");

View File

@ -18,8 +18,10 @@ function Keyboard()
case 13: this.key_enter(); break; case 13: this.key_enter(); break;
case 186: this.key_colon(); break; case 186: this.key_colon(); break;
case 27: this.key_escape(); break; case 27: this.key_escape(); break;
case 219: ronin.brush.size -= ronin.brush.size > 1 ? 1 : 0;ronin.widget.update(); break; case 219: ronin.brush.size_up(); break;
case 221: ronin.brush.size += 1;ronin.widget.update(); break; case 221: ronin.brush.size_down(); break;
case 38: ronin.surface.layer_up(); break;
case 40: ronin.surface.layer_down(); break;
} }
// Passive // Passive

View File

@ -45,6 +45,18 @@ function Brush(rune)
} }
} }
this.size_up = function()
{
this.size -= this.size > 1 ? 1 : 0;
ronin.widget.update();
}
this.size_down = function()
{
this.size += 1;
ronin.widget.update();
}
this.add_pointer = function(cmd) this.add_pointer = function(cmd)
{ {
var pointer = new Pointer(); var pointer = new Pointer();
@ -75,10 +87,6 @@ function Brush(rune)
return this.pointers.length > 0 ? "Brush "+this.size+", "+this.pointers.length+" pointers" : "No Pointers"; return this.pointers.length > 0 ? "Brush "+this.size+", "+this.pointers.length+" pointers" : "No Pointers";
} }
// Commands
// this.
// Cursor // Cursor
this.is_drawing = false; this.is_drawing = false;

View File

@ -80,12 +80,12 @@ function Surface(rune)
{ {
if(!this.active_layer){ return ""; } if(!this.active_layer){ return ""; }
var s = "# "+this.size.render()+"<br />"; var s = "";
Object.keys(ronin.surface.layers).forEach(function (key) { Object.keys(ronin.surface.layers).forEach(function (key) {
s += ronin.surface.layers[key].widget(); s = ronin.surface.layers[key].widget()+s;
}); });
return s; return "# "+this.size.render()+"<br />"+s;
} }
this.widget_cursor = function() this.widget_cursor = function()
@ -93,6 +93,26 @@ function Surface(rune)
return "Drag"; return "Drag";
} }
// Commands
this.layer_up = function()
{
var keys = Object.keys(ronin.surface.layers);
var loc = keys.indexOf(this.active_layer.name);
if(loc >= keys.length-1){ console.log("Reached end"); return false; }
if(keys[loc+1] != null){this.select_layer(ronin.surface.layers[keys[loc+1]]);}
}
this.layer_down = function()
{
var keys = Object.keys(ronin.surface.layers);
var loc = keys.indexOf(this.active_layer.name);
if(keys[loc-1] != null){this.select_layer(ronin.surface.layers[keys[loc-1]]);}
}
// Layers // Layers
this.context = function() this.context = function()