haskal
/
asciiflow2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More cody tidy up, fixed text tool highlighting

This commit is contained in:
Lewis Hemens 2014-02-09 18:19:47 +00:00
parent 5a6de282b6
commit 150b8810ec
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
js-lib/draw.js
View File

@ -22,25 +22,21 @@ function drawLine(state, startPosition, endPosition, clockwise, opt_value) {
var midX = clockwise ? endPosition.x : startPosition.x; var midX = clockwise ? endPosition.x : startPosition.x;
var midY = clockwise ? startPosition.y : endPosition.y; var midY = clockwise ? startPosition.y : endPosition.y;
// Need to store the context of the next cell before we modify the current one. while (startX++ < endX) {
var context = state.getContext(new ascii.Vector(startX, midY));
while (startX < endX) {
var position = new ascii.Vector(startX, midY); var position = new ascii.Vector(startX, midY);
// Don't erase 4 way junctions. var context = state.getContext(new ascii.Vector(startX, midY));
var draw = (value != ' ' || context.up + context.down != 2); // Don't erase any lines that we cross.
// Set the context for the next loop before we draw. if (value != ' ' || context.up + context.down != 2) {
context = state.getContext(position.add(new ascii.Vector(1, 0))); state.drawValueIncremental(position, value);
if (draw) { state.drawValueIncremental(position, value); } }
startX++;
} }
context = state.getContext(new ascii.Vector(midX, startY));
while (startY++ < endY) { while (startY++ < endY) {
var position = new ascii.Vector(midX, startY); var position = new ascii.Vector(midX, startY);
// Don't erase 4 way junctions. var context = state.getContext(new ascii.Vector(midX, startY));
var draw = (value != ' ' || context.left + context.right != 2); // Don't erase any lines that we cross.
// Set the context for the next loop before we draw. if (value != ' ' || context.left + context.right != 2) {
context = state.getContext(position.add(new ascii.Vector(0, 1))); state.drawValueIncremental(position, value);
if (draw) { state.drawValueIncremental(position, value); } }
} }
state.drawValue(startPosition, value); state.drawValue(startPosition, value);
@ -175,7 +171,7 @@ ascii.DrawText.prototype.start = function(position) {
this.state.clearDraw(); this.state.clearDraw();
// Effectively highlights the starting cell. // Effectively highlights the starting cell.
var currentValue = this.state.getCell(position).getRawValue(); var currentValue = this.state.getCell(position).getRawValue();
this.state.drawValue(position, currentValue == null ? ' ' : currentValue); this.state.drawValue(position, currentValue == null ? ERASE_CHAR : currentValue);
}; };
ascii.DrawText.prototype.move = function(position) {}; ascii.DrawText.prototype.move = function(position) {};
ascii.DrawText.prototype.end = function(position) {}; ascii.DrawText.prototype.end = function(position) {};
@ -198,7 +194,10 @@ ascii.DrawText.prototype.handleKey = function(value) {
// Pressed backspace key, so clear this cell and go back. // Pressed backspace key, so clear this cell and go back.
this.state.clearDraw(); this.state.clearDraw();
nextPosition = this.currentPosition.add(new ascii.Vector(-1, 0)); nextPosition = this.currentPosition.add(new ascii.Vector(-1, 0));
this.state.drawValue(nextPosition, ' '); if (nextPosition.x < this.startPosition.x) {
nextPosition.x = this.startPosition.x;
}
this.state.drawValue(nextPosition, ERASE_CHAR);
this.state.commitDraw(); this.state.commitDraw();
} }
if (value == KEY_UP) { if (value == KEY_UP) {
@ -227,7 +226,7 @@ ascii.DrawText.prototype.handleKey = function(value) {
// Highlight the next cell. // Highlight the next cell.
this.currentPosition = nextPosition; this.currentPosition = nextPosition;
var nextValue = this.state.getCell(nextPosition).getRawValue(); var nextValue = this.state.getCell(nextPosition).getRawValue();
this.state.drawValue(nextPosition, nextValue == null ? ' ' : nextValue); this.state.drawValue(nextPosition, nextValue == null ? ERASE_CHAR : nextValue);
}; };
/** /**