e2D 1.4.15__py3-none-any.whl → 1.4.17__py3-none-any.whl

e2D/envs.py

@@ -38,7 +38,7 @@ class RootEnv:
     def __init__(self,
                  screen_size : Vector2D = Vector2D(1920, 1080),
                  target_fps : int = 60,
-                 show_fps = True,
+                 show_fps : bool = True,
                  quit_on_key_pressed : None|int = pg.K_x,
                  vsync : bool = True,
                  window_flags : int = pg.DOUBLEBUF,
@@ -59,12 +59,11 @@ class RootEnv:
         self.current_frame = 0
         self.show_fps = show_fps
         self.events :list[pg.event.Event]= []
-        self.background_color = rgb(0,0,0)
+        self.background_color = BLACK_COLOR_PYG
         self.clear_screen_each_frame = clear_screen_each_frame
         self.utils :dict[int|str, Util]= {}
         self.selected_util :Util|None = None
         self.__quit_on_key_pressed__ = quit_on_key_pressed
-    
 
     @property
     def screen_size(self) -> Vector2D:
@@ -72,6 +71,7 @@ class RootEnv:
 
     @screen_size.setter
     def screen_size(self, new_size:Vector2D) -> None:
+        self.__screen_size__ = new_size
         self.screen = pg.display.set_mode(self.__screen_size__(), vsync=self.__vsync__, flags=self.__flags__)
 
     @property
@@ -81,22 +81,23 @@ class RootEnv:
     def get_teoric_max_fps(self) -> float:
         rawdelta = self.clock.get_rawtime()
         return (1000 / rawdelta) if rawdelta != 0 else 1
-    
+
     def update_screen_mode(self, vsync:None|bool=None, flags=None) -> None:
-        pass
-    
+        self.__vsync__ = vsync
+        self.__flags__ = flags
+
     def sleep(self, seconds:int|float, precise_delay=False) -> None:
         if precise_delay:
             pg.time.delay(seconds * 1000)
         else:
             pg.time.wait(seconds * 1000)
-    
+
     def add_utils(self, *utils:Util) -> None:
         for util in utils:
             if util.surface == None: util.surface = self.screen
             util.rootEnv = self
             self.utils[util.id] = util
-    
+
     def remove_utils(self, *utils:int|str|Util) -> None:
         for uid in utils:
             if uid in self.utils:
@@ -105,29 +106,29 @@ class RootEnv:
                 del self.utils[uid.id]
             else:
                 raise Exception(f"Unknown util type: {uid}")
-    
+
     @property
     def runtime_seconds(self) -> float:
         return pg.time.get_ticks() / 1e3
-    
+
     def init(self, sub_env:DefEnv) -> None:
         self.env = sub_env
-    
+
     def clear(self) -> None:
         self.screen.fill(self.background_color)
-    
+
     def clear_rect(self, position:Vector2D, size:Vector2D) -> None:
         self.screen.fill(self.background_color, position() + size())
-    
+
     def print(self, 
             text : str, 
             position : Vector2D, 
-            color : tuple[float,float,float] = (255,255,255), 
+            color : pg.color.Color = WHITE_COLOR_PYG,
             pivot_position : __LITERAL_PIVOT_POSITIONS__ = "top_left",
             font : pg.font.Font = FONT_ARIAL_32,
-            bg_color : None|tuple[int,int,int]|list[int] = None,
-            border_color : None|tuple[int,int,int]|list[int] = (255,255,255),
-            border_width : float = 0,
+            bg_color : None|pg.color.Color = None,
+            border_color : pg.color.Color = WHITE_COLOR_PYG,
+            border_width : float = 0.0,
             border_radius : int|list[int]|tuple[int,int,int,int] = -1,
             margin : Vector2D = Vector2D.zero(),
             personalized_surface : pg.Surface|None = None
@@ -147,13 +148,13 @@ class RootEnv:
         self.clock.tick(self.target_fps)
         self.current_fps = self.clock.get_fps()
         if self.clear_screen_each_frame: self.clear()
-        
+
         self.env.draw()
         for util in self.utils.values(): util.draw()
-        
-        if self.show_fps: self.print(str(round(self.current_fps,2)), self.screen_size * .01, bg_color=(0,0,0))
+
+        if self.show_fps: self.print(str(round(self.current_fps,2)), self.screen_size * .01, bg_color=BLACK_COLOR_PYG)
         pg.display.flip()
-    
+
     def __update__(self) -> None:
         self.mouse.update()
         self.keyboard.update()
@@ -168,4 +169,5 @@ class RootEnv:
 
         for event in self.events:
             if event.type == pg.QUIT or ((event.type == pg.KEYDOWN and event.key == self.__quit_on_key_pressed__ and self.selected_util == None) if self.__quit_on_key_pressed__ != None else False):
+                pg.quit()
                 self.quit = True

e2D/plots.py

@@ -125,7 +125,7 @@ class Point(Object):
 class MathFunction(Function):
     def __init__(self,
                  id:int|str,
-                 function:Callable[[int|float, int|float], int|float],
+                 function:Callable[[np.ndarray, np.ndarray], np.ndarray],
                  domain:list[float]=[-np.inf, np.inf],
                  codomain:list[float]=[-np.inf, np.inf],
                  color:list[float]|tuple[float,float,float]=(255,255,255)) -> None:

e2D/utils.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 from typing import Any, Callable, Literal
 import pygame as pg
 from e2D import *
+from e2D.colors import *
 
 import math as _mt
 
@@ -12,7 +13,8 @@ __LITERAL_KEY_MODE_TYPES__ = Literal["pressed", "just_pressed", "just_released"]
 
 __LITERAL_FONTS__ = Literal['arial', 'arialblack', 'bahnschrift', 'calibri', 'cambria', 'cambriamath', 'candara', 'comicsansms', 'consolas', 'constantia', 'corbel', 'couriernew', 'ebrima', 'franklingothicmedium', 'gabriola', 'gadugi', 'georgia', 'impact', 'inkfree', 'javanesetext', 'leelawadeeui', 'leelawadeeuisemilight', 'lucidaconsole', 'lucidasans', 'malgungothic', 'malgungothicsemilight', 'microsofthimalaya', 'microsoftjhenghei', 'microsoftjhengheiui', 'microsoftnewtailue', 'microsoftphagspa', 'microsoftsansserif', 'microsofttaile', 'microsoftyahei', 'microsoftyaheiui', 'microsoftyibaiti', 'mingliuextb', 'pmingliuextb', 'mingliuhkscsextb', 'mongolianbaiti', 'msgothic', 'msuigothic', 'mspgothic', 'mvboli', 'myanmartext', 'nirmalaui', 'nirmalauisemilight', 'palatinolinotype', 'segoemdl2assets', 'segoeprint', 'segoescript', 'segoeui', 'segoeuiblack', 'segoeuiemoji', 'segoeuihistoric', 'segoeuisemibold', 'segoeuisemilight', 'segoeuisymbol', 'simsun', 'nsimsun', 'simsunextb', 'sitkasmall', 'sitkatext', 'sitkasubheading', 'sitkaheading', 'sitkadisplay', 'sitkabanner', 'sylfaen', 'symbol', 'tahoma', 'timesnewroman', 'trebuchetms', 'verdana', 'webdings', 'wingdings', 'yugothic', 'yugothicuisemibold', 'yugothicui', 'yugothicmedium', 'yugothicuiregular', 'yugothicregular', 'yugothicuisemilight', 'holomdl2assets', 'bizudgothic', 'bizudpgothictruetype', 'bizudminchomedium', 'bizudpminchomediumtruetype', 'meiryo', 'meiryoui', 'msmincho', 'mspmincho', 'uddigikyokashonb', 'uddigikyokashonpb', 'uddigikyokashonkb', 'uddigikyokashonr', 'uddigikyokashonpr', 'uddigikyokashonkr', 'yumincho', 'lcd', 'glassgauge', 'maiandragd', 'maiandragddemi', 'newsgothic', 'quartz', 'kievitoffcpro', 'agencyfbgrassetto', 'agencyfb', 'algerian', 'bookantiquagrassetto', 'bookantiquagrassettocorsivo', 'bookantiquacorsivo', 'arialcorsivo', 'arialrounded', 'baskervilleoldface', 'bauhaus93', 'bell', 'bellgrassetto', 'bellcorsivo', 'bernardcondensed', 'bookantiqua', 'bodonigrassetto', 'bodonigrassettocorsivo', 'bodoniblackcorsivo', 'bodoniblack', 'bodonicondensedgrassetto', 'bodonicondensedgrassettocorsivo', 'bodonicondensedcorsivo', 'bodonicondensed', 'bodonicorsivo', 'bodonipostercompressed', 'bodoni', 'bookmanoldstyle', 'bookmanoldstylegrassetto', 'bookmanoldstylegrassettocorsivo', 'bookmanoldstylecorsivo', 'bradleyhanditc', 'britannic', 'berlinsansfbgrassetto', 'berlinsansfbdemigrassetto', 'berlinsansfb', 'broadway', 'brushscriptcorsivo', 'bookshelfsymbol7', 'californianfbgrassetto', 'californianfbcorsivo', 'californianfb', 'calisto', 'calistograssetto', 'calistograssettocorsivo', 'calistocorsivo', 'castellar', 'centuryschoolbook', 'centaur', 'century', 'chiller', 'colonna', 'cooperblack', 'copperplategothic', 'curlz', 'dubai', 'dubaimedium', 'dubairegular', 'elephant', 'elephantcorsivo', 'engravers', 'erasitc', 'erasdemiitc', 'erasmediumitc', 'felixtitling', 'forte', 'franklingothicbook', 'franklingothicbookcorsivo', 'franklingothicdemi', 'franklingothicdemicond', 'franklingothicdemicorsivo', 'franklingothicheavy', 'franklingothicheavycorsivo', 'franklingothicmediumcond', 'freestylescript', 'frenchscript', 'footlight', 'garamond', 'garamondgrassetto', 'garamondcorsivo', 'gigi', 'gillsansgrassettocorsivo', 'gillsansgrassetto', 'gillsanscondensed', 'gillsanscorsivo', 'gillsansultracondensed', 'gillsansultra', 'gillsans', 'gloucesterextracondensed', 'gillsansextcondensed', 'centurygothic', 'centurygothicgrassetto', 'centurygothicgrassettocorsivo', 'centurygothiccorsivo', 'goudyoldstyle', 'goudyoldstylegrassetto', 'goudyoldstylecorsivo', 'goudystout', 'harlowsolid', 'harrington', 'haettenschweiler', 'hightowertext', 'hightowertextcorsivo', 'imprintshadow', 'informalroman', 'blackadderitc', 'kristenitc', 'jokerman', 'juiceitc', 'kunstlerscript', 'widelatin', 'lucidabright', 'lucidacalligraphy', 'leelawadee', 'leelawadeegrassetto', 'lucidafax', 'lucidafaxdemigrassetto', 'lucidafaxdemigrassettocorsivo', 'lucidafaxcorsivo', 'lucidahandwritingcorsivo', 'lucidasansdemigrassetto', 'lucidasansdemigrassettocorsivo', 'lucidasanscorsivo', 'lucidasanstypewriter', 'lucidasanstypewritergrassetto', 'lucidasanstypewritergrassettooblique', 'lucidasanstypewriteroblique', 'magnetograssetto', 'maturascriptcapitals', 'mistral', 'modernno20', 'microsoftuighurgrassetto', 'microsoftuighur', 'monotypecorsiva', 'extra', 'niagaraengraved', 'niagarasolid', 'ocraextended', 'oldenglishtext', 'onyx', 'msoutlook', 'palacescript', 'papyrus', 'parchment', 'perpetuagrassettocorsivo', 'perpetuagrassetto', 'perpetuacorsivo', 'perpetuatitlinggrassetto', 'perpetuatitlingchiarissimo', 'perpetua', 'playbill', 'poorrichard', 'pristina', 'rage', 'ravie', 'msreferencesansserif', 'msreferencespecialty', 'rockwellcondensedgrassetto', 'rockwellcondensed', 'rockwell', 'rockwellgrassetto', 'rockwellgrassettocorsivo', 'rockwellextra', 'rockwellcorsivo', 'centuryschoolbookgrassetto', 'centuryschoolbookgrassettocorsivo', 'centuryschoolbookcorsivo', 'script', 'showcardgothic', 'snapitc', 'stencil', 'twcengrassettocorsivo', 'twcengrassetto', 'twcencondensedgrassetto', 'twcencondensedextra', 'twcencondensed', 'twcencorsivo', 'twcen', 'tempussansitc', 'vinerhanditc', 'vivaldicorsivo', 'vladimirscript', 'wingdings2', 'wingdings3', 'cascadiacoderegular', 'cascadiamonoregular', 'edwardianscriptitcnormale', 'stoneharbourregular', 'mregular', 'xirodregular', 'minecraft']
 
-NEW_FONT :Callable[[int, __LITERAL_FONTS__, bool, bool], pg.font.Font]= lambda size, name="arial", bold=False, italic=False: pg.font.SysFont(name, size, bold, italic)
+def NEW_FONT(size, name:__LITERAL_FONTS__="arial", bold:bool=False, italic:bool=False) -> pg.font.Font:
+    return pg.font.SysFont(name, size, bold, italic)
 FONT_ARIAL_16 = NEW_FONT(16)
 FONT_ARIAL_32 = NEW_FONT(32)
 FONT_ARIAL_64 = NEW_FONT(64)
@@ -74,7 +76,7 @@ class Mouse:
 
 class Keyboard:
     def __init__(self) -> None:
-        self.__pressed__ :list= pg.key.get_pressed()
+        self.__pressed__ :pg.key.ScancodeWrapper= pg.key.get_pressed()
         self.update()
     
     def update(self) -> None:
@@ -91,7 +93,6 @@ class Keyboard:
         else:
             raise Exception(f"Unknown mode type: {mode}")
 
-
 class Util:
     def __init__(self) -> None:
         self.rootEnv = None
@@ -108,9 +109,9 @@ class InputCell(Util):
                 position : Vector2D,
                 size : Vector2D,
                 prefix : str|None = None,
-                text_color : tuple[int,int,int]|list[int] = (255,255,255),
-                bg_color : None|tuple[int,int,int]|list[int] = None,
-                border_color : None|tuple[int,int,int]|list[int] = (255,255,255),
+                text_color : Color = Color.white(),
+                bg_color : None|Color = None,
+                border_color : Color = Color.white(),
                 border_width : float = 0,
                 border_radius : int|list[int]|tuple[int,int,int,int] = -1,
                 margin : Vector2D = Vector2D.zero(),
@@ -148,13 +149,13 @@ class InputCell(Util):
     def draw(self) -> None:
         self.text_surface.fill((0,0,0,0))
         if self.bg_color != None:
-            pg.draw.rect(self.text_surface, self.bg_color, self.bg_rect, 0, -1, *self.border_radius)
+            pg.draw.rect(self.text_surface, self.bg_color(), self.bg_rect, 0, -1, *self.border_radius)
         
         self.text_surface.blit(self.text_box, self.text_position())
         
         if self.rootEnv.selected_util != self:
             if self.border_width:
-                pg.draw.rect(self.text_surface, self.border_color, self.margin_rect, self.border_width, -1, *self.border_radius)
+                pg.draw.rect(self.text_surface, self.border_color(), self.margin_rect, self.border_width, -1, *self.border_radius)
         else:
             pg.draw.rect(self.text_surface, [127 + 127 * _mt.sin(self.rootEnv.runtime_seconds * 10)]*3, self.margin_rect, self.border_width if self.border_width else 10, -1, *self.border_radius)
 
@@ -182,7 +183,7 @@ class InputCell(Util):
             self.update_text()
 
     def update_text(self) -> None:
-        self.text_box = self.font.render(self.prefix + self.value, True, self.text_color)
+        self.text_box = self.font.render(self.prefix + self.value, True, self.text_color())
         if self.rootEnv != None and self.rootEnv.selected_util == self:
             # self.text_position = self.position + self.size * Vector2D(.85, .5) - Vector2D(*self.text_box.get_size()) * Vector2D(1, .5) - self.position
             self.text_position = self.position + self.size * .5 - Vector2D(*self.text_box.get_size()) * Vector2D(.5, .5) - self.position

{e2D-1.4.15.dist-info → e2D-1.4.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: e2D
-Version: 1.4.15
+Version: 1.4.17
 Summary: Python library for 2D games. Streamlines dev with keyboard/mouse input, vector calculations, color manipulation, and collision detection. Simplify game creation and unleash creativity!
 Home-page: https://github.com/marick-py/e2D
 Author: Riccardo Mariani

e2D-1.4.17.dist-info/RECORD

@@ -0,0 +1,13 @@
+e2D/__init__.py,sha256=kY54r5Hv_5wFZ2xu_Fn1iIzew4hDm8Xnm7Sx7KZh4zw,23099
+e2D/__init__.pyi,sha256=YgNYO9ungr1qqVnzQZe14v7_zt7jZ4lWtc5rBsA8TYY,48092
+e2D/colors.py,sha256=7EXlRWmK-ie5XrEtpRAj3_TZ61AVGope2RTFRkEhyZ4,20396
+e2D/def_colors.py,sha256=3sJq2L6qFZ3svn2qEWIx0SinNXjb9huNaFigDeJipm8,43805
+e2D/envs.py,sha256=W2Yj-vPit_l8wKq6yPAT_gOrx9NBC-qy9cc0bCaN9C4,6342
+e2D/plots.py,sha256=MTvIeQl_9ASDW7QUd6fgrL2IDK-5NFtiXsm7rhFKdNs,36078
+e2D/utils.py,sha256=cJarYc6OTIdud7AJZHxwOhxMcEJLlgfKu60kkBu4hB8,14116
+e2D/winrec.py,sha256=EFFfWYbk27NhS-rWD-BLChXvLjFW1uYZ5LkRGMj_Xo0,1116
+e2D-1.4.17.dist-info/LICENSE,sha256=wymkNVDvj3qmjdO_rAhkRPM4t5y3_SqffGsFdgfvznU,1066
+e2D-1.4.17.dist-info/METADATA,sha256=tCqqaOzNTZgLg95iJf9ejt510YB0XMCmiycwYVdRejc,9611
+e2D-1.4.17.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+e2D-1.4.17.dist-info/top_level.txt,sha256=3vKZ-CGzNlTCpzVMmM0Ht76krCofKw7hZ0wBf-dnKdM,4
+e2D-1.4.17.dist-info/RECORD,,

{e2D-1.4.15.dist-info → e2D-1.4.17.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

e2D-1.4.15.dist-info/RECORD

@@ -1,11 +0,0 @@
-e2D/__init__.py,sha256=_c-g4Fcqq3SuEHAzuWgRiJz_WtrHkhCa4sUV1ECxriE,23047
-e2D/__init__.pyi,sha256=rMceBt26-bozw_Xt3JQWfQ_20G8RAkE2j4CqIf7PIuQ,48013
-e2D/envs.py,sha256=Kf6f9szesdI9xado9u1FiDOBEVusbJDAvU-i9rMESws,6306
-e2D/plots.py,sha256=S4YWKJVrb1bfJGxUebFy4167coCb4oTdcNl_DKcJtlA,36075
-e2D/utils.py,sha256=tDs_Fl_8YBQoJaATQmgmFD50oNu39i4bCmvxxU16cS0,14152
-e2D/winrec.py,sha256=EFFfWYbk27NhS-rWD-BLChXvLjFW1uYZ5LkRGMj_Xo0,1116
-e2D-1.4.15.dist-info/LICENSE,sha256=wymkNVDvj3qmjdO_rAhkRPM4t5y3_SqffGsFdgfvznU,1066
-e2D-1.4.15.dist-info/METADATA,sha256=oFrU4Cpad58Ipuxxacs2Cj9b-qtl9_4FeDGnJ2Guvfs,9611
-e2D-1.4.15.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-e2D-1.4.15.dist-info/top_level.txt,sha256=3vKZ-CGzNlTCpzVMmM0Ht76krCofKw7hZ0wBf-dnKdM,4
-e2D-1.4.15.dist-info/RECORD,,