Feature: Store scene name and allow textboxes to process input events

Need to refactor to cleanup shared functionality between ui elements before adding more

Author: Kyjor

src/Main.jl

@@ -373,6 +373,7 @@ function JulGame.change_scene(sceneFileName::String)
 	#load new scene 
 	camera = this.scene.camera
 	this.scene = SceneModule.Scene()
+	this.scene.name = split(sceneFileName, ".")[1]
 	this.scene.entities = persistentEntities
 	this.scene.uiElements = persistentUIElements
 	this.scene.camera = camera

src/editor/JulGameEditor/Components/ScreenButtonFields.jl

@@ -1,6 +1,6 @@
 function show_screenbutton_fields(selectedScreenButton, screenButtonField)
     fieldName = getFieldName1(screenButtonField)
-    unusedFields = ["alpha","clickEvents", "currentTexture", "buttonDownSprite", "buttonDownSpritePath", "buttonDownTexture", "buttonUpSprite", "buttonUpSpritePath", "buttonUpTexture", "fontPath", "isInitialized", "mouseOverSprite", "textTexture"]
+    unusedFields = ["alpha","clickEvents", "currentTexture", "buttonDownSprite", "buttonDownSpritePath", "buttonDownTexture", "buttonUpSprite", "buttonUpSpritePath", "buttonUpTexture", "fontPath", "isInitialized", "textTexture"]
     push!(unusedFields, "text")
     if fieldName in unusedFields
         return

src/engine/Input/Input.jl

@@ -116,32 +116,30 @@ module InputModule
                     end
 
                     insideAnyButton = false
-                    for screenButton in MAIN.scene.uiElements
-                        if split("$(typeof(screenButton))", ".")[end] != "ScreenButton"
-                            continue
-                        end
+                    for uiElement in MAIN.scene.uiElements
                         # Check position of button to see which we are interacting with
                         eventWasInsideThisButton = true
-                        if x[1] < screenButton.position.x + MAIN.scene.camera.startingCoordinates.x
+                        if x[1] < uiElement.position.x + MAIN.scene.camera.startingCoordinates.x
                             eventWasInsideThisButton = false
-                        elseif x[1] > MAIN.scene.camera.startingCoordinates.x + screenButton.position.x + screenButton.size.x * MAIN.zoom
+                        elseif x[1] > MAIN.scene.camera.startingCoordinates.x + uiElement.position.x + uiElement.size.x * MAIN.zoom
                             eventWasInsideThisButton = false
-                        elseif y[1] < screenButton.position.y + MAIN.scene.camera.startingCoordinates.y
+                        elseif y[1] < uiElement.position.y + MAIN.scene.camera.startingCoordinates.y
                             eventWasInsideThisButton = false
-                        elseif y[1] > MAIN.scene.camera.startingCoordinates.y + screenButton.position.y + screenButton.size.y * MAIN.zoom
+                        elseif y[1] > MAIN.scene.camera.startingCoordinates.y + uiElement.position.y + uiElement.size.y * MAIN.zoom
                             eventWasInsideThisButton = false
                         end
 
-                        screenButton.mouseOverSprite = eventWasInsideThisButton
                         if !eventWasInsideThisButton
-                            screenButton.isHovered = false
+                            uiElement.isHovered = false
                             continue
                         end
                         insideAnyButton = true
 
-                        SDL2.SDL_SetCursor(this.cursorBank["hand"])
+                        if split("$(typeof(uiElement))", ".")[end] == "ScreenButton"
+                            SDL2.SDL_SetCursor(this.cursorBank["crosshair"])
+                        end
 
-                        JulGame.UI.handle_event(screenButton, evt, x[1], y[1])
+                        JulGame.UI.handle_event(uiElement, evt, x[1], y[1])
                     end
 
                     if !insideAnyButton

src/engine/Scene.jl

@@ -8,6 +8,7 @@
         entities::Vector{Any}
         rigidbodies::Vector{Any}
         uiElements::Vector{Any}
+        name::String
 
         function Scene()
             this = new()

src/engine/SceneManagement/SceneBuilder.jl

@@ -115,6 +115,7 @@ module SceneBuilderModule
         MAIN.globals = globals
         MAIN.level = this
         MAIN.targetFrameRate = targetFrameRate
+        MAIN.scene.name = split(this.scene, ".")[1]
 
         if size == Math.Vector2()
 			displayMode = SDL2.SDL_DisplayMode[SDL2.SDL_DisplayMode(0x12345678, 800, 600, 60, C_NULL)]

src/engine/UI/DefaultFont.jl

@@ -19,7 +19,6 @@ module ScreenButtonModule
         isActive::Bool
         isHovered::Bool
         isInitialized::Bool
-        mouseOverSprite
         name::String
         persistentBetweenScenes::Bool
         position::Math.Vector2
@@ -40,7 +39,6 @@ module ScreenButtonModule
             this.currentTexture = C_NULL
             this.size = size
             this.fontPath = fontPath
-            this.mouseOverSprite = false
             this.name = name
             this.position = position
             this.text = text
@@ -64,9 +62,6 @@ module ScreenButtonModule
             return
         end
 
-        if !this.mouseOverSprite && this.currentTexture == this.buttonDownTexture
-            #TODO: this.currentTexture = this.buttonUpTexture
-        end    
         if this.currentTexture == C_NULL || 
             #this.textTexture == C_NULL || 
             this.currentTexture === nothing #|| this.textTexture === nothing

src/engine/UI/ScreenButton.jl

@@ -5,13 +5,15 @@ module TextBoxModule
     export TextBox      
     mutable struct TextBox
         alpha
+        clickEvents
         font
         fontPath::String
         fontSize::Int32
         id::Int32
         isActive::Bool
         isCenteredX::Bool
         isCenteredY::Bool
+        isHovered::Bool
         isWorldEntity::Bool
         name::String
         persistentBetweenScenes::Bool
@@ -27,6 +29,7 @@ module TextBoxModule
 
             this.isConstructed = false
             this.alpha = 255
+            this.clickEvents = []
             this.fontPath = fontPath
             this.fontSize = Int32(fontSize)
             this.id = Int32(0)
@@ -35,12 +38,12 @@ module TextBoxModule
             this.name = name
             this.position = position
             setfield!(this, :text, text)
+            this.isHovered = false
             this.isWorldEntity = isWorldEntity
             this.textTexture = C_NULL
             this.persistentBetweenScenes = false
             this.isActive = true
             this.renderText = C_NULL
-
 
             if fontPath == ""
                 fontPath = joinpath("FiraCode-Regular.ttf")
@@ -100,6 +103,21 @@ module TextBoxModule
         end
     end
 
+    function UI.add_click_event(this::TextBox, event)
+        push!(this.clickEvents, event)
+    end
+
+    function UI.handle_event(this::TextBox, evt, x, y)
+        if evt.type == evt.type == SDL2.SDL_MOUSEBUTTONDOWN
+        elseif evt.type == SDL2.SDL_MOUSEBUTTONUP
+            for eventToCall in this.clickEvents
+                Base.invokelatest(eventToCall,(evt = evt, x = x, y = y))
+            end
+        elseif evt.type == SDL2.SDL_MOUSEMOTION
+            this.isHovered = true
+        end 
+    end
+
     function load_font_sdl(basePath::String, fontPath::String, fontSize::Int32)
         if haskey(JulGame.FONT_CACHE, get_comma_separated_path(fontPath))
             raw_data = JulGame.FONT_CACHE[get_comma_separated_path(fontPath)]