voxels

@@ -55,7 +55,9 @@ class Camera:

     def mvp(self, ent):

         if ent.hud:

-            return ent.translate() @ ent.orient

+            am = np.identity(4, dtype=FLOAT)

+            am[0, 0] = 1 / self.aspect

+            return ent.translate() @ am @ ent.orient

         else:

             return self.persp_mat() @ self.view_mat() @ ent.translate() @ ent.orient

@@ -1,4 +1,5 @@

 from OpenGL.GL import *

+import itertools

 import numpy as np

 import pygame

@@ -8,6 +9,10 @@ VOXEL_TYPE = np.uint8

 def vec(l):

     return np.array(l, dtype=FLOAT)

+RED = vec([1.0, 0.0, 0.0, 1.0])

+YELLOW = vec([1.0, 1.0, 0.0, 1.0])

+GREEN = vec([0.0, 1.0, 0.0, 1.0])

+

 def normalize(v):

     norm = np.linalg.norm(v)

     return v / norm if norm > 0 else v

@@ -24,6 +24,8 @@ void main() {

 }

 """

+FPS = 240

+

 def click_mesh(self, button, ind):

     a, p = self.faces[ind]

     match button:

@@ -44,11 +46,7 @@ def build_scene():

             for k in range(2):

                 box.add_voxel((-i % 16, -j % 16, -k % 16))

     box.onclick = click_mesh

-    cross = Entity(

-        [[-0.05, 0.0, 0.0], [0.05, 0.0, 0.0], [0.0, -0.05, 0.0], [0.0, 0.05, 0.0]],

-        [0.9, 0.9, 0.9, 1.0], [0.0, 0.0, 0.0], mode=GL_LINES, hud=True

-    )

-    return [box, cross]

+    return [box]

 def main():

     pygame.init()

@@ -66,21 +64,20 @@ def main():

     clock = pygame.time.Clock()

     cam = Player()

     cam.set_focus(True)

-    n = 0

     while True:

-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)

-        for ent in scene:

-            cam.draw(ent, loc_mvp)

         for ev in pygame.event.get():

             if ev.type == pygame.QUIT or ev.type == pygame.KEYUP and ev.unicode == "q":

                 pygame.quit()

                 return

             cam.handle_event(ev, scene)

         cam.update_pos()

+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)

+        perf = clock.get_fps() / FPS

+        cam.hud["fps"].col = GREEN if 0.9 < perf < 1.1 else YELLOW if perf > 0.5 else RED

+        cam.hud["fps"].update_attr(1)

+        for ent in itertools.chain(scene, cam.hud.values()):

+            cam.draw(ent, loc_mvp)

         pygame.display.flip()

         clock.tick(240)

-        n += 1

-        if n % 120 == 0:

-            pygame.display.set_caption(f"fps {round(clock.get_fps())}")

 main()

@@ -1,5 +1,6 @@

 from libs import *

 import camera

+import entity

 ARROWS = [pygame.K_UP, pygame.K_DOWN, pygame.K_LEFT, pygame.K_RIGHT, pygame.K_SPACE, pygame.K_LSHIFT]

@@ -13,6 +14,16 @@ class Player(camera.Camera):

         self.sensitivity = kwargs.get("sensitivity", 0.005)

         self.rv = vec([0, 0, 0])

         self.speed = kwargs.get("speed", 0.05)

+        self.hud = {

+            "crosshair": entity.Entity(

+                [[-0.03, 0.0, 0.0], [0.03, 0.0, 0.0], [0.0, -0.03, 0.0], [0.0, 0.03, 0.0]],

+                [1.0, 1.0, 1.0, 1.0], [0.0, 0.0, 0.0], mode=GL_LINES, hud=True

+            ),

+            "fps": entity.Entity(

+                [[0.0, 0.0, 0.0], [0.1, 0.0, 0.0], [0.0, -0.1, 0.0], [0.1, -0.1, 0.0]],

+                YELLOW, [-1.0, 1.0, 0.0], mode=GL_TRIANGLE_STRIP, hud=True

+            ),

+        }

     def set_focus(self, f): 

         pygame.event.set_grab(f)