GameBox 0.9.1__py3-none-any.whl → 0.9.2__py3-none-any.whl

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.dist-info → gamebox-0.9.2.dist-info}/METADATA

@@ -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.dist-info → gamebox-0.9.2.dist-info}/RECORD

@@ -8,7 +8,7 @@ GameBox/basics/_shapes.py,sha256=Rbkd0lrpxGvbVdwL98_iovFtqB1USI5Qk6umJPR0CIc,131
 GameBox/basics/cammera.py,sha256=eP7cNkTruZ9CDf94VGTsjgdI4NNnWjN-ilCHgGLYNSs,941
 GameBox/basics/utils.py,sha256=w6H34MhxcNoX58iQtlvbT5-4GXefy3RIMTxZGP9fSxA,432
 GameBox/helpers/_Conditions.py,sha256=FSqwJWL0QBvCQmSyzhL5LtudhP5c-tRzC_8xuQENsGw,1946
-GameBox/helpers/_collisions.py,sha256=b8eBnEYbgYFxQ4m6xpAeAaNkYosbP5xUOIlT40sztBs,4503
+GameBox/helpers/_collisions.py,sha256=q29j6N1bNh7hp9OoX5ipODLf4n6FjPzGb8vNSZ_x4Oc,5692
 GameBox/helpers/_input.py,sha256=97bPxM5dkonRywOhj11lgHVQVicuLAKYi_w8EPM0Af8,1963
 GameBox/player/_player.py,sha256=HU7iOBoHj5oXJTA-lHmwPZbFt8CXm-IPzK3NWBGzRhM,1872
 GameBox/player/_playerControler.py,sha256=XEb87RFlgLFoXnXqxIS4lpzHN0wywMNCX5y-NIhw0cs,1715
@@ -19,7 +19,7 @@ GameBox/tilemap/_collisionDef.py,sha256=VxWcfz3nlhyYI_Hemp-LvC6IDC-YN6wIdRaU8Asg
 GameBox/tilemap/_editorBrushes.py,sha256=GFfRV0OB3t9sFb37eO3sB8Cmwyd5i_q64q5IjYlkx1k,7247
 GameBox/tilemap/_tilemap.py,sha256=SEQlokpsUO9zQkLMF-j6amx1FqNeD2eM2CRFj3zCnZ8,3330
 GameBox/ui/_basicUI.py,sha256=LnlQ-YNHFypohjal3eYRws9H52iCLUyRuZWg6n5Fg0o,1007
-gamebox-0.9.1.dist-info/METADATA,sha256=XghkrBPlIfxU7NdxwlbVZq6Hhz4U-qJp7H9ydOlgalw,1059
-gamebox-0.9.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-gamebox-0.9.1.dist-info/licenses/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
-gamebox-0.9.1.dist-info/RECORD,,
+gamebox-0.9.2.dist-info/METADATA,sha256=8FWr5TfY0d3CxfiJlDUAPO1oq0AfDAmfqVyu8H7oir4,1059
+gamebox-0.9.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+gamebox-0.9.2.dist-info/licenses/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
+gamebox-0.9.2.dist-info/RECORD,,