cleanup and improving rigidbody

Author: Kyjor

src/Main.jl

@@ -342,10 +342,10 @@ function JulGame.change_scene(sceneFileName::String)
 		JulGame.destroy_entity(this, entity)
 		count += 1
 	end
-	# println("Destroyed $count entities")
-	# println("Skipped $skipcount entities")
+	@debug "Destroyed $count entities while changing scenes"
+	@debug "Skipped $skipcount entities while changing scenes"
 
-	# println("Entities left after destroying: ", length(persistentEntities))
+	@debug "Entities left after destroying while changing scenes (persistent): $(length(persistentEntities)) "
 
 	persistentUIElements = []
 	# delete all UIElements
@@ -632,21 +632,21 @@ function game_loop(this::Main, startTime::Ref{UInt64} = Ref(UInt64(0)), lastPhys
 					"Mouse pos world: $(this.mousePositionWorld.x),$(this.mousePositionWorld.y)"
 				]
 
-				if length(this.debugTextBoxes) == 0
-					fontPath = joinpath(this.assets, "fonts", "FiraCode-Regular.ttf")
-
-					for i = eachindex(statTexts)
-						textBox = UI.TextBoxModule.TextBox("Debug text", fontPath, 40, Math.Vector2(0, 35 * i), statTexts[i], false, false)
-						push!(this.debugTextBoxes, textBox)
-                        JulGame.initialize(textBox)
-					end
-				else
-					for i = eachindex(this.debugTextBoxes)
-                        db_textbox = this.debugTextBoxes[i]
-                        JulGame.update_text(db_textbox, statTexts[i])
-                        JulGame.render(db_textbox, false)
-					end
-				end
+				# if length(this.debugTextBoxes) == 0
+				# 	fontPath = joinpath(this.assets, "fonts", "FiraCode-Regular.ttf")
+
+				# 	for i = eachindex(statTexts)
+				# 		textBox = UI.TextBoxModule.TextBox("Debug text", fontPath, 40, Math.Vector2(0, 35 * i), statTexts[i], false, false)
+				# 		push!(this.debugTextBoxes, textBox)
+                #         JulGame.initialize(textBox)
+				# 	end
+				# else
+				# 	for i = eachindex(this.debugTextBoxes)
+                #         db_textbox = this.debugTextBoxes[i]
+                #         JulGame.update_text(db_textbox, statTexts[i])
+                #         JulGame.render(db_textbox, false)
+				# 	end
+				# end
 			end
 
 			if !JulGame.IS_EDITOR
@@ -743,6 +743,8 @@ function game_loop(this::Main, startTime::Ref{UInt64} = Ref(UInt64(0)), lastPhys
 			end
 
 			if DEBUG && entity.collider != C_NULL
+				rgba = (r = Ref(UInt8(0)), g = Ref(UInt8(0)), b = Ref(UInt8(0)), a = Ref(UInt8(255)))
+        		SDL2.SDL_GetRenderDrawColor(JulGame.Renderer::Ptr{SDL2.SDL_Renderer}, rgba.r, rgba.g, rgba.b, rgba.a)
 				SDL2.SDL_SetRenderDrawColor(JulGame.Renderer::Ptr{SDL2.SDL_Renderer}, 0, 255, 0, SDL2.SDL_ALPHA_OPAQUE)
 				pos = entity.transform.position
 				scale = entity.transform.scale
@@ -754,23 +756,18 @@ function game_loop(this::Main, startTime::Ref{UInt64} = Ref(UInt64(0)), lastPhys
 				colliderRenderCount += 1
 				collider = entity.collider
 
-				if Component.get_type(collider) == "CircleCollider"
-					SDL2E.SDL_RenderDrawCircle(
-							round(Int32, (pos.x - cameraPosition.x) * SCALE_UNITS - ((entity.transform.scale.x * SCALE_UNITS - SCALE_UNITS) / 2)), 
-							round(Int32, (pos.y - cameraPosition.y) * SCALE_UNITS - ((entity.transform.scale.y * SCALE_UNITS - SCALE_UNITS) / 2)), 
-							round(Int32, collider.diameter/2 * SCALE_UNITS))
-				else
-						colSize = Component.get_size(collider)
-						colSize = Math.Vector2f(colSize.x, colSize.y)
-						colOffset = collider.offset
-						colOffset = Math.Vector2f(colOffset.x, colOffset.y)
+				
+				colSize = collider.size
+				colSize = Math.Vector2f(colSize.x, colSize.y)
+				colOffset = collider.offset
+				colOffset = Math.Vector2f(colOffset.x, colOffset.y)
 
-						SDL2.SDL_RenderDrawRectF(JulGame.Renderer::Ptr{SDL2.SDL_Renderer}, 
-						Ref(SDL2.SDL_FRect((pos.x + colOffset.x - cameraPosition.x) * SCALE_UNITS - ((colSize.x * SCALE_UNITS - SCALE_UNITS) / 2), 
-						(pos.y + colOffset.y - cameraPosition.y) * SCALE_UNITS - ((colSize.y * SCALE_UNITS - SCALE_UNITS) / 2), 
-						entity.transform.scale.x * colSize.x * SCALE_UNITS, 
-						entity.transform.scale.y * colSize.y * SCALE_UNITS)))
-				end
+				SDL2.SDL_RenderDrawRectF(JulGame.Renderer::Ptr{SDL2.SDL_Renderer}, 
+				Ref(SDL2.SDL_FRect((pos.x + colOffset.x - cameraPosition.x) * SCALE_UNITS, 
+				(pos.y + colOffset.y - cameraPosition.y) * SCALE_UNITS, 
+				entity.transform.scale.x * colSize.x * SCALE_UNITS, 
+				entity.transform.scale.y * colSize.y * SCALE_UNITS)))
+				SDL2.SDL_SetRenderDrawColor(JulGame.Renderer::Ptr{SDL2.SDL_Renderer}, rgba.r[], rgba.g[], rgba.b[], rgba.a[]);
 			end
 		end
 	end

src/editor/JulGameEditor/Utils/FileContents.jl

@@ -77,7 +77,7 @@ end
 
 function newScriptContent(scriptName)
     return "module $(scriptName)Module
-    using JulGame
+    using ..JulGame
     mutable struct $scriptName
     parent # do not remove this line, this is a reference to the entity that this script is attached to
     # This is where you define your script's fields

src/editor/JulGameEditor/src/imgui.ini

@@ -5,7 +5,7 @@ Collapsed=0
 
 [Window][Hierarchy]
 Pos=0,19
-Size=307,332
+Size=475,332
 Collapsed=0
 DockId=0x00000006,0
 
@@ -20,14 +20,14 @@ Size=825,481
 Collapsed=0
 
 [Window][Debug]
-Pos=309,494
-Size=539,226
+Pos=477,688
+Size=371,32
 Collapsed=0
 DockId=0x00000003,0
 
 [Window][Scene]
-Pos=309,19
-Size=539,473
+Pos=477,19
+Size=371,667
 Collapsed=0
 DockId=0x00000002,0
 
@@ -42,20 +42,20 @@ Size=825,1358
 Collapsed=0
 
 [Window][Controls]
-Pos=309,494
-Size=539,226
+Pos=477,688
+Size=371,32
 Collapsed=0
 DockId=0x00000003,1
 
 [Window][Dear ImGui Demo]
 Pos=850,19
-Size=430,701
+Size=430,451
 Collapsed=0
-DockId=0x0000000A,1
+DockId=0x00000001,1
 
 [Window][Open Scene]
-Pos=1092,19
-Size=746,1358
+Pos=777,19
+Size=500,114
 Collapsed=0
 
 [Window][ResetCamera]
@@ -71,13 +71,13 @@ DockId=0x00000009,0
 
 [Window][Entity Inspector]
 Pos=0,353
-Size=307,367
+Size=475,367
 Collapsed=0
 DockId=0x0000000B,1
 
 [Window][UI Inspector]
 Pos=0,353
-Size=307,367
+Size=475,367
 Collapsed=0
 DockId=0x0000000B,0
 
@@ -88,9 +88,9 @@ Collapsed=0
 
 [Window][Scene List]
 Pos=850,19
-Size=430,701
+Size=430,451
 Collapsed=0
-DockId=0x0000000A,0
+DockId=0x00000001,0
 
 [Window][Example: Custom rendering]
 Pos=99,110
@@ -132,7 +132,7 @@ DockId=0x00000002,1
 Pos=1264,19
 Size=656,998
 Collapsed=0
-DockId=0x0000000A,2
+DockId=0x00000001,2
 
 [Window][Animation - frame 3]
 Pos=427,19
@@ -144,7 +144,7 @@ DockId=0x00000002,1
 Pos=1506,19
 Size=414,998
 Collapsed=0
-DockId=0x0000000A,2
+DockId=0x00000001,2
 
 [Window][Animation - frame 5]
 Pos=427,19
@@ -153,8 +153,8 @@ Collapsed=0
 DockId=0x00000002,1
 
 [Window][Game]
-Pos=309,19
-Size=1053,718
+Pos=477,19
+Size=371,667
 Collapsed=0
 DockId=0x00000002,1
 
@@ -168,6 +168,29 @@ Pos=390,303
 Size=500,114
 Collapsed=0
 
+[Window][Camera]
+Pos=850,472
+Size=430,248
+Collapsed=0
+DockId=0x0000000C,0
+
+[Window][Project Config]
+Pos=850,472
+Size=430,248
+Collapsed=0
+DockId=0x0000000C,1
+
+[Window][Start/Stop Game]
+Pos=700,553
+Size=577,88
+Collapsed=0
+
+[Window][Sprite crop]
+Pos=477,19
+Size=1011,776
+Collapsed=0
+DockId=0x00000002,2
+
 [Table][0x45A0E60D,7]
 RefScale=13
 Column 0  Width=49
@@ -223,13 +246,15 @@ Column 2  Weight=1.0000
 [Docking][Data]
 DockSpace       ID=0x7C6B3D9B Window=0xA87D555D Pos=0,19 Size=1280,701 Split=X
   DockNode      ID=0x00000007 Parent=0x7C6B3D9B SizeRef=848,828 Split=X
-    DockNode    ID=0x00000004 Parent=0x00000007 SizeRef=307,828 Split=Y Selected=0xC7219E3D
+    DockNode    ID=0x00000004 Parent=0x00000007 SizeRef=475,828 Split=Y Selected=0xC7219E3D
       DockNode  ID=0x00000006 Parent=0x00000004 SizeRef=316,473 Selected=0x29EABFBD
       DockNode  ID=0x0000000B Parent=0x00000004 SizeRef=316,523 Selected=0x60AF69E6
-    DockNode    ID=0x00000005 Parent=0x00000007 SizeRef=539,828 Split=Y
-      DockNode  ID=0x00000002 Parent=0x00000005 SizeRef=1440,473 Selected=0xE192E354
-      DockNode  ID=0x00000003 Parent=0x00000005 SizeRef=1440,226 CentralNode=1 Selected=0x67284010
+    DockNode    ID=0x00000005 Parent=0x00000007 SizeRef=1651,828 Split=Y
+      DockNode  ID=0x00000002 Parent=0x00000005 SizeRef=1440,776 Selected=0xE192E354
+      DockNode  ID=0x00000003 Parent=0x00000005 SizeRef=1440,214 CentralNode=1 Selected=0x67284010
   DockNode      ID=0x00000008 Parent=0x7C6B3D9B SizeRef=430,828 Split=Y Selected=0xD04A4B96
     DockNode    ID=0x00000009 Parent=0x00000008 SizeRef=503,414 Selected=0xD04A4B96
-    DockNode    ID=0x0000000A Parent=0x00000008 SizeRef=503,412 Selected=0x77FEF510
+    DockNode    ID=0x0000000A Parent=0x00000008 SizeRef=503,412 Split=Y Selected=0x77FEF510
+      DockNode  ID=0x00000001 Parent=0x0000000A SizeRef=430,451 Selected=0x77FEF510
+      DockNode  ID=0x0000000C Parent=0x0000000A SizeRef=430,248 Selected=0x0545BD69
 

src/engine/Camera/Camera.jl

@@ -36,7 +36,7 @@ module CameraModule
         rgba = (r = Ref(UInt8(0)), g = Ref(UInt8(0)), b = Ref(UInt8(0)), a = Ref(UInt8(255)))
         SDL2.SDL_GetRenderDrawColor(JulGame.Renderer::Ptr{SDL2.SDL_Renderer}, rgba.r, rgba.g, rgba.b, rgba.a)
         SDL2.SDL_SetRenderDrawColor(Renderer, this.backgroundColor[1], this.backgroundColor[2], this.backgroundColor[3], this.backgroundColor[4]);
-        SDL2.SDL_RenderFillRectF(Renderer, Ref(SDL2.SDL_FRect(this.windowPos.x, this.windowPos.y, this.size.x, this.size.y)))
+        #SDL2.SDL_RenderFillRectF(Renderer, Ref(SDL2.SDL_FRect(this.windowPos.x, this.windowPos.y, this.size.x, this.size.y)))
         SDL2.SDL_SetRenderDrawColor(JulGame.Renderer::Ptr{SDL2.SDL_Renderer}, rgba.r[], rgba.g[], rgba.b[], rgba.a[]);
 
         center =  Vector2f(this.size.x/SCALE_UNITS/2, this.size.y/SCALE_UNITS/2)

src/engine/Component/CircleCollider.jl

@@ -57,7 +57,7 @@ module CircleColliderModule
 
         for i in eachindex(colliders)
             #TODO: Skip any out of a certain range of this. This will prevent a bunch of unnecessary collision checks
-            if !Component.get_parent(colliders[i]).isActive || !colliders[i].enabled
+            if !colliders[i].parent.isActive || !colliders[i].enabled
                 if this.parent.rigidbody.grounded && i == length(colliders)
                     this.parent.rigidbody.grounded = false
                 end
@@ -68,13 +68,13 @@ module CircleColliderModule
                 if CheckIfResting(this, colliders[i])[1] == true && length(this.currentRests) > 0 && !(colliders[i] in this.currentRests)
                     # if this collider isn't already in the list of current rests, check if it is on the same Y level and the same size as any of the current rests, if it is, then add it to current rests
                     for j in eachindex(this.currentRests)
-                        if Component.get_parent(this.currentRests[j]).transform.position.y == Component.get_parent(colliders[i]).transform.position.y && Component.get_size(this.currentRests[j]).y == Component.get_size(colliders[i]).y
+                        if this.currentRests[j].parent.transform.position.y == colliders[i].parent.transform.position.y && Component.get_size(this.currentRests[j]).y == Component.get_size(colliders[i]).y
                             push!(this.currentRests, colliders[i])
                             break
                         end
                     end
                 end
-                transform = Component.get_parent(this).transform
+                transform = this.parent.transform
                 # if collision[1] == Top::CollisionDirection
                 #     push!(this.currentCollisions, colliders[i])
                 #     for eventToCall in this.collisionEvents
@@ -130,18 +130,10 @@ module CircleColliderModule
         this.currentCollisions = []
     end
 
-    function Component.get_parent(this::CircleCollider)
-        return this.parent
-    end
-
     function Component.add_collision_event(this::CircleCollider, event)
         push!(this.collisionEvents, event)
     end   
 
-    function Component.get_type(this::CircleCollider)
-        return "CircleCollider"
-    end
-
     function check_collision(a::CircleCollider, b::CircleCollider)
         # Calculate total radius squared
         totalRadiusSquared::Float64 = (a.diameter + b.diameter)^2
@@ -158,8 +150,8 @@ module CircleColliderModule
         # Closest point on collision box
         cX, cY = 0, 0
 
-        posA = Component.get_parent(a).transform.position + a.offset
-        posB = Component.get_parent(b).transform.position + b.offset
+        posA = a.parent.transform.position + a.offset
+        posB = b.parent.transform.position + b.offset
 
         # Find closest x offset
         if posA.x < posB.x
@@ -194,8 +186,8 @@ module CircleColliderModule
         # Closest point on collision box
         cX = 0
 
-        posA = Component.get_parent(a).transform.position + a.offset
-        posB = Component.get_parent(b).transform.position + b.offset
+        posA = a.parent.transform.position + a.offset
+        posB = b.parent.transform.position + b.offset
         radius = a.diameter / 2
 
         # Find closest x offset