simple-graphics-lib 0.0.7__tar.gz → 0.0.8__tar.gz

{simple_graphics_lib-0.0.7 → simple_graphics_lib-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple-graphics-lib
-Version: 0.0.7
+Version: 0.0.8
 Summary: A simple graphics library for python learners
 Author-email: Max-Hillyer <maxhillyer7012@gmail.com>
 License-Expression: MIT
@@ -308,6 +308,19 @@ def print_click():
 run()
 ```
 
+### on_hover
+functions defined with the `@on_hover` decorator will run whenever the specified object is being hovered over
+
+the function below will run whenever the mouse is over the rectangle 
+```python
+r1 = Rect(200,200, 100, 100)
+
+@on_hover(r1)
+def p():
+    print("hovering")
+
+run(400,400)
+```
 ---
 ## The mouse
 A mouse object is already initialized in the Simple Graphics import 
@@ -322,6 +335,15 @@ def main():
 
 run()
 ```
+
+## dragging 
+
+to make a shape draggable, add the keyword argument to the object initialization: 
+```python
+r = Rect(250,250, draggable = True)
+```
+this works for all shapes including images and text
+
 ---
 ## Miscellaneous Functions
 

{simple_graphics_lib-0.0.7 → simple_graphics_lib-0.0.8}/README.md

@@ -292,6 +292,19 @@ def print_click():
 run()
 ```
 
+### on_hover
+functions defined with the `@on_hover` decorator will run whenever the specified object is being hovered over
+
+the function below will run whenever the mouse is over the rectangle 
+```python
+r1 = Rect(200,200, 100, 100)
+
+@on_hover(r1)
+def p():
+    print("hovering")
+
+run(400,400)
+```
 ---
 ## The mouse
 A mouse object is already initialized in the Simple Graphics import 
@@ -306,6 +319,15 @@ def main():
 
 run()
 ```
+
+## dragging 
+
+to make a shape draggable, add the keyword argument to the object initialization: 
+```python
+r = Rect(250,250, draggable = True)
+```
+this works for all shapes including images and text
+
 ---
 ## Miscellaneous Functions
 

{simple_graphics_lib-0.0.7 → simple_graphics_lib-0.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simple-graphics-lib"
-version = "0.0.7"
+version = "0.0.8"
 authors = [
   { name="Max-Hillyer", email="maxhillyer7012@gmail.com" },
 ]

{simple_graphics_lib-0.0.7 → simple_graphics_lib-0.0.8}/src/simple_graphics/module.py

@@ -11,6 +11,8 @@ _ontick = []
 _key_funcs = {}
 _key_hold_funcs = {}
 _mouse_click_funcs = {}
+_hover_funcs = {}
+_dragging_shape = None
 _bgcolor = "white"
 _font = "Arial"
 
@@ -31,15 +33,24 @@ mouse = Mouse()
 
 
 class Shape:
-    def __init__(self, x, y, color="black", outline=False):
+    def __init__(self, x, y, color="black", outline=False, draggable=False):
         self.x = x
         self.y = y
         self.color = color
         self.outline = int(outline)
+        self.draggable = draggable
         _shapes.append(self)
 
     def __str__(self):
-        return self.__class__.__name__.lower()
+        class_name = self.__class__.__name__.lower()
+        sig = signature(self.__init__)
+        params = [p for p in sig.parameters if p != "self"]
+
+        values = {}
+        for p in params:
+            if hasattr(self, p):
+                values[p] = getattr(self, p)
+        return f"{class_name}: {values}"
 
 
 class Rect(Shape):
@@ -51,8 +62,9 @@ class Rect(Shape):
         height: int = 10,
         color: str = "black",
         outline: bool = False,
+        draggable: bool = False,
     ):
-        super().__init__(x, y, color, outline)
+        super().__init__(x, y, color, outline, draggable)
         self.width = width
         self.height = height
 
@@ -84,8 +96,9 @@ class Circle(Shape):
         radius: int = 10,
         color: str = "black",
         outline: bool = False,
+        draggable: bool = False,
     ):
-        super().__init__(x, y, color, outline)
+        super().__init__(x, y, color, outline, draggable)
         self.radius = radius
 
     def is_obj_over(self, ox=None, oy=None):
@@ -102,11 +115,16 @@ class Circle(Shape):
 
 class Polygon(Shape):
     def __init__(
-        self, points: list[tuple], color: str = "black", outline: bool = False
+        self,
+        points: list[tuple],
+        color: str = "black",
+        outline: bool = False,
+        draggable: bool = False,
     ):
         self.color = color
         self.points = points
         self.outline = int(outline)
+        self.draggable = draggable
         _shapes.append(self)
 
     def is_obj_over(self, ox=None, oy=None):
@@ -133,10 +151,17 @@ class Polygon(Shape):
 
 
 class Line(Shape):
-    def __init__(self, points: list[tuple], width: int = 10, color: str = "black"):
+    def __init__(
+        self,
+        points: list[tuple],
+        width: int = 10,
+        color: str = "black",
+        draggable: bool = False,
+    ):
         self.color = color
         self.points = points
         self.width = width
+        self.draggable = draggable
         _shapes.append(self)
 
     def is_obj_over(self, ox=None, oy=None):
@@ -173,9 +198,15 @@ class Line(Shape):
 
 class Image(Shape):
     def __init__(
-        self, x: int, y: int, img_path: str, width: int = None, height: int = None
+        self,
+        x: int,
+        y: int,
+        img_path: str,
+        width: int = None,
+        height: int = None,
+        draggable: bool = False,
     ):
-        super().__init__(x, y)
+        super().__init__(x, y, draggable)
         self.img_path = img_path
         self.original_img = pygame.image.load(self.img_path)
 
@@ -207,8 +238,9 @@ class Text(Shape):
         color: str = "black",
         font=_font,
         size: int = 36,
+        draggable: bool = False,
     ):
-        super().__init__(x, y, color)
+        super().__init__(x, y, color, False, draggable)
         self.text = text
         self.size = size
         self.font = pygame.font.SysFont(font, size)
@@ -271,6 +303,24 @@ class Group:
         for child in self.grouped:
             child.y += delta
 
+    def __getitem__(self, key):
+        return self.grouped[key]
+
+    def __len__(self):
+        return len(self.grouped)
+
+    def __iter__(self):
+        return iter(self.grouped)
+
+    def __contains__(self, item):
+        return item in self.grouped
+
+    def __setitem__(self, key, value):
+        self.grouped[key] = value
+
+    def __delitem__(self, key):
+        del self.grouped[key]
+
     def add(self, *shapes):
         for s in shapes:
             if not isinstance(s, Shape):
@@ -291,8 +341,12 @@ class Group:
                 return True
         return False
 
-    def __str__(self):
-        return "group"
+    def __repr__(self):
+        shapes_str = ", ".join(str(s) for s in self.grouped)
+        return f"Group([{shapes_str}])"
+
+    # def __str__(self):
+    #     return "group"
 
 
 class CollisionManager:
@@ -489,6 +543,16 @@ def on_click(target: Callable | Shape):
         return decorator
 
 
+def on_hover(shape: Shape):
+    def decorator(func: Callable):
+        name = currentframe().f_code.co_name
+        check_args(func, name)
+        _hover_funcs[shape] = func
+        return func
+
+    return decorator
+
+
 def set_bg(color: str):
     global _bgcolor
     _bgcolor = color
@@ -503,14 +567,16 @@ def erase(obj):
 
 
 def is_colliding(shape1: Shape, shape2: Shape) -> bool:
-    if "group" == str(shape1) or "group" == str(shape2):
+    shapeName1 = shape1.__class__.__name__.lower()
+    shapeName2 = shape2.__class__.__name__.lower()
+    if "group" == shapeName1 or "group" == shapeName2:
         method_name = "groupcollision"
         method = getattr(CollisionManager, method_name, None)
         return method(shape1, shape2)
-    method_name = f"{str(shape1)}_{str(shape2)}"
+    method_name = f"{shapeName1}_{shapeName2}"
     method = getattr(CollisionManager, method_name, None)
     if method is None:
-        method_name = f"{str(shape2)}_{str(shape1)}"
+        method_name = f"{shapeName2}_{shapeName1}"
         method = getattr(CollisionManager, method_name, None)
         if method is None:
             raise Exception(
@@ -540,6 +606,7 @@ def run(
 
     def handle_events():
         nonlocal running
+        global _dragging_shape
 
         for event in pygame.event.get():
             if event.type == pygame.QUIT:
@@ -564,6 +631,26 @@ def run(
                 for shape in _shapes:
                     if shape.is_obj_over() and shape in _mouse_click_funcs:
                         _mouse_click_funcs[shape]()
+                    if shape.draggable and shape.is_obj_over():
+                        _dragging_shape = shape
+                        break
+
+            if event.type == pygame.MOUSEBUTTONUP:
+                _dragging_shape = None
+
+            def _move_shape(_dragging_shape):
+                if _dragging_shape is not None:
+                    if hasattr(_dragging_shape, "points"):
+                        dx = mouse.x - _dragging_shape.points[0][0]
+                        dy = mouse.y - _dragging_shape.points[0][1]
+                        _dragging_shape.points = [
+                            (p[0] + dx, p[1] + dy) for p in _dragging_shape.points
+                        ]
+                    else:
+                        _dragging_shape.x = mouse.x
+                        _dragging_shape.y = mouse.y
+
+            _move_shape(_dragging_shape)
 
         keys_pressed = pygame.key.get_pressed()
         for pygame_key, func in _key_hold_funcs.items():
@@ -577,6 +664,9 @@ def run(
                     func(pygame.key.name(pygame_key))
                 else:
                     func()
+        for shape, func in _hover_funcs.items():
+            if shape.is_obj_over(mouse.x, mouse.y):
+                func()
 
         for func in _ontick:
             func()
@@ -587,20 +677,21 @@ def run(
         screen.fill(_bgcolor)
 
         for shape in _shapes:
-            if str(shape) == "circle":
+            shapeName = shape.__class__.__name__.lower()
+            if shapeName == "circle":
                 pygame.draw.circle(
                     screen, shape.color, (shape.x, shape.y), shape.radius, shape.outline
                 )
-            elif str(shape) == "rect":
+            elif shapeName == "rect":
                 pygame.draw.rect(
                     screen,
                     shape.color,
                     shape.rect,
                     shape.outline,
                 )
-            elif str(shape) == "polygon":
+            elif shapeName == "polygon":
                 pygame.draw.polygon(screen, shape.color, shape.points, shape.outline)
-            elif str(shape) == "line":
+            elif shapeName == "line":
                 for i in range(1, len(shape.points)):
                     pygame.draw.line(
                         screen,
@@ -609,11 +700,11 @@ def run(
                         shape.points[i],
                         shape.width,
                     )
-            elif str(shape) == "text":
+            elif shapeName == "text":
                 screen.blit(shape.txtsurf, (shape.x, shape.y))
-            elif str(shape) == "image":
+            elif shapeName == "image":
                 screen.blit(shape.surface, (shape.x, shape.y))
-            elif str(shape) == "group":
+            elif shapeName == "group":
                 pass  # this stops weird edgecases while keeping good rendering
 
         pygame.display.flip()

{simple_graphics_lib-0.0.7 → simple_graphics_lib-0.0.8}/src/simple_graphics_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple-graphics-lib
-Version: 0.0.7
+Version: 0.0.8
 Summary: A simple graphics library for python learners
 Author-email: Max-Hillyer <maxhillyer7012@gmail.com>
 License-Expression: MIT
@@ -308,6 +308,19 @@ def print_click():
 run()
 ```
 
+### on_hover
+functions defined with the `@on_hover` decorator will run whenever the specified object is being hovered over
+
+the function below will run whenever the mouse is over the rectangle 
+```python
+r1 = Rect(200,200, 100, 100)
+
+@on_hover(r1)
+def p():
+    print("hovering")
+
+run(400,400)
+```
 ---
 ## The mouse
 A mouse object is already initialized in the Simple Graphics import 
@@ -322,6 +335,15 @@ def main():
 
 run()
 ```
+
+## dragging 
+
+to make a shape draggable, add the keyword argument to the object initialization: 
+```python
+r = Rect(250,250, draggable = True)
+```
+this works for all shapes including images and text
+
 ---
 ## Miscellaneous Functions