GSOF-3dWireFrame 1.0.0__tar.gz → 1.1.0__tar.gz

gsof_3dwireframe-1.1.0/GSOF_3dWireFrame/Drone_Class.py

@@ -0,0 +1,64 @@
+#!/usr/bin/python
+"""
+ * F16_Class.py
+ * Created on: 6 Jan 2025
+ * Improved for: 25 May 2026
+ * Author: Tzur Soffer
+ * Copyright (C) 2026 Tzur Soffer
+"""
+
+import copy
+try:
+   from GSOF_3dWireFrame.Lib3D.Object_WireFrame import Object_wireFrame as Object
+   from GSOF_3dWireFrame.Lib3D.Assembly import Assembly
+   from GSOF_3dWireFrame.Lib3D.Utils import Colors
+except:
+   print("GSOF_Wireframe3D module isn't installed")
+
+class View(Assembly):
+    """Constructs the gauges screen"""
+    def __init__(self, folder='./'):
+        self.time = 0.0
+        axis  = Object(
+            filename="%s/objects/axis.json"%folder, color=Colors.GREEN)\
+            .scale(50.0)\
+            .translate(0, 0, 150)\
+            .setOrigin()
+
+        self.drone = Object(
+            filename="%s/objects/Drone/Body.stl"%folder, color=Colors.BLUE)\
+            .setCenter(scale=1.0, method="arithCenter")
+
+        propellorObj = Object(filename="%s/objects/Drone/Blade.stl"%folder, color=Colors.RED)\
+            .translate(0,20,0)\
+            .setCenter(scale=1.0, method="arithCenter")\
+            .setOrigin()
+   
+        self.propellorA = copy.deepcopy(propellorObj)
+        self.propellorB = copy.deepcopy(propellorObj)
+        self.propellorC = copy.deepcopy(propellorObj)
+        self.propellorD = copy.deepcopy(propellorObj)
+
+        self.propellorA.color = Colors.RED
+        self.propellorB.color = Colors.BLACK
+        self.propellorC.color = Colors.GRAY
+        self.propellorD.color = Colors.YELLOW
+
+        super().__init__(objects=(axis, self.drone,
+                                  Assembly(objects=(self.propellorA,)).translate(-95,0,-90).setOrigin(),
+                                  Assembly(objects=(self.propellorB,)).translate(100,0,-90).setOrigin(),
+                                  Assembly(objects=(self.propellorC,)).translate(90,0,100).setOrigin(),
+                                  Assembly(objects=(self.propellorD,)).translate(-85,0,100).setOrigin()
+                                  ))
+
+    def setPropellorRps(self, propellor, rps) -> None:
+        propellor.rotate(x=0, y=rps*self.time*6.28, z=0)
+
+    def setPropellors(self, A, B, C, D) -> None:
+        self.setPropellorRps(self.propellorA, A)
+        self.setPropellorRps(self.propellorB, B)
+        self.setPropellorRps(self.propellorC, C)
+        self.setPropellorRps(self.propellorD, D)
+    
+    def tick(self, dt):
+        self.time+=dt

gsof_3dwireframe-1.1.0/GSOF_3dWireFrame/Example_Drone.py

@@ -0,0 +1,150 @@
+#!/usr/bin/python
+"""
+ * Example_F16.py
+ * Created on: 31 May 2026
+ * Improved for: 31 May 2026
+ * Author: Tzur Soffer
+ * Copyright (C) 2026 Tzur Soffer
+"""
+import pygame, math
+from MathLib import MathLib
+from Lib3D.Object_WireFrame import Object_wireFrame
+from Lib3D.Assembly import Assembly
+from Lib3D import Objects
+from Lib3D import WireFrame_display as DISP
+from Lib3D.Utils import Colors
+from Drone_Class import View
+
+SCREEN_WIDTH = 800
+SCREEN_HEIGHT = 600
+PI = math.pi
+
+def drawWireFrame(screen, obj, color=None) -> None:
+    for line in obj.getLines():
+        x0, y0, z0 = line.p0
+        x1, y1, z1 = line.p1
+        lcolor = color
+        if lcolor == None:
+            lcolor = line.color
+        pygame.draw.line( screen, lcolor, (x0, y0), (x1, y1) ) #< Line from P0 to P1
+
+def clearScreen(screen, color=(255,255,255)) -> None:
+  screen.fill(color)
+    
+def newScreen(title="New", resX=SCREEN_WIDTH, resY=SCREEN_HEIGHT, color=Colors.WHITE):
+    screenSize = (resX, resY)
+    screen = pygame.display.set_mode( screenSize )
+    clearScreen(screen, color)
+    pygame.display.set_caption(title)
+    return screen
+
+def rotatePR(p, r, yaw):
+    R = MathLib.DCM_V2(yaw)
+    return MathLib.MxV_2x2(R, [p, r])
+
+def quadMix(p, r):
+    M = [
+        [ 1, -1],  # A
+        [ 1,  1],  # B
+        [-1,  1],  # C
+        [-1, -1],  # D
+    ]
+    return MathLib.MxV(M, [p, r])
+
+def computePropellers(maxRps, p, r, yaw):
+    p2, r2 = rotatePR(p, r, yaw)
+
+    props = quadMix(p2, r2)  # mix WITHOUT maxRps first
+
+    # Normalize
+    maxVal = 0
+    for v in props:
+        if abs(v) > maxVal:
+            maxVal = abs(v)
+
+    # Scale if needed
+    if maxVal > 1.0:
+        props = MathLib.scaleV(props, 1.0 / maxVal)
+
+    # Apply maxRps
+    props = MathLib.scaleV(props, maxRps)
+
+    A = MathLib.clip(props[0], -maxRps, maxRps)
+    B = MathLib.clip(props[1], -maxRps, maxRps)
+    C = MathLib.clip(props[2], -maxRps, maxRps)
+    D = MathLib.clip(props[3], -maxRps, maxRps)
+
+    return A, B, C, D
+
+def sign(val):
+    if val >= 0:
+        return 1
+    return -1
+
+
+if __name__ == "__main__":
+    pygame.init()
+    ground = Object_wireFrame(
+       obj=Objects.net(25,25), color=(0,100,0))\
+       .scale(0.2)\
+       .rotate(x=math.pi/2, y=0, z=0)\
+       .translate(-250, -200, -250)\
+       .setOrigin()
+
+    drone = View()\
+          .scale(1.0)\
+          .translate(100, 100, -100).setOrigin()
+
+    world = Assembly(objects=(ground, drone)).translate(0,0,-1000).setOrigin()
+
+    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)
+
+    fps = 30
+    maxRps = 2
+    dt = 1/fps
+    t = 0
+    useMouse = True
+    mPosZ = 0
+    run = True
+    while run:
+        for event in pygame.event.get():
+            if event.type == pygame.QUIT:
+              run = False
+        world.reset()
+        clearScreen(screen)
+
+        keys = pygame.key.get_pressed()
+
+        if useMouse:
+            (mPosX, mPosY) = pygame.mouse.get_pos()
+            mPosZ += (keys[pygame.K_z] -keys[pygame.K_x])*2
+            x = mPosX/SCREEN_WIDTH -0.5
+            y = mPosY/SCREEN_HEIGHT -0.5
+            z = mPosZ/360
+        else:
+            x += 0.5*dt
+            y += 1*dt
+            z = 0
+        camAngX_r = y*PI
+        camAngY_r = z*PI
+        camAngZ_r = x*PI
+        
+        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)
+        C+=maxRps/2*sign(C)
+        D+=maxRps/2*sign(D)
+        drone.setPropellors(A, B, C, D)
+        drone.rotate(-camAngX_r,-camAngY_r,-camAngZ_r, centerAt=(100, 100, -100))
+        drone.tick(dt)
+        wireframe.draw(world)
+
+        t += dt
+        clock.tick(30)
+
+        pygame.display.flip()
+
+    pygame.quit()

{gsof_3dwireframe-1.0.0 → gsof_3dwireframe-1.1.0}/GSOF_3dWireFrame/F16_Class.py

@@ -73,7 +73,7 @@ class F16_View(Assembly):
             filename="%s/objects/f16.stl"%folder, color=BLUE, name="F16")\
             .setCenter(scale=1.0, method="arithCenter")
         
-        self.plume = objects=Object(
+        self.plume = Object(
            filename="%s/objects/Plume.json"%folder, color=RED)\
            .setCenter(scale=30, rotate=(180*degToRad, 0, 0))
         plume = Assembly(objects=(self.plume,))   

{gsof_3dwireframe-1.0.0 → gsof_3dwireframe-1.1.0}/GSOF_3dWireFrame.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GSOF_3dWireFrame
-Version: 1.0.0
+Version: 1.1.0
 Summary: A 3D wireframe rendering library built on Pygame
 Author-email: Guy Soffer <gsoffer@yahoo.com>
 License: GPL-3.0-or-later
@@ -25,7 +25,7 @@ License-File: AUTHORS
 Requires-Dist: pygame
 Dynamic: license-file
 
-# 3dWireFrame
+# GSOF_3dWireFrame
 Simple and basic 3D Wire-Frame drawing program.
 - Loads .stl or .json object files.
 - Supports assembly containers to manipulate object in their own frame of reference.
@@ -36,13 +36,17 @@ Simple and basic 3D Wire-Frame drawing program.
 ## Running instructions
 ## Using pip (recommened)
 - run `pip install GSOF_3dWireFrame`
+
 ## Manual install
 - Clone
 - Install requirements `pip install -r requirements.txt`
 - run `pip install .`
 - Open and run one of the code examples (e.g. `Example_staticWorld.py`)
 
+![alt text](./Documentation/3DWireFrame_quadcopter.gif "Animation")
+
 ![alt text](./Documentation/3DWireFrame_interactive.gif "Animation")
 
 ![alt text](./Documentation/3DWireFrame_flex.gif "Screenshot")
 
+## This project is licensed under MIT LICENSE, see LICENSE file for more info.

{gsof_3dwireframe-1.0.0 → gsof_3dwireframe-1.1.0}/GSOF_3dWireFrame.egg-info/SOURCES.txt

@@ -2,6 +2,8 @@ AUTHORS
 LICENSE
 README.md
 pyproject.toml
+GSOF_3dWireFrame/Drone_Class.py
+GSOF_3dWireFrame/Example_Drone.py
 GSOF_3dWireFrame/Example_F16.py
 GSOF_3dWireFrame/Example_dynamicWorld.py
 GSOF_3dWireFrame/Example_motionWorld.py

{gsof_3dwireframe-1.0.0 → gsof_3dwireframe-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GSOF_3dWireFrame
-Version: 1.0.0
+Version: 1.1.0
 Summary: A 3D wireframe rendering library built on Pygame
 Author-email: Guy Soffer <gsoffer@yahoo.com>
 License: GPL-3.0-or-later
@@ -25,7 +25,7 @@ License-File: AUTHORS
 Requires-Dist: pygame
 Dynamic: license-file
 
-# 3dWireFrame
+# GSOF_3dWireFrame
 Simple and basic 3D Wire-Frame drawing program.
 - Loads .stl or .json object files.
 - Supports assembly containers to manipulate object in their own frame of reference.
@@ -36,13 +36,17 @@ Simple and basic 3D Wire-Frame drawing program.
 ## Running instructions
 ## Using pip (recommened)
 - run `pip install GSOF_3dWireFrame`
+
 ## Manual install
 - Clone
 - Install requirements `pip install -r requirements.txt`
 - run `pip install .`
 - Open and run one of the code examples (e.g. `Example_staticWorld.py`)
 
+![alt text](./Documentation/3DWireFrame_quadcopter.gif "Animation")
+
 ![alt text](./Documentation/3DWireFrame_interactive.gif "Animation")
 
 ![alt text](./Documentation/3DWireFrame_flex.gif "Screenshot")
 
+## This project is licensed under MIT LICENSE, see LICENSE file for more info.

{gsof_3dwireframe-1.0.0 → gsof_3dwireframe-1.1.0}/README.md

@@ -1,4 +1,4 @@
-# 3dWireFrame
+# GSOF_3dWireFrame
 Simple and basic 3D Wire-Frame drawing program.
 - Loads .stl or .json object files.
 - Supports assembly containers to manipulate object in their own frame of reference.
@@ -9,13 +9,17 @@ Simple and basic 3D Wire-Frame drawing program.
 ## Running instructions
 ## Using pip (recommened)
 - run `pip install GSOF_3dWireFrame`
+
 ## Manual install
 - Clone
 - Install requirements `pip install -r requirements.txt`
 - run `pip install .`
 - Open and run one of the code examples (e.g. `Example_staticWorld.py`)
 
+![alt text](./Documentation/3DWireFrame_quadcopter.gif "Animation")
+
 ![alt text](./Documentation/3DWireFrame_interactive.gif "Animation")
 
 ![alt text](./Documentation/3DWireFrame_flex.gif "Screenshot")
 
+## This project is licensed under MIT LICENSE, see LICENSE file for more info.

{gsof_3dwireframe-1.0.0 → gsof_3dwireframe-1.1.0}/pyproject.toml

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