diff --git a/dotscape b/dotscape index 87c74b0..9ba9e24 100755 Binary files a/dotscape and b/dotscape differ diff --git a/fcore/quad-tree.sml b/fcore/quad-tree.sml index 506b2c7..71f8073 100644 --- a/fcore/quad-tree.sml +++ b/fcore/quad-tree.sml @@ -536,6 +536,8 @@ struct fun toExportStringFolder ({x, ex, y, ey, data = {r, g, b, a}}, acc) = let + val ey = if ey = y then y + 1 else ey + val x = makeXString x val y = makeYString y val ex = makeEndXString (x, ex) diff --git a/green.dsc b/green.dsc index 1e0b520..dd7d862 100644 --- a/green.dsc +++ b/green.dsc @@ -1 +1 @@ -30 30 { {0 0 0 29 0 0 0 1 } {0 0 29 0 0 0 0 1 } {0 29 29 29 0 0 0 1 } {29 0 29 29 0 0 0 1 } } \ No newline at end of file +10 10 { {0 0 0 10 0 0 0 1 } {0 0 9 0 0 0 0 1 } {0 9 9 10 0 0 0 1 } {2 2 7 2 0 0 0 1 } {9 0 9 10 0 0 0 1 } } \ No newline at end of file diff --git a/green.sml b/green.sml index 7e3d01d..2e7bdb1 100644 --- a/green.sml +++ b/green.sml @@ -21,52 +21,64 @@ struct in #[ xToNdc (xOffset, 0.000000000000000, scale, halfWidth), -yToNdc (yOffset, 30.000000000000000, scale, halfHeight), +yToNdc (yOffset, 10.000000000000000, scale, halfHeight), endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 0.000000000000000, scale, halfWidth), -yToNdc (yOffset, 30.000000000000000, scale, halfHeight), +yToNdc (yOffset, 10.000000000000000, scale, halfHeight), xToNdc (xOffset, 0.000000000000000, scale, halfWidth), yToNdc (yOffset, 0.000000000000000, scale, halfHeight), xToNdc (xOffset, 0.000000000000000, scale, halfWidth), yToNdc (yOffset, 0.000000000000000, scale, halfHeight), endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 0.000000000000000, scale, halfWidth), -yToNdc (yOffset, 30.000000000000000, scale, halfHeight), +yToNdc (yOffset, 10.000000000000000, scale, halfHeight), endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 0.000000000000000, scale, halfWidth), yToNdc (yOffset, 0.000000000000000, scale, halfHeight), xToNdc (xOffset, 0.000000000000000, scale, halfWidth), -yToNdc (yOffset, 0.000000000000000, scale, halfHeight), -endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 29.000000000000000, scale, halfWidth), -yToNdc (yOffset, 0.000000000000000, scale, halfHeight), +yToNdc (yOffset, 1.000000000000000, scale, halfHeight), +endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 9.000000000000000, scale, halfWidth), +yToNdc (yOffset, 1.000000000000000, scale, halfHeight), xToNdc (xOffset, 0.000000000000000, scale, halfWidth), yToNdc (yOffset, 0.000000000000000, scale, halfHeight), xToNdc (xOffset, 0.000000000000000, scale, halfWidth), yToNdc (yOffset, 0.000000000000000, scale, halfHeight), -endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 29.000000000000000, scale, halfWidth), -yToNdc (yOffset, 0.000000000000000, scale, halfHeight), -endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 29.000000000000000, scale, halfWidth), +endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 9.000000000000000, scale, halfWidth), +yToNdc (yOffset, 1.000000000000000, scale, halfHeight), +endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 9.000000000000000, scale, halfWidth), yToNdc (yOffset, 0.000000000000000, scale, halfHeight), xToNdc (xOffset, 0.000000000000000, scale, halfWidth), -yToNdc (yOffset, 30.000000000000000, scale, halfHeight), -endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 29.000000000000000, scale, halfWidth), -yToNdc (yOffset, 30.000000000000000, scale, halfHeight), +yToNdc (yOffset, 10.000000000000000, scale, halfHeight), +endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 9.000000000000000, scale, halfWidth), +yToNdc (yOffset, 10.000000000000000, scale, halfHeight), xToNdc (xOffset, 0.000000000000000, scale, halfWidth), -yToNdc (yOffset, 29.000000000000000, scale, halfHeight), +yToNdc (yOffset, 9.000000000000000, scale, halfHeight), xToNdc (xOffset, 0.000000000000000, scale, halfWidth), -yToNdc (yOffset, 29.000000000000000, scale, halfHeight), -endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 29.000000000000000, scale, halfWidth), -yToNdc (yOffset, 30.000000000000000, scale, halfHeight), -endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 29.000000000000000, scale, halfWidth), -yToNdc (yOffset, 29.000000000000000, scale, halfHeight), -xToNdc (xOffset, 29.000000000000000, scale, halfWidth), -yToNdc (yOffset, 30.000000000000000, scale, halfHeight), -endXToNdc (xOffset, xToNdc (xOffset, 29.000000000000000, scale, halfWidth), 29.000000000000000, scale, halfWidth), -yToNdc (yOffset, 30.000000000000000, scale, halfHeight), -xToNdc (xOffset, 29.000000000000000, scale, halfWidth), +yToNdc (yOffset, 9.000000000000000, scale, halfHeight), +endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 9.000000000000000, scale, halfWidth), +yToNdc (yOffset, 10.000000000000000, scale, halfHeight), +endXToNdc (xOffset, xToNdc (xOffset, 0.000000000000000, scale, halfWidth), 9.000000000000000, scale, halfWidth), +yToNdc (yOffset, 9.000000000000000, scale, halfHeight), +xToNdc (xOffset, 2.000000000000000, scale, halfWidth), +yToNdc (yOffset, 3.000000000000000, scale, halfHeight), +endXToNdc (xOffset, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), 7.000000000000000, scale, halfWidth), +yToNdc (yOffset, 3.000000000000000, scale, halfHeight), +xToNdc (xOffset, 2.000000000000000, scale, halfWidth), +yToNdc (yOffset, 2.000000000000000, scale, halfHeight), +xToNdc (xOffset, 2.000000000000000, scale, halfWidth), +yToNdc (yOffset, 2.000000000000000, scale, halfHeight), +endXToNdc (xOffset, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), 7.000000000000000, scale, halfWidth), +yToNdc (yOffset, 3.000000000000000, scale, halfHeight), +endXToNdc (xOffset, xToNdc (xOffset, 2.000000000000000, scale, halfWidth), 7.000000000000000, scale, halfWidth), +yToNdc (yOffset, 2.000000000000000, scale, halfHeight), +xToNdc (xOffset, 9.000000000000000, scale, halfWidth), +yToNdc (yOffset, 10.000000000000000, scale, halfHeight), +endXToNdc (xOffset, xToNdc (xOffset, 9.000000000000000, scale, halfWidth), 9.000000000000000, scale, halfWidth), +yToNdc (yOffset, 10.000000000000000, scale, halfHeight), +xToNdc (xOffset, 9.000000000000000, scale, halfWidth), yToNdc (yOffset, 0.000000000000000, scale, halfHeight), -xToNdc (xOffset, 29.000000000000000, scale, halfWidth), +xToNdc (xOffset, 9.000000000000000, scale, halfWidth), yToNdc (yOffset, 0.000000000000000, scale, halfHeight), -endXToNdc (xOffset, xToNdc (xOffset, 29.000000000000000, scale, halfWidth), 29.000000000000000, scale, halfWidth), -yToNdc (yOffset, 30.000000000000000, scale, halfHeight), -endXToNdc (xOffset, xToNdc (xOffset, 29.000000000000000, scale, halfWidth), 29.000000000000000, scale, halfWidth), +endXToNdc (xOffset, xToNdc (xOffset, 9.000000000000000, scale, halfWidth), 9.000000000000000, scale, halfWidth), +yToNdc (yOffset, 10.000000000000000, scale, halfHeight), +endXToNdc (xOffset, xToNdc (xOffset, 9.000000000000000, scale, halfWidth), 9.000000000000000, scale, halfWidth), yToNdc (yOffset, 0.000000000000000, scale, halfHeight) ] end