topologicpy 0.7.10__py3-none-any.whl → 0.7.11__py3-none-any.whl

topologicpy/Face.py

@@ -1317,32 +1317,71 @@ class Face():
             obstacles = [obs for obs in obstacles if Topology.IsInstance(obs, "Wire")]
         else:
             obstacles = []
+        
+        origin = Vertex.Origin()
+        normal = Face.Normal(face)
+        flat_face = Topology.Flatten(face, origin=origin, direction=normal)
+        flat_vertex = Topology.Flatten(vertex, origin=origin, direction=normal)
+        eb = Face.ExternalBoundary(flat_face)
+        vertices = Topology.Vertices(eb)
+        coords = [Vertex.Coordinates(v, outputType="xy") for v in vertices]
+        new_vertices = [Vertex.ByCoordinates(coord) for coord in coords]
+        eb = Wire.ByVertices(new_vertices, close=True)
+
+        ib_list = Face.InternalBoundaries(flat_face)
+        new_ib_list = []
+        for ib in ib_list:
+            vertices = Topology.Vertices(ib)
+            coords = [Vertex.Coordinates(v, outputType="xy") for v in vertices]
+            new_vertices = [Vertex.ByCoordinates(coord) for coord in coords]
+            new_ib_list.append(Wire.ByVertices(new_vertices, close=True))
+
+        flat_face = Face.ByWires(eb, new_ib_list)
         for obs in obstacles:
-            face = Topology.Difference(face, Face.ByWire(obs))
-        targets = Topology.Vertices(face)
+            flat_face = Topology.Difference(flat_face, Face.ByWire(obs))
+        targets = Topology.Vertices(flat_face)
         distances = []
         for target in targets:
-            distances.append(Vertex.Distance(vertex, target))
+            distances.append(Vertex.Distance(flat_vertex, target))
         distances.sort()
         max_d = distances[-1]*1.05
         edges = []
         for target in targets:
-            if Vertex.Distance(vertex, target) > tolerance:
-                e = Edge.ByVertices(vertex, target, silent=True)
+            if Vertex.Distance(flat_vertex, target) > tolerance:
+                e = Edge.ByVertices(flat_vertex, target, silent=True)
                 e = Edge.SetLength(e, length=max_d, bothSides=False, tolerance=tolerance)
                 edges.append(e)
-        shell = Topology.Slice(face, Cluster.ByTopologies(edges))
+        shell = Topology.Slice(flat_face, Cluster.ByTopologies(edges))
         faces = Topology.Faces(shell)
         final_faces = []
-        for face in faces:
-            if vertexPartofFace(vertex, face, tolerance=0.001):
-                final_faces.append(face)
+        for f in faces:
+            if vertexPartofFace(flat_vertex, f, tolerance=0.001):
+                final_faces.append(f)
         shell = Shell.ByFaces(final_faces)
-        return_face = Topology.RemoveCoplanarFaces(shell)
+        return_face = Topology.RemoveCoplanarFaces(shell, epsilon=0.1)
+        if not Topology.IsInstance(return_face, "face"):
+            temp = Shell.ExternalBoundary(shell)
+            if Topology.IsInstance(temp, "Wire"):
+                return_face = Face.ByWire(temp)
+            elif Topology.IsInstance(temp, "Cluster"):
+                edges = Topology.Edges(temp)
+                vertices = Topology.Vertices(temp)
+                vertices = Vertex.Fuse(vertices, tolerance=0.01)
+                new_edges = []
+                for edge in edges:
+                    sv = vertices[Vertex.Index(Edge.StartVertex(edge), vertices, tolerance=0.01)]
+                    ev = vertices[Vertex.Index(Edge.EndVertex(edge), vertices, tolerance=0.01)]
+                    if Vertex.Distance(sv, ev) > tolerance:
+                        new_edges.append(Edge.ByVertices([sv,ev]))
+                w = Wire.ByEdges(new_edges, tolerance=0.01)
+                return_face = Face.ByWire(w)
+            if not Topology.IsInstance(return_face, "Face"):
+                print("Face.Isovist - Error: Could not create isovist. Returning None.")
+                return None 
+
         compAngle = 0
         if fov == 360:
-            c = Wire.Circle(origin= vertex, radius=max_d, sides=180, close = True)
-            pie = Face.ByWire(c)
+            pie = Face.Circle(origin= vertex, radius=max_d, sides=180)
         else:
             compAngle = Vector.CompassAngle(Vector.North(), direction, mantissa=mantissa, tolerance=tolerance) - 90
             fromAngle = -fov*0.5 - compAngle
@@ -1358,7 +1397,10 @@ class Face():
         if return_face == None:
             print("Face.Isovist - Error: Could not create isovist. Returning None.")
             return None
-        return return_face
+        simpler_face = Face.RemoveCollinearEdges(return_face)
+        if Topology.IsInstance(simpler_face, "face"):
+            return Topology.Unflatten(simpler_face, origin=origin, direction=normal)
+        return Topology.Unflatten(return_face, origin=origin, direction=normal)
 
     @staticmethod
     def MedialAxis(face, resolution: int = 0, externalVertices: bool = False, internalVertices: bool = False, toLeavesOnly: bool = False, angTolerance: float = 0.1, tolerance: float = 0.0001):

topologicpy/Wire.py

@@ -1519,17 +1519,26 @@ class Wire(Topology):
         normal = Face.Normal(f)
         origin = Topology.Centroid(f)
         w = Topology.Flatten(wire, origin=origin, direction=normal)
+        flat_f = Topology.Flatten(f, origin=origin, direction=normal)
+        flat_normal = Face.Normal(flat_f)
+        if flat_normal[2] < 0:
+            w = Topology.Rotate(w, origin=origin, axis=[1,0,0], angle=180)
         angles = []
         edges = Topology.Edges(w)
         for i in range(len(edges)-1):
             e1 = edges[i]
             e2 = edges[i+1]
-            a = round(360 - Vector.CompassAngle(Edge.Direction(e1), Edge.Direction(e2)), mantissa)
+            a = round(Vector.Angle(Edge.Direction(e1), Vector.Reverse(Edge.Direction(e2))), mantissa)
             angles.append(a)
         e1 = edges[len(edges)-1]
         e2 = edges[0]
-        a = round(360 - Vector.CompassAngle(Edge.Direction(e1), Edge.Direction(e2)), mantissa)
+        a = round(Vector.Angle(Edge.Direction(e1), Vector.Reverse(Edge.Direction(e2))), mantissa)
         angles = [a]+angles
+        # if abs(sum(angles)-(len(angles)-2)*180)<tolerance:
+        #     return angles
+        # else:
+        #     angles = [360-ang for ang in angles]
+        #     return angles
         return angles
 
     @staticmethod

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.10'
+__version__ = '0.7.11'

{topologicpy-0.7.10.dist-info → topologicpy-0.7.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.10
+Version: 0.7.11
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: MIT License

{topologicpy-0.7.10.dist-info → topologicpy-0.7.11.dist-info}/RECORD

@@ -8,7 +8,7 @@ topologicpy/DGL.py,sha256=RpkLnAzjg6arY7cEMs2pDFYzRdkerVg1Wbm9hcE3QaM,138991
 topologicpy/Dictionary.py,sha256=pMbfE2RYGCNpVr2x58qiHRc-aBWnp1jLlyzwS9nz6-w,25891
 topologicpy/Edge.py,sha256=EiOgg2HtuR-YtL5cpFcLcL1Y3A2Y-m4qPNtLjHGRZBQ,52407
 topologicpy/EnergyModel.py,sha256=ni0H1JgvLl1-q90yK9Sm1qj5P1fTuidlimEIcwuj6qE,53287
-topologicpy/Face.py,sha256=XqBi_wrR8qhxE8UdT-GhIoRnmaxo64E9Etm9iELjX5A,98729
+topologicpy/Face.py,sha256=IiejcLoTDhY0C97I-2IQuOniHf7vDirpzjhG_rj4X5s,101031
 topologicpy/Graph.py,sha256=IFEGU0MCE4_fPe2j8sx1vuXPKMjGaov5wTlgRAwB7ns,384631
 topologicpy/Grid.py,sha256=2uDFDxg4NqROC-7bNi1BjK5Uz__BPH13afJ-VDBRW0M,18466
 topologicpy/Helper.py,sha256=07V9IFu5ilMpvAdZVhIbdBOjBJSRTtJ0BfR1IoRaRXU,17743
@@ -23,11 +23,11 @@ topologicpy/Sun.py,sha256=3tYb8kssU882lE1gEWg2mxDvCCY_LAVElkyUT6wa-ZU,36935
 topologicpy/Topology.py,sha256=sXvhiMShOjOp0aILjEU6uNDqKm3zEAEdrN_IJgDK47c,308819
 topologicpy/Vector.py,sha256=2OXmty9CKZZzfsg5T4ckml-lPUUvgDvqokcKDsZVN9Y,29806
 topologicpy/Vertex.py,sha256=WjQZf-r8h_Cjwkt_qNN483FCUql20fbv72Ymiq7ZYtw,67462
-topologicpy/Wire.py,sha256=TTGVySZAbo0cY_Ykoqyv6FiQHBBHzRGOKITjRNkdzSg,139107
+topologicpy/Wire.py,sha256=Mr9FhiFmcdASjg85ylGTwQmlrcPJuMJh2XybGlg2JH0,139515
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=yDniQ0XMYyXTl9AyH9Sr2sBx5o3HhQZmldHel-_qTEc,23
-topologicpy-0.7.10.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.10.dist-info/METADATA,sha256=VxeJ8w5ZkcWATvgpOBWfYR3qdsZGmU0EAeYavY7JjUI,8405
-topologicpy-0.7.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-topologicpy-0.7.10.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.10.dist-info/RECORD,,
+topologicpy/version.py,sha256=CRTpS8UXaJkuf-9u9BHiQMdmQOwD3_viBSxzJw8B4-8,23
+topologicpy-0.7.11.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.11.dist-info/METADATA,sha256=ZUyfq-XqWnusntlHekNjU8MbsQNOLQEa-9zfwi4GdFw,8405
+topologicpy-0.7.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+topologicpy-0.7.11.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.11.dist-info/RECORD,,