PyScene 1.0.8__tar.gz → 1.1.0__tar.gz

{pyscene-1.0.8 → pyscene-1.1.0}/.gitignore

@@ -10,3 +10,5 @@ dist/
 
 .vscode/
 .idea/
+
+.pyscene/

{pyscene-1.0.8 → pyscene-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: PyScene
-Version: 1.0.8
+Version: 1.1.0
 Summary: A python and pygame Game Engine
 Project-URL: Homepage, https://github.com/sfertig/PyScene
 Project-URL: Issues, https://github.com/sfertig/PyScene/issues
@@ -19,5 +19,5 @@ This is not a pygame wrapper, as it goed beyons the basic helper features and di
 
 Please Note: This engine is still in development and many features, like tilemaps and audio, are a work in progress. It also lack any form of documentation, I ask for patience as docs will be rolled out once the core features are more solidified.
 
-PyScene is in developement and API's may change offten, a fully stable version should come with v2.0.0, currently on v1.0.8
+PyScene is in developement and API's may change offten, a fully stable version should come with v2.0.0, currently on v1.1.0
 

{pyscene-1.0.8 → pyscene-1.1.0}/README.md

@@ -5,5 +5,5 @@ This is not a pygame wrapper, as it goed beyons the basic helper features and di
 
 Please Note: This engine is still in development and many features, like tilemaps and audio, are a work in progress. It also lack any form of documentation, I ask for patience as docs will be rolled out once the core features are more solidified.
 
-PyScene is in developement and API's may change offten, a fully stable version should come with v2.0.0, currently on v1.0.8
+PyScene is in developement and API's may change offten, a fully stable version should come with v2.0.0, currently on v1.1.0
 

{pyscene-1.0.8 → pyscene-1.1.0}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["hatchling >= 1.26"]
 build-backend = "hatchling.build"
 [project]
 name = "PyScene"
-version = "1.0.8"
+version = "1.1.0"
 authors = [
   { name="Sam Fertig", email="sfertig007@gmail.com" },
 ]

{pyscene-1.0.8 → pyscene-1.1.0}/src/PyScene/Game.py

@@ -1,5 +1,6 @@
 import pygame
 import sys
+import os
 
 from .Keys import Keys
 from .Math import Vector2D
@@ -59,6 +60,13 @@ class _game:
         #other flags
         self.always_global = False
 
+        self.__check_dir_files()
+
+    def __check_dir_files(self): #check and create dir and files
+        if os.path.exists(".pyscene"): return
+        os.mkdir(".pyscene")
+        os.mkdir(".pyscene/tilemaps")
+
 
     def _queue_add(self, obj): 
         if self.active_scene is None: self.queue_creation.append(obj)
@@ -137,7 +145,8 @@ class _game:
         if _clear: self.screen.fill(self.bg)
         #render call
         if self.active_scene is None: 
-            for obj in self.render_queue: obj.render()
+            for obj in self.render_queue: 
+                if obj.visible: obj.render()
         #render scene
         else: 
             self.active_scene.render()
@@ -212,7 +221,8 @@ class Scene:
         _length = len(self._objects)+len(Game.objects)
         if _length != len(self._render_queue): self.__update_render_queue()
         #render
-        for obj in self._render_queue: obj.render()
+        for obj in self._render_queue: 
+            if obj.visible: obj.render()
 
     def _queue_add(self, obj): self.queue_creation.append(obj)
     def _queue_remove(self, obj): self.queue_del.append(obj)

{pyscene-1.0.8 → pyscene-1.1.0}/src/PyScene/__init__.py

@@ -1,6 +1,6 @@
 #imports
 "PyScene is a custom python + pygame framework / engine developed to streamline 2d game development."
-"Version: 1.0.8"
+"Version: 1.0.9"
 
 from .Game import Game, Scene, handle_collision
 from .Math import *
@@ -27,6 +27,7 @@ __all__ = [
     "Text",
     "Image",
     "Timer",
+    "Tilemap",
 
     "Animation",
     "AnimationManager",

pyscene-1.1.0/src/PyScene/__main__.py

@@ -0,0 +1,24 @@
+import sys
+import os
+
+def main():
+    args = sys.argv[1:]
+    if not args:
+        print("PyScene CLI Tools")
+        print("Usage:")
+        print("  python -m PyScene manager   - Launch tilemap & asset manager GUI")
+        #print("  python -m PyScene clean     - Scan and remove orphaned engine files")
+        return
+
+    command = args[0].lower()
+    
+    if command == "manager":
+        # Import and launch the PyGame GUI manager
+        #from PyScene.tools.manager_gui import launch_manager
+        #launch_manager()
+        pass
+    else:
+        print(f"Unknown PyScene command: '{command}'")
+
+if __name__ == "__main__":
+    main()

{pyscene-1.0.8 → pyscene-1.1.0}/src/PyScene/objs/GameObj.py

@@ -3,7 +3,7 @@ from ..Math import Vector2D
 from ..Game import Game
 
 class GameObj: #this will be the base class of every game obj
-    def __init__(self, pos, z_index=0, active=True, visible=True, Global=False):
+    def __init__(self, pos=Vector2D(0, 0), z_index=0, active=True, visible=True, Global=False):
         self.pos: Vector2D = pos
         self.vel: Vector2D = Vector2D(0, 0)
         self.z_index = z_index

{pyscene-1.0.8 → pyscene-1.1.0}/src/PyScene/objs/Shapes.py

@@ -17,7 +17,6 @@ class Rect(GameObj):
         if self.pos.to_int() != self.rect.topleft: self.rect.topleft = self.pos.to_int()
 
     def render(self):
-        if not self.visible: return
         Game.cam.draw_rect(self.rect, self.color, self.width, self.offset)
 
 class Circle(GameObj):
@@ -29,7 +28,6 @@ class Circle(GameObj):
         self.offset = offset
 
     def render(self):
-        if not self.visible: return
         Game.cam.draw_circle(self.pos, self.radius, self.color, self.width, self.offset)
 
 class Line(GameObj):
@@ -41,5 +39,4 @@ class Line(GameObj):
         self.offset = offset
 
     def render(self): 
-        if not self.visible: return
         Game.cam.draw_line(self.pos, self.end, self.color, self.width, self.offset)

{pyscene-1.0.8 → pyscene-1.1.0}/src/PyScene/objs/Text.py

@@ -35,8 +35,9 @@ class Text(GameObj):
         self.rect = self.surface.get_rect(**{self.align: self.pos})
 
     def render(self):
-        if not self.visible: return
         Game.cam.draw_text(self.surface, self.rect, self.offset)
+    def render_to(self, surface):
+        surface.blit(self.surface, self.rect)
 
 class Image(GameObj):
     def __init__(self, image, pos=Vector2D(0, 0), z_index=0, active=True, visible=True, offset=True, Global=False):
@@ -45,6 +46,7 @@ class Image(GameObj):
         self.offset = offset
 
     def render(self):
-        if not self.visible: return
         Game.cam.draw_image(self.image, self.pos, self.offset)
+    def render_to(self, surface):
+        surface.blit(self.image, self.pos.to_int())
 

pyscene-1.1.0/src/PyScene/objs/Tilemap.py

@@ -0,0 +1,91 @@
+import os
+import json
+from ..Game import Game
+import pygame
+from .GameObj import GameObj
+from ..Math import Vector2D
+from ..utils import SubScreen
+
+class Tilemap(GameObj):
+    def __init__(self, name, tileset, size=16, z_index=0, active=True, visible=True, Global=False ):
+        super().__init__(Vector2D(0, 0), z_index, active, visible, Global)
+        self.name = name
+        self.tileset: dict[list[int], pygame.surface.Surface] = tileset
+        self.size: int = size
+
+        self.tilemap: dict[list[int], list[int]] = {}
+        self.dirty = True #set to true to load from file
+
+        self.subscreen = SubScreen(0, 0, Game.width, Game.height, displaySurface=Game.screen)
+        self.screen = self.subscreen.screen
+
+        self.__init_file()
+
+    def __init_file(self):
+        #create file if not exists
+        if not os.path.exists(f".pyscene/tilemaps/{self.name}.json"):
+            with open(f".pyscene/tilemaps/{self.name}.json", "w") as f:
+                json.dump({}, f)
+        self._load()
+
+    def _save(self):
+        #check tilemap
+        map: dict[str, str] = {}
+        for k, v in self.tilemap.items():
+            key = f"{k[0]}_{k[1]}"
+            value = f"{v[0]}_{v[1]}"
+            map[key] = value
+        #save tilemap
+        with open(f".pyscene/tilemaps/{self.name}.json", "w") as f:
+            json.dump(map, f)
+    def _load(self):
+        with open(f".pyscene/tilemaps/{self.name}.json", "r") as f:
+            data = json.load(f)
+            if data is None: data = {}
+            for k, v in data.items():
+                k = k.split("_")
+                k = (int(k[0]), int(k[1]))
+                v = v.split("_")
+                v = (int(v[0]), int(v[1]))
+                self.tilemap[k] = v
+
+    def update(self):
+        if not self.tilemap:
+            return
+        #determine if we need to re-render tilemap
+        if not self.dirty: return
+
+        self.dirty = False
+        self._save() #save tilemap with changes
+
+        #else update
+        min_x = min(pos[0] for pos in self.tilemap.keys())
+        max_x = max(pos[0] for pos in self.tilemap.keys())
+        min_y = min(pos[1] for pos in self.tilemap.keys())
+        max_y = max(pos[1] for pos in self.tilemap.keys())
+
+        # 1. Determine dimensions (+1 to include the max tile itself)
+        width = (max_x - min_x + 1) * self.size
+        height = (max_y - min_y + 1) * self.size
+
+        self.pos.x = min_x * self.size
+        self.pos.y = min_y * self.size
+
+        # 2. Create the SubScreen matching this exact bounding box
+        # Note: Position this subscreen in world space using (min_x * self.size, min_y * self.size)
+        self.subscreen = SubScreen(min_x * self.size, min_y * self.size, width, height, displaySurface=Game.screen)
+        self.subscreen.clear()
+        self.screen = self.subscreen.screen
+
+        # 3. Bake the tiles by offsetting negative/arbitrary coords to (0, 0)
+
+        for (tile_x, tile_y), tile_id in self.tilemap.items():
+            # Shift coordinates so min_x/min_y lands at local pixel (0, 0)
+            local_x = (tile_x - min_x) * self.size
+            local_y = (tile_y - min_y) * self.size
+            
+            self.screen.blit(self.tileset[tile_id], (local_x, local_y))
+
+    def render(self):
+        Game.screen.blit(self.screen, (self.pos-Game.cam.pos).to_int())
+

{pyscene-1.0.8 → pyscene-1.1.0}/src/PyScene/objs/__init__.py

@@ -4,5 +4,6 @@ from .Text import *
 from .animation import *
 from .Collision_shapes import *
 from .Timer import Timer
+from .Tilemap import *
 
-__all__ = ["GameObj", "Rect", "Circle", "Line", "Text", "Image", "Animation", "AnimationManager", "StaticCollisionRect", "DynamicCollisionRect", "Timer"]
+__all__ = ["GameObj", "Rect", "Circle", "Line", "Text", "Image", "Animation", "AnimationManager", "StaticCollisionRect", "DynamicCollisionRect", "Timer", "Tilemap"]

{pyscene-1.0.8 → pyscene-1.1.0}/src/PyScene/objs/animation.py

@@ -57,16 +57,19 @@ class Animation(GameObj):
     def flip_v(self):
         for i in range(len(self.images)):
             self.images[i] = pygame.transform.flip(self.images[i], False, True)
+        return self
 
     def flip_h(self):
         for i in range(len(self.images)):
             self.images[i] = pygame.transform.flip(self.images[i], True, False)
+        return self
 
     def copy(self):
         return Animation(self.image, self.size, self.fps, self.loop, self.pos, self.z_index, self.active, self.visible, self.offset, self._global)
     def render(self):
-        if not self.visible: return
         Game.cam.draw_image(self.get_image(), self.pos, self.offset)
+    def render_to(self, screen):
+        screen.blit(self.get_image(), self.pos.to_int())
 
 class AnimationManager(GameObj):
     def __init__(self, animations: dict[str, Animation], current_anim=None, z_index=0, active=True, visible=True, offset=True, Global=False):
@@ -101,7 +104,7 @@ class AnimationManager(GameObj):
     def update(self):
         if self.current_anim is None and self.current_anim in self.animations:
             return
-        self.animations[self.current_anim].update(Game.dt)
+        self.animations[self.current_anim].update()
     def get_image(self) -> pygame.Surface:
         if self.current_anim is None and self.current_anim in self.animations:
             return
@@ -112,5 +115,6 @@ class AnimationManager(GameObj):
         return self.animations[self.current_anim]
 
     def render(self):
-        if not self.visible: return
-        self.get_animation().render()
+        self.get_animation().render()
+    def render_to(self, screen):
+        self.get_animation().render_to(screen)

{pyscene-1.0.8 → pyscene-1.1.0}/src/PyScene/utils/Assets.py

@@ -80,9 +80,11 @@ class _assets:
         if sWidth is not None and sHeight is not None:
             image = pygame.transform.scale(image, (sWidth, sHeight))
         self.images[name] = image.convert()
+        return self.images[name]
 
     def new_font(self, name, path, size):
         self.fonts[name] = pygame.font.Font(path, size)
+        return self.fonts[name]
 
     def new_animation(self, name, image, size=16, fps=3, loop=True, rect=None, pos=Vector2D(0, 0), z_index=0, active=True, visible=True, offset=True, Global=False):
         m = image
@@ -94,10 +96,11 @@ class _assets:
         #create image
         self.new_image(name, path, rect, scale, colorKey, sWidth, sHeight)
         #create animation
-        self.new_animation(name, self.images[name], size*scale, fps, loop, pos, z_index, active, visible, offset, Global)
+        return self.new_animation(name, self.images[name], size*scale, fps, loop, pos, z_index, active, visible, offset, Global)
 
     def new_sound(self, name, path):
         self.sounds[name] = pygame.mixer.Sound(path)
+        return self.sounds[name]
 
     def new_tileset(self, path, name, width=16, height=16, scale=1.0, colorkey=None):
         image = pygame.image.load(path).convert_alpha()
@@ -108,6 +111,7 @@ class _assets:
         data, cache = load_tileset(image, width*scale, height*scale)
         self.tilesets[name] = data
         self._tileset_cache_data[name] = cache
+        return self.tilesets[name]
 
     #getters
     def get_image(self, name):
@@ -140,8 +144,6 @@ class _assets:
         else:
             return None
 
-    
-
 Assets = _assets()
 
 def load_tileset(image, width, height):

{pyscene-1.0.8 → pyscene-1.1.0}/src/PyScene/utils/Subscreen.py

@@ -4,7 +4,7 @@ from ..Math import Vector2D
 
 
 class SubScreen:
-    def __init__(self, x, y, w, h, bgColor: None, displaySurface: pygame.Surface = None, parent=None):
+    def __init__(self, x, y, w, h, bgColor = None, displaySurface: pygame.Surface = None, parent=None):
         self.pos = Vector2D(x, y)
         self.dim = Vector2D(w, h)
         self.color = bgColor

pyscene-1.1.0/test.py

@@ -0,0 +1,28 @@
+from src.PyScene import *
+import pygame
+
+
+Game.init(640, 360, "Test - 01", "darkblue", fullscreen=False)
+
+class Player(GameObj):
+    def __init__(self):
+        super().__init__(Vector2D(0, 0), 0)
+        self.rect = Rect(0, 0, 16, 16, "green")
+
+    def update(self):
+        self.vel = (Keys.get_vector(Keys.a, Keys.d, Keys.w, Keys.s, False)*150)*Game.dt
+        self.pos += self.vel
+        self.rect.pos = self.pos
+
+Game.cam.pos.x = -Game.width/2
+Game.cam.pos.y = -Game.height/2
+Player()
+
+Assets.new_tileset("tests/tileset.png", "tileset")
+t = Tilemap("test", Assets.get_tileset("tileset"), 16, -1)
+
+#t.tilemap[(0, 0)] = (1, 0)
+#t.tilemap[(0, 1)] = (1, 1)
+#t.dirty = True
+
+Game.Run(True)

pyscene-1.0.8/test.py

@@ -1,30 +0,0 @@
-from src.PyScene import *
-import pygame
-
-
-Game.init(640, 360, "Test - 01", "darkblue", fullscreen=False)
-
-class player(GameObj):
-    def __init__(self):
-        super().__init__(Vector2D(0, 0), 0)
-        #create animation
-        Assets.new_anim_nIMG("player", 8, 2, "tests/pause.png", (0, 0, 16, 8), colorKey=None, scale=3.0)
-        self.anim = Assets.get_animation("player")
-
-    def update(self):
-        self.pos += (Keys.get_vector(Keys.a, Keys.d, Keys.w, Keys.s, False)*150)*Game.dt
-        self.anim.pos = self.pos #positions stay linked
-
-class Test(Scene):
-    def __init__(self):
-        super().__init__("Test")
-        player()
-
-Test()
-
-Game.Tick()
-print(Game.objects)
-print(Game.active_scene._objects)
-
-Game.Run()
-