batframework 1.0.9a11__py3-none-any.whl → 1.0.9a13__py3-none-any.whl

batFramework/gui/debugger.py

@@ -1,130 +1,140 @@
-from .label import Label
-from typing import Self,Callable,Any
-import batFramework as bf
-import pygame
-import sys
-
-
-def convert_to_int(*args):
-    return [int(arg) for arg in args]
-
-
-class Debugger(Label):
-    def __init__(self) -> None:
-        super().__init__("")
-        self.static_data: dict[str,Any] = {}
-        self.dynamic_data: dict[str,Callable[[],str]] = {}
-        self.refresh_rate = 10
-        self.refresh_counter: float = 0
-        self.add_tags("debugger")
-        self.set_visible(False)
-
-    def set_refresh_rate(self, value: int) -> Self:
-        self.refresh_rate = value
-        return self
-
-    def add_static(self, key: str, data):
-        self.static_data[key] = str(data)
-        self.update_text()
-
-    def add_dynamic(self, key: str, func:Callable[[],str]) -> None:
-        self.dynamic_data[key] = func
-        self.update_text()
-
-    def remove_static(self, key:str) -> bool:
-        try:
-            self.static_data.pop(key)
-            return True
-        except KeyError:
-            return False
-
-    def remove_dynamic(self, key:str) -> bool:
-        try:
-            self.dynamic_data.pop(key)
-            return True
-        except KeyError:
-            return False
-
-    def set_parent_scene(self, scene) -> Self:
-        super().set_parent_scene(scene)
-        self.set_render_order(sys.maxsize-100)
-        self.update_text()
-        return self
-
-    def set_text(self, text: str) -> Self:
-        return super().set_text(text)
-
-    def update_text(self) -> None:
-        if not self.parent_scene:
-            return
-
-        d = "\n".join(
-            key + ":" + data if key != "" else data
-            for key, data in self.static_data.items()
-        )
-
-        d2 = "\n".join(
-            key + ":" + str(data()) if key != "" else str(data())
-            for key, data in self.dynamic_data.items()
-        )
-
-        self.set_text("\n".join((d, d2)).strip())
-
-    def update(self, dt: float) -> None:
-        if not self.parent_scene:
-            return
-        
-        if bf.ResourceManager().get_sharedVar("debug_mode") != bf.debugMode.DEBUGGER:
-            self.set_visible(False)
-            return
-        
-        self.set_visible(True)
-        self.refresh_counter = self.refresh_counter + (dt * 60)
-        
-        if self.refresh_counter > self.refresh_rate:
-            self.refresh_counter = 0
-            self.update_text()
-
-
-    def __str__(self) -> str:
-        return "Debugger"
-
-    def top_at(self, x, y):
-        return None
-
-
-class FPSDebugger(Debugger):
-    def __init__(self):
-        super().__init__()
-
-    def do_when_added(self):
-        if not self.parent_scene or not self.parent_scene.manager:
-            print("Debugger could not link to the manager")
-            return
-        manager_link = self.parent_scene.manager
-        self.add_dynamic("FPS", lambda: str(round(manager_link.get_fps())))
-
-
-class BasicDebugger(FPSDebugger):
-    def do_when_added(self):
-        if not self.parent_scene or not self.parent_scene.manager:
-            print("Debugger could not link to the manager")
-            return
-        self.add_dynamic(
-            "Resolution", lambda: "x".join(str(i) for i in bf.const.RESOLUTION)
-        )
-        super().do_when_added()
-        self.add_dynamic("Mouse", pygame.mouse.get_pos)
-
-        if not hasattr(self.parent_scene,"root"):
-            print("Debugger couldn't find 'root' widget in parent scene")
-            return
-        
-        parent_scene = self.parent_scene
-
-        self.add_dynamic(
-            "Hover",
-            lambda: (
-                str(parent_scene.root.hovered) if parent_scene.root.hovered else None
-            ),
-        )
+from .label import Label
+from typing import Self,Callable,Any
+import batFramework as bf
+import pygame
+import sys
+
+
+def convert_to_int(*args):
+    return [int(arg) for arg in args]
+
+
+class Debugger(Label):
+    def __init__(self) -> None:
+        super().__init__("")
+        self.root_link = None
+        self.static_data: dict[str,Any] = {}
+        self.dynamic_data: dict[str,Callable[[],str]] = {}
+        self.refresh_interval :float = .01
+        self.refresh_counter: float = 0
+        self.add_tags("debugger")
+        self.set_visible(False)
+    
+
+    def set_parent(self, parent):
+        super().set_parent(parent)
+        self.root_link = self.get_root()
+        
+    def set_refresh_rate(self, value: float) -> Self:
+        """
+        seet refresh interval, time in seconds between each refresh of the debugger
+        """
+        self.refresh_interval = value
+        self.refresh_counter = 0
+        return self
+
+    def add_static(self, key: str, data):
+        self.static_data[key] = str(data)
+        self.update_text()
+
+    def add_dynamic(self, key: str, func:Callable[[],str]) -> None:
+        self.dynamic_data[key] = func
+        self.update_text()
+
+    def remove_static(self, key:str) -> bool:
+        try:
+            self.static_data.pop(key)
+            return True
+        except KeyError:
+            return False
+
+    def remove_dynamic(self, key:str) -> bool:
+        try:
+            self.dynamic_data.pop(key)
+            return True
+        except KeyError:
+            return False
+
+    def set_parent_scene(self, scene) -> Self:
+        super().set_parent_scene(scene)
+        self.set_render_order(sys.maxsize-100)
+        self.update_text()
+        return self
+
+    def set_text(self, text: str) -> Self:
+        return super().set_text(text)
+
+    def update_text(self) -> None:
+        if not self.parent_scene:
+            return
+
+        d = "\n".join(
+            key + ":" + data if key != "" else data
+            for key, data in self.static_data.items()
+        )
+
+        d2 = "\n".join(
+            key + ":" + str(data()) if key != "" else str(data())
+            for key, data in self.dynamic_data.items()
+        )
+
+        self.set_text("\n".join((d, d2)).strip())
+
+    def update(self, dt: float) -> None:
+        if not self.parent_scene:
+            return
+        
+        if bf.ResourceManager().get_sharedVar("debug_mode") != bf.debugMode.DEBUGGER:
+            self.set_visible(False)
+            return
+        
+        self.set_visible(True)
+        self.refresh_counter = self.refresh_counter + dt
+        
+        if self.refresh_counter > self.refresh_interval:
+            self.refresh_counter = 0
+            self.update_text()
+
+
+    def __str__(self) -> str:
+        return "Debugger"
+
+    def top_at(self, x, y):
+        return None
+
+
+class FPSDebugger(Debugger):
+    def __init__(self):
+        super().__init__()
+
+    def do_when_added(self):
+        if not self.parent_scene or not self.parent_scene.manager:
+            print("Debugger could not link to the manager")
+            return
+        manager_link = self.parent_scene.manager
+        self.add_dynamic("FPS", lambda: str(round(manager_link.get_fps())))
+
+
+class BasicDebugger(FPSDebugger):
+
+    def do_when_added(self):
+        if not self.parent_scene or not self.parent_scene.manager:
+            print("Debugger could not link to the manager")
+            return
+        self.add_dynamic(
+            "Resolution", lambda: "x".join(str(i) for i in bf.const.RESOLUTION)
+        )
+        super().do_when_added()
+        self.add_dynamic("Mouse", pygame.mouse.get_pos)
+
+        if self.root_link is None:
+            return
+        
+
+        self.add_dynamic(
+            "Hover",
+            lambda: (
+                str(self.root_link.hovered) if self.root_link.hovered else None
+            ),
+        )
+

batFramework/gui/draggableWidget.py

@@ -1,44 +1,63 @@
-from .interactiveWidget import InteractiveWidget
-import batFramework as bf
-import pygame
-
-
-class DraggableWidget(InteractiveWidget):
-    def __init__(self, *args, **kwargs) -> None:
-        self.drag_start = None
-        self.offset = None
-        self.click_mask = [True,False,False,False,False]
-        self.is_dragged : bool = False # the widget is following the mouse AND the mouse is in the widget
-        self.is_dragged_outside : bool = False # the widget is following the mouse BUT the mouse is NOT in the widget
-        super().__init__(*args, **kwargs)
-    
-    def set_click_mask(self,b1=0,b2=0,b3=0,b4=0,b5=0):
-        self.click_mask = [b1,b2,b3,b4,b5]
-
-    def on_click_down(self, button):
-        super().on_click_down(button)
-        return any(i==j and i== True for i,j in zip(self.is_clicked_down,self.click_mask))
-    
-    def do_on_drag(
-        self, drag_start_pos: tuple[float, float], drag_end_pos: tuple[float, float]
-    ) -> None:
-        new_pos = drag_end_pos[0] - self.offset[0], drag_end_pos[1] - self.offset[1]
-        if self.rect.topleft != new_pos:
-            self.set_position(*new_pos)
-
-    def update(self, dt: float):
-        self.is_dragged_outside = any(i==j and i== True for i,j in zip(pygame.mouse.get_pressed(5),self.click_mask))
-        self.is_dragged = any(i==j and i== True for i,j in zip(self.is_clicked_down,self.click_mask))
-
-        if self.is_dragged and self.is_dragged_outside:
-            x, y = self.parent_layer.camera.screen_to_world(pygame.mouse.get_pos())
-            if self.drag_start == None:
-                self.offset = x - self.rect.x, y - self.rect.y
-                self.drag_start = x, y
-            else:
-                self.do_on_drag(self.drag_start, (x, y))
-        else:
-            self.drag_start = None
-            self.offset = None
-            self.is_clicked_down = [False]*5
-        super().update(dt)
+from .interactiveWidget import InteractiveWidget
+import batFramework as bf
+import pygame
+
+
+class DraggableWidget(InteractiveWidget):
+    def __init__(self, *args, **kwargs) -> None:
+        self.drag_start = None
+        self.offset = None
+        self.click_mask = [True,False,False,False,False]
+        self.is_dragged : bool = False # the widget is following the mouse AND the mouse is in the widget
+        self.is_dragged_outside : bool = False # the widget is following the mouse BUT the mouse is NOT in the widget
+        super().__init__(*args, **kwargs)
+    
+    def set_click_mask(self,b1=0,b2=0,b3=0,b4=0,b5=0):
+        self.click_mask = [b1,b2,b3,b4,b5]
+
+    
+    def do_on_drag(
+        self, drag_start_pos: tuple[float, float], drag_end_pos: tuple[float, float]
+    ) -> None:
+        
+        new_pos = drag_end_pos[0] - self.offset[0], drag_end_pos[1] - self.offset[1]
+        if self.rect.topleft != new_pos:
+
+            self.set_position(*new_pos)
+
+    def on_click_down(self, button, event=None):
+        if button < 1 or button > 5 :
+            return
+        self.is_clicked_down[button-1] = True
+        self.is_dragged = any(i==j and i== True for i,j in zip(self.is_clicked_down,self.click_mask))
+        if self.is_dragged:
+            event.consumed = True
+        self.do_on_click_down(button,event)
+
+    def on_click_up(self, button, event=None):
+        if button < 1 or button > 5 :
+            return
+        self.is_clicked_down[button-1] = False
+        self.is_dragged = any(i==j and i== True for i,j in zip(self.is_clicked_down,self.click_mask))
+        self.do_on_click_up(button,event)
+
+    def update(self, dt: float):
+        super().update(dt)
+        self.is_dragged_outside = any(i==j and i== True for i,j in zip(pygame.mouse.get_pressed(5),self.click_mask))
+
+
+        if self.is_dragged and self.is_dragged_outside:
+            x, y = self.parent_layer.camera.get_mouse_pos()
+            if self.drag_start == None:
+                self.offset = x - self.rect.x, y - self.rect.y
+                self.drag_start = x, y
+            else:
+                self.do_on_drag(self.drag_start, (x, y))
+                
+        else:
+            self.drag_start = None
+            self.offset = None
+            self.is_clicked_down = [False]*5
+        
+        if not self.is_dragged_outside:
+            self.is_dragged = False

batFramework/gui/image.py

@@ -1,58 +1,61 @@
-import batFramework as bf
-from .widget import Widget
-from .shape import Shape
-import pygame
-from typing import Self
-
-
-class Image(Shape):
-    def __init__(
-        self,
-        path: str = None,
-        convert_alpha=True,
-    ):
-        self.original_surface = None
-        super().__init__(convert_alpha=convert_alpha)
-        if path is not None:
-            self.from_path(path)
-
-    def __str__(self) -> str:
-        return "Image"
-
-    def paint(self) -> None:
-        super().paint()
-        if self.original_surface is None:
-            return
-        padded = self.get_inner_rect().move(-self.rect.x,-self.rect.y)
-        target_size = padded.size
-        if self.original_surface.get_size() != target_size:
-            self.surface.blit(pygame.transform.scale(self.original_surface, target_size), padded.topleft)
-        else:
-            self.surface.blit(self.original_surface, padded.topleft)
-
-    def build(self) -> None:
-        if self.original_surface is not None:
-            self.set_size(
-                self.expand_rect_with_padding((0,0,*self.original_surface.get_size())).size
-            )
-        super().build()
-
-
-    def from_path(self, path: str) -> Self:
-        tmp = bf.ResourceManager().get_image(path, self.convert_alpha)
-        if tmp is None:
-            return self
-        self.original_surface = tmp
-        size = self.original_surface.get_size()
-        self.set_size(size)
-        self.dirty_surface = True
-        return self
-
-    def from_surface(self, surface: pygame.Surface) -> Self:
-        if surface is None:
-            return self
-        self.original_surface = surface
-        size = self.original_surface.get_size()
-        self.set_size(size)
-        self.dirty_surface = True
-        return self
+import batFramework as bf
+from .widget import Widget
+from .shape import Shape
+import pygame
+from typing import Self
+
+
+class Image(Shape):
+    def __init__(
+        self,
+        path: str = None,
+        convert_alpha=True,
+    ):
+        self.original_surface = None
+        super().__init__(convert_alpha=convert_alpha)
+        if path is not None:
+            self.from_path(path)
+
+    def __str__(self) -> str:
+        return "Image"
+
+    def paint(self) -> None:
+        super().paint()
+        if self.original_surface is None:
+            return
+        padded = self.get_inner_rect().move(-self.rect.x,-self.rect.y)
+        target_size = padded.size
+        if self.original_surface.get_size() != target_size:
+            self.surface.blit(pygame.transform.scale(self.original_surface, target_size), padded.topleft)
+        else:
+            self.surface.blit(self.original_surface, padded.topleft)
+
+    def build(self) -> None:
+        if self.original_surface is not None:
+            self.set_size(
+                self.expand_rect_with_padding((0,0,*self.original_surface.get_size())).size
+            )
+        super().build()
+
+
+    def from_path(self, path: str) -> Self:
+        tmp = bf.ResourceManager().get_image(path, self.convert_alpha)
+        if tmp is None:
+            return self
+        self.original_surface = tmp
+        # size = self.original_surface.get_size()
+        # self.set_size(size)
+        self.dirty_shape = True
+        self.dirty_surface = True
+        return self
+
+    def from_surface(self, surface: pygame.Surface) -> Self:
+        if surface is None:
+            return self
+        self.original_surface = surface
+        # size = self.original_surface.get_size()
+        # self.set_size(size)
+        self.dirty_shape = True
+
+        self.dirty_surface = True
+        return self