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

Hacky solution to resize bug, needs cleanup

This commit is contained in:
Lewis Hemens 2014-01-18 14:09:48 +00:00
parent 0270156786
commit 7cf15a98ab
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js-lib/state-controller.js
View File

@ -155,7 +155,10 @@ DrawMove.prototype.start = function(position) {
var ends = []; var ends = [];
for (var i in directions) { for (var i in directions) {
var midPoint = this.followLine(position, directions[i]); var midPoints = this.followLine(position, directions[i]);
for (var k in midPoints) {
var midPoint = midPoints[k];
// Clockwise is a lie, it is true if we move vertically first. // Clockwise is a lie, it is true if we move vertically first.
var clockwise = (directions[i].x != 0); var clockwise = (directions[i].x != 0);
// Ignore any directions that didn't go anywhere. // Ignore any directions that didn't go anywhere.
@ -171,16 +174,19 @@ DrawMove.prototype.start = function(position) {
} }
// Continue following lines from the midpoint. // Continue following lines from the midpoint.
for (var j in directions) { for (var j in directions) {
if (directions[i].add(directions[j]).length() == 0) { if (directions[i].add(directions[j]).length() == 0 ||
// Don't go back on ourselves. directions[i].add(directions[j]).length() == 2) {
// Don't go back on ourselves, or don't carry on in same direction.
continue; continue;
} }
var end = this.followLine(midPoint, directions[j]); // On the second line we don't care about multiple junctions, just the first.
var endz = this.followLine(midPoint, directions[j]);
// Ignore any directions that didn't go anywhere. // Ignore any directions that didn't go anywhere.
if (midPoint.equals(end)) { if (endz.length == 0 || midPoint.equals(endz[0])) {
continue; continue;
} }
ends.push({position: end, clockwise: clockwise}); ends.push({position: endz[0], clockwise: clockwise});
}
} }
} }
this.ends = ends; this.ends = ends;
@ -207,16 +213,17 @@ DrawMove.prototype.end = function(position) {
DrawMove.prototype.followLine = function(startPosition, direction) { DrawMove.prototype.followLine = function(startPosition, direction) {
var endPosition = startPosition.clone(); var endPosition = startPosition.clone();
var junctions = [];
while (true) { while (true) {
var nextEnd = endPosition.add(direction); var nextEnd = endPosition.add(direction);
if (!this.state.isSpecial(nextEnd)) { if (!this.state.isSpecial(nextEnd)) {
return endPosition; return junctions;
} }
endPosition = nextEnd; endPosition = nextEnd;
var context = this.state.getContext(nextEnd); var context = this.state.getContext(nextEnd);
if (!(context.left && context.right && !context.up && !context.down) && if (!(context.left && context.right && !context.up && !context.down) &&
!(!context.left && !context.right && context.up && context.down)) { !(!context.left && !context.right && context.up && context.down)) {
return endPosition; junctions.push(endPosition);
} }
} }
}; };