threequick 0.0.0__tar.gz → 0.0.1__tar.gz

{threequick-0.0.0/src/threequick.egg-info → threequick-0.0.1}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: threequick
-Version: 0.0.0
-Summary: A simple python library for creating 3D visualisations without OpenGL.
+Version: 0.0.1
+Summary: A simple python library for creating 3D visualisations
 Author-email: Hannah Baldwin <contact@hannahbaldwin.net>
 License: GPL-3.0
 Project-URL: Homepage, https://github.com/habaldwin01/threequick
@@ -16,4 +16,4 @@ Requires-Dist: pygame>=2.0.0
 Dynamic: license-file
 
 # threequick
-A simple python library for creating 3D visualisations without OpenGL
+A simple python library for creating 3D visualisations.

threequick-0.0.1/README.md

@@ -0,0 +1,2 @@
+# threequick
+A simple python library for creating 3D visualisations.

{threequick-0.0.0 → threequick-0.0.1}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [
   { name="Hannah Baldwin", email="contact@hannahbaldwin.net" },
 ]
 license = { text="GPL-3.0" }
-description = "A simple python library for creating 3D visualisations without OpenGL."
+description = "A simple python library for creating 3D visualisations"
 readme = "README.md"
 requires-python = ">=3.6"
 classifiers = [

threequick-0.0.1/scripts/example.py

@@ -0,0 +1,95 @@
+import pygame
+import numpy as np
+import math
+from threequick import CameraContext, Object3d, Cube, Sphere, PointCloud
+
+
+window = pygame.display.set_mode((1280, 720), pygame.RESIZABLE)
+pygame.display.set_caption("threequick test")
+done = False
+renderable_objects = []
+
+
+tc = Cube(0.2)
+# pitch  roll   yaw
+# x      y      z
+tc.set_rotation(30,10,60)
+tc.set_position(1,0,0)
+renderable_objects.append(tc)
+
+sp = Sphere(16, 6+1, 1)
+renderable_objects.append(sp)
+
+#point_cloud = PointCloud()
+#renderable_objects.append(point_cloud)
+
+#point_cloud.add_point([0,0.25,0.25], [0,255,0])
+
+cam_dist = 2
+
+camera_context = CameraContext([0,-cam_dist,0], [70,0,30], 90, window)
+camera_context.position[0] = (math.sin(math.radians(camera_context.rotation[2])) * -cam_dist) * math.sin(math.radians(camera_context.rotation[0]))
+camera_context.position[1] = (math.cos(math.radians(camera_context.rotation[2])) * -cam_dist) * math.sin(math.radians(camera_context.rotation[0]))
+camera_context.position[2] = math.cos(math.radians(camera_context.rotation[0])) * -cam_dist
+
+cube_angle = 0
+
+pygame.init()
+
+last_ticks = pygame.time.get_ticks()
+
+while not done:
+    current_ticks = pygame.time.get_ticks()
+
+    pygame.draw.rect(window, (0, 0, 0), (0, 0, window.get_width(), window.get_height()))
+
+    mx, my = pygame.mouse.get_pos()
+    for event in pygame.event.get():
+        if event.type == pygame.QUIT:
+            exit()
+
+    left_button, middle_button, right_button = pygame.mouse.get_pressed()
+    if not left_button:
+        last_rc_pos = (mx, my)
+
+
+    if left_button:
+        camera_context.rotation[0] -= (my - last_rc_pos[1]) * 0.2
+        if camera_context.rotation[0] > 180:
+            camera_context.rotation[0] = 180
+        if camera_context.rotation[0] < 0:
+            camera_context.rotation[0] = 0
+        smx = (math.sin(math.radians(camera_context.rotation[0]))) + 0.5
+        camera_context.rotation[2] -= (mx - last_rc_pos[0]) * 0.2 / smx
+        last_rc_pos = (mx, my)
+
+
+    orbital_period_s = 8
+    cube_angle = ((pygame.time.get_ticks() / 1000) / orbital_period_s) * 360
+
+    tc.set_rotation(30,10,60 + cube_angle)
+    tc.set_position(math.sin(math.radians(cube_angle)),-math.cos(math.radians(cube_angle)),0)
+
+    # Slow rotation of camera
+    #camera_context.rotation[2] += (last_ticks - current_ticks) / 80
+
+
+    # Calculate camera position based off angle so it always points at 0,0,0
+    camera_context.position[0] = (math.sin(math.radians(camera_context.rotation[2])) * -cam_dist) * math.sin(math.radians(camera_context.rotation[0]))
+    camera_context.position[1] = (math.cos(math.radians(camera_context.rotation[2])) * -cam_dist) * math.sin(math.radians(camera_context.rotation[0]))
+    camera_context.position[2] = math.cos(math.radians(camera_context.rotation[0])) * -cam_dist
+
+
+    last_ticks = current_ticks
+
+    camera_context.update_screenspace()
+    for ro in renderable_objects:
+        ro.draw(camera_context)
+
+    for event in pygame.event.get():
+        if event.type == pygame.QUIT:
+            done = True
+
+    pygame.display.flip()
+
+exit()

{threequick-0.0.0 → threequick-0.0.1}/src/threequick/threequick.py

@@ -42,10 +42,12 @@ class CameraContext:
     def __init__(self,
                  position: list[float],
                  rotation: list[float],
+                 fov: float,
                  surface: pygame.Surface):
         self.position = position
         self.rotation = rotation
         self.screen_size = (1,1)
+        self.fov = fov
         self.frustum_width = 1
         self.frustum_height = 1
         self.surface = surface
@@ -54,13 +56,13 @@ class CameraContext:
         self.screen_size = (self.surface.get_width(), self.surface.get_height())
 
         self.min_render_distance = 0.1
-        self.frustum_width = self.min_render_distance
+        self.frustum_width = self.min_render_distance * math.radians(self.fov)
         self.frustum_height = self.frustum_width * (self.screen_size[1] / self.screen_size[0])
         #self.projection_matrix = [[nx/2,  0,     0,     (nx-1)/2],
         #                       [0,     ny/2,  0,     (ny-1)/2],
         #                       [0,     0,     1/2,   1/2     ]]
 
-        f = 4 # far
+        f = 10 # far
         n = self.min_render_distance # near
         r = self.frustum_width # width
         t = self.frustum_height # height
@@ -105,28 +107,27 @@ class Object3d(Renderable):
                  vertices: list[list[float]],
                  edges: list[list[int]],
                  faces: list[list[int]]) -> None:
-        self.__mod_vertices = vertices
-        self.__mod_edges = edges
-        self.__mod_faces = faces
+        self.__mod_vertices = [None] * len(vertices)
+        #self.__mod_edges = edges
+        #self.__mod_faces = faces
         self.vertices = vertices
         self.edges = edges
         self.faces = faces
-        self.position = [0,0,0]
-        self.rotation_matrix = [[1, 0, 0, 0],
-                                [0, 1, 0, 0],
-                                [0, 0, 1, 0],
-                                [0, 0, 0, 1]]
+        self.position = [0, 0, 0]
+        self.rotation_matrix = pry_rot_to_4x4(0, 0, 0)
+        self.update_vertex_cache()
 
     def set_rotation(self, pitch, roll, yaw):
         self.rotation_matrix = pry_rot_to_4x4(pitch, roll, yaw)
-
-        for vindex, vertex in enumerate(self.vertices):
-            self.__mod_vertices[vindex] = transform_3d_point_4x4_mat(self.rotation_matrix, vertex)
+        self.update_vertex_cache()
 
     def set_position(self, x, y, z):
         self.position = [x, y, z]
+        self.update_vertex_cache()
 
+    def update_vertex_cache(self):
         for vindex, vertex in enumerate(self.vertices):
+            vertex = transform_3d_point_4x4_mat(self.rotation_matrix, vertex)
             self.__mod_vertices[vindex] = [vertex[0] + self.position[0], vertex[1] + self.position[1], vertex[2] + self.position[2]]
 
     def draw(self, camera_context: CameraContext) -> None:

{threequick-0.0.0 → threequick-0.0.1/src/threequick.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: threequick
-Version: 0.0.0
-Summary: A simple python library for creating 3D visualisations without OpenGL.
+Version: 0.0.1
+Summary: A simple python library for creating 3D visualisations
 Author-email: Hannah Baldwin <contact@hannahbaldwin.net>
 License: GPL-3.0
 Project-URL: Homepage, https://github.com/habaldwin01/threequick
@@ -16,4 +16,4 @@ Requires-Dist: pygame>=2.0.0
 Dynamic: license-file
 
 # threequick
-A simple python library for creating 3D visualisations without OpenGL
+A simple python library for creating 3D visualisations.

threequick-0.0.0/README.md

@@ -1,2 +0,0 @@
-# threequick
-A simple python library for creating 3D visualisations without OpenGL

threequick-0.0.0/scripts/example.py

@@ -1,68 +0,0 @@
-import pygame
-import numpy as np
-import math
-from threequick import CameraContext, Object3d, Cube, Sphere, PointCloud
-
-
-window = pygame.display.set_mode((1280, 720), pygame.RESIZABLE)
-pygame.display.set_caption("threequick test")
-done = False
-renderable_objects = []
-
-
-tc = Cube(0.2)
-# pitch  roll   yaw
-# x      y      z
-tc.set_rotation(30,10,60)
-renderable_objects.append(tc)
-
-sp = Sphere(16, 6+1, 1)
-renderable_objects.append(sp)
-
-point_cloud = PointCloud()
-renderable_objects.append(point_cloud)
-
-point_cloud.add_point([0,0.25,0.25], [0,255,0])
-
-cam_dist = 2
-
-camera_context = CameraContext([0,-cam_dist,0], [90,0,0], window)
-
-
-while not done:
-    pygame.draw.rect(window, (0, 0, 0), (0, 0, 1280, 720))
-
-    mx, my = pygame.mouse.get_pos()
-    for event in pygame.event.get():
-        if event.type == pygame.QUIT:
-            exit()
-
-    left_button, middle_button, right_button = pygame.mouse.get_pressed()
-    if not left_button:
-        last_rc_pos = (mx, my)
-
-
-    if left_button:
-        camera_context.rotation[0] -= (my - last_rc_pos[1]) * 0.2
-        if camera_context.rotation[0] > 180:
-            camera_context.rotation[0] = 180
-        if camera_context.rotation[0] < 0:
-            camera_context.rotation[0] = 0
-        smx = (math.sin(math.radians(camera_context.rotation[0]))) + 0.5
-        camera_context.rotation[2] -= (mx - last_rc_pos[0]) * 0.2 / smx
-        camera_context.position[0] = (math.sin(math.radians(camera_context.rotation[2])) * -cam_dist) * math.sin(math.radians(camera_context.rotation[0]))
-        camera_context.position[1] = (math.cos(math.radians(camera_context.rotation[2])) * -cam_dist) * math.sin(math.radians(camera_context.rotation[0]))
-        camera_context.position[2] = math.cos(math.radians(camera_context.rotation[0])) * -cam_dist
-        last_rc_pos = (mx, my)
-
-    camera_context.update_screenspace()
-    for ro in renderable_objects:
-        ro.draw(camera_context)
-
-    for event in pygame.event.get():
-        if event.type == pygame.QUIT:
-            done = True
-
-    pygame.display.flip()
-
-exit()