batframework 1.0.8a1__py3-none-any.whl → 1.0.8a2__py3-none-any.whl

batFramework/animatedSprite.py

@@ -2,6 +2,7 @@ import batFramework as bf
 import pygame
 
 
+
 def search_index(target, lst):
     cumulative_sum = 0
     for index, value in enumerate(lst):
@@ -12,156 +13,105 @@ def search_index(target, lst):
 
 
 class AnimState:
-    def __init__(
-        self,
-        name: str,
-        surface: pygame.Surface,
-        width,
-        height,
-        duration_list: list | int,
-    ) -> None:
-        self.frames: list[pygame.Surface] = list(
-            bf.utils.split_surface(
-                surface, width, height, False, convert_alpha
-            ).values()
-        )
-        self.frames_flipX: list[pygame.Surface] = list(
-            bf.utils.split_surface(surface, width, height, True, convert_alpha).values()
+    def __init__(self, file, width, height, frame_length_list:list|int) -> None:
+        self.frames: list[pygame.Surface] = bf.utils.img_slice(file, width, height)
+        self.frames_flipX: list[pygame.Surface] = bf.utils.img_slice(
+            file, width, height, True
         )
 
-        self.name = name
-        self.duration_list: list[int] = []
-        self.duration_list_length = 0
-        self.set_duration_list(duration_list)
+        self.frame_length_list = []
+        self.ffl_length = 0
+        self.set_frame_length_list(frame_length_list)
 
-    def __repr__(self):
-        return f"AnimState({self.name})"
-
-    def counter_to_frame(self, counter: float | int) -> int:
-        return search_index(
-            int(counter % self.duration_list_length), self.duration_list
-        )
+    def get_frame_index(self, counter:float|int):
+        return search_index(int(counter % self.ffl_length), self.frame_length_list)
 
     def get_frame(self, counter, flip):
-        i = self.counter_to_frame(counter)
+        i = self.get_frame_index(counter)
         return self.frames_flipX[i] if flip else self.frames[i]
 
-    def set_duration_list(self, duration_list: list[int] | int):
-        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)
-
+    def set_frame_length_list(self,frame_length_list:list[int]|int):
+        if isinstance(frame_length_list,int):
+            frame_length_list = [frame_length_list] * len(self.frames)
+        if len(frame_length_list) != len(self.frames) : 
+            raise ValueError("frame_length_list should have values for all frames")
+        self.frame_length_list = frame_length_list
+        self.ffl_length = sum(self.frame_length_list)
+        
 
 class AnimatedSprite(bf.DynamicEntity):
     def __init__(self, size=None) -> None:
         super().__init__(size, no_surface=True)
-        self.float_counter: float = 0
+        self.float_counter = 0
         self.animStates: dict[str, AnimState] = {}
-        self.current_state: AnimState | None = None
+        self.current_animState :str = ""
         self.flipX = False
         self._locked = False
-        self.paused: bool = False
-
-    def pause(self) -> None:
-        self.paused = True
-
-    def resume(self) -> None:
-        self.paused = False
 
-    def toggle_pause(self) -> None:
-        self.paused = not self.paused
-
-    def set_counter(self, value: float) -> None:
+    def set_counter(self,value:float):
         self.float_counter = value
+        
 
-    def set_frame(self, frame_index: int) -> None:
-        if not self.current_state:
-            return
-        total = sum(self.current_state.duration_list)
-        frame_index = max(0, min(total, frame_index))
-        new_counter = 0
-        i = 0
-        while frame_index < total:
-            if self.current_state.counter_to_frame(new_counter) >= frame_index:
-                break
-            new_counter += self.current_state.duration_list[i]
-            i += 1
-        self.set_counter(new_counter)
-
-    def lock(self) -> None:
+    def lock_animState(self):
         self._locked = True
 
-    def unlock(self) -> None:
+    def unlock_animState(self):
         self._locked = False
 
-    def set_flipX(self, value) -> None:
+    def set_flipX(self, value):
         self.flipX = value
 
-    def remove_animState(self, name: str) -> bool:
-        if not name in self.animStates:
-            return False
-        self.animStates.pop(name)
-        if self.current_state and self.current_state.name == name:
-            self.current_animState = (
-                list(self.animStates.keys())[0] if self.animStates else ""
-            )
-        return True
+    def remove_animState(self, name:str):
+        if not name in self.animStates :return
+        self.animStates.pop(name) 
+        if self.current_animState == name : self.current_animState = list(self.animStates.keys())[0] if self.animStates else "" 
 
     def add_animState(
-        self,
-        name: str,
-        surface: pygame.Surface,
-        size: tuple[int, int],
-        duration_list: list[int],
-        convert_alpha: bool = True,
-    ) -> bool:
+        self, name: str, file: str, size: tuple[int, int], frame_length_list: list[int]
+    ):
         if name in self.animStates:
-            return False
-        self.animStates[name] = AnimState(name, surface, *size, duration_list)
-        if len(self.animStates) == 1:
-            self.set_animState(name)
-        return True
+            return
+        self.animStates[name] = AnimState(file, *size, frame_length_list)
+        if len(self.animStates) == 1 : self.set_animState(name)
 
-    def set_animState(self, state: str, reset_counter=True, lock=False) -> bool:
+    def set_animState(self, state:str, reset_counter=True, lock=False):
         if state not in self.animStates or self._locked:
             return False
-
-        animState = self.animStates[state]
-        self.current_state = animState
-
-        self.rect = self.current_state.frames[0].get_frect(center=self.rect.center)
-
-        if reset_counter or self.float_counter > sum(animState.duration_list):
+        self.current_animState = state
+        self.rect = (
+            self.animStates[self.current_animState]
+            .frames[0]
+            .get_frect(center=self.rect.center)
+        )
+        if reset_counter or self.float_counter > sum(
+            self.get_state().frame_length_list
+        ):
             self.float_counter = 0
         if lock:
-            self.lock()
+            self.lock_animState()
         return True
 
-    def get_animState(self) -> AnimState | None:
-        return self.current_state
+    def get_state(self):
+        return self.animStates.get(self.current_animState,None)
 
-    def update(self, dt: float) -> None:
-        s = self.get_animState()
-        if not self.animStates or s is None:
-            return
-        if not self.paused:
-            self.float_counter += 60 * dt
-            if self.float_counter > s.duration_list_length:
-                self.float_counter = 0
+    def get_frame_index(self):
+        return self.animStates[self.current_animState].get_frame_index(
+            self.float_counter
+        )
+
+    def update(self, dt: float):
+        if not self.animStates : return
+        self.float_counter += 60 * dt
+        if self.float_counter > self.get_state().ffl_length:
+            self.float_counter = 0
         self.do_update(dt)
 
-    def draw(self, camera: bf.Camera) -> int:
-        if (
-            not self.visible
-            or not camera.rect.colliderect(self.rect)
-            or not self.current_state
-        ):
-            return 0
+    def draw(self, camera: bf.Camera) -> bool:
+        if not self.visible or not camera.intersects(self.rect) or not self.animStates:
+            return False
+        # pygame.draw.rect(camera.surface,"purple",camera.transpose(self.rect).move(2,2))
         camera.surface.blit(
-            self.current_state.get_frame(self.float_counter, self.flipX),
-            camera.world_to_screen(self.rect),
+            self.get_state().get_frame(self.float_counter, self.flipX),
+            camera.transpose(self.rect),
         )
-        return 1
+        return True

batFramework/audioManager.py

@@ -5,26 +5,24 @@ pygame.mixer.init()
 
 
 class AudioManager(metaclass=bf.Singleton):
-    def __init__(self) -> None:
-        self.sounds: dict = {}
-        self.musics: dict = {}
-        self.current_music: str | None = None
-        self.music_volume: float = 1
-        self.sound_volume: float = 1
+    def __init__(self):
+        self.sounds: dict[str : dict[str, pygame.mixer.Sound, bool]] = {}
+        self.musics: dict[str:str] = {}
+        self.current_music = None
+        self.music_volume = 1
+        self.sound_volume = 1
         pygame.mixer_music.set_endevent(bf.const.MUSIC_END_EVENT)
 
-    def free_sounds(self, force: bool = False):
+    def free_sounds(self, force=False):
         if force:
             self.sounds = {}
             return
-        self.sounds: dict = {
-            key: value for key, value in self.sounds.items() if value["persistent"]
-        }
+        to_remove = []
+        for name, data in self.sounds.items():
+            if not data["persistent"]:
+                to_remove.append(name)
 
-    def free_music(self):
-        if self.current_music:
-            pygame.mixer.music.unload(self.current_music)
-            
+        _ = [self.sounds.pop(i) for i in to_remove]
 
     def set_sound_volume(self, volume: float):
         self.sound_volume = volume
@@ -33,19 +31,13 @@ class AudioManager(metaclass=bf.Singleton):
         self.music_volume = volume
         pygame.mixer_music.set_volume(volume)
 
-    def get_music_volume(self) -> float:
-        return self.music_volume
-
-    def get_sound_volume(self) -> float:
-        return self.sound_volume
-
-    def has_sound(self, name: str):
+    def has_sound(self, name):
         return name in self.sounds
 
     def load_sound(self, name, path, persistent=False) -> pygame.mixer.Sound:
         if name in self.sounds:
             return self.sounds[name]["sound"]
-        path = bf.ResourceManager().get_path(path)
+        path = bf.utils.get_path(path)
         self.sounds[name] = {
             "path": path,
             "sound": pygame.mixer.Sound(path),
@@ -53,57 +45,24 @@ class AudioManager(metaclass=bf.Singleton):
         }
         return self.sounds[name]["sound"]
 
-    def load_sounds(self, sound_data_list: list[tuple[str, str, bool]]) -> None:
-        for data in sound_data_list:
-            self.load_sound(*data)
-        return
-
-    def play_sound(self, name, volume=1) -> bool:
-        """
-        Play the sound file with the given name.
-        returns True if the sound was played
-
-        """
-        try:
-            self.sounds[name]["sound"].set_volume(volume * self.sound_volume)
-            self.sounds[name]["sound"].play()
-            return True
-        except KeyError:
-            # print(f"Sound '{name}' not loaded in AudioManager.")
-            return False
-
-    def stop_sound(self, name) -> bool:
-        try:
+    def play_sound(self, name, volume=1):
+        self.sounds[name]["sound"].set_volume(volume * self.sound_volume)
+        self.sounds[name]["sound"].play()
+
+    def stop_sound(self, name):
+        if name in self.sounds:
             self.sounds[name]["sound"].stop()
-            return True
-        except KeyError:
-            return False
-            # print(f"Sound '{name}' not loaded in AudioManager.")
 
     def load_music(self, name, path):
-        self.musics[name] = bf.ResourceManager().get_path(path)
-        return
-
-    def load_musics(self, music_data_list: list[tuple[str, str]]):
-        for data in music_data_list:
-            self.load_music(*data)
-        return
-
-    def play_music(self, name, loop=0, fade=500) -> bool:
-        """
-        Play the sound file with the given 'name'.
-        Fades with the given 'fade' time in ms.
-        Music will loop 'loop' times (indefinitely if -1).
-        returns True if the sound was played
-        """
-        try:
+        self.musics[name] = bf.utils.get_path(path)
+
+    def play_music(self, name, loop=0, fade=500):
+        if name in self.musics:
             pygame.mixer_music.load(self.musics[name])
             pygame.mixer_music.play(loop, fade_ms=fade)
             self.current_music = name
-            return True
-        except KeyError:
-            return False
-            # print(f"Music '{name}' not loaded in AudioManager.")
+        else:
+            print(f"Music '{name}' not found in AudioManager.")
 
     def stop_music(self):
         if not self.current_music:
@@ -124,6 +83,3 @@ class AudioManager(metaclass=bf.Singleton):
         if not self.current_music:
             return
         pygame.mixer_music.unpause()
-
-    def get_current_music(self) -> str | None:
-        return self.current_music