topologicpy 0.7.12__py3-none-any.whl → 0.7.15__py3-none-any.whl

topologicpy/Grid.py

@@ -258,7 +258,7 @@ class Grid():
 
         if len(uRange) < 1 or len(vRange) < 1:
             return None
-        if not origin:
+        if not Topology.IsInstance(origin, "Vertex"):
             if not Topology.IsInstance(face, "Face"):
                 origin = Vertex.ByCoordinates(0, 0, 0)
             else:

topologicpy/Polyskel.py

@@ -22,23 +22,168 @@ from collections import namedtuple
 import os
 import warnings
 
-try:
-	from euclid import *
-except:
-	print("Polyskel - Installing required euclid library.")
-	try:
-		os.system("pip install euclid")
-	except:
-		os.system("pip install euclid --user")
-	try:
-		from euclid import *
-	except:
-		warnings.warn("Polyskel - ERROR: Could not import euclid.")
+# try:
+# 	from euclid import *
+# except:
+# 	print("Polyskel - Installing required euclid library.")
+# 	try:
+# 		os.system("pip install euclid")
+# 	except:
+# 		os.system("pip install euclid --user")
+# 	try:
+# 		from euclid import *
+# 	except:
+# 		warnings.warn("Polyskel - ERROR: Could not import euclid.")
 
 log = logging.getLogger("__name__")
 
 EPSILON = 0.00001
 
+
+
+
+import math
+
+class Point2:
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+
+    def __sub__(self, other):
+        return Point2(self.x - other.x, self.y - other.y)
+
+    def __add__(self, other):
+        return Point2(self.x + other.x, self.y + other.y)
+	
+    def __mul__(self, scalar):
+        return Point2(self.x * scalar, self.y * scalar)
+	
+    def __neg__(self):
+        return Point2(-self.x, -self.y)
+
+    def __eq__(self, other):
+        return self.x == other.x and self.y == other.y
+
+    def __abs__(self):
+        return math.sqrt(self.x ** 2 + self.y ** 2)
+	
+    def __iter__(self):
+        yield self.x
+        yield self.y
+	
+    def cross(self, other):
+        """
+        Computes the cross product of this point with another point.
+
+        Args:
+            other (Point2): The other point to compute the cross product with.
+
+        Returns:
+            float: The cross product value.
+        """
+        return self.x * other.y - self.y * other.x
+
+    def normalized(self):
+        length = abs(self)
+        return Point2(self.x / length, self.y / length)
+
+    def dot(self, other):
+        return self.x * other.x + self.y * other.y
+
+    def distance(self, other):
+        return abs(self - other)
+
+
+class Ray2:
+    def __init__(self, p, v):
+        self.p = p
+        self.v = v.normalized()
+
+    def __str__(self):
+        return f"Ray2({self.p}, {self.v})"
+	
+    def intersect(self, other):
+        """
+        Intersects this ray with another ray.
+
+        Args:
+            other (Ray2): The other ray to intersect with.
+
+        Returns:
+            Point2 or None: The intersection point if it exists, or None if the rays do not intersect.
+        """
+        # Check if the rays are parallel
+        if abs(self.v.dot(other.v)) == 1:
+            return None  # Rays are parallel and do not intersect
+        
+        # Calculate the intersection point using vector algebra
+        t = (other.p - self.p).cross(other.v) / self.v.cross(other.v)
+        if t >= 0:
+            return self.p + self.v * t  # Intersection point
+        else:
+            return None  # Rays do not intersect or intersection point lies behind self
+
+class Line2:
+    def __init__(self, p1, p2=None):
+        if p2 is None:
+            self.p = p1.p
+            self.v = p1.v
+        else:
+            self.p = p1
+            self.v = (p2 - p1).normalized()
+
+    def intersect(self, other):
+        # Line intersection formula
+        det = self.v.x * other.v.y - self.v.y * other.v.x
+        if abs(det) < EPSILON:
+            return None  # Lines are parallel
+
+        dx = other.p.x - self.p.x
+        dy = other.p.y - self.p.y
+        t = (dx * other.v.y - dy * other.v.x) / det
+        return Point2(self.p.x + t * self.v.x, self.p.y + t * self.v.y)
+
+    def distance(self, point):
+        # Perpendicular distance from a point to the line
+        return abs((point.x - self.p.x) * self.v.y - (point.y - self.p.y) * self.v.x) / abs(self.v)
+
+    def __str__(self):
+        return f"Line2({self.p}, {self.v})"
+
+
+class LineSegment2(Line2):
+    def __init__(self, p1, p2):
+        super().__init__(p1, p2)
+        self.p2 = p2
+
+    def intersect(self, other):
+        # Check if intersection point lies on both line segments
+        inter = super().intersect(other)
+        if inter is None:
+            return None
+
+        if self._on_segment(inter) and other._on_segment(inter):
+            return inter
+        return None
+
+    def _on_segment(self, point):
+        return (min(self.p.x, self.p2.x) - EPSILON <= point.x <= max(self.p.x, self.p2.x) + EPSILON and
+                min(self.p.y, self.p2.y) - EPSILON <= point.y <= max(self.p.y, self.p2.y) + EPSILON)
+
+    def __str__(self):
+        return f"LineSegment2({self.p}, {self.p2})"
+
+
+
+
+
+
+
+
+
+
+
+
 class Debug:
 	def __init__(self, image):
 		if image is not None:

topologicpy/Shell.py

@@ -1047,7 +1047,7 @@ class Shell():
         from topologicpy.Vertex import Vertex
         from topologicpy.Face import Face
         from topologicpy.Topology import Topology
-        if not origin:
+        if not Topology.IsInstance(origin, "Vertex"):
             origin = Vertex.ByCoordinates(0, 0, 0)
         if not Topology.IsInstance(origin, "Vertex"):
             return None
@@ -1165,7 +1165,7 @@ class Shell():
         if not Topology.IsInstance(shell, "Shell"):
             print("Shell.Planarize - Error: The input wire parameter is not a valid topologic shell. Returning None.")
             return None
-        if origin == None:
+        if not Topology.IsInstance(origin, "Vertex"):
             origin = Vertex.Origin()
         if not Topology.IsInstance(origin, "Vertex"):
             print("Shell.Planarize - Error: The input origin parameter is not a valid topologic vertex. Returning None.")
@@ -1217,7 +1217,7 @@ class Shell():
         from topologicpy.Face import Face
         from topologicpy.Topology import Topology
 
-        if not origin:
+        if not Topology.IsInstance(origin, "Vertex"):
             origin = Vertex.ByCoordinates(0, 0, 0)
         if not Topology.IsInstance(origin, "Vertex"):
             return None
@@ -1329,7 +1329,6 @@ class Shell():
             return None
         shell = Shell.Skeleton(flat_face, tolerance=tolerance)
         faces = Shell.Faces(shell)
-        Topology.Show(shell)
         if not faces:
             return None
         triangles = []

topologicpy/Sun.py

@@ -379,7 +379,7 @@ class Sun():
         return sunset
 
     @staticmethod
-    def Vector(latitude, longitude, date, north=0):
+    def Vector(latitude: float, longitude: float, date, north: float = 0, mantissa: int = 6, tolerance: float = 0.0001):
         """
         Returns the Sun as a vector.
 
@@ -402,7 +402,7 @@ class Sun():
         from topologicpy.Vector import Vector
         azimuth = Sun.Azimuth(latitude=latitude, longitude=longitude, date=date)
         altitude = Sun.Altitude(latitude=latitude, longitude=longitude, date=date)
-        return Vector.ByAzimuthAltitude(azimuth=azimuth, altitude=altitude, north=north, reverse=True)
+        return Vector.ByAzimuthAltitude(azimuth=azimuth, altitude=altitude, north=north, reverse=True, mantissa=mantissa, tolerance=tolerance)
 
     @staticmethod
     def Position(latitude, longitude, date, origin=None, radius=0.5, north=0, mantissa=6):
@@ -465,7 +465,7 @@ class Sun():
         from topologicpy.Topology import Topology
         from topologicpy.Vector import Vector
 
-        if origin == None:
+        if not Topology.IsInstance(origin, "Vertex"):
             origin = Vertex.Origin()
         vector = Vector.Reverse(Sun.Vector(latitude=latitude, longitude=longitude, date=date, north=north))
         sun_v = Topology.TranslateByDirectionDistance(origin, direction=vector, distance=radius)
@@ -501,7 +501,7 @@ class Sun():
         from topologicpy.Topology import Topology
         from topologicpy.Vector import Vector
 
-        if origin == None:
+        if not Topology.IsInstance(origin, "Vertex"):
             origin = Vertex.Origin()
         vector = Vector.Reverse(Sun.Vector(latitude=latitude, longitude=longitude, date=date, north=north))
         sun_v = Topology.TranslateByDirectionDistance(origin, direction=vector, distance=radius)
@@ -591,7 +591,7 @@ class Sun():
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Topology import Topology
 
-        if origin == None:
+        if not Topology.IsInstance(origin, "Vertex"):
             origin = Vertex.Origin()
         if startTime == None:
             startTime = Sun.Sunrise(latitude=latitude, longitude=longitude, date=date)
@@ -780,7 +780,7 @@ class Sun():
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
 
-        if origin == None:
+        if not Topology.IsInstance(origin, "Vertex"):
             origin = Vertex.Origin()
 
         cutter = Cell.Prism(origin=origin, width=radius*4, length=radius*4, height=radius*2)