done fixing errors in output from CollosionTrin.toExportString (I forgot to increment 'ey' if 'y' = 'ey')
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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 } }
|
||||
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 } }
|
||||
66
green.sml
66
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
|
||||
|
||||
Reference in New Issue
Block a user