humza/sml-projects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

address one regression, where triangles were no longer being displayed (because calculation changed) after the previous refactoring. I know of only one more regression, which is that the clicked dots do not persist after moving the mouse.

Browse Source
This commit is contained in:
Humza Shahid
2024-09-19 17:46:40 +01:00
parent 9153217d5f
commit 6a7f11efe6
3 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
functional-core/app/app-update.sml
View File

@@ -18,7 +18,7 @@ struct
val drawVec =
case ClickPoints.getClickPositionFromMouse model of
SOME (xpos, ypos) =>
ClickPoints.getDrawVec (xpos, ypos, 1.0, 0.0, 0.0, model)
ClickPoints.getDrawDot (xpos, ypos, 1.0, 0.0, 0.0, model)
| NONE => Vector.fromList []
val drawMsg = DRAW_DOT drawVec
in
@@ -29,14 +29,16 @@ struct
case ClickPoints.getClickPositionFromMouse model of
SOME (xpos, ypos) =>
let
val dotVec = ClickPoints.getDrawVec (xpos, ypos, 0.0, 0.0, 1.0, model)
val dotVec = ClickPoints.getDrawDot (xpos, ypos, 0.0, 0.0, 1.0, model)
val {windowWidth, windowHeight, ...} = model
val halfWidth = Real32.fromInt (windowWidth div 2)
val halfHeight = Real32.fromInt (windowHeight div 2)
val hpos =
Ndc.centreAlignX (xpos, windowWidth, windowHeight, halfWidth)
ClickPoints.xposToNdc (xpos, windowWidth, windowHeight, halfWidth)
val vpos =
Ndc.centreAlignY (ypos, windowWidth, windowHeight, halfHeight)
ClickPoints.yposToNdc (ypos, windowWidth, windowHeight, halfHeight)
val newUndoTuple = (hpos, vpos)
in
(case #triangleStage model of
@@ -70,7 +72,6 @@ struct
let
val model = AppWith.addTriangle
(model, x1, y1, x2, y2, hpos, vpos, newUndoTuple)
val drawVec = Triangles.toVector model
val drawMsg = DRAW_TRIANGLES_AND_RESET_DOTS drawVec
in