fix compiler errors (illegal tokens in two files) introduced in previous commit

This commit is contained in:
2025-08-18 02:56:25 +01:00
parent 5ca2806c01
commit 2d43c69178
3 changed files with 49 additions and 49 deletions

View File

@@ -14,94 +14,94 @@ struct
#[
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 11.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 11.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 11.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 1.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 1.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 1.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
r, g, b.
r, g, b
]
end
end

View File

@@ -14,58 +14,58 @@ struct
#[
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 2.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b.,
r, g, b,
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b.
r, g, b
]
end
end

View File

@@ -6,7 +6,7 @@ struct
fun yToNdc (yOffset, ypos, scale, 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
val halfWidth = windowWidth / 2.0
val halfHeight = windowHeight / 2.0