add r, g, b arguments to equals function (forgot to do this in previous commit)
This commit is contained in:
@@ -6,7 +6,7 @@ struct
|
||||
fun yToNdc (yOffset, ypos, scale, halfHeight) =
|
||||
~(((ypos * scale + yOffset) - halfHeight) / halfHeight)
|
||||
|
||||
fun lerp (xOffset: Real32.real, yOffset, scale, windowWidth, windowHeight) =
|
||||
fun lerp (xOffset: Real32.real, yOffset, scale, windowWidth, windowHeight, r, g, b) =
|
||||
let
|
||||
val halfWidth = windowWidth / 2.0
|
||||
val halfHeight = windowHeight / 2.0
|
||||
@@ -14,64 +14,40 @@ struct
|
||||
#[
|
||||
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
||||
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
r, g, b,
|
||||
xToNdc (xOffset, 5.000000000000000, scale, halfWidth),
|
||||
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
r, g, b,
|
||||
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
||||
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
r, g, b,
|
||||
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
||||
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
r, g, b,
|
||||
xToNdc (xOffset, 5.000000000000000, scale, halfWidth),
|
||||
yToNdc (yOffset, 6.000000000000000, scale, halfHeight),
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
r, g, b,
|
||||
xToNdc (xOffset, 5.000000000000000, scale, halfWidth),
|
||||
yToNdc (yOffset, 5.000000000000000, scale, halfHeight),
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
r, g, b,
|
||||
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
||||
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
r, g, b,
|
||||
xToNdc (xOffset, 5.000000000000000, scale, halfWidth),
|
||||
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
r, g, b,
|
||||
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
||||
yToNdc (yOffset, 7.000000000000000, scale, halfHeight),
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
r, g, b,
|
||||
xToNdc (xOffset, 0.000000000000000, scale, halfWidth),
|
||||
yToNdc (yOffset, 7.000000000000000, scale, halfHeight),
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
r, g, b,
|
||||
xToNdc (xOffset, 5.000000000000000, scale, halfWidth),
|
||||
yToNdc (yOffset, 8.000000000000000, scale, halfHeight),
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
r, g, b,
|
||||
xToNdc (xOffset, 5.000000000000000, scale, halfWidth),
|
||||
yToNdc (yOffset, 7.000000000000000, scale, halfHeight),
|
||||
0.000000000000000,
|
||||
0.000000000000000,
|
||||
0.000000000000000
|
||||
r, g, b
|
||||
]
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user