Working on preloading

Author: Kyjor

src/JulGame.jl

@@ -17,6 +17,7 @@ module JulGame
     # TODO: Create a globals file
 
     SCENE_CACHE::Dict = Dict{String, Any}()
+    PRELOADED_SCENES::Dict = Dict{String, Any}()
     IMAGE_CACHE::Dict = Dict{String, Any}()
     FONT_CACHE::Dict = Dict{String, Any}()
     AUDIO_CACHE::Dict = Dict{String, Any}()

src/editor/JulGameEditor/Components/FieldInputHandler.jl

@@ -33,20 +33,20 @@ function handle_component_field_input(component, componentField, newScriptText="
         return false
     end
 
-    # Handle vector types
     if isa(fieldValue, Math._Vector2{Float64}) || isa(fieldValue, Math._Vector2{Int32})
         return show_vector2_input(component, componentField, fieldValue)
     elseif isa(fieldValue, Math._Vector3{Float64}) || isa(fieldValue, Math._Vector3{Int32})
         return show_vector3_input(component, componentField, fieldValue)
     elseif isa(fieldValue, Math._Vector4{Float64}) || isa(fieldValue, Math._Vector4{Int32})
         return show_vector4_input(component, componentField, fieldValue)
 
+
     # Handle scalar types 
     elseif isa(fieldValue, Bool)
         return show_boolean_input(component, componentField, fieldValue)
     elseif isa(fieldValue, String)
         return show_string_input(component, componentField, fieldValue)
-    elseif isa(fieldValue, Number)
+    elseif isa(fieldValue, Int) || isa(fieldValue, Float64) || isa(fieldValue, Float32)
         return show_numeric_input(component, componentField, fieldValue)
 
     # Handle scripts specially

src/editor/JulGameEditor/Utils/EditorUtils.jl

@@ -659,7 +659,7 @@ end
 function reset_camera_event(main)
     event = @event begin
         if main.scene.camera === nothing
-            @warn "No camera found in scene when resetting camera"
+            @debug "No camera found in scene when resetting camera"
             return
         end
         main.scene.camera.position = JulGame.Math.Vector3f(0.0, 0.0, 0.0)

src/engine/Component/SoundSource.jl

@@ -146,4 +146,11 @@ module SoundSourceModule
             SDL2.Mix_PlayChannel(this.channel, this.sound, loops)
         end
     end
+
+    function set_master_volume(volume::Int)
+        # Convert volume to Int32 and clamp between 0 and 128
+        volume = Math.TypeConversions.safe_int32_convert(clamp(volume, 0, 128))
+        SDL2.Mix_MasterVolume(volume)
+        SDL2.Mix_VolumeMusic(volume)
+    end
 end

src/engine/SceneManagement/SceneBuilder.jl

@@ -37,7 +37,7 @@ module SceneBuilderModule
         end    
     end
 
-    function load_and_prepare_scene(this::Scene, main = JulGame.MainLoop(); config=parse_config(), windowName::String="Game", isWindowResizable::Bool=false)
+    function load_and_prepare_scene(this::Scene, main = JulGame.MainLoop(); config=parse_config(), windowName::String="Game", isWindowResizable::Bool=false, preloadAllScenes::Bool=false)
         if config === nothing
             @info("Config is nothing, parsing config")
             config = parse_config()
@@ -67,6 +67,7 @@ module SceneBuilderModule
 			size = Math.Vector2(displayMode[1].w, displayMode[1].h)
 		end
 
+        
         scene = nothing
         if !JulGame.IS_EDITOR && !JulGame.IS_WEB
             # Initialize window manager
@@ -85,6 +86,24 @@ module SceneBuilderModule
                 @error "Failed to create renderer with window $(MAIN.windowManager.window), $(unsafe_string(SDL2.SDL_GetError()))"
                 return
             end
+
+            # Preload all scenes if requested
+            if preloadAllScenes
+                @info "Preloading all scenes..."
+                scenesDir = joinpath(BasePath, "scenes")
+                if isdir(scenesDir)
+                    for file in readdir(scenesDir)
+                        if endswith(file, ".json")
+                            scenePath = joinpath(scenesDir, file)
+                            @debug "Preloading scene: $file"
+                            SceneReaderModule.preload_scene(scenePath)
+                        end
+                    end
+                    @info "Finished preloading scenes"
+                else
+                    @warn "Scenes directory not found: $scenesDir"
+                end
+            end
 
             # Set default texture scaling mode to linear
             SDL2.SDL_SetHint(SDL2.SDL_HINT_RENDER_SCALE_QUALITY, "2")
@@ -96,7 +115,13 @@ module SceneBuilderModule
             JulGame.WindowManagerModule.set_vsync(isVsyncEnabled)
 
             @debug "Deserializing scene"
-            scene = deserialize_scene(joinpath(BasePath, "scenes", this.scene))
+            # Use preloaded scene if available
+            if preloadAllScenes && haskey(JulGame.PRELOADED_SCENES, this.scene)
+                @info "Using preloaded scene: $(this.scene)"
+                scene = JulGame.PRELOADED_SCENES[this.scene]
+            else
+                scene = deserialize_scene(joinpath(BasePath, "scenes", this.scene))
+            end
             camera = scene[3]
             # Set logical rendering size based on camera
             @debug "Setting logical size to $(size.x)x$(size.y)"
@@ -112,7 +137,13 @@ module SceneBuilderModule
         end
 
         if scene === nothing
-            scene = deserialize_scene(joinpath(BasePath, "scenes", this.scene))
+            # Use preloaded scene if available
+            if preloadAllScenes && haskey(JulGame.PRELOADED_SCENES, this.scene)
+                @debug "Using preloaded scene: $(this.scene)"
+                scene = JulGame.PRELOADED_SCENES[this.scene]
+            else
+                scene = deserialize_scene(joinpath(BasePath, "scenes", this.scene))
+            end
         end
 
         MAIN.scene.entities = scene[1]

src/engine/SceneManagement/SceneReader.jl

@@ -21,9 +21,40 @@ module SceneReaderModule
         () -> (name; fields)
     end
 
+    export preload_scene
+    """
+        preload_scene(filePath::String)
+
+    Preloads a scene from the specified file path and stores it in the PRELOADED_SCENES cache.
+    This allows for faster scene switching as the scene is already loaded in memory.
+
+    # Arguments
+    - `filePath::String`: The path to the scene file to preload
+    """
+    function preload_scene(filePath::String)
+        try
+            if haskey(JulGame.PRELOADED_SCENES, basename(filePath))
+                @debug("Scene already preloaded: $(basename(filePath))")
+                return
+            end
+
+            scene = deserialize_scene(filePath)
+            JulGame.PRELOADED_SCENES[basename(filePath)] = (entities = scene[1], uiElements = scene[2], camera = scene[3])
+            @debug("Preloaded scene: $(basename(filePath))")
+        catch e
+            @error string(e)
+            Base.show_backtrace(stdout, catch_backtrace())
+        end
+    end
+
     export deserialize_scene
     function deserialize_scene(filePath)
         try
+            if haskey(JulGame.PRELOADED_SCENES, basename(filePath))
+                @info "deserialize_scene: Using preloaded scene: $(basename(filePath))"
+                return JulGame.PRELOADED_SCENES[basename(filePath)]
+            end
+
             json = nothing
             if haskey(JulGame.SCENE_CACHE, basename(filePath))
                 json = JulGame.SCENE_CACHE[basename(filePath)]

src/engine/UI/TextBox.jl

@@ -330,7 +330,7 @@ module TextBoxModule
 
     function UI.center_text(this::TextBox)
         if MAIN.scene.camera === nothing
-            @warn "No camera found in scene"
+            @debug "No camera found in scene"
             return
         end