OpenSimula 0.7.0__tar.gz → 0.7.1__tar.gz

{opensimula-0.7.0 → opensimula-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensimula
-Version: 0.7.0
+Version: 0.7.1
 Summary: Component-based time simulation environment in Python
 Author-email: "Juan F. Coronel" <jfc@us.es>
 Requires-Python: >=3.12
@@ -18,7 +18,6 @@ Requires-Dist: psychrolib>=2.5.0
 Requires-Dist: scipy>=1.16.2
 Requires-Dist: shapely>=2.1.1
 Requires-Dist: tqdm>=4.67.1
-Requires-Dist: triangle>=20250106
 Requires-Dist: vedo>=2025.5.4
 Dynamic: license-file
 

{opensimula-0.7.0 → opensimula-0.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "opensimula"
-version = "0.7.0"
+version = "0.7.1"
 requires-python = ">=3.12"
 authors = [
   { name="Juan F. Coronel", email="jfc@us.es" },
@@ -20,8 +20,7 @@ dependencies = [
     "scipy>=1.16.2",
     "shapely>=2.1.1",
     "tqdm>=4.67.1",
-    "triangle>=20250106",
-    "vedo>=2025.5.4",
+"vedo>=2025.5.4",
 ]
 
 [dependency-groups]

{opensimula-0.7.0 → opensimula-0.7.1}/src/opensimula/__init__.py

@@ -5,5 +5,4 @@ opensimula is a Python Package for perform time simulations
 """
 from opensimula.Simulation import Simulation
 from opensimula.Iterative_process import Iterative_process
-from importlib.metadata import version
-VERSION = version("opensimula")
+VERSION = "0.7.1"

{opensimula-0.7.0 → opensimula-0.7.1}/src/opensimula/visual_3D/Environment_3D.py

@@ -132,6 +132,24 @@ class Environment_3D:
             lighting=dict(ambient=0.85, diffuse=0.5, specular=0.05),
         )
 
+    def _merge_outlines_to_plotly_(self, polygon_list):
+        """Merge outlines of multiple Polygon_3D into a single go.Scatter3d."""
+        import plotly.graph_objects as go
+        xs, ys, zs = [], [], []
+        for pol in polygon_list:
+            boundary = np.array(pol.polygon3D)
+            if len(boundary) == 0:
+                continue
+            xs.extend(list(boundary[:, 0]) + [boundary[0, 0], None])
+            ys.extend(list(boundary[:, 1]) + [boundary[0, 1], None])
+            zs.extend(list(boundary[:, 2]) + [boundary[0, 2], None])
+        return go.Scatter3d(
+            x=xs, y=ys, z=zs,
+            mode="lines",
+            line=dict(color="black", width=2),
+            showlegend=False, hoverinfo="skip",
+        )
+
     def _scene_bounds_(self, pols):
         """Return (xmin, xmax, ymin, ymax, zmin, zmax) for a list of Polygon_3D."""
         all_pts = np.concatenate([np.array(p.polygon3D) for p in pols if len(p.polygon3D) > 0], axis=0)
@@ -182,16 +200,19 @@ class Environment_3D:
     def _plotly_scene_layout_(self):
         import plotly.graph_objects as go
         axis_style = dict(
-            showbackground=False,
+            showbackground=True,
+            backgroundcolor="rgb(220, 220, 220)",
             tickfont=dict(size=9, color="gray"),
             title_font=dict(size=10, color="gray"),
         )
         return go.Layout(
+            paper_bgcolor="rgb(235, 235, 235)",
             scene=dict(
                 xaxis=dict(title="X [m]", **axis_style),
                 yaxis=dict(title="Y [m]", **axis_style),
                 zaxis=dict(title="Z [m]", **axis_style),
                 aspectmode="data",
+                bgcolor="rgb(235, 235, 235)",
             ),
             margin=dict(l=0, r=0, t=0, b=0),
             showlegend=False,
@@ -256,15 +277,19 @@ class Environment_3D:
             # Build frames (sunny + shadow merged meshes update per frame)
             self.calculate_shadows(cosines[0], create_polygons=True)
             init_sunny = self._merge_to_plotly_(self.pol_sunny, "sunny")
+            init_sunny_outline = self._merge_outlines_to_plotly_(self.pol_sunny)
             init_shadow = self._merge_to_plotly_(self.pol_shadows, "shadow")
+            init_shadow_outline = self._merge_outlines_to_plotly_(self.pol_shadows)
 
             frames = []
             for i, (cos, text) in enumerate(zip(cosines, texts)):
                 self.calculate_shadows(cos, create_polygons=True)
                 frames.append(go.Frame(
                     data=[self._merge_to_plotly_(self.pol_sunny, "sunny"),
-                          self._merge_to_plotly_(self.pol_shadows, "shadow")],
-                    traces=[n_static, n_static + 1],
+                          self._merge_outlines_to_plotly_(self.pol_sunny),
+                          self._merge_to_plotly_(self.pol_shadows, "shadow"),
+                          self._merge_outlines_to_plotly_(self.pol_shadows)],
+                    traces=[n_static, n_static + 1, n_static + 2, n_static + 3],
                     name=str(i),
                     layout=go.Layout(title_text=text),
                 ))
@@ -296,7 +321,7 @@ class Environment_3D:
                 )],
             )
             go.Figure(
-                data=static_traces + [init_sunny, init_shadow],
+                data=static_traces + [init_sunny, init_sunny_outline, init_shadow, init_shadow_outline],
                 layout=layout,
                 frames=frames,
             ).show()

{opensimula-0.7.0 → opensimula-0.7.1}/src/opensimula/visual_3D/Polygon_3D.py

@@ -1,8 +1,8 @@
 import math
 import numpy as np
-from shapely.geometry import Polygon
+from shapely.geometry import Polygon, MultiPoint
+from shapely.ops import triangulate as shapely_triangulate
 import vedo
-from triangle import triangulate
 
 class Polygon_3D():
     def __init__(self, name, origin, azimuth, altitude, polygon2D, holes2D=[], color="white", opacity=1.0, visible=True,shading=True,calculate_shadows=True):
@@ -74,32 +74,27 @@ class Polygon_3D():
         return mesh
 
     def _triangulate_(self):
-        def edge_idxs(nv):
-            i = np.append(np.arange(nv), 0)
-            return np.stack([i[:-1], i[1:]], axis=1)
+        all_verts = list(self.polygon2D)
+        for hole in self.holes2D:
+            all_verts.extend(hole)
 
-        nv = 0
-        verts, edges = [], []
-        for loop in (self.polygon2D, *self.holes2D):
-            verts.append(loop)
-            edges.append(nv + edge_idxs(len(loop)))
-            nv += len(loop)
+        tris = [t for t in shapely_triangulate(MultiPoint(all_verts))
+                if self.shapely_polygon.contains(t.centroid)]
 
-        verts, edges = np.concatenate(verts), np.concatenate(edges)
-        # Triangulate needs to know a single interior point for each hole
-        holes = np.array([np.mean(h, axis=0) for h in self.holes2D])
-        # Because triangulate is a wrapper around a C library the syntax is a little weird, 'p' here means planar straight line graph
-        if self.has_holes():
-            d = triangulate(dict(vertices=verts, segments=edges, holes=holes), opts='p')
-        else:
-            d = triangulate(dict(vertices=verts, segments=edges), opts='p')
-        # Convert back 
-        v, f = d['vertices'], d['triangles']
-        nv, nf = len(v), len(f)
-        points = np.concatenate([v, np.zeros((nv, 1))], axis=1)
-        # Creo que lo tengo que hacer en 2D y luego pasarlo a 3D
-        #faces = np.concatenate([np.full((nf, 1), 3), f], axis=1).reshape(-1)
-        return (self._convert_2D_to_3D_(points), f)
+        vert_map = {}
+        verts = []
+        faces = []
+        for tri in tris:
+            face = []
+            for c in list(tri.exterior.coords)[:-1]:
+                key = (round(c[0], 10), round(c[1], 10))
+                if key not in vert_map:
+                    vert_map[key] = len(verts)
+                    verts.append(c)
+                face.append(vert_map[key])
+            faces.append(face)
+
+        return (self._convert_2D_to_3D_(np.array(verts)), np.array(faces))
 
     def _are_vertices_counterclockwise_(self,puntos):
         # Se suma el primer punto al final para cerrar el polígono.

{opensimula-0.7.0 → opensimula-0.7.1}/src/opensimula.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensimula
-Version: 0.7.0
+Version: 0.7.1
 Summary: Component-based time simulation environment in Python
 Author-email: "Juan F. Coronel" <jfc@us.es>
 Requires-Python: >=3.12
@@ -18,7 +18,6 @@ Requires-Dist: psychrolib>=2.5.0
 Requires-Dist: scipy>=1.16.2
 Requires-Dist: shapely>=2.1.1
 Requires-Dist: tqdm>=4.67.1
-Requires-Dist: triangle>=20250106
 Requires-Dist: vedo>=2025.5.4
 Dynamic: license-file
 

{opensimula-0.7.0 → opensimula-0.7.1}/src/opensimula.egg-info/requires.txt

@@ -10,5 +10,4 @@ psychrolib>=2.5.0
 scipy>=1.16.2
 shapely>=2.1.1
 tqdm>=4.67.1
-triangle>=20250106
 vedo>=2025.5.4