batframework 1.0.8a12__tar.gz → 1.0.8a14__tar.gz

{batframework-1.0.8a12/src/batframework.egg-info → batframework-1.0.8a14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batframework
-Version: 1.0.8a12
+Version: 1.0.8a14
 Summary: Pygame framework for making games easier.
 Author-email: Turan Baturay <baturayturan@gmail.com>
 Project-URL: Homepage, https://github.com/TuranBaturay/batFramework

{batframework-1.0.8a12 → batframework-1.0.8a14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "batframework"
-version = "1.0.8a12"
+version = "1.0.8a14"
 description = "Pygame framework for making games easier."
 readme = "README.md"
 classifiers = [ "Programming Language :: Python :: 3", "License :: OSI Approved :: MIT License", "Operating System :: OS Independent",]

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/__init__.py

@@ -8,7 +8,7 @@ from .resourceManager import ResourceManager
 from .fontManager import FontManager
 from .utils import Utils as utils
 from .tileset import Tileset
-from .time import *
+from .timeManager import TimeManager,Timer,SceneTimer
 from .easingController import EasingController
 from .cutscene import Cutscene, CutsceneManager
 from .cutsceneBlocks import *
@@ -17,14 +17,15 @@ import batFramework.transition as transition
 from .action import Action
 from .actionContainer import *
 from .camera import Camera
-from .object import Object
 from .entity import Entity
+from .drawable import Drawable
 from .renderGroup import RenderGroup
 from .dynamicEntity import DynamicEntity
 from .sprite import Sprite
 from .scrollingSprite import ScrollingSprite
 from .particle import *
-from .animatedSprite import AnimatedSprite, Animation
+from .animation import Animation
+from .animatedSprite import AnimatedSprite
 from .character import Character
 from .stateMachine import State, StateMachine
 from .scene import Scene

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/animatedSprite.py

@@ -1,59 +1,11 @@
 import batFramework as bf
 import pygame
 from typing import List, Dict, Tuple, Union, Optional, Self
+from .animation import Animation
 
-
-def search_index(target: int, lst: List[int]) -> int:
-    cumulative_sum = 0
-    for index, value in enumerate(lst):
-        cumulative_sum += value
-        if cumulative_sum >= target:
-            return index
-    return -1
-
-
-class Animation:
-    def __init__(
-        self,
-        name: str
-    ) -> None:
-        self.name = name
-        self.frames: list[pygame.Surface] = []
-        self.frames_flipX : list[pygame.Surface] = []
-        self.duration_list = []
-        self.duration_list_length = 1
-
-    def from_surface(self,surface:pygame.Surface,size : Tuple[int,int])->Self:
-        self.frames         : List[pygame.Surface] = list(bf.utils.split_surface(surface, size).values())
-        self.frames_flipX   : List[pygame.Surface] = list(bf.utils.split_surface(surface, size,func=lambda s : pygame.transform.flip(s,True,False)).values())
-        return self
-
-    def __repr__(self):
-        return f"Animation({self.name})"
-
-    def counter_to_frame(self, counter: Union[float, int]) -> int:
-        if not self.frames : 
-            raise ValueError("Animation has no frames")
-        return search_index(
-            int(counter % self.duration_list_length), self.duration_list
-        )
-
-    def get_frame(self, counter: Union[float, int], flip: bool) -> pygame.Surface:
-        i = self.counter_to_frame(counter)
-        return self.frames_flipX[i] if flip else self.frames[i]
-
-    def set_duration_list(self, duration_list: Union[List[int], int]) -> Self:
-        if isinstance(duration_list, int):
-            duration_list = [duration_list] * len(self.frames)
-        if len(duration_list) != len(self.frames):
-            raise ValueError("duration_list should have values for all frames")
-        self.duration_list = duration_list
-        self.duration_list_length = sum(self.duration_list)
-        return self
-
-class AnimatedSprite(bf.Entity):
-    def __init__(self, size: Optional[Tuple[int, int]] = None) -> None:
-        super().__init__(size, no_surface=True)
+class AnimatedSprite(bf.Drawable):
+    def __init__(self, size: Optional[Tuple[int, int]] = None,*args,**kwargs) -> None:
+        super().__init__(size, no_surface=True,*args,**kwargs)
         self.float_counter: float = 0
         self.animations: Dict[str, Animation] = {}
         self.current_state: Optional[Animation] = None

batframework-1.0.8a14/src/batFramework/animation.py

@@ -0,0 +1,52 @@
+import pygame
+import batFramework as bf
+from typing import List, Dict, Tuple, Union, Optional, Self
+
+
+def search_index(target: int, lst: List[int]) -> int:
+    cumulative_sum = 0
+    for index, value in enumerate(lst):
+        cumulative_sum += value
+        if cumulative_sum >= target:
+            return index
+    return -1
+
+
+class Animation:
+    def __init__(
+        self,
+        name: str
+    ) -> None:
+        self.name = name
+        self.frames: list[pygame.Surface] = []
+        self.frames_flipX : list[pygame.Surface] = []
+        self.duration_list = []
+        self.duration_list_length = 1
+
+    def from_surface(self,surface:pygame.Surface,size : Tuple[int,int])->Self:
+        self.frames         : List[pygame.Surface] = list(bf.utils.split_surface(surface, size).values())
+        self.frames_flipX   : List[pygame.Surface] = list(bf.utils.split_surface(surface, size,func=lambda s : pygame.transform.flip(s,True,False)).values())
+        return self
+
+    def __repr__(self):
+        return f"Animation({self.name})"
+
+    def counter_to_frame(self, counter: Union[float, int]) -> int:
+        if not self.frames : 
+            raise ValueError("Animation has no frames")
+        return search_index(
+            int(counter % self.duration_list_length), self.duration_list
+        )
+
+    def get_frame(self, counter: Union[float, int], flip: bool) -> pygame.Surface:
+        i = self.counter_to_frame(counter)
+        return self.frames_flipX[i] if flip else self.frames[i]
+
+    def set_duration_list(self, duration_list: Union[List[int], int]) -> Self:
+        if isinstance(duration_list, int):
+            duration_list = [duration_list] * len(self.frames)
+        if len(duration_list) != len(self.frames):
+            raise ValueError("duration_list should have values for all frames")
+        self.duration_list = duration_list
+        self.duration_list_length = sum(self.duration_list)
+        return self

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/character.py

@@ -3,9 +3,9 @@ from .stateMachine import State
 from .animatedSprite import AnimatedSprite
 from .dynamicEntity import DynamicEntity
 
-class Character(AnimatedSprite,DynamicEntity):
-    def __init__(self) -> None:
-        super().__init__()
+class Character(DynamicEntity,AnimatedSprite):
+    def __init__(self,*args,**kwargs) -> None:
+        super().__init__(*args,**kwargs)
         self.state_machine = bf.StateMachine(self)
         self.do_setup_animations()
         self.do_setup_states()

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/constants.py

@@ -4,6 +4,8 @@ import pygame
 class Constants:
     SCREEN: pygame.Surface = None
     RESOLUTION: tuple[int, int] = (1280, 720)
+    WIDTH = 1280
+    HEIGHT = 720
     VSYNC = 0
     FLAGS: int = pygame.SCALED | pygame.RESIZABLE
     FPS: int = 60
@@ -18,6 +20,8 @@ class Constants:
     @staticmethod
     def set_resolution(resolution: tuple[int, int]):
         Constants.RESOLUTION = resolution
+        Constants.WIDTH = resolution[0]
+        Constants.HEIGHT = resolution[1]
 
     @staticmethod
     def set_default_cursor(cursor: pygame.Cursor):

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/cutscene.py

@@ -1,5 +1,5 @@
 import batFramework as bf
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING,Self
 
 class CutsceneBlock: ...
 
@@ -75,13 +75,15 @@ class Cutscene:
     def init_blocks(self):
         pass
 
-    def add_blocks(self, *blocks: CutsceneBlock):
+    def add_blocks(self, *blocks: CutsceneBlock)->Self:
         self.cutscene_blocks.extend(blocks)
-
-    def add_end_blocks(self, *blocks: CutsceneBlock):
+        return self
+        
+    def add_end_blocks(self, *blocks: CutsceneBlock)->Self:
         _ = [block.set_parent_cutscene(self) for block in blocks]
         self.end_blocks.extend(blocks)
-
+        return self
+        
     def get_scene_at(self, index):
         return bf.CutsceneManager().manager.scenes[index]
 

batframework-1.0.8a12/src/batFramework/entity.py → batframework-1.0.8a14/src/batFramework/drawable.py

@@ -1,10 +1,10 @@
 from typing import Any, Self
 import pygame
 import batFramework as bf
-from .object import Object
+from .entity import Entity
 
 
-class Entity(Object):
+class Drawable(Entity):
     """
     Basic entity class
     """
@@ -19,6 +19,7 @@ class Entity(Object):
     ) -> None:
         super().__init__()
         self.visible: bool = True
+        self.render_order: int = 0
         self.rect.size = (10, 10) if size is None else size
         self.convert_alpha: bool = convert_alpha
         self.surface_flags: int = surface_flags

batframework-1.0.8a12/src/batFramework/object.py → batframework-1.0.8a14/src/batFramework/entity.py

@@ -7,7 +7,7 @@ if TYPE_CHECKING:
     from .camera import Camera
 
 
-class Object:
+class Entity:
     __count = 0
     __available_uid = set()
     __used_uid = set()
@@ -17,18 +17,17 @@ class Object:
         self.tags: list[str] = []
         self.parent_scene: bf.Scene | None = None
         self.debug_color: tuple | str = "red"
-        self.render_order: int = 0
-        self.uid: int = Object.__count
-        Object.__used_uid.add(self.uid)
+        self.uid: int = Entity.__count
+        Entity.__used_uid.add(self.uid)
 
-        if Object.__available_uid:
-            self.name = Object.__available_uid.pop()
+        if Entity.__available_uid:
+            self.name = Entity.__available_uid.pop()
         else:
-            self.name = Object.__count
-            Object.__count += 1
+            self.name = Entity.__count
+            Entity.__count += 1
 
     def __del__(self):
-        Object.__available_uid.add(self.uid)
+        Entity.__available_uid.add(self.uid)
 
     def set_position(self, x, y) -> Self:
         self.rect.topleft = x, y
@@ -62,11 +61,13 @@ class Object:
         pass
 
     def set_uid(self, uid: int) -> Self:
-        if uid in Object.__used_uid:
+        if uid in Entity.__used_uid:
             print(f"set_uid error : UID '{uid}' is already in use")
             return self
         self.uid = uid
-        Object.__used_uid.add(uid)
+        if uid in Entity.__used_uid:
+            Entity.__used_uid.remove(uid)
+        Entity.__used_uid.add(uid)
         return self
 
     def add_tags(self, *tags) -> Self:
@@ -87,7 +88,7 @@ class Object:
 
     def process_event(self, event: pygame.Event) -> bool:
         """
-        Returns bool : True if the method is blocking (no propagation to next object of the scene)
+        Returns bool : True if the method is blocking (no propagation to next Entity of the scene)
         """
         if event.consumed:
             return
@@ -112,7 +113,7 @@ class Object:
 
     def update(self, dt: float) -> None:
         """
-        Update method to be overriden by subclasses of object (must call do_update and do_reset_actions)
+        Update method to be overriden by subclasses of Entity (must call do_update and do_reset_actions)
         """
         self.do_update(dt)
         self.do_reset_actions()

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/gui/container.py

@@ -174,7 +174,7 @@ class Container(Shape, InteractiveWidget):
             self.paint()
             self.dirty_surface = False
 
-        bf.Entity.draw(self, camera)
+        bf.Drawable.draw(self, camera)
 
         if self.clip_children:
             new_clip = camera.world_to_screen(self.get_padded_rect())

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/gui/debugger.py

@@ -72,7 +72,7 @@ class Debugger(Label):
     def update(self, dt: float) -> None:
         if not self.parent_scene:
             return
-        if self.parent_scene.get_sharedVar("debug_mode") != bf.debugMode.DEBUGGER:
+        if bf.ResourceManager().get_sharedVar("debug_mode") != bf.debugMode.DEBUGGER:
             self.set_visible(False)
             return
         self.set_visible(True)

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/gui/label.py

@@ -37,7 +37,6 @@ class Label(Shape):
         self.text_rect = pygame.FRect(0, 0, 0, 0)
         # text surface (result of font.render)
         self.text_surface: pygame.Surface = pygame.Surface((0, 0))
-        self.do_caching: bool = False
 
         self.show_text_outline: bool = False
 
@@ -54,21 +53,9 @@ class Label(Shape):
         self.set_autoresize(True)
         self.set_font(force=True)
 
-    @staticmethod
-    def clear_cache():
-        Label._text_cache = {}
-
     def __str__(self) -> str:
         return f"Label({repr(self.text)})"
 
-    def enable_caching(self) -> Self:
-        self.do_caching = True
-        return self
-
-    def disable_caching(self) -> Self:
-        self.do_caching = False
-        return self
-
     def set_text_color(self, color) -> Self:
         self.text_color = color
         self.dirty_surface = True
@@ -197,7 +184,6 @@ class Label(Shape):
             self.text_rect.size = self._get_text_rect_required_size()
         res = self.inflate_rect_by_padding((0, 0, *self.text_rect.size)).size
 
-        return res
         return res[0] if self.autoresize_w else self.rect.w, (
             res[1] if self.autoresize_h else self.rect.h
         )
@@ -206,35 +192,26 @@ class Label(Shape):
         return self.text
 
     def _render_font(self, params: dict) -> pygame.Surface:
-        key = tuple(params.values())
-
-        cached_value = Label._text_cache.get(key, None)
 
         if self.draw_mode == bf.drawMode.SOLID:
-            if cached_value is None:
-                params.pop("font_name")
-
-                # save old settings
-                old_italic = self.font_object.get_italic()
-                old_bold = self.font_object.get_bold()
-                old_underline = self.font_object.get_underline()
-
-                # setup font
-                self.font_object.set_italic(self.is_italic)
-                self.font_object.set_bold(self.is_bold)
-                self.font_object.set_underline(self.is_underlined)
-
-                surf = self.font_object.render(**params)
-
-                # reset font
-                self.font_object.set_italic(old_italic)
-                self.font_object.set_bold(old_bold)
-                self.font_object.set_underline(old_underline)
-
-                if self.do_caching:
-                    Label._text_cache[key] = surf
-            else:
-                surf = cached_value
+            params.pop("font_name")
+
+            # save old settings
+            old_italic = self.font_object.get_italic()
+            old_bold = self.font_object.get_bold()
+            old_underline = self.font_object.get_underline()
+
+            # setup font
+            self.font_object.set_italic(self.is_italic)
+            self.font_object.set_bold(self.is_bold)
+            self.font_object.set_underline(self.is_underlined)
+
+            surf = self.font_object.render(**params)
+
+            # reset font
+            self.font_object.set_italic(old_italic)
+            self.font_object.set_bold(old_bold)
+            self.font_object.set_underline(old_underline)
         else:
             params.pop("font_name")
             surf = self.font_object.render(**params)

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/gui/layout.py

@@ -1,8 +1,8 @@
 import batFramework as bf
 from .widget import Widget
 from .constraints.constraints import *
-from typing import Self, TYPE_CHECKING,override
-from abc import ABC,abstractmethod
+from typing import Self, TYPE_CHECKING
+from abc import ABC
 import pygame
 
 if TYPE_CHECKING:

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/gui/root.py

@@ -95,8 +95,6 @@ class Root(InteractiveWidget):
         return self
 
     def do_handle_event(self, event):
-        if not self.parent_scene.get_sharedVar("player_has_control"):
-            return
         if self.focused:
             if event.type == pygame.KEYDOWN:
                 if self.focused.on_key_down(event.key):
@@ -130,8 +128,6 @@ class Root(InteractiveWidget):
 
     def update(self, dt: float) -> None:
         super().update(dt)
-        if not self.parent_scene.get_sharedVar("player_has_control",True):
-            return
         old = self.hovered
         transposed = self.drawing_camera.screen_to_world(pygame.mouse.get_pos())
         self.hovered = self.top_at(*transposed) if self.top_at(*transposed) else None
@@ -145,8 +141,6 @@ class Root(InteractiveWidget):
 
     def draw(self, camera: bf.Camera) -> None:
         super().draw(camera)
-        if not self.parent_scene.get_sharedVar("player_has_control"):
-            return
         if (
             self.parent_scene
             and self.parent_scene.active

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/gui/widget.py

@@ -18,7 +18,7 @@ class WidgetMeta(type):
         return obj
 
 
-class Widget(bf.Entity, metaclass=WidgetMeta):
+class Widget(bf.Drawable, metaclass=WidgetMeta):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self.children: list["Widget"] = []

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/manager.py

@@ -1,23 +1,24 @@
 import batFramework as bf
 import pygame
 import asyncio
-import random
 
 class Manager(bf.SceneManager):
     def __init__(self, *initial_scene_list) -> None:
-        # random.seed("random")
         super().__init__()
-        self._screen: pygame.Surface | None = bf.const.SCREEN
-        self._timeManager = bf.TimeManager()
-        self._cutsceneManager = bf.CutsceneManager()
-        self._cutsceneManager.set_manager(self)
-        self._clock: pygame.Clock = pygame.Clock()
-        self._is_async_running : bool = False
-        self._running = False
+        self.debug_mode: bf.enums.debugMode = bf.debugMode.HIDDEN
+        self.screen: pygame.Surface | None = bf.const.SCREEN
+        self.timeManager = bf.TimeManager()
+        self.cutsceneManager = bf.CutsceneManager()
+        self.cutsceneManager.set_manager(self)
+        self.clock: pygame.Clock = pygame.Clock()
+        self.is_async_running : bool = False
+        self.running = False
         pygame.mouse.set_cursor(bf.const.DEFAULT_CURSOR)
         self.do_pre_init()
         self.init_scenes(*initial_scene_list)
-        self.set_sharedVar("clock", self._clock)
+        bf.ResourceManager().set_sharedVar("clock", self.clock)
+        bf.ResourceManager().set_sharedVar("debug_mode", self.debug_mode)
+
         self.do_init()
 
     @staticmethod
@@ -39,14 +40,14 @@ class Manager(bf.SceneManager):
         print("=" * 50)
         
         # Print the timers information
-        print(self._timeManager)
+        print(self.timeManager)
         
         # End with a visual separator
         print("=" * 50 + "\n")
 
 
     def get_fps(self) -> float:
-        return self._clock.get_fps()
+        return self.clock.get_fps()
 
     def do_init(self) -> None:
         pass
@@ -55,67 +56,67 @@ class Manager(bf.SceneManager):
         pass
 
     def stop(self) -> None:
-        self._running = False
+        self.running = False
 
     async def run_async(self):
-        if self._running:
+        if self.running:
             print("Error : Already running")
             return
-        self._is_async_running = True
-        self._running = True
+        self.is_async_running = True
+        self.running = True
         dt: float = 0
-        while self._running:
+        while self.running:
             for event in pygame.event.get():
                 event.consumed = False
                 self.process_event(event)
                 if not event.consumed:
                     if event.type == pygame.QUIT:
-                        self._running = False
+                        self.running = False
                         break
                     if event.type == pygame.VIDEORESIZE and not (
                         bf.const.FLAGS & pygame.SCALED
                     ):
                         bf.const.set_resolution((event.w, event.h))
             # update
-            dt = self._clock.tick(bf.const.FPS) / 1000
-            # dt = min(dt, 0.02) dirty fix for dt being too high when window not focused for a long time
-            self._timeManager.update(dt)
-            self._cutsceneManager.update(dt)
+            self.timeManager.update(dt)
+            self.cutsceneManager.update(dt)
             self.update(dt)
             # render
-            self._screen.fill((0, 0, 0))
-            self.draw(self._screen)
+            self.screen.fill((0, 0, 0))
+            self.draw(self.screen)
             pygame.display.flip()
+            dt = self.clock.tick(bf.const.FPS) / 1000
+            # dt = min(dt, 0.02) dirty fix for dt being too high when window not focused for a long time
             await asyncio.sleep(0)
         pygame.quit()
 
 
     def run(self) -> None:
-        if self._running:
+        if self.running:
             print("Error : Already running")
             return
-        self._running = True
+        self.running = True
         dt: float = 0
-        while self._running:
+        while self.running:
             for event in pygame.event.get():
                 event.consumed = False
                 self.process_event(event)
                 if not event.consumed:
                     if event.type == pygame.QUIT:
-                        self._running = False
+                        self.running = False
                         break
                     if event.type == pygame.VIDEORESIZE and not (
                         bf.const.FLAGS & pygame.SCALED
                     ):
                         bf.const.set_resolution((event.w, event.h))
             # update
-            dt = self._clock.tick(bf.const.FPS) / 1000
-            # dt = min(dt, 0.02) dirty fix for dt being too high when window not focused for a long time
-            self._timeManager.update(dt)
-            self._cutsceneManager.update(dt)
+            self.timeManager.update(dt)
+            self.cutsceneManager.update(dt)
             self.update(dt)
             # render
-            self._screen.fill((0, 0, 0))
-            self.draw(self._screen)
+            self.screen.fill((0, 0, 0))
+            self.draw(self.screen)
             pygame.display.flip()
+            dt = self.clock.tick(bf.const.FPS) / 1000
+            # dt = min(dt, 0.02) dirty fix for dt being too high when window not focused for a long time
         pygame.quit()

{batframework-1.0.8a12 → batframework-1.0.8a14}/src/batFramework/particle.py

@@ -78,7 +78,7 @@ class DirectionalParticle(BasicParticle):
         super().update_surface()
 
 
-class ParticleGenerator(bf.Entity):
+class ParticleGenerator(bf.Drawable):
     def __init__(self) -> None:
         super().__init__((0, 0))
         self.particles: list[Particle] = []