GameBox 0.9.1__tar.gz → 0.9.2__tar.gz

{gamebox-0.9.1 → gamebox-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameBox
-Version: 0.9.1
+Version: 0.9.2
 Summary: GameBox is a beginner-friendly Python package built on top of pygame, designed to make 2D game development faster and easier. It provides ready-to-use modules, utilities, and abstractions that let new developers create polished games without needing advanced coding knowledge—while still offering the flexibility for experienced coders to customize and extend.
 Author-email: Sam Fertig <sfertig007@gmail.com>
 License-Expression: MIT

{gamebox-0.9.1 → gamebox-0.9.2}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["hatchling >= 1.26"]
 build-backend = "hatchling.build"
 [project]
 name = "GameBox"
-version = "0.9.1"
+version = "0.9.2"
 authors = [
   { name="Sam Fertig", email="sfertig007@gmail.com" },
 ]

{gamebox-0.9.1 → gamebox-0.9.2}/src/GameBox/helpers/_collisions.py

@@ -14,34 +14,85 @@ def CheckCollisions(x, y, vx, vy, dim, sample, obj):
         return x, y, vx, vy
     
 def _mainCollisionLogic(collisions, x, y, vx, vy, dim):
-    # Y-axis collisions
-    py = y
-    new_rect = pygame.Rect((x, y), dim)
-    if Global._debug:
-        pygame.draw.rect(Global.screen, "green", new_rect, 5)
+    offset = 0
+
+    prev_rect = pygame.Rect(x - vx, y - vy, dim[0], dim[1])
+    rect = pygame.Rect(x, y, dim[0], dim[1])
+
+    # =====================
+    # Y AXIS COLLISION
+    # =====================
+    y_hit = None
+
     for collision in collisions:
         if Global._debug:
-            pygame.draw.rect(Global.screen, "yellow", collision, 5)
-        if collision.colliderect(new_rect):
-            if vy > 0:  # falling
-                y = collision.top - dim[1]
-                vy = 0
-            elif vy < 0:  # jumping
-                y = collision.bottom
-                vy = 0
-                
-    new_rect = pygame.Rect((x, py), dim)
+            pygame.draw.rect(Global.screen, "yellow", collision, 2)
+
+        if collision.colliderect(rect):
+            if vy > 0 and prev_rect.bottom <= collision.top:
+                if y_hit is None or collision.top < y_hit.top:
+                    y_hit = collision
+            elif vy < 0 and prev_rect.top >= collision.bottom:
+                if y_hit is None or collision.bottom > y_hit.bottom:
+                    y_hit = collision
+
+    if y_hit:
+        if vy > 0:
+            y = y_hit.top - dim[1] - offset
+        else:
+            y = y_hit.bottom + offset
+        vy = 0
+
+    # update rect after Y resolution
+    rect.y = y
+
+    # =====================
+    # X AXIS COLLISION
+    # =====================
+    x_hit = None
+
     for collision in collisions:
-        if Global._debug:
-            pygame.draw.rect(Global.screen, "yellow", collision, 5)
-        if collision.colliderect(new_rect):
-            if vx > 0:
-                x = collision.left - dim[0]
-            elif vx < 0:
-                x = collision.right
-            vx = 0
+        if collision.colliderect(rect):
+
+            # ONLY resolve X if we were NOT overlapping horizontally last frame
+            if prev_rect.right <= collision.left and vx > 0:
+                if x_hit is None or collision.left < x_hit.left:
+                    x_hit = collision
+
+            elif prev_rect.left >= collision.right and vx < 0:
+                if x_hit is None or collision.right > x_hit.right:
+                    x_hit = collision
+
+    if x_hit:
+        if vx > 0:
+            x = x_hit.left - dim[0] - offset
+        else:
+            x = x_hit.right + offset
+        vx = 0
+
+    if Global._debug:
+        pygame.draw.rect(
+            Global.screen,
+            "green",
+            rect,
+            2
+        )
+        pygame.draw.rect(
+            Global.screen,
+            "red",
+            prev_rect,
+            1
+        )
+        pygame.draw.rect(
+            Global.screen,
+            "blue",
+            (x, y, dim[0], dim[1]),
+            2
+        )
 
     return x, y, vx, vy
+
+
     
 def _checkTilemapCollisions(x, y, vx, vy, dim, sample, obj):
     if len(Global.tilemap) == 0:

{gamebox-0.9.1 → gamebox-0.9.2}/tests/GettingStarted.py

@@ -6,6 +6,7 @@ width, height = 800, 600
 
 game = Game(width, height, "blue", "First Game!")
 screen = game.get_screen()
+game._set_debug(True)
 
 cam = Cammera()