e2D 1.3.10__tar.gz → 1.3.11__tar.gz

{e2D-1.3.10 → e2D-1.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e2D
-Version: 1.3.10
+Version: 1.3.11
 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.3.10 → e2D-1.3.11}/e2D/__init__.py

@@ -15,7 +15,7 @@ DOUBLE_PI = PI*2
 # 
 
 class Vector2D:
-    round_values_on_print :float= 1.0
+    round_values_on_print :int|float= 2
     def __init__(self:"V2|Vector2D", x:int|float=0.0, y:int|float=0.0) -> None:
         """
         # Initialize a 2D vector with the specified x and y components.
@@ -666,11 +666,25 @@ class Vector2D:
         other = self.__normalize__(other)
         return Vector2D(max(self.x, other.x), max(self.y, other.y))
 
+    def advanced_stringify(self:"V2|Vector2D", precision:float|None=None, use_scientific_notation:bool=False, return_as_list=False) -> str:
+        precision = self.round_values_on_print if precision == None else precision
+        def optimize(value) -> str:
+            abs_value = abs(value)
+            if abs_value < 1/10**precision and abs_value != 0:
+                return f"{value:.{precision}e}"
+            elif abs_value < 10**precision:
+                return f"{value:.{precision}f}".rstrip('0').rstrip('.')
+            else:
+                return f"{value:.{precision}e}"
+        if return_as_list:
+            return [optimize(self.x), optimize(self.y)] if use_scientific_notation else [f"{self.x:.{precision}f}" f"{self.y:.{precision}f}"]
+        return f"{optimize(self.x)}, {optimize(self.y)}" if use_scientific_notation else f"{self.x:.{precision}f}, {self.y:.{precision}f}"
+
     def __str__(self:"V2|Vector2D") -> str:
-        return f"{self.x:{self.round_values_on_print}f}, {self.y:{self.round_values_on_print}f}"
+        return f"{self.x:.{self.round_values_on_print}f}, {self.y:.{self.round_values_on_print}f}"
 
     def __repr__(self:"V2|Vector2D") -> str:
-        return f"x:{self.x:{self.round_values_on_print}f}\ty:{self.y:{self.round_values_on_print}f}"
+        return f"x:{self.x:.{self.round_values_on_print}f}\ty:{self.y:.{self.round_values_on_print}f}"
 
     def __call__(self:"V2|Vector2D", return_tuple=False) -> list|tuple:
         return (self.x, self.y) if return_tuple else [self.x, self.y]
@@ -1250,3 +1264,12 @@ def distance_line_point(line_point_a:Vector2D|V2, line_point_b:Vector2D|V2, poin
         The result is returned as a float representing the distance between the line segment and the point.
     """
     return float(_np.linalg.norm(_np.cross((line_point_b-line_point_a)(), (line_point_a-point_c)()))/_np.linalg.norm((line_point_b-line_point_a)()))
+
+def optimize_value_string(value:int|float, precision:int) -> str:
+    abs_value = abs(value)
+    if abs_value < 1/10**precision and abs_value != 0:
+        return f"{value:.{precision}e}"
+    elif abs_value < 10**precision:
+        return f"{value:.{precision}f}".rstrip('0').rstrip('.')
+    else:
+        return f"{value:.{precision}e}"

{e2D-1.3.10 → e2D-1.3.11}/e2D/envs.py

@@ -22,9 +22,9 @@ while not rootEnv.quit:
 
 pg.init()
 pg.font.init()
-font_arial_16 = pg.font.SysFont("Arial", 16)
-font_arial_32 = pg.font.SysFont("Arial", 32)
-font_arial_64 = pg.font.SysFont("Arial", 64)
+FONT_ARIAL_16 = pg.font.SysFont("Arial", 16)
+FONT_ARIAL_32 = pg.font.SysFont("Arial", 32)
+FONT_ARIAL_64 = pg.font.SysFont("Arial", 64)
 create_arial_font_size = lambda size: pg.font.SysFont("Arial", size)
 
 TEXT_FIXED_SIDES_TOP_LEFT = 0
@@ -64,7 +64,7 @@ class RootEnv:
     def clear_rect(self, position:V2|Vector2D, size:V2|Vector2D) -> None:
         self.screen.fill(self.background_color, position() + size())
     
-    def print(self, text:str, position:V2|Vector2D, color:tuple[float,float,float]=(255,255,255), fixed_sides=TEXT_FIXED_SIDES_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]=None, border_width:float=0, border_radius:int|list[int]|tuple[int,int,int,int]=-1, margin:V2|Vector2D=V2z, personalized_surface:pg.Surface|None=None) -> None:
+    def print(self, text:str, position:V2|Vector2D, color:tuple[float,float,float]=(255,255,255), fixed_sides=TEXT_FIXED_SIDES_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]=None, border_width:float=0, border_radius:int|list[int]|tuple[int,int,int,int]=-1, margin:V2|Vector2D=V2z, personalized_surface:pg.Surface|None=None) -> None:
         text_box = font.render(text, True, color)
         size = V2(*text_box.get_size()) + margin * 2
         position = position - size * self.__fixed_sides_multiplier[fixed_sides] + margin

{e2D-1.3.10 → e2D-1.3.11}/e2D/plots.py

@@ -65,7 +65,7 @@ class PointsFunction(Function):
 
     def render(self) -> None:
         self.__layer_surface__.fill((0,0,0,0))
-        if len(self.plot_points): pg.draw.lines(self.__layer_surface__, self.color, False, self.plot_points)
+        if len(self.plot_points)>=2: pg.draw.lines(self.__layer_surface__, self.color, False, self.plot_points)
         # for point in self.points:
             # pg.draw.circle(self.__layer_surface__,
             #                self.points_color,
@@ -120,7 +120,6 @@ class __PlotSettings__:
                 "distance_to_axis_for_scalar_zoom" : 10,
 
             # cursor
-                "show_cursor_coords" : False,
                 "zoom_on_center" : False,
 
             # plot visual options
@@ -152,6 +151,9 @@ class __PlotSettings__:
                     "show_pointer" : True,
                     "pointer_radius" : 15,
                     "pointer_color" : rgb(255, 255, 255),
+                
+                # cursor
+                    "show_cursor_coords" : False,
 
                 #rect
                     "render_bg" : True,
@@ -163,8 +165,9 @@ class __PlotSettings__:
 
                 # info options
                     "show_zoom_info": True,
-                    "top_left_info_position" : self.plot.position + V2(20, 100),
-                    "info_interline_space" : V2(0, 32),
+                    "top_left_info_position" : self.plot.position + V2(15, 75),
+                    "info_interline_space" : V2(0, 24),
+                    "info_font" : create_arial_font_size(24),
                     "info_precision" : 2,
         }
 
@@ -281,10 +284,10 @@ class Plot:
             pg.draw.circle(self.canvas, pointer_color, (self.size * .5)(), 15, 1) #type: ignore
 
         if self.settings.get("show_corners_coords"):
-            self.rootEnv.print(str(self.top_left_plot_coord), V2z.copy(), bg_color=(0,0,0), border_color=(255,255,255), border_width=2, border_radius=15, margin=V2(10,10), personalized_surface=self.canvas)
-            self.rootEnv.print(str(V2(self.top_left_plot_coord.x, self.bottom_right_plot_coord.y)), self.size * V2(0, 1), fixed_sides=TEXT_FIXED_SIDES_BOTTOM_LEFT, bg_color=(0,0,0), border_color=(255,255,255), border_width=2, border_radius=15, margin=V2(10,10), personalized_surface=self.canvas)
-            self.rootEnv.print(str(self.bottom_right_plot_coord), self.size.copy(), fixed_sides=TEXT_FIXED_SIDES_BOTTOM_RIGHT, bg_color=(0,0,0), border_color=(255,255,255), border_width=2, border_radius=15, margin=V2(10,10), personalized_surface=self.canvas)
-            self.rootEnv.print(str(V2(self.bottom_right_plot_coord.x, self.top_left_plot_coord.y)), self.size * V2(1, 0), fixed_sides=TEXT_FIXED_SIDES_TOP_RIGHT, bg_color=(0,0,0), border_color=(255,255,255), border_width=2, border_radius=15, margin=V2(10,10), personalized_surface=self.canvas)
+            self.rootEnv.print(self.top_left_plot_coord.advanced_stringify(4, True), V2z.copy(), bg_color=(0,0,0), border_color=(255,255,255), border_width=2, border_radius=15, margin=V2(10,10), personalized_surface=self.canvas)
+            self.rootEnv.print(V2(self.top_left_plot_coord.x, self.bottom_right_plot_coord.y).advanced_stringify(4, True), self.size * V2(0, 1), fixed_sides=TEXT_FIXED_SIDES_BOTTOM_LEFT, bg_color=(0,0,0), border_color=(255,255,255), border_width=2, border_radius=15, margin=V2(10,10), personalized_surface=self.canvas)
+            self.rootEnv.print(self.bottom_right_plot_coord.advanced_stringify(4, True), self.size.copy(), fixed_sides=TEXT_FIXED_SIDES_BOTTOM_RIGHT, bg_color=(0,0,0), border_color=(255,255,255), border_width=2, border_radius=15, margin=V2(10,10), personalized_surface=self.canvas)
+            self.rootEnv.print(V2(self.bottom_right_plot_coord.x, self.top_left_plot_coord.y).advanced_stringify(4, True), self.size * V2(1, 0), fixed_sides=TEXT_FIXED_SIDES_TOP_RIGHT, bg_color=(0,0,0), border_color=(255,255,255), border_width=2, border_radius=15, margin=V2(10,10), personalized_surface=self.canvas)
     
     def update(self) -> None:
         # update mouse and center positions
@@ -389,14 +392,17 @@ class Plot:
         if not render_axes_on_top: self.rootEnv.screen.blit(self.canvas, self.position())
 
         if self.is_mouse_in_rect and self.settings.get("show_cursor_coords"):
-            self.rootEnv.print(str(self.plot_mouse_position), self.rootEnv.mouse.position, fixed_sides=TEXT_FIXED_SIDES_BOTTOM_MIDDLE) #type: ignore
+            self.rootEnv.print(self.plot_mouse_position.advanced_stringify(3, True), self.rootEnv.mouse.position, fixed_sides=TEXT_FIXED_SIDES_BOTTOM_MIDDLE) #type: ignore
+
 
+        current_real_zoom = (.5**(.1*self.current_zoom)).advanced_stringify(self.settings.get('info_precision'), True, True)
         data = [
             [f"ZOOM:", TEXT_FIXED_SIDES_TOP_LEFT, self.settings.get("show_zoom_info")],
-            [f"  x: {(.5**(.1*self.current_zoom.x)):.{self.settings.get('info_precision')}f};", TEXT_FIXED_SIDES_TOP_LEFT, self.settings.get("show_zoom_info")],
-            [f"  y: {(.5**(.1*self.current_zoom.y)):.{self.settings.get('info_precision')}f};", TEXT_FIXED_SIDES_TOP_LEFT, self.settings.get("show_zoom_info")],
+            [f"  x: {current_real_zoom[0]};", TEXT_FIXED_SIDES_TOP_LEFT, self.settings.get("show_zoom_info")],
+            [f"  y: {current_real_zoom[1]};", TEXT_FIXED_SIDES_TOP_LEFT, self.settings.get("show_zoom_info")],
+            [f"  ratio: {optimize_value_string(self.current_zoom.x / self.current_zoom.y, 4)};", TEXT_FIXED_SIDES_TOP_LEFT, self.settings.get("show_zoom_info")],
         ]
 
         for i, (d, fixed_side, show) in enumerate(data):
             if show:
-                self.rootEnv.print(d, self.settings.get("top_left_info_position") + self.settings.get("info_interline_space") * i, fixed_sides=fixed_side) #type: ignore
+                self.rootEnv.print(d, self.settings.get("top_left_info_position") + self.settings.get("info_interline_space") * i, fixed_sides=fixed_side, font=self.settings.get("info_font"))

{e2D-1.3.10 → e2D-1.3.11}/e2D.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e2D
-Version: 1.3.10
+Version: 1.3.11
 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.3.10 → e2D-1.3.11}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = e2D
-version = 1.3.10
+version = 1.3.11
 author = Riccardo Mariani
 author_email = ricomari2006@gmail.com
 description = Python library for 2D games. Streamlines dev with keyboard/mouse input, vector calculations, color manipulation, and collision detection. Simplify game creation and unleash creativity!