GSOF-3dWireFrame 1.1.2__tar.gz → 1.1.3__tar.gz

{gsof_3dwireframe-1.1.2 → gsof_3dwireframe-1.1.3}/GSOF_3dWireFrame/Example_Drone.py

@@ -105,7 +105,7 @@ if __name__ == "__main__":
 
     clock = pygame.time.Clock()
     screen = newScreen("3D Wire Frame Shapes", SCREEN_WIDTH, SCREEN_HEIGHT, Colors.WHITE)
-    wireframe = DISP.WireFrame(screen, pygame.draw.line, f=50, scale=20.0)
+    wireframe = DISP.WireFrame(screen, pygame.draw.line, f=1, scale=1000.0)
 
     fps = 30
     maxRps = 2
@@ -137,7 +137,7 @@ if __name__ == "__main__":
         camAngY_r = z*PI
         camAngZ_r = x*PI
         
-        print(computePropellers(maxRps, camAngX_r, camAngY_r, camAngZ_r))
+        #print(computePropellers(maxRps, camAngX_r, camAngY_r, camAngZ_r))
         A, B, C, D = computePropellers(maxRps/2, camAngX_r, camAngY_r, camAngZ_r)
         A+=maxRps/2*sign(A)
         B+=maxRps/2*sign(B)

{gsof_3dwireframe-1.1.2 → gsof_3dwireframe-1.1.3}/GSOF_3dWireFrame/Example_F16.py

@@ -81,7 +81,7 @@ if __name__ == "__main__":
     pygame.init()
     clock = pygame.time.Clock()
     screen = newScreen("3D Wire Frame Shapes", SCREEN_WIDTH, SCREEN_HEIGHT, WHITE)
-    wireframe = DISP.WireFrame(screen, pygame.draw.line, f=50, scale=20.0)
+    wireframe = DISP.WireFrame(screen, pygame.draw.line, f=0.5, scale=1000.0)
 
     fps = 30
     dt = 1/fps

{gsof_3dwireframe-1.1.2 → gsof_3dwireframe-1.1.3}/GSOF_3dWireFrame/Example_dynamicWorld.py

@@ -22,13 +22,13 @@ def newScreen(title="New", resX=SCREEN_WIDTH, resY=SCREEN_HEIGHT, color=WHITE):
     
 if __name__ == "__main__":
     import json
-    d = 4
+    d = 30
     solidHouse = Object(filename="./objects/house.json", color=(0,180,180), name="House").scale(10.0).setOrigin()
     window = Object(filename="./objects/frame.json", color=(200,0,0), name="Window").setCenter(scale=0.8)
     flexHouse = Assembly(objects = (
-        Object(filename="./objects/cube.json", color=(190,190,190), name="Body").translate(0,0,0 +d).setOrigin(),
-        Object(filename="./objects/pyramid.json", color=(90,90,90), name="Roof").translate(0,-2.5,0 +d).setOrigin(),
-        Assembly(objects=(window,), name="Window-Assy").translate(0,0,-1 +d).setOrigin(),
+        Object(filename="./objects/cube.json", color=(190,190,190), name="Body").translate(0,0,0).setOrigin(),
+        Object(filename="./objects/pyramid.json", color=(90,90,90), name="Roof").translate(0,-2.5,0).setOrigin(),
+        Assembly(objects=(window,), name="Window-Assy").translate(0,0,-1).setOrigin(),
         ),
         connections=[
           [[0,4],[1,0]], #< Point-4 of object-0 to point-0 of object-1
@@ -41,12 +41,12 @@ if __name__ == "__main__":
 
     world = Assembly(objects = (
         solidHouse.translate(0,0,0).setOrigin(),
-        flexHouse.translate(0,-0,0).setOrigin(),
+        flexHouse.translate(0,0,d).setOrigin(),
         ))
     pygame.init()
     clock = pygame.time.Clock()
     screen = newScreen("3D Wire Frame Shapes", SCREEN_WIDTH, SCREEN_HEIGHT, WHITE)
-    wireframe = DISP.WireFrame(screen, pygame.draw.line, f=50, scale=80)
+    wireframe = DISP.WireFrame(screen, pygame.draw.line, scale=50*80)
     fps = 30
     dt = 1/fps
     t = 0.0

{gsof_3dwireframe-1.1.2 → gsof_3dwireframe-1.1.3}/GSOF_3dWireFrame/Example_motionWorld.py

@@ -1,4 +1,4 @@
-import pygame
+import pygame, math
 from Lib3D.Object_WireFrame import Object_wireFrame as Object
 from Lib3D.Assembly import Assembly
 from Lib3D import Objects
@@ -21,16 +21,17 @@ def newScreen(title="New", resX=SCREEN_WIDTH, resY=SCREEN_HEIGHT, color=WHITE):
     return screen
   
 if __name__ == "__main__":
-    house = Object(filename="./objects/house.json", color=(0,180,180))
     world = Assembly(objects = (
-        house,
+        Object(filename="./objects/house.json", color=(0,180,180), name="HOUSE"),
+        Object(Objects.net(20,20), color=(0,100,0), name="GROUND").scale(0.005)\
+        .rotate(x=math.pi/2, y=0, z=0).translate(-5, -1, -5).setOrigin(),
         ))
 
     pygame.init()
     clock = pygame.time.Clock()
     screen = newScreen("3D Wire Frame Shapes", SCREEN_WIDTH, SCREEN_HEIGHT, WHITE)
-    wireframe = DISP.WireFrame(screen, pygame.draw.line, f=50, scale=10)
-    viewer = Controls.Viewer( pos=(0,0,-400),
+    wireframe = DISP.WireFrame(screen, pygame.draw.line, scale=1000)
+    viewer = Controls.Viewer( pos=(0,0,-10),
                               center=(int(screen.get_width()/2), int(screen.get_height()/2)),
                               moveLeftKey  = pygame.K_a,
                               moveRightKey = pygame.K_d,
@@ -54,8 +55,8 @@ if __name__ == "__main__":
 
         keys = pygame.key.get_pressed()
         (mPosX, mPosY) = pygame.mouse.get_pos()
-        wireframe.f += -(keys[pygame.K_1] - keys[pygame.K_2])*10
-        viewer.update(keys, mPosX, mPosY, speed=2)
+        wireframe.scale += -(keys[pygame.K_1] - keys[pygame.K_2])*10
+        viewer.update(keys, mPosX, mPosY, speed=0.1)
         
         clearScreen(screen, WHITE)
         world.reset()

{gsof_3dwireframe-1.1.2 → gsof_3dwireframe-1.1.3}/GSOF_3dWireFrame/Example_staticWorld.py

@@ -67,7 +67,7 @@ if __name__ == "__main__":
     pygame.init()
     clock = pygame.time.Clock()
     screen = newScreen("3D Wire Frame Shapes", SCREEN_WIDTH, SCREEN_HEIGHT, WHITE)
-    wireframe = DISP.WireFrame(screen, pygame.draw.line, f=50, scale=10.0)
+    wireframe = DISP.WireFrame(screen, pygame.draw.line, f=1, scale=500.0)
 
     fps = 30
     dt = 1/fps

gsof_3dwireframe-1.1.3/GSOF_3dWireFrame/Lib3D/WireFrame_display.py

@@ -0,0 +1,60 @@
+def _findLine(x1,y1,x2,y2) -> list:
+        DX = x2 -x1
+        DY = y2 -y1
+        Ay = DY/DX
+        By = y2 -Ay*x2
+        return (Ay, By)
+
+def calcLine(a, b, x) -> float:
+    return a*x +b
+
+class WireFrame():
+    def __init__(self, screen, line, f=1, scale=1000.0, maxViewDistance=10000):
+        self.screen = screen #< Object to draw on
+        self.line = line     #< function to draw a line
+        self.f = f           #< Perspective factor
+        self.scale = scale   #< Lens zoom
+        self.maxViewZ = maxViewDistance #< 
+        self.minViewZ = abs(1.0)        #< 
+        self.centerX, self.centerY = (int(screen.get_width()/2), int(screen.get_height()/2))
+        
+    def draw(self, obj, color=None) -> None:
+        """  """
+        for line in obj.getLines():
+            p1, p2 = line.points
+            #p1[2], p2[2] = -p1[2], -p2[2]
+            z0 = -self.minViewZ
+            if (p1[2] < z0) or (p2[2] < z0):
+                ### At least one end of the line is infront of the camera
+                self.clip(p1,p2)
+                p1 = self.camera(p1)
+                p2 = self.camera(p2)
+                lcolor = line.color if color == None else color
+                self.drawLine( lcolor, p1, p2 )
+
+    def clip(self, p1, p2) -> None:
+        z0, z1, z2 = -self.minViewZ, p1[2], p2[2]
+        x1, x2 = p1[0], p2[0]
+        y1, y2 = p1[1], p2[1]
+        if z1 != z2:
+            Ax, Bx = _findLine(z1,x1,z2,x2)
+            Ay, By = _findLine(z1,y1,z2,y2)
+            if z1 > z0:
+                p1[0], p1[1], p1[2] = calcLine(Ax, Bx, z0), calcLine(Ay, By, z0), z0
+            elif z2 > z0:
+                p2[0], p2[1], p2[2] = calcLine(Ax, Bx, z0), calcLine(Ay, By, z0), z0
+
+    def camera(self, point) -> list:
+        """ Perspective projection <https://en.wikipedia.org/wiki/3D_projection> """
+        x, y, z = point
+        s =self.scale/10
+        z *= -1
+        if (self.f != 0):
+            s = self.scale/z
+        return (x*s, y*s, z)
+
+    def drawLine(self, color, p0, p1):
+        """  """
+        p0 = (self.centerX +p0[0], self.centerY -p0[1])
+        p1 = (self.centerX +p1[0], self.centerY -p1[1])
+        self.line( self.screen, color, p0, p1 ) #< Line from P0 to P1

{gsof_3dwireframe-1.1.2 → gsof_3dwireframe-1.1.3/GSOF_3dWireFrame.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GSOF_3dWireFrame
-Version: 1.1.2
+Version: 1.1.3
 Summary: A 3D wireframe rendering library built on Pygame
 Author-email: Guy Soffer <gsoffer@yahoo.com>
 License: GPL-3.0-or-later

{gsof_3dwireframe-1.1.2/GSOF_3dWireFrame.egg-info → gsof_3dwireframe-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GSOF_3dWireFrame
-Version: 1.1.2
+Version: 1.1.3
 Summary: A 3D wireframe rendering library built on Pygame
 Author-email: Guy Soffer <gsoffer@yahoo.com>
 License: GPL-3.0-or-later

{gsof_3dwireframe-1.1.2 → gsof_3dwireframe-1.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GSOF_3dWireFrame"
-version = "1.1.2"
+version = "1.1.3"
 description = "A 3D wireframe rendering library built on Pygame"
 readme = "README.md"
 requires-python = ">=3.9"

gsof_3dwireframe-1.1.2/GSOF_3dWireFrame/Lib3D/WireFrame_display.py

@@ -1,37 +0,0 @@
-class WireFrame():
-    def __init__(self, screen, line, f=50, scale=1.0):
-        self.screen = screen
-        self.line = line
-        self.f = f
-        self.scale = scale
-        self.centerX, self.centerY = (int(screen.get_width()/2), int(screen.get_height()/2))
-        
-    def draw(self, obj, color=None) -> None:
-        """  """
-        for line in obj.getLines():
-            p0 = self.camera(line.points[0])
-            p1 = self.camera(line.points[1])
-            if (p0[2] > self.f) or (p1[2] > self.f): #Skip lines in the back of the viewer
-                lcolor = color
-                if lcolor == None:
-                    lcolor = line.color
-                self.drawLine( lcolor, p0, p1 ) #< Line from P0 to P1
-
-    def camera(self, point) -> list:
-        """ Perspective projection <https://en.wikipedia.org/wiki/3D_projection> """
-        x, y, z = point
-        z = -z
-        if (self.f != None):
-            if (z > self.f):
-                s = (self.f/z)*self.scale
-            else:
-                s = 100000
-            x *= s
-            y *= s
-        return (x,y,z)
-
-    def drawLine(self, color, p0, p1):
-        """  """
-        p0 = (self.centerX +p0[0], self.centerY -p0[1])
-        p1 = (self.centerX +p1[0], self.centerY -p1[1])
-        self.line( self.screen, color, p0, p1 ) #< Line from P0 to P1