PyScene 1.1.1__tar.gz → 1.1.2__tar.gz

{pyscene-1.1.1 → pyscene-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: PyScene
-Version: 1.1.1
+Version: 1.1.2
 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.1.1
+PyScene is in developement and API's may change offten, a fully stable version should come with v2.0.0, currently on v1.1.2
 

{pyscene-1.1.1 → pyscene-1.1.2}/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.1.1
+PyScene is in developement and API's may change offten, a fully stable version should come with v2.0.0, currently on v1.1.2
 

{pyscene-1.1.1 → pyscene-1.1.2}/pyproject.toml

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

{pyscene-1.1.1 → pyscene-1.1.2}/src/PyScene/objs/Shapes.py

@@ -19,6 +19,9 @@ class Rect(GameObj):
     def render(self):
         Game.cam.draw_rect(self.rect, self.color, self.width, self.offset)
 
+    def render_to(self, screen):
+        pygame.draw.rect(screen, self.color, self.rect, self.width)
+
 class Circle(GameObj):
     def __init__(self, x, y, r, color, z_index=0, width=0, active=True, visible=True, offset=True, Global=False):
         super().__init__(Vector2D(x, y), z_index, active, visible, Global)
@@ -30,6 +33,9 @@ class Circle(GameObj):
     def render(self):
         Game.cam.draw_circle(self.pos, self.radius, self.color, self.width, self.offset)
 
+    def render_to(self, screen):
+        pygame.draw.circle(screen, self.color, self.pos.to_int(), self.radius, self.width)
+
 class Line(GameObj):
     def __init__(self, x1, y1, x2, y2, color, z_index=0, width=1, active=True, visible=True, offset=True, Global=False):
         super().__init__(Vector2D(x1, y1), z_index, active, visible, Global)
@@ -40,3 +46,5 @@ class Line(GameObj):
 
     def render(self): 
         Game.cam.draw_line(self.pos, self.end, self.color, self.width, self.offset)
+    def render_to(self, screen):
+        pygame.draw.line(screen, self.color, self.pos.to_int(), self.end.to_int(), self.width)

{pyscene-1.1.1 → pyscene-1.1.2}/src/PyScene/objs/Text.py

@@ -30,9 +30,9 @@ class Text(GameObj):
             self.text = new_text
             self._update_surface()
 
-    def set_pos(self, new_pos):
+    def set_pos(self, new_pos: Vector2D):
         self.pos = new_pos
-        self.rect = self.surface.get_rect(**{self.align: self.pos})
+        self.rect = self.surface.get_rect(**{self.align: self.pos.to_int()})
 
     def render(self):
         Game.cam.draw_text(self.surface, self.rect, self.offset)

pyscene-1.1.2/src/PyScene/tools/manager_gui.py

@@ -0,0 +1,260 @@
+import pygame
+import os
+import json
+
+from ..Game import Game, Scene
+from ..utils import SubScreen
+from ..Math import Vector2D
+from ..Keys import Keys
+from ..objs import *
+
+class GUI(Scene):
+    def __init__(self):
+        super().__init__("GUI")
+        Text(pygame.font.Font(None, 25), "PyScene Tilemaps:", (141, 144, 148), Vector2D(10, 10), "topleft", 1)
+        Rect(Game.width-200, 35, 190, Game.height-40, (35, 35, 35), 0, 5)
+        Text(pygame.font.Font(None, 25), "Tilemap Options:", (141, 144, 148), Vector2D(Game.width-200, 10), "topleft", 1)
+        FileWin()
+
+
+class ManagerGUI:
+    def __init__(self):
+        Game.init(640, 360, "PyScene Tilemap Manager GUI", (53, 56, 59))
+        GUI()
+        Game.Run()
+
+class FileWin(GameObj):
+    def __init__(self):
+        super().__init__(Vector2D(10, 35), 1)
+        self.subscreen = SubScreen(10, 35, 200, Game.height-40, (35, 35, 35), Game.screen)
+        self.screen = self.subscreen.screen
+
+        self.files: list[FileDefined] = []
+        self.__load()
+
+    def __load(self):
+        y = 10
+        #scan the files in .pyscene/tilemaps
+        for file in os.listdir(".pyscene/tilemaps"):
+            name = file.split(".")[0]
+            self.files.append(FileDefined(y, name))
+            y += self.files[-1].rect.height+5
+
+    def update(self):
+        for file in self.files:
+            file.update(self.subscreen)
+        for file in self.files:
+            if file.RESET:
+                self.files.clear()
+                self.__load()
+        #using mouse wheel to scroll through files, or arrow keys
+        change = 0
+        for event in Game.events:
+            if event.type == pygame.MOUSEWHEEL: change = event.y
+        if Keys.is_held(Keys.down): change = 1
+        elif Keys.is_held(Keys.up): change = -1
+        change*=5
+        if change != 0:
+            for file in self.files:
+                file.move_y(change)
+
+
+    def render(self):
+        self.subscreen.clear()
+        for file in self.files:
+            file.render(self.subscreen.screen)
+        self.subscreen.render()
+
+class FileDefined():
+    def __init__(self, y, name, w=150, h=30):
+        self.pos = Vector2D(25, y)
+        self.name = name
+        self.rect = pygame.Rect(self.pos.x, self.pos.y, w, h)
+        self.text = Text(pygame.font.Font(None, 25), self.name, (141, 144, 148), Vector2D(self.rect.centerx, self.rect.centery), "center", 1, visible=False)
+        self.w = 3
+        self.hovered = False
+        self.selected = False
+
+        self.RESET = False
+
+        self.options: FileOptions = None
+
+    def move_y(self, addition):
+        self.pos.y += addition
+        self.rect.y += addition
+        self.text.set_pos(Vector2D(self.text.pos.x, self.text.pos.y+addition))
+
+    def update(self, sub: SubScreen):
+        if not self.selected:
+            mpos = sub.local_mouse_pos().to_int()
+            self.hovered = self.rect.collidepoint(mpos)
+            if self.hovered: self.w = 5
+            else: self.w = 3 
+            if Game.click and self.hovered:
+                self.selected = True
+                self.w = 0
+                self.options = FileOptions(self.name)
+                return
+        else: #selected
+            if (Game.click and sub.screen.get_rect().collidepoint(pygame.mouse.get_pos())) or (Keys.is_pressed(Keys.escape) and self.options.renameWidth == 2):
+                self.selected = False
+                self.w = 3
+                self.options._destroy()
+                self.options = None
+            else:
+                if self.options.RENAME:
+                    new = self.options.renameName.text
+                    old = self.name
+                    self.name = new
+                    self.text.set_text(new)
+                    self.options.RENAME = False
+                    self.options.renameName.set_text("")
+                    self.options.name.set_text(f"Name: {new}")
+                    #rename file
+                    os.rename(f".pyscene/tilemaps/{old}.json", f".pyscene/tilemaps/{new}.json")
+                elif self.options.DUPE:
+                    self.options.DUPE = False
+                    self.RESET = True
+                    #duplicate file
+                    with open(f".pyscene/tilemaps/{self.name}.json", "r") as f:
+                        data = json.load(f)
+                    with open(f".pyscene/tilemaps/{self.name}_copy.json", "w") as f:
+                        json.dump(data, f)
+                    self.options._destroy()
+                elif self.options.DEL:
+                    self.options.DEL = False
+                    self.RESET = True
+                    #delete file
+                    os.remove(f".pyscene/tilemaps/{self.name}.json")
+                    self.options._destroy()
+
+
+    def render(self, screen):
+        pygame.draw.rect(screen, (0, 0, 0), self.rect, self.w)
+        self.text.render_to(screen)
+
+class FileOptions(GameObj):
+    def __init__(self, name):
+        super().__init__(Vector2D(Game.width-200, 35), 1)
+        self.sub = SubScreen(Game.width-200, 35, 190, Game.height-40, (35, 35, 35), Game.screen)
+
+        #name text and details
+        self.name = Text(pygame.font.Font(None, 25), f"Name: {name}", (141, 144, 148), Vector2D(5, 10), "topleft", 1, visible=False)
+        self.line = Line(5, 30, self.sub.screen.get_rect().width-10, 30, (0, 0, 0), 1, visible=False)
+        #rename
+        self.renameText = Text(pygame.font.Font(None, 25), "Rename:", (141, 144, 148), Vector2D(5, 40), "topleft", 1, visible=False)
+        self.renameRect = pygame.Rect(10, 60, self.sub.screen.get_rect().width-20, 30)
+        self.renameWidth = 2
+        self.renameName = Text(pygame.font.Font(None, 25), "", (141, 144, 148), Vector2D(self.renameRect.centerx, self.renameRect.centery), "center", 1, visible=False)
+        self.RENAME = False
+        self.renameLine = Line(5, 100, self.sub.screen.get_rect().width-10, 100, (0, 0, 0), 1, visible=False)
+        #dupe
+        self.dupeRect = pygame.Rect(10, 110, self.sub.screen.get_rect().width-20, 30)
+        self.dupeWidth = 2
+        self.dupeText = Text(pygame.font.Font(None, 25), "Duplicate", (141, 144, 148), Vector2D(self.dupeRect.centerx, self.dupeRect.centery), "center", 1, visible=False)
+        self.DUPE = False
+        self.dupeLine = Line(5, 150, self.sub.screen.get_rect().width-10, 150, (0, 0, 0), 1, visible=False)
+        #del
+        self.delRect = pygame.Rect(10, 160, self.sub.screen.get_rect().width-20, 30)
+        self.delWidth = 2
+        self.delText = Text(pygame.font.Font(None, 25), "Delete", (141, 144, 148), Vector2D(self.delRect.centerx, self.delRect.centery), "center", 1, visible=False)
+        self.DEL = False
+        self.DELCHECK = False
+        self.delCnf_rect = pygame.Rect(30, 200, self.sub.screen.get_rect().width-60, 30)
+        self.delCnf_text = Text(pygame.font.Font(None, 25), "Confirm", (141, 144, 148), Vector2D(self.delCnf_rect.centerx, self.delCnf_rect.centery), "center", 1, visible=False)
+        self.delDnf_width = 2
+
+    def update(self):
+        #rename
+        if Game.click:
+            mpos = self.sub.local_mouse_pos().to_int()
+            if self.renameRect.collidepoint(mpos):
+                self.renameWidth = 5
+            else:
+                self.renameWidth = 2
+        elif Keys.is_pressed(Keys.escape):
+            if self.renameWidth == 5:
+                self.renameWidth = 2
+        if self.renameWidth == 5:
+            text = self.renameName.text
+            done = False
+            for event in Game.events:
+                if event.type == pygame.KEYDOWN:
+                    if event.key == pygame.K_BACKSPACE:
+                        text = text[:-1]
+                    elif event.key == pygame.K_RETURN:
+                        if len(text) > 0: done = True
+                    else:
+                        if len(text) > 15: continue
+                        text += event.unicode
+            self.renameName.set_text(text)
+            if done: 
+                self.RENAME = True
+                self.renameWidth = 2
+        #dupe
+        mpos = self.sub.local_mouse_pos().to_int()
+        if self.dupeRect.collidepoint(mpos):
+            self.dupeWidth = 5
+        else:
+            self.dupeWidth = 2
+        if self.dupeWidth == 5 and Game.click:
+            self.DUPE = True
+
+        #del
+        mpos = self.sub.local_mouse_pos().to_int()
+        if self.delRect.collidepoint(mpos):
+            self.delWidth = 5
+        else:
+            self.delWidth = 2
+        if self.delWidth == 5 and Game.click:
+            self.DELCHECK = True
+            return
+
+        if self.DELCHECK:
+            mpos = self.sub.local_mouse_pos().to_int()
+            if self.delCnf_rect.collidepoint(mpos):
+                self.delDnf_width = 5
+            else:
+                self.delDnf_width = 2
+            if self.delDnf_width == 5 and Game.click:
+                self.DEL = True
+            elif Keys.is_pressed(Keys.escape) or Game.click:
+                self.DELCHECK = False
+
+    def render(self):
+        self.sub.clear()
+
+        self.name.render_to(self.sub.screen)
+        self.line.render_to(self.sub.screen)
+
+        self.renameText.render_to(self.sub.screen)
+        pygame.draw.rect(self.sub.screen, (0, 0, 0), self.renameRect, self.renameWidth)
+        self.renameName.render_to(self.sub.screen)
+        self.renameLine.render_to(self.sub.screen)
+
+        pygame.draw.rect(self.sub.screen, (0, 0, 0), self.dupeRect, self.dupeWidth)
+        self.dupeText.render_to(self.sub.screen)
+        self.dupeLine.render_to(self.sub.screen)
+
+        pygame.draw.rect(self.sub.screen, (0, 0, 0), self.delRect, self.delWidth)
+        self.delText.render_to(self.sub.screen)
+
+        if self.DELCHECK:
+            pygame.draw.rect(self.sub.screen, (173, 103, 85), self.delCnf_rect, self.delDnf_width)
+            self.delCnf_text.render_to(self.sub.screen)
+
+        self.sub.render()
+
+    def _destroy(self): #destroys self and all objects used
+        self.destroy()
+        self.name.destroy()
+        self.line.destroy()
+        self.renameText.destroy()
+        self.dupeText.destroy()
+        self.renameLine.destroy()
+        self.dupeLine.destroy()
+        self.delText.destroy()
+        self.delCnf_text.destroy()
+
+
+

pyscene-1.1.1/src/PyScene/tools/manager_gui.py

@@ -1,10 +0,0 @@
-import pygame
-
-from ..Game import Game
-from ..utils import SubScreen
-
-class ManagerGUI:
-    def __init__(self):
-        Game.init(640, 360, "PyScene Tilemap Manager GUI", "darkblue")
-        Game.Run(True)
-