Made gameloop logic a system in a plugin

Author: Gesee-y

src/App.jl

@@ -45,7 +45,7 @@ Will create a new global instance of a CruiseApp. Note that a program can only h
 The next call to CruiseApp will return the same object.
 """
 mutable struct CruiseApp
-	const plugins::Dict{Symbol, CRPlugin}
+	const plugins::CRPlugin
 	app::ODApp
 	render::HorizonManager
 	running::Bool
@@ -61,8 +61,7 @@ function CruiseApp()
 	global app_lock
 	lock(app_lock)
 	if !isassigned(app)
-	    app[] = CruiseApp(Dict{Symbol, CRPlugin}(:preupdate => CRPlugin(), :postupdate => CRPlugin()), 
-	    	ODApp(), HorizonManager(),false, false)
+	    app[] = CruiseApp(CRPlugin(), ODApp(), HorizonManager(),false, false)
 	end
 	unlock(app_lock)
 	return app[]	
@@ -93,10 +92,7 @@ Initialize all the systems in the given CRPlugin.
 function awake!()
     a = CruiseApp() 
 	a.running = true
-	awake!(a.app)
-	for sg in values(a.plugins)
-		awake!(sg)
-	end
+	awake!(a.plugins)
 
 	ON_CRUISE_STARTUP.emit
 end
@@ -112,15 +108,7 @@ Update for the current frame the CruiseApp and all his plugins.
 
 Update for the current frame all the systems in the given CRPlugin.
 """
-function update!()
-    a = CruiseApp()
-    update!(a.app)
-	for sg in values(a.plugins)
-		update!(sg)
-	end
-	update!(a.render)
-end
-update!(a::CruiseApp, phase::Symbol) = update!(a.plugins[phase])
+update!() = update!(CruiseApp().plugins)
 update!(sg::CRPlugin) = pmap!(update!, sg)
 update!(n::CRPluginNode) = nothing
 
@@ -135,17 +123,13 @@ This will stop the given system graph by topologically calling shutdown! on the
 """
 function shutdown!()
 	a = CruiseApp()
-	shutdown!(a.app)
-	shutdown!(a.render)
     if on(a)
         a.running = false
-        for sg in values(a.plugins)
-		    shutdown!(sg)
-	    end
+        shutdown!(a.plugins)
     end
 end
 shutdown!(sg::CRPlugin) = smap!(shutdown!, sg)
-shutdown!(n::CRPluginNode) = (n.status[] = CRPluginStatus.OFF)
+shutdown!(n::CRPluginNode) = (n.status[] = PLUGIN_OFF)
 
 """
     on(a::CruiseApp)
@@ -161,13 +145,9 @@ Returns true if the CruiseApp isn't running.
 """
 off(a::CruiseApp) = !a.running
 
-merge_plugin!(app::CruiseApp, plugin::CRPlugin, phase=:postupdate) = merge_plugin!(app.plugins[phase], plugin)
+merge_plugin!(app::CruiseApp, plugin::CRPlugin) = merge_plugin!(app.plugins, plugin)
 merge_plugin!(plugin1::CRPlugin, plugin2::CRPlugin) = merge_graphs!(plugin1, plugin2)
 
-preupdate_plugins(a::CruiseApp) = a.plugins[:preupdate]
-
-postupdate_plugins(a::CruiseApp) = a.plugins[:postupdate]
-
 ########################################################### OUTDOORS ################################################################
 
 function Outdoors.CreateWindow(style::Type{<:AbstractStyle}, args...)

src/game_loop.jl

@@ -55,6 +55,15 @@ end
 
 const LOOP_VAR_REF = Ref{GameLoop}(GameLoop())
 
+"""
+This struct represent the code you passed on to the game loop object.
+That code will be used to generate a new system that will be used to execute your code
+"""
+mutable struct GameCode
+    expr::Expr
+    code::Function
+end
+
 function reset!(l::GameLoop)
     l.last_frame_time_ns = 0
     l.frame_idx = 0
@@ -91,13 +100,14 @@ end
 ```
 """
 macro gameloop(args...)
-    length(args) < 2 && error("@gameloop should take at least 2 argument.")
+    length(args) < 1 && error("@gameloop should take at least 1 argument.")
     code = args[end]
-    main = args[end-1]
+    rawcode = QuoteNode(code)
 
     max_fps = 60
     max_duration = 0.3
-    for i in 1:length(args)-2
+    for i in 1:length(args)-1
+        args[i] isa Symbol && error("@gameloop should take keyword arguments not `$(args[i])")
         arg = args[i].args
         if arg[1] == :max_fps
             max_fps = arg[2]
@@ -107,25 +117,21 @@ macro gameloop(args...)
             error("Unknow keyword $(arg[1])")
         end
     end
+
     body = esc(quote
-        app = Cruise.CruiseApp()
         Cruise.off(app) && Cruise.awake!()
+        
+        # Adding the user code as a system in the plugin
+        codeid = add_system!(app.plugins, Cruise.GameCode($rawcode, () -> $code))
+
         tolerance = 0.02
         LOOP_VAR = LOOP_VAR_REF[]
         Cruise.reset!(LOOP_VAR)
         LOOP_VAR.max_fps = $max_fps
         LOOP_VAR.max_frame_duration = $max_duration
         while Cruise.on(app)
 
-            # First pump events and initialize every windows
-            Cruise.update!(app.app)
-            Cruise.update!(app, :preupdate)
-
-            # Then execute the loop code
-            $code
-
-            Cruise.update!(app, :postupdate)
-            Cruise.update!(app.render)
+            Cruise.update!() # Traverse the graph and execute each node
 
             # Advance the timer.
             LOOP_VAR.frame_idx += 1
@@ -161,8 +167,14 @@ macro gameloop(args...)
         end
 
         on(app) && shutdown!()
+        remove_system!(app.plugins, codeid)
     end)
 
-    # A noted by William, global code is slow in julia, better wrap it in an anonymous function
-    return :(((app) -> $body)($main))
+    # As noted by William, global code is slow in julia, better wrap it in an anonymous function
+    return :(((app) -> $body)(Cruise.CruiseApp()))
+end
+
+function Cruise.update!(n::CRPluginNode{GameCode})
+    gamelogic = n.obj
+    gamelogic.code()
 end

src/plugin/operations.jl

@@ -99,6 +99,10 @@ Add the given obj to the system graph.
 function add_system!(sg::CRPlugin, args...; sort=true, mainthread=false)
     id = get_available_id(sg)
     node = CRPluginNode(args...; mainthread=mainthread)
+    
+    for n in values(sg.idtonode)
+        typeof(n) == typeof(node) && return
+    end
     add_node!(sg, id, node)
     add_vertex!(sg.graph)
     node.id = id

test/runtests.jl

@@ -1,6 +1,4 @@
-include("..\\src\\Cruise.jl")
-
-using .Cruise
+using Cruise
 using Test
 
 include("test_temp_storage.jl")

test/test_gameloop.jl

@@ -1,23 +1,23 @@
 
-mutable struct Counter
-    c::Int
+mutable struct Counter{T} 
+    c::T
 end
 
 app = CruiseApp()
 
 pl1 = CRPlugin()
 pl2 = CRPlugin()
-counter1 = Counter(0)
-counter2 = Counter(0)
+counter1 = Counter{Int}(0)
+counter2 = Counter{Float64}(0)
 add_system!(pl1, counter1)
 add_system!(pl2, counter2)
 
-Cruise.awake!(n::CRPluginNode{Counter}) = (n.obj.c = 0)
-Cruise.update!(n::CRPluginNode{Counter}) = (n.obj.c += 1)
-Cruise.shutdown!(n::CRPluginNode{Counter}) = (n.obj.c)
+Cruise.awake!(n::CRPluginNode{<:Counter}) = (n.obj.c = 0)
+Cruise.update!(n::CRPluginNode{<:Counter}) = (n.obj.c += 1)
+Cruise.shutdown!(n::CRPluginNode{<:Counter}) = (n.obj.c)
 
-merge_plugin!(app, pl1, :preupdate)
-merge_plugin!(app, pl2, :postupdate)
+merge_plugin!(app, pl1)
+merge_plugin!(app, pl2)
 
 @testset "GameLoop struct" begin
     gl = GameLoop()
@@ -50,7 +50,7 @@ end
 @testset "@gameloop default arguments" begin
     cnt = Ref(0)
 
-    @gameloop app begin
+    @gameloop begin
         cnt[] += 1
         cnt[] >= 2 && shutdown!()
     end
@@ -73,7 +73,7 @@ end
     counter = Ref(0)
     deltas = Float32[]
 
-    @gameloop max_fps=30 app begin
+    @gameloop max_fps=30 begin
         counter[] += 1
         push!(deltas, LOOP_VAR.delta_seconds)
         counter[] >= 3 && shutdown!()
@@ -86,7 +86,7 @@ end
 @testset "GameLoop progression" begin
     frame_indices = Int[]
 
-    @gameloop max_fps=10 app begin
+    @gameloop max_fps=10 begin
         push!(frame_indices, LOOP_VAR.frame_idx)
         LOOP_VAR.frame_idx >= 2 && shutdown!()
     end