clean up imports, finish adding concrete type annotations (#55)

Kyjor · Jan 26, 2024 · 4968f44 · 4968f44
1 parent 79d0507
commit 4968f44
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 40 deletions.
diff --git a/src/Camera.jl b/src/Camera.jl
@@ -1,5 +1,5 @@
 using JulGame
-using JulGame.Math
+using .Math
 
 mutable struct Camera
     dimensions::Vector2
@@ -28,8 +28,8 @@ function Base.getproperty(this::Camera, s::Symbol)
         end
     elseif s == :update
         function(newPosition = C_NULL)
-            SDL2.SDL_SetRenderDrawColor(JulGame.Renderer, MAIN.cameraBackgroundColor[1], MAIN.cameraBackgroundColor[2], MAIN.cameraBackgroundColor[3], SDL2.SDL_ALPHA_OPAQUE );
-            SDL2.SDL_RenderFillRectF(JulGame.Renderer, Ref(SDL2.SDL_FRect(0,0,this.dimensions.x, this.dimensions.y)))
+            SDL2.SDL_SetRenderDrawColor(Renderer, MAIN.cameraBackgroundColor[1], MAIN.cameraBackgroundColor[2], MAIN.cameraBackgroundColor[3], SDL2.SDL_ALPHA_OPAQUE );
+            SDL2.SDL_RenderFillRectF(Renderer, Ref(SDL2.SDL_FRect(0,0,this.dimensions.x, this.dimensions.y)))
 
             if this.target != C_NULL && newPosition == C_NULL
                 targetPos = this.target.getPosition()
@@ -55,4 +55,4 @@ function Base.getproperty(this::Camera, s::Symbol)
             Base.show_backtrace(stdout, catch_backtrace())
         end
     end
-end
+end
diff --git a/src/JulGame.jl b/src/JulGame.jl
@@ -41,20 +41,21 @@ module JulGame
     using .UI
     export ScreenButtonModule, TextBoxModule
 
-    include("Main.jl") 
-    using .MainLoop: Main   
-    const MAIN = Main(Float64(1.0))
-    export MAIN
-
+
     include("Component/Component.jl")
     using .Component
     export AnimationModule, AnimatorModule, ColliderModule, CircleColliderModule, RigidbodyModule, ShapeModule, SoundSourceModule, SpriteModule, TransformModule
-
+    
     include("Entity.jl") 
     using .EntityModule   
     export Entity
 
     include("SceneManagement/SceneManagement.jl")
     using .SceneManagement
     export SceneBuilderModule, SceneLoaderModule, SceneReaderModule, SceneWriterModule 
-end
+
+    include("Main.jl") 
+    using .MainLoop: Main   
+    const MAIN = Main(Float64(1.0))
+    export MAIN
+end
diff --git a/src/Main.jl b/src/Main.jl
@@ -19,8 +19,7 @@ module MainLoop
 		isDraggingEntity::Bool
 		lastMousePosition::Union{Math.Vector2, Math.Vector2f}
 		lastMousePositionWorld::Union{Math.Vector2, Math.Vector2f}
-        # need to work on import order so that this can be concretely typed
-		level#::JulGame.SceneManagement.SceneBuilderModule.Scene
+		level::JulGame.SceneManagement.SceneBuilderModule.Scene
 		mousePositionWorld::Union{Math.Vector2, Math.Vector2f}
 		mousePositionWorldRaw::Union{Math.Vector2, Math.Vector2f}
 		optimizeSpriteRendering::Bool

diff --git a/src/Scene.jl b/src/Scene.jl
@@ -1,6 +1,5 @@
 mutable struct Scene
-    # Need to work on import order so this can be concretely typed or at least parametricized
-    camera::Union{Nothing, Any} #, JulGame.SceneManagement.SceneBuilderModule.Camera}
+    camera::Union{Nothing, JulGame.SceneManagement.SceneBuilderModule.Camera}
     colliders::Vector{Any}
     entities::Vector{Any}
     rigidbodies::Vector{Any}

diff --git a/src/SceneManagement/SceneBuilder.jl b/src/SceneManagement/SceneBuilder.jl
@@ -1,11 +1,11 @@
 module SceneBuilderModule
-    using ..SceneManagement.JulGame
-    using ..SceneManagement.JulGame.Math
-    using ..SceneManagement.JulGame.ColliderModule
-    using ..SceneManagement.JulGame.EntityModule
-    using ..SceneManagement.JulGame.RigidbodyModule
-    using ..SceneManagement.JulGame.TextBoxModule
-    using ..SceneManagement.SceneReaderModule
+    using ...JulGame
+    using ...Math
+    using ...ColliderModule
+    using ...EntityModule
+    using ...RigidbodyModule
+    using ...TextBoxModule
+    using ..SceneReaderModule
 
     function __init__()
         if isdir(joinpath(pwd(), "..", "scripts")) #dev builds
@@ -217,4 +217,4 @@ module SceneBuilderModule
             end
         end
     end
-end
+end
diff --git a/src/SceneManagement/SceneLoader.jl b/src/SceneManagement/SceneLoader.jl
@@ -1,6 +1,6 @@
 module SceneLoaderModule
-    using ..SceneManagement.JulGame
-    using ..SceneManagement.SceneBuilderModule
+    using ...JulGame
+    using ..SceneBuilderModule
 
     export loadScene
     function loadScene(projectPath, sceneFileName, isUsingEditor = false) 
@@ -48,4 +48,4 @@ module SceneLoaderModule
         sceneFileName = split(scenePath, "\\")[end]
         return sceneFileName
     end
-end
+end
diff --git a/src/SceneManagement/SceneManagement.jl b/src/SceneManagement/SceneManagement.jl
@@ -1,5 +1,4 @@
 module SceneManagement
-    using ..JulGame
     include("SceneReader.jl")
     include("SceneWriter.jl")
     include("SceneBuilder.jl")
@@ -9,4 +8,4 @@ module SceneManagement
     export SceneWriterModule
     export SceneBuilderModule
     export SceneLoaderModule
-end
+end
diff --git a/src/SceneManagement/SceneReader.jl b/src/SceneManagement/SceneReader.jl
@@ -1,16 +1,16 @@
 module SceneReaderModule
     using JSON3
-    using ..SceneManagement.JulGame.AnimatorModule
-    using ..SceneManagement.JulGame.AnimationModule
-    using ..SceneManagement.JulGame.ColliderModule
-    using ..SceneManagement.JulGame.CircleColliderModule
-    using ..SceneManagement.JulGame.EntityModule
-    using ..SceneManagement.JulGame.Math
-    using ..SceneManagement.JulGame.RigidbodyModule
-    using ..SceneManagement.JulGame.SoundSourceModule
-    using ..SceneManagement.JulGame.SpriteModule
-    using ..SceneManagement.JulGame.UI.TextBoxModule
-    using ..SceneManagement.JulGame.TransformModule
+    using ...AnimatorModule
+    using ...AnimationModule
+    using ...ColliderModule
+    using ...CircleColliderModule
+    using ...EntityModule
+    using ...Math
+    using ...RigidbodyModule
+    using ...SoundSourceModule
+    using ...SpriteModule
+    using ...UI.TextBoxModule
+    using ...TransformModule
 
 
     function scriptObj(name::String, parameters::Array)
@@ -152,4 +152,4 @@ module SceneReaderModule
             Base.show_backtrace(stdout, catch_backtrace())
         end
     end
-end
+end