Fix textbox rendering and camera setup

Author: Kyjor

src/engine/SceneManagement/SceneBuilder.jl

@@ -150,13 +150,8 @@ module SceneBuilderModule
         MAIN.scene.uiElements = scene[2]
         MAIN.scene.camera = scene[3]
 
-        if size.x < MAIN.scene.camera.size.x && size.x > 0
-            MAIN.scene.camera.size = Vector2(size.x, MAIN.scene.camera.size.y)
-        end
-        if size.y < MAIN.scene.camera.size.y && size.y > 0
-            MAIN.scene.camera.size = Vector2(MAIN.scene.camera.size.x, size.y)
-        end
         if !JulGame.IS_EDITOR && !JulGame.IS_WEB
+            @info "Setting logical size to $(MAIN.scene.camera.size.x)x$(MAIN.scene.camera.size.y)"
             SDL2.SDL_RenderSetLogicalSize(JulGame.Renderer, MAIN.scene.camera.size.x, MAIN.scene.camera.size.y)
         end
 

src/engine/UI/ImmediateUI.jl

@@ -18,12 +18,12 @@ module ImmediateUIModule
     const IMMEDIATE_UI_TIMESTAMPS = Dict{String, UInt64}()
 
     # Lifetime in milliseconds before an unused immediate component is removed (default: 5 seconds)
-    const DEFAULT_LIFETIME = 200
+    const DEFAULT_LIFETIME = 5000
 
     """
     immediate_text(id::String, text::String; 
         name::String = "TextBox", 
-        anchor::Symbol = :center,
+        anchor::Symbol = :none,
         anchorOffset::Math.Vector2 = Math.Vector2(0,0), 
         isWorldEntity::Bool=false, 
         layer::Int=0,
@@ -66,7 +66,7 @@ module ImmediateUIModule
     # Returns
     The TextBox object
     """
-    function immediate_text(text::String, id::String; 
+    function immediate_text(id::String, text::String = "TextBox"; 
         name::String = "TextBox", 
         anchor::Symbol = :none,
         anchorOffset::Math.Vector2 = Math.Vector2(0,0), 
@@ -162,10 +162,6 @@ module ImmediateUIModule
                 # Reload font and regenerate texture
                 UI.load_font(textBox, joinpath(BasePath, "assets", "fonts"), fontPath)
                 UI.rerender_text(textBox)
-                
-                if anchor != :none
-                    UI.center_text(textBox)
-                end
             end
 
             # Ensure the component is in the scene's uiElements
@@ -175,6 +171,7 @@ module ImmediateUIModule
 
             return textBox
         else
+            @debug "creating new text component with id $(composite_id): $(length(IMMEDIATE_UI_CACHE))"
             # Create new text component
             textBox = TextBox(text; 
                 id=id,
@@ -967,26 +964,16 @@ module ImmediateUIModule
         component_layers = Dict{String, Int}()
 
         # First pass: collect layers for each component and check expiration
-        for (id, component) in IMMEDIATE_UI_CACHE
-            # Skip if the component is not properly initialized
-            if !isdefined(component.element, :isActive) || component.element === nothing
-                push!(expired_ids, id)
-                continue
-            end
-            
+        for (composite_id, component) in IMMEDIATE_UI_CACHE     
             # Check if this component hasn't been used for a while
-            if !haskey(IMMEDIATE_UI_TIMESTAMPS, id) || current_time - IMMEDIATE_UI_TIMESTAMPS[id] > component.lifetime
-                push!(expired_ids, id)
-                continue
-            end
-            
-            # Skip inactive components
-            if isdefined(component.element, :isActive) && !component.element.isActive
+            if !haskey(IMMEDIATE_UI_TIMESTAMPS, composite_id) || current_time - IMMEDIATE_UI_TIMESTAMPS[composite_id] > component.lifetime
+                @info "component $(composite_id) expired from lifetime $(component.lifetime)"
+                push!(expired_ids, composite_id)
                 continue
             end
 
             # Store the layer for sorting
-            component_layers[id] = isdefined(component.element, :layer) ? component.element.layer : 0
+            component_layers[composite_id] = component.element.layer
         end
 
         # Sort component IDs by layer

src/engine/UI/TextBox.jl

@@ -57,6 +57,7 @@ module TextBoxModule
             this.hoverEnterEvents = hoverEnterEvents
             this.hoverExitEvents = hoverExitEvents
 
+            this.font = C_NULL
             this.fontPath = fontPath
             this.fontSize = fontSize  # Store the base font size
             this.id = id
@@ -144,17 +145,26 @@ module TextBoxModule
 
     function UI.load_font(this::TextBox, basePath::String, fontPath::String)
         @debug string("loading font from $(basePath)\\$(fontPath)")
-        
         # Calculate the true font size based on window resolution
         #trueFontSize = get_true_font_size(this.fontSize)
         trueFontSize = this.fontSize
+
+        # If the font is already loaded, clean it up
+        if this.font != C_NULL
+            println("closing font")
+            println(this.font)
+            SDL2.TTF_CloseFont(this.font)
+            this.font = C_NULL
+        end
+        free_text_resources(this)
+
 
         this.font = load_font_sdl(basePath, fontPath, trueFontSize)
         if this.font == C_NULL
             error("Failed to load font, $(unsafe_string(SDL2.SDL_GetError()))")
             return
         end
-        if fontPath != joinpath("FiraCode-Regular.ttf")
+        if fontPath != "Default"
             this.fontPath = fontPath
         end
 
@@ -220,7 +230,7 @@ module TextBoxModule
             if rw != C_NULL
                 @debug("loading font from cache")
                 @debug("comma separated path: ", get_comma_separated_path(fontPath))
-                return SDL2.TTF_OpenFontRW(rw, 1, Math.TypeConversions.safe_int32_convert(fontSize))
+                return CallSDLFunction(SDL2.TTF_OpenFontRW, rw, 1, Math.TypeConversions.safe_int32_convert(fontSize))
             end
         end
         @debug "Loading font from disk, there are $(length(JulGame.FONT_CACHE)) fonts in cache"
@@ -254,12 +264,7 @@ module TextBoxModule
     # Examples
     """
     function UI.rerender_text(this::TextBox)
-        if this.renderText != C_NULL
-            SDL2.SDL_FreeSurface(this.renderText)
-        end
-        if this.textTexture != C_NULL
-            SDL2.SDL_DestroyTexture(this.textTexture)
-        end
+        free_text_resources(this)
 
         # Check if we need to wrap text
         if this.maxLineWidth > 0
@@ -288,12 +293,23 @@ module TextBoxModule
         this.size = Math.Vector2(surface[1].w, surface[1].h)
 
         this.textTexture = SDL2.SDL_CreateTextureFromSurface(JulGame.Renderer::Ptr{SDL2.SDL_Renderer}, this.renderText)
-        
+
         if !this.isWorldEntity
             UI.center_text(this)
         end
     end
 
+    function free_text_resources(this::TextBox)
+        if this.renderText != C_NULL
+            SDL2.SDL_FreeSurface(this.renderText)
+            this.renderText = C_NULL
+        end
+        if this.textTexture != C_NULL
+            SDL2.SDL_DestroyTexture(this.textTexture)
+            this.textTexture = C_NULL
+        end
+    end
+
     # Helper function to manually wrap text at character boundaries
     function wrap_text(text::String, font, maxWidth::Int, wrapWords::Bool)
         if maxWidth <= 0 || isempty(text)
@@ -361,7 +377,7 @@ module TextBoxModule
             return
         end
 
-        @info "centering text $(this.name) with anchor $(this.anchor.current_state)"
+        #@info "centering text $(this.name) with anchor $(this.anchor.current_state)"
         if this.anchor.current_state == :center
             this.position = Math.Vector2(max(MAIN.scene.camera.size.x/2 - this.size.x/2, 0) + this.anchorOffset.x, max(MAIN.scene.camera.size.y/2 - this.size.y/2, 0) + this.anchorOffset.y)  
         elseif this.anchor.current_state == :top
@@ -396,7 +412,9 @@ module TextBoxModule
 
         # Close the current font
         if this.font != C_NULL
+            println("closing font from update_font_size")
             SDL2.TTF_CloseFont(this.font)
+            this.font = C_NULL
         end
 
         # Load the font with the scaled size
@@ -436,12 +454,11 @@ module TextBoxModule
     end
 
     function UI.destroy(this::TextBox)
-        if this.textTexture == C_NULL
-            return
+        if this.font != C_NULL
+            SDL2.TTF_CloseFont(this.font)
+            this.font = C_NULL
         end
-
-        SDL2.SDL_DestroyTexture(this.textTexture)
-        this.textTexture = C_NULL
+        free_text_resources(this)
     end
 #= 
     function Base.setproperty!(this::TextBox, s::Symbol, x)
@@ -494,8 +511,9 @@ module TextBoxModule
     function UI.handle_window_resize(this::TextBox)
         if this.font != C_NULL
             # Close the current font
+            println("closing font from handle_window_resize")
             SDL2.TTF_CloseFont(this.font)
-            
+            this.font = C_NULL
             # Reload the font with the new scaled size
             basePath = joinpath(BasePath, "assets", "fonts")
             UI.load_font(this, basePath, joinpath(this.fontPath))