done refactoring (next: need to do some bug fixing)

This commit is contained in:
2025-07-06 15:14:19 +01:00
parent dd291096d5
commit 270481a0ba
5 changed files with 37 additions and 37 deletions

BIN
dotscape Executable file

Binary file not shown.

View File

@@ -157,6 +157,10 @@ typedef Pointer Objptr;
extern "C" {
#endif
MLLIB_PUBLIC(void mltonMouseMoveCallback (Real32 x0, Real32 x1);)
MLLIB_PUBLIC(void mltonMouseClickCallback (Int32 x0, Int32 x1);)
MLLIB_PUBLIC(void mltonFramebufferSizeCallback (Int32 x0, Int32 x1);)
MLLIB_PUBLIC(void mltonKeyCallback (Int32 x0, Int32 x1, Int32 x2, Int32 x3);)
#undef MLLIB_PRIVATE
#undef MLLIB_PUBLIC

View File

@@ -111,7 +111,7 @@ struct
val uploadModalText = uploadDotVector
val drawModalText = drawDot
val initTriangles = initDot
val uploadTrianglesVector = uploadDotVector
val drawTriangles = drawDot
val initSquares = initDot
val uploadSquaresVector = uploadDotVector
val drawSquares = drawDot
end

View File

@@ -10,8 +10,8 @@ struct
, drawGraphLength
, dotDrawObject
, dotDrawLength
, triangleDrawObject
, triangleDrawLength
, squareDrawObject
, squareDrawLength
, modalTextDrawObject
, modalTextDrawLength
) =
@@ -23,8 +23,7 @@ struct
val _ = Gles3.clear ()
val _ = AppDraw.drawGraphLines (graphDrawObject, drawGraphLength)
val _ =
AppDraw.drawTriangles (triangleDrawObject, triangleDrawLength)
val _ = AppDraw.drawSquares (squareDrawObject, squareDrawLength)
val _ = AppDraw.drawDot (dotDrawObject, dotDrawLength)
val _ =
AppDraw.drawModalText (modalTextDrawObject, modalTextDrawLength)
@@ -39,8 +38,8 @@ struct
, drawGraphLength
, dotDrawObject
, dotDrawLength
, triangleDrawObject
, triangleDrawLength
, squareDrawObject
, squareDrawLength
, modalTextDrawObject
, modalTextDrawLength
)
@@ -59,18 +58,17 @@ struct
, drawGraphLength
, dotDrawObject
, dotDrawLength
, triangleDrawObject
, triangleDrawLength
, squareDrawObject
, squareDrawLength
, modalTextDrawObject
, modalTextDrawLength
)
end
| DRAW_TRIANGLES_AND_RESET_DOTS triangleVec =>
| DRAW_SQUARES_AND_RESET_DOTS squareVec =>
let
val _ =
AppDraw.uploadTrianglesVector
(triangleDrawObject, triangleVec)
val triangleDrawLength = Vector.length triangleVec div 5
AppDraw.uploadSquaresVector (squareDrawObject, squareVec)
val squareDrawLength = Vector.length squareVec div 5
(* dots are reset by setting dotDrawLength to 0 *)
in
run
@@ -80,18 +78,17 @@ struct
, drawGraphLength
, dotDrawObject
, 0
, triangleDrawObject
, triangleDrawLength
, squareDrawObject
, squareDrawLength
, modalTextDrawObject
, modalTextDrawLength
)
end
| DRAW_TRIANGLES_AND_DOTS {triangles = triangleVec, dots = dotsVec} =>
| DRAW_SQUARES_AND_DOTS {squares = squareVec, dots = dotsVec} =>
let
val _ =
AppDraw.uploadTrianglesVector
(triangleDrawObject, triangleVec)
val triangleDrawLength = Vector.length triangleVec div 5
AppDraw.uploadSquaresVector (squareDrawObject, squareVec)
val squareDrawLength = Vector.length squareVec div 5
val _ = AppDraw.uploadDotVector (dotDrawObject, dotsVec)
val dotDrawLength = Vector.length dotsVec div 5
@@ -103,8 +100,8 @@ struct
, drawGraphLength
, dotDrawObject
, dotDrawLength
, triangleDrawObject
, triangleDrawLength
, squareDrawObject
, squareDrawLength
, modalTextDrawObject
, modalTextDrawLength
)
@@ -120,17 +117,16 @@ struct
, drawGraphLength
, dotDrawObject
, dotDrawLength
, triangleDrawObject
, triangleDrawLength
, squareDrawObject
, squareDrawLength
, modalTextDrawObject
, modalTextDrawLength
)
end
| RESIZE_TRIANGLES_DOTS_AND_GRAPH {triangles, graphLines, dots} =>
| RESIZE_SQUARES_DOTS_AND_GRAPH {squares, graphLines, dots} =>
let
val _ =
AppDraw.uploadTrianglesVector (triangleDrawObject, triangles)
val triangleDrawLength = Vector.length triangles div 5
val _ = AppDraw.uploadSquaresVector (squareDrawObject, squares)
val squareDrawLength = Vector.length squares div 5
val _ = AppDraw.uploadGraphLines (graphDrawObject, graphLines)
val drawGraphLength = Vector.length graphLines div 2
@@ -145,8 +141,8 @@ struct
, drawGraphLength
, dotDrawObject
, dotDrawLength
, triangleDrawObject
, triangleDrawLength
, squareDrawObject
, squareDrawLength
, modalTextDrawObject
, modalTextDrawLength
)
@@ -163,8 +159,8 @@ struct
, drawGraphLength
, dotDrawObject
, dotDrawLength
, triangleDrawObject
, triangleDrawLength
, squareDrawObject
, squareDrawLength
, modalTextDrawObject
, modalTextDrawLength
)
@@ -181,8 +177,8 @@ struct
, drawGraphLength
, dotDrawObject
, dotDrawLength
, triangleDrawObject
, triangleDrawLength
, squareDrawObject
, squareDrawLength
, modalTextDrawObject
, modalTextDrawLength
)

View File

@@ -27,7 +27,7 @@ struct
val _ = AppDraw.uploadGraphLines (graphDrawObject, graphLines)
val dotDrawObject = AppDraw.initDot ()
val triangleDrawObject = AppDraw.initTriangles ()
val squareDrawObject = AppDraw.initSquares ()
val modalTextDrawObject = AppDraw.initModalText ()
@@ -48,7 +48,7 @@ struct
, Vector.length graphLines div 2
, dotDrawObject
, 0
, triangleDrawObject
, squareDrawObject
, 0
, modalTextDrawObject
, 0