amend compile/type errors introduced in previous commit

This commit is contained in:
2025-08-18 03:19:59 +01:00
parent 7561573370
commit b7bc847e34
2 changed files with 80 additions and 82 deletions

View File

@@ -8,9 +8,7 @@ struct
fun lerp (xOffset: Real32.real, yOffset, scale, windowWidth, windowHeight, r, g, b) =
let
val windowWidth = Real32.fromInt windowWidth
val halfWidth = windowWidth / 2.0
val windowHeight = Real32.fromInt windowHeight
val halfHeight = windowHeight / 2.0
in
#[

View File

@@ -13,108 +13,117 @@ struct
in
#[
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
yToNdc (yOffset, 11.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 11.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 3.000000000000000, scale, halfHeight),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
yToNdc (yOffset, 11.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 4.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 1.000000000000000, scale, halfWidth),
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
yToNdc (yOffset, 10.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 7.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 7.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 7.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 7.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 2.000000000000000, scale, halfWidth),
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 9.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
@@ -124,19 +133,10 @@ xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 7.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
yToNdc (yOffset, 7.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 3.000000000000000, scale, halfWidth),
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
yToNdc (yOffset, 7.000000000000000, scale, halfHeight),
r, g, b,
xToNdc (xOffset, 4.000000000000000, scale, halfWidth),
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
r, g, b
]
end