crystalwindow 3.6.6__py3-none-any.whl → 3.6.7__py3-none-any.whl

crystalwindow/gravity.py

@@ -1,55 +1,71 @@
 class Gravity:
-    def __init__(self, obj, force=1, terminal_velocity=15, bouncy=False, bounce_strength=0.7):
+    def __init__(self, obj, force=0.6, terminal_velocity=18, bouncy=False, bounce_strength=0.7):
+        """
+        obj: Sprite (or object with x, y, width, height, vel_y)
+        force: gravity per frame
+        terminal_velocity: max falling speed
+        bouncy: should object bounce on collision
+        bounce_strength: fraction of vel_y to keep when bouncing
+        """
         self.obj = obj
+
+        # Ensure velocity exists
         if not hasattr(self.obj, "vel_y"):
             self.obj.vel_y = 0
+
         self.force = force
         self.terminal_velocity = terminal_velocity
         self.bouncy = bouncy
         self.bounce_strength = bounce_strength
         self.on_ground = False
-        self.stretch_factor = 0  # for squishy effect
+        self.stretch_factor = 0  # optional squishy effect
 
-        # --- NEW: choose mode ---
-        # If object has .sprite use that, else fallback to rect mode
-        if hasattr(obj, "sprite"):
-            self.mode = "sprite"
-        else:
-            self.mode = "rect"
+        # Decide mode (rect or sprite)
+        self.mode = "sprite" if hasattr(obj, "sprite") else "rect"
 
+    # -----------------------
+    # Rect getter
+    # -----------------------
     def get_obj_rect(self):
-        # helper to get x,y,w,h depending on mode
         if self.mode == "sprite":
             s = self.obj.sprite
-            x = getattr(s, "x", 0)
-            y = getattr(s, "y", 0)
-            w = getattr(s, "width", getattr(s, "w", 32))
-            h = getattr(s, "height", getattr(s, "h", 32))
+            return s.x, s.y, s.width, s.height
         else:
-            x = getattr(self.obj, "x", 0)
-            y = getattr(self.obj, "y", 0)
-            w = getattr(self.obj, "width", getattr(self.obj, "w", 32))
-            h = getattr(self.obj, "height", getattr(self.obj, "h", 32))
-        return x, y, w, h
+            return self.obj.x, self.obj.y, self.obj.width, self.obj.height
 
-    def update(self, dt, platforms=[]):
-        # apply gravity
-        self.obj.vel_y += self.force * dt * 60
+    # -----------------------
+    # Rect setter
+    # -----------------------
+    def set_obj_rect(self, x, y):
+        if self.mode == "sprite":
+            self.obj.sprite.x = x
+            self.obj.sprite.y = y
+        else:
+            self.obj.x = x
+            self.obj.y = y
+
+    # -----------------------
+    # Update gravity
+    # -----------------------
+    def update(self, dt=1, platforms=[]):
+        # Apply gravity (per frame, not dt scaled)
+        self.obj.vel_y += self.force
         if self.obj.vel_y > self.terminal_velocity:
             self.obj.vel_y = self.terminal_velocity
 
-        # move object
+        # Move
         x, y, w, h = self.get_obj_rect()
         y += self.obj.vel_y
         self.on_ground = False
 
-        # check collisions
+        # Platform collisions
         for plat in platforms:
-            plat_w = getattr(plat, "width", getattr(plat, "w", 0))
-            plat_h = getattr(plat, "height", getattr(plat, "h", 0))
+            plat_w = getattr(plat, "width", 32)
+            plat_h = getattr(plat, "height", 32)
+
             if (x + w > plat.x and x < plat.x + plat_w and
                 y + h > plat.y and y < plat.y + plat_h):
-                
+                # Land on top
                 y = plat.y - h
                 self.on_ground = True
 
@@ -60,16 +76,11 @@ class Gravity:
                     self.obj.vel_y = 0
                     self.stretch_factor = 0
 
-        # slowly reset stretch
+        # Slowly reset stretch
         if self.stretch_factor > 0:
             self.stretch_factor -= 0.05
             if self.stretch_factor < 0:
                 self.stretch_factor = 0
 
-        # write back position
-        if self.mode == "sprite":
-            self.obj.sprite.x = x
-            self.obj.sprite.y = y
-        else:
-            self.obj.x = x
-            self.obj.y = y
+        # Write back position
+        self.set_obj_rect(x, y)

{crystalwindow-3.6.6.dist-info → crystalwindow-3.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crystalwindow
-Version: 3.6.6
+Version: 3.6.7
 Summary: A Tkinter powered window + GUI toolkit made by Crystal (MEEEEEE)! Easier apps, smoother UI and all-in-one helpers!
 Home-page: https://pypi.org/project/crystalwindow/
 Author: CrystalBallyHereXD

{crystalwindow-3.6.6.dist-info → crystalwindow-3.6.7.dist-info}/RECORD

@@ -11,7 +11,7 @@ crystalwindow/draw_rects.py,sha256=o7siET3y35N2LPeNBGe8QhsQbOH8J-xF6fOUz07rymU,1
 crystalwindow/draw_text_helper.py,sha256=qv5fFCuTCKWeGDk9Z_ZpOzrTFP8YYwlgQrrorwrq9Hg,1298
 crystalwindow/draw_tool.py,sha256=1YYEqjmgt4HpV3S15sTjCSmcqgHup4fD8gskTkxU0t4,1638
 crystalwindow/fun_helpers.py,sha256=fo5yTwGENltdtVIVwgITtUkvzpsImujOcqTxe8XPzR8,760
-crystalwindow/gravity.py,sha256=tMctHYubpcUJRogz4kNg3XZGDPE3605zON-4YumiVGo,2752
+crystalwindow/gravity.py,sha256=pZJykZzO-mKVBPsZRP55nnlvUoYQfR29wPgJcI4IbBs,2904
 crystalwindow/gui.py,sha256=D-El18XUaZQR-XZoOr28hnhO7EEoGuypCHxPbPR_yng,3680
 crystalwindow/gui_ext.py,sha256=ZhNgc5eK6Vzj-jUNeFzimuEbLnTmM7Bx594Z34_N0oM,2856
 crystalwindow/math.py,sha256=slOY3KQZ99VDMUMxsSJabMyRtJcwVzEyxR2RoXspHho,963
@@ -31,8 +31,8 @@ crystalwindow/gametests/guitesting.py,sha256=SrOssY5peCQEV6TQ1AiOWtjb9phVGdRzW-Q
 crystalwindow/gametests/sandbox.py,sha256=Oo2tU2N0y3BPVa6T5vs_h9N6islhQrjSrr_78XLut5I,1007
 crystalwindow/gametests/squaremove.py,sha256=poP2Zjl2oc2HVvIAgIK34H2jVj6otL4jEdvAOR6L9sI,572
 crystalwindow/gametests/windowtesting.py,sha256=_9X6wnV1-_X_PtNS-0zu-k209NtFIwAc4vpxLPp7V2o,97
-crystalwindow-3.6.6.dist-info/licenses/LICENSE,sha256=7pvUgvRXL3ED5VVAZPH5oGn1CaIXcyoDC9gqox6sB0g,1079
-crystalwindow-3.6.6.dist-info/METADATA,sha256=okNZBTtaxrXf1LzZmjfzY7kiXRmwF4ydG8c_MBUbAZs,7340
-crystalwindow-3.6.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-crystalwindow-3.6.6.dist-info/top_level.txt,sha256=PeQSld4b19XWT-zvbYkvE2Xg8sakIMbDzSzSdOSRN8o,14
-crystalwindow-3.6.6.dist-info/RECORD,,
+crystalwindow-3.6.7.dist-info/licenses/LICENSE,sha256=7pvUgvRXL3ED5VVAZPH5oGn1CaIXcyoDC9gqox6sB0g,1079
+crystalwindow-3.6.7.dist-info/METADATA,sha256=va5lxkx7-ygKzOZqvmKUuNy33bYscHNVAQPy06JAZXY,7340
+crystalwindow-3.6.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+crystalwindow-3.6.7.dist-info/top_level.txt,sha256=PeQSld4b19XWT-zvbYkvE2Xg8sakIMbDzSzSdOSRN8o,14
+crystalwindow-3.6.7.dist-info/RECORD,,