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

begin title screen by adding title screen type

Browse Source
This commit is contained in:
Humza Shahid
2025-02-19 03:39:36 +00:00
parent 6b4b637624
commit 25b2c41355
7 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fcore/game-type.sml
View File

@@ -1,6 +1,6 @@
signature GAME_TYPE =
sig
datatype mode = LEVEL of LevelType.level_type
datatype mode = LEVEL of LevelType.level_type | TITLE of TitleType.title_type
type game_type = {userKeys: CoreKey.user_key, mode: mode}
@@ -9,12 +9,12 @@ end
structure GameType :> GAME_TYPE =
struct
datatype mode = LEVEL of LevelType.level_type
datatype mode = LEVEL of LevelType.level_type | TITLE of TitleType.title_type
type game_type = {userKeys: CoreKey.user_key, mode: mode}
fun init userKeys =
let val mode = LEVEL LevelType.initial
let val mode = TITLE TitleType.initial
in {mode = mode, userKeys = userKeys}
end
end

4
fcore/game-update.sml
View File

@@ -12,6 +12,10 @@ struct
let val level = LevelUpdate.update (level, input)
in LEVEL level
end
| TITLE title =>
let val title = TitleUpdate.update (title, input)
in TITLE title
end
in
{mode = mode, userKeys = userKeys}
end

6
fcore/level/level-update.sml
View File

@@ -1,6 +1,6 @@
structure LevelUpdate =
struct
fun update (game, input) =
fun update (level, input) =
let
val
{ player
@@ -11,9 +11,9 @@ struct
, enemies
, graph
, fallingEnemies
} = game
} = level
val player = Player.runPhysicsAndInput (game, input)
val player = Player.runPhysicsAndInput (level, input)
val enemyTree = Enemy.generateTree enemies
val player = Player.checkEnemyCollisions (player, enemies, enemyTree)

17
fcore/title/title-type.sml Normal file
View File

@@ -0,0 +1,17 @@
signature TITLE_TYPE =
sig
datatype focus = START_BUTTON
type title_type = {focus: focus}
val initial: title_type
end
structure TitleType :> TITLE_TYPE =
struct
datatype focus = START_BUTTON
type title_type = {focus: focus}
val initial = {focus = START_BUTTON}
end

6
fcore/title/title-update.sml Normal file
View File

@@ -0,0 +1,6 @@
structure TitleUpdate =
struct
open TitleType
fun update (titleState, input) = titleState
end

3
oms.mlb
View File

@@ -52,6 +52,9 @@ fcore/level/player/player-attack.sml
fcore/level/projectile.sml
fcore/level/level-update.sml
fcore/title/title-type.sml
fcore/title/title-update.sml
fcore/game-type.sml
fcore/game-update.sml

59
shell/gl-draw.sml
View File

@@ -213,7 +213,7 @@ struct
fun drawField ({fieldVertexBuffer, fieldProgram, fieldLength, ...}) =
drawXyrgba (fieldVertexBuffer, fieldProgram, fieldLength)
fun drawLevel (shellState: t) =
fun helpDrawLevel (shellState: t) =
let
val _ = drawWall shellState
val _ = drawPlayer shellState
@@ -222,38 +222,41 @@ struct
()
end
fun drawLevel (shellState: t, level) =
let
val width = InputState.getWidth ()
val height = InputState.getHeight ()
val playerVec = Player.getDrawVec (#player level, width, height)
val enemyVec = Enemy.getDrawVec (#enemies level, width, height)
val playerVec = Vector.concat [playerVec, enemyVec]
val wallVec = Wall.getDrawVec (#walls level, width, height)
val platVec = Platform.getDrawVec (#platforms level, width, height)
val chainVec = Player.getFieldVec (#player level, width, height)
val fallingVec = FallingEnemies.getDrawVec (level, width, height)
val wallVec = Vector.concat [wallVec, platVec, chainVec, fallingVec]
val pelletVec = Player.getPelletVec (#player level, width, height)
val projectileVec =
Projectile.getProjectileVec (#player level, width, height)
val fieldVec = Vector.concat [pelletVec, projectileVec]
val shellState = uploadWall (shellState, wallVec)
val shellState = uploadPlayer (shellState, playerVec)
val shellState = uploadField (shellState, fieldVec)
val () = helpDrawLevel shellState
in
shellState
end
fun drawMode (shellState: t, game: GameType.game_type) =
let
open GameType
in
case #mode game of
LEVEL level =>
let
val width = InputState.getWidth ()
val height = InputState.getHeight ()
val playerVec = Player.getDrawVec (#player level, width, height)
val enemyVec = Enemy.getDrawVec (#enemies level, width, height)
val playerVec = Vector.concat [playerVec, enemyVec]
val wallVec = Wall.getDrawVec (#walls level, width, height)
val platVec = Platform.getDrawVec (#platforms level, width, height)
val chainVec = Player.getFieldVec (#player level, width, height)
val fallingVec = FallingEnemies.getDrawVec (level, width, height)
val wallVec = Vector.concat [wallVec, platVec, chainVec, fallingVec]
val pelletVec = Player.getPelletVec (#player level, width, height)
val projectileVec =
Projectile.getProjectileVec (#player level, width, height)
val fieldVec = Vector.concat [pelletVec, projectileVec]
val shellState = uploadWall (shellState, wallVec)
val shellState = uploadPlayer (shellState, playerVec)
val shellState = uploadField (shellState, fieldVec)
val () = drawLevel shellState
in
shellState
end
LEVEL level => drawLevel (shellState, level)
| TITLE title => shellState
end
fun helpLoop (shellState as {window, ...}: t, game) =