fix compiler errors (illegal tokens in two files) introduced in previous commit
This commit is contained in:
@@ -14,94 +14,94 @@ struct
|
|||||||
#[
|
#[
|
||||||
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 11.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 11.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 11.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 11.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 11.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 11.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 1.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 1.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 1.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 1.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 1.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 1.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
|
||||||
r, g, b.
|
r, g, b
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -14,58 +14,58 @@ struct
|
|||||||
#[
|
#[
|
||||||
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
|
||||||
r, g, b.,
|
r, g, b,
|
||||||
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
|
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
|
||||||
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
|
||||||
r, g, b.
|
r, g, b
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ struct
|
|||||||
fun yToNdc (yOffset, ypos, scale, halfHeight) =
|
fun yToNdc (yOffset, ypos, scale, halfHeight) =
|
||||||
~(((ypos * scale + yOffset) - halfHeight) / halfHeight)
|
~(((ypos * scale + yOffset) - halfHeight) / halfHeight)
|
||||||
|
|
||||||
fun lerp (xOffset, yOffset, scale, windowWidth, windowHeight, r, g, b) =
|
fun lerp (xOffset: Real32.real, yOffset, scale, windowWidth, windowHeight, r, g, b) =
|
||||||
let
|
let
|
||||||
val halfWidth = windowWidth / 2.0
|
val halfWidth = windowWidth / 2.0
|
||||||
val halfHeight = windowHeight / 2.0
|
val halfHeight = windowHeight / 2.0
|
||||||
|
|||||||
Reference in New Issue
Block a user