Feature/sdl editor

src/Component/Sprite.jl

@@ -87,10 +87,10 @@ module SpriteModule
         deprecated_get_property(method_props, this, s)
     end
     function draw(this::InternalSprite, zoom::Float64 = 1.0)
+        zoom = 1.0
         if this.image == C_NULL || JulGame.Renderer == C_NULL
             return
         end
-
         if this.texture == C_NULL
             this.texture = SDL2.SDL_CreateTextureFromSurface(JulGame.Renderer, this.image)
             this.setColor()

src/Main.jl

@@ -222,27 +222,30 @@
         end
 
         if "SPACE" in this.input.buttonsHeldDown
-            if "LEFT" in this.input.buttonsHeldDown
-                this.zoom -= .01
-                this.zoom = clamp(this.zoom, 0.01, 10)
+            if "LEFT" in this.input.buttonsPressedDown
+                this.zoom -= .1
+                this.zoom = round(clamp(this.zoom, 0.2, 3); digits=1)
+				SDL2.SDL_RenderSetScale(JulGame.Renderer, this.zoom, this.zoom)
+				println("Zoom: ", this.zoom)
                 if update != C_NULL
-                    SDL2.SDL_RenderSetScale(JulGame.Renderer, this.zoom, this.zoom)
                 end
-            elseif "RIGHT" in this.input.buttonsHeldDown
-                this.zoom += .01
-                this.zoom = clamp(this.zoom, 0.01, 10)
+            elseif "RIGHT" in this.input.buttonsPressedDown
+                this.zoom += .1
+                this.zoom = round(clamp(this.zoom, 0.2, 3); digits=1)
+				println("Zoom: ", this.zoom)
+
+				SDL2.SDL_RenderSetScale(JulGame.Renderer, this.zoom, this.zoom)
                 if update != C_NULL
-                    SDL2.SDL_RenderSetScale(JulGame.Renderer, this.zoom, this.zoom)
                 end
             end
         elseif this.input.getButtonHeldDown("LEFT")
             cameraPosition = Math.Vector2f(cameraPosition.x - 0.01, cameraPosition.y)
         elseif this.input.getButtonHeldDown("RIGHT")
             cameraPosition = Math.Vector2f(cameraPosition.x + 0.01, cameraPosition.y)
         elseif this.input.getButtonHeldDown("DOWN")
-            cameraPosition = Math.Vector2f(cameraPosition.x, cameraPosition.y + 0.1)
+            cameraPosition = Math.Vector2f(cameraPosition.x, cameraPosition.y + 0.01)
         elseif this.input.getButtonHeldDown("UP")
-            cameraPosition = Math.Vector2f(cameraPosition.x, cameraPosition.y - 0.1)
+            cameraPosition = Math.Vector2f(cameraPosition.x, cameraPosition.y - 0.01)
         end
 
         if update != C_NULL && update[6]
@@ -593,8 +596,9 @@
 - `update`: An array containing information to pass back to the editor.
 
 """
-function GameLoop(this, startTime::Ref{UInt64} = Ref(UInt64(0)), lastPhysicsTime::Ref{UInt64} = Ref(UInt64(0)), isEditor::Bool = false, update::Union{Ptr{Nothing}, Vector{Any}} = C_NULL, windowPos = C_NULL, windowSize = C_NULL)
+function GameLoop(this::Main, startTime::Ref{UInt64} = Ref(UInt64(0)), lastPhysicsTime::Ref{UInt64} = Ref(UInt64(0)), isEditor::Bool = false, update::Union{Ptr{Nothing}, Vector{Any}} = C_NULL, windowPos = C_NULL, windowSize = C_NULL)
         try
+			#SDL2.SDL_RenderSetScale(JulGame.Renderer, this.zoom, this.zoom)
 			lastStartTime = startTime[]
 			startTime[] = SDL2.SDL_GetPerformanceCounter()
 
@@ -614,7 +618,8 @@
 				end
 			end
 			if isEditor && update == C_NULL
-				this.scene.camera.dimensions = Math.Vector2(windowSize.x, windowSize.y)
+				this.scene.camera.dimensions = Math.Vector2(1920, 1080)
+				update_viewport(this, 1920, 1080)
 				this.scene.camera.windowPos = Math.Vector2(windowPos.x, windowPos.y)
 			end
 
@@ -701,7 +706,7 @@
 				rendercount = 0
 				# println("position: $(this.scene.camera.position) offset: $(this.scene.camera.offset) dimensions: $(this.scene.camera.dimensions)")
 				 #println("dimensions: $(this.scene.camera.dimensions)")
-				zoomMultiplier = (isEditor && update == C_NULL) ? this.zoom : 1.0
+				zoomMultiplier = 1.0
 				for layer in this.spriteLayers["sort"]
 					for sprite in this.spriteLayers["$(layer)"]
 						spritePosition = sprite.parent.transform.getPosition()
@@ -760,7 +765,7 @@
 					end
 					colliderRenderCount += 1
 					collider = entity.collider
-					zoomMultiplier = (isEditor && update == C_NULL) ? this.zoom : 1.0
+					zoomMultiplier = 1.0
 					if collider.getType() == "CircleCollider"
 						SDL2E.SDL_RenderDrawCircle(
 							round(Int32, (pos.x - this.scene.camera.position.x) * SCALE_UNITS - ((entity.transform.getScale().x * SCALE_UNITS - SCALE_UNITS) / 2)), 
@@ -805,7 +810,7 @@
 							println("delete entity with name $(selectedEntity.name) and id $(selectedEntity.id)")
 						end
 
-						zoomMultiplier = (isEditor && update == C_NULL) ? this.zoom : 1.0
+						zoomMultiplier = 1.0
 						pos = selectedEntity.transform.getPosition()
 						size = selectedEntity.collider != C_NULL ? selectedEntity.collider.getSize() : selectedEntity.transform.getScale()
 						size = Math.Vector2f(size.x * zoomMultiplier, size.y * zoomMultiplier)

src/editor/JulGameEditor/EditorSDLBackend.jl

@@ -27,15 +27,17 @@
     function run()
         info = initSDLAndImGui()
         window, renderer, ctx, io, clear_color = info[1], info[2], info[3], info[4], info[5]
-
-        sceneTexture = SDL2.SDL_CreateTexture(renderer, SDL2.SDL_PIXELFORMAT_BGRA8888, SDL2.SDL_TEXTUREACCESS_TARGET, 300, 200)# SDL2.SDL_SetRenderTarget(renderer, sceneTexture)
+        startingSize = ImVec2(1920, 1080)
+        sceneTexture = SDL2.SDL_CreateTexture(renderer, SDL2.SDL_PIXELFORMAT_BGRA8888, SDL2.SDL_TEXTUREACCESS_TARGET, startingSize.x, startingSize.y)# SDL2.SDL_SetRenderTarget(renderer, sceneTexture)
+        sceneTextureSize = ImVec2(startingSize.x, startingSize.y)
 
         styleImGui()
         showDemoWindow = true
         game = nothing
         gameInfo = []
-        windowPos = ImVec2(0, 0)
-        windowSize = ImVec2(0, 0)
+
+        sceneWindowPos = ImVec2(0, 0)
+        scenewindowSize = ImVec2(startingSize.x, startingSize.y)
         quit = false
             try
                 while !quit
@@ -44,7 +46,7 @@
                     end
 
                     StartFrame()
-                    LibCImGui.igDockSpaceOverViewport(C_NULL, ImGuiDockNodeFlags_PassthruCentralNode, C_NULL) # Creating the "dockspace" that covers the whole window. This allows the child windows to automatically resize.
+                    #LibCImGui.igDockSpaceOverViewport(C_NULL, ImGuiDockNodeFlags_PassthruCentralNode, C_NULL) # Creating the "dockspace" that covers the whole window. This allows the child windows to automatically resize.
 
                     ################################## RENDER HERE
 
@@ -67,17 +69,23 @@
                             CImGui.End()
                         end
                     end
-
                     @cstatic begin
                         CImGui.Begin("Hello World")  
-                            windowPos = CImGui.GetWindowPos()
-                            windowSize = CImGui.GetWindowSize()
-                            CImGui.Image(sceneTexture, ImVec2(windowSize.x - 20, windowSize.y - 20))
+                        sceneWindowPos = CImGui.GetWindowPos()
+                        scenewindowSize = CImGui.GetWindowSize()
+                        if scenewindowSize.x != sceneTextureSize.x || scenewindowSize.y != sceneTextureSize.y
+                            SDL2.SDL_DestroyTexture(sceneTexture)
+                            sceneTexture = SDL2.SDL_CreateTexture(renderer, SDL2.SDL_PIXELFORMAT_BGRA8888, SDL2.SDL_TEXTUREACCESS_TARGET, scenewindowSize.x, scenewindowSize.y)
+                            sceneTextureSize = ImVec2(scenewindowSize.x, scenewindowSize.y)
+                        end
+
+                        CImGui.Image(sceneTexture, sceneTextureSize)
                         CImGui.End()
                     end
                     SDL2.SDL_SetRenderTarget(renderer, sceneTexture)
+                    SDL2.SDL_RenderClear(renderer)
                     #SDL2.SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
-                    gameInfo = game === nothing ? [] : game.gameLoop(Ref(UInt64(0)), Ref(UInt64(0)), true, C_NULL, ImVec2(windowPos.x, windowPos.y + 20), ImVec2(windowSize.x, windowSize.y - 20))
+                    gameInfo = game === nothing ? [] : game.gameLoop(Ref(UInt64(0)), Ref(UInt64(0)), true, C_NULL, ImVec2(0, 0), ImVec2(scenewindowSize.x, scenewindowSize.y - 20))
                     SDL2.SDL_SetRenderTarget(renderer, C_NULL)
                     SDL2.SDL_RenderClear(renderer)
 
@@ -86,11 +94,11 @@
 
                     ################################# STOP RENDERING HERE
                     CImGui.Render()
-                    SDL2.SDL_RenderSetScale(renderer, unsafe_load(io.DisplayFramebufferScale.x), unsafe_load(io.DisplayFramebufferScale.y));
+                    #SDL2.SDL_RenderSetScale(renderer, unsafe_load(io.DisplayFramebufferScale.x), unsafe_load(io.DisplayFramebufferScale.y));
                     SDL2.SDL_SetRenderDrawColor(renderer, (UInt8)(round(clear_color[1] * 255)), (UInt8)(round(clear_color[2] * 255)), (UInt8)(round(clear_color[3] * 255)), (UInt8)(round(clear_color[4] * 255)));
                     SDL2.SDL_RenderClear(renderer);
                     ImGui_ImplSDLRenderer2_RenderDrawData(CImGui.GetDrawData(), test)
-                    screenA = Ref(SDL2.SDL_Rect(round(windowPos.x), windowPos.y + 20, windowSize.x, windowSize.y - 20))
+                    screenA = Ref(SDL2.SDL_Rect(round(sceneWindowPos.x), sceneWindowPos.y + 20, scenewindowSize.x, scenewindowSize.y - 20))
                     SDL2.SDL_RenderSetViewport(renderer, screenA)
                     ################################################# Injecting game loop into editor
                     if game !== nothing
@@ -112,6 +120,7 @@
                 ImGui_ImplSDL2_Shutdown();
 
                 CImGui.DestroyContext(ctx)
+                SDL2.SDL_DestroyTexture(sceneTexture)
                 SDL_DestroyRenderer(renderer);
                 SDL2.SDL_DestroyWindow(window);
                 SDL2.SDL_Quit()

src/editor/JulGameEditor/ImGuiSDLBackend/imgui_impl_sdlrenderer2.jl

@@ -170,7 +170,7 @@
                 #     r = SDL2.SDL_Rect(ix, iy, iz, iw)
                 r = SDL2.SDL_Rect((Int)(round(clip_min.x)), (Int)(round(clip_min.y)), (Int)(round(clip_max.x - clip_min.x)), (Int)(round(clip_max.y - clip_min.y)))
 
-                    # @c SDL2.SDL_RenderSetClipRect(sdlRenderer, &r)
+                @c SDL2.SDL_RenderSetClipRect(sdlRenderer, &r) # This prevents rendering to outside of the current window. For example, if you have a window that is 800x600 and you try to render a 1000x1000 image, it will only render the part that is inside the window.
 
                     color = unsafe_load(vtx_buffer.Data).col
                     r = (color >> 16) & 0xFF