voxels

@@ -18,7 +18,7 @@ class Entity:

     def norm_list(self):

         l = []

-        if self.draw_mode == GL_TRIANGLE_STRIP:

+        if self.draw_mode == GL_TRIANGLE_STRIP or self.draw_mode == GL_TRIANGLE_FAN:

             l.append(norm_tri(self.verts[:3]))

             for i in range(1, len(self.verts) - 1):

                 l.append(norm_tri(self.verts[i - 1:i + 2]))

@@ -60,7 +60,7 @@ class Entity:

         ]) @ self.orient

     def click(self, button, face, hand=1):

-        self.onclick(self, button, face, hand)

+        return self.onclick(self, button, face, hand)

     def raycast(self, ro, rd):

         if self.hud or self.draw_mode == GL_LINES:

@@ -1,51 +0,0 @@

-from OpenGL.GL import *

-from OpenGL.GLU import *

-from OpenGL.GLUT import *

-import sys

-import time

-

-lf = time.time()

-fc = 0

-

-def reshape(width, height):

-    glViewport(0, 0, width, height)

-    glMatrixMode(GL_PROJECTION)

-    glLoadIdentity()

-    gluPerspective(45, width / float(height or 1), 1, 50)

-    glMatrixMode(GL_MODELVIEW)

-

-def draw_cube():

-    glutWireCube(1)

-

-def display():

-    global lf, fc

-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)

-    glLoadIdentity()

-    glTranslatef(0, 0, -5)

-    glRotatef((60 * time.time()) % 360, 2, 1, 0)

-    draw_cube()

-    glutSwapBuffers()

-    fc += 1

-    now = time.time()

-    if now - lf >= 1.0:

-        print(f"{fc} FPS")

-        fc = 0

-        lf = now

-

-def keyboard(key, x, y):

-    if key == b'\x1b':  # ESC

-        glutLeaveMainLoop()

-

-glutInit(sys.argv)

-glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH)

-glutInitWindowSize(500, 500)

-glutInitWindowPosition(100, 100)

-glutCreateWindow("PyOpenGL Cube")

-glEnable(GL_DEPTH_TEST)

-

-glutDisplayFunc(display)

-glutIdleFunc(display)

-glutReshapeFunc(reshape)

-glutKeyboardFunc(keyboard)

-

-glutMainLoop()

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

 VERTEX_ATTRS = ["vec3 position", "vec4 col", "vec3 normal", "vec4 refls"]

 UNIFORMS = {"MVP": ["vert", "mat4", None], "lightPos": ["frag", "vec4", None], "camPos": ["frag", "vec3", None]}

+LIGHT_POS = [5, 30, 10]

+GRAVITY = 1

 VIEW_DIST = 30

 FPS = 60

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

@@ -5,6 +5,7 @@ from mapgen import MapGen

 from mesh import SquareMesh

 from player import Player

 from region import WorldRegion

+import os

 VS = f"""

 #version 120

@@ -49,7 +50,7 @@ def in_view(wr, cam):

 def main():

     pygame.init()

-    pygame.display.set_mode((640, 480), pygame.DOUBLEBUF | pygame.OPENGL | pygame.FULLSCREEN | pygame.SCALED, vsync=1)

+    pygame.display.set_mode((640, 480), pygame.DOUBLEBUF | pygame.OPENGL | (pygame.FULLSCREEN | pygame.SCALED if os.environ.get("FULLSCREEN") else pygame.RESIZABLE), vsync=1)

     pygame.event.set_allowed([pygame.KEYDOWN, pygame.KEYUP, pygame.MOUSEBUTTONDOWN, pygame.MOUSEBUTTONUP, pygame.MOUSEMOTION, pygame.QUIT, pygame.WINDOWRESIZED, pygame.WINDOWSIZECHANGED])

     pygame.display.set_caption("Voxels")

     sp = shaders.compileProgram(

@@ -63,7 +64,7 @@ def main():

     glEnable(GL_BLEND)

     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)

     glClearColor(0.1, 0.1, 0.1, 1.0)

-    glUniform4fv(UNIFORMS["lightPos"][2], 1, vec([5, 30, 10, 100]))

+    glUniform4fv(UNIFORMS["lightPos"][2], 1, vec([*LIGHT_POS, 100]))

     mg = build_scene()

     clock = pygame.time.Clock()

     cam = Player(speed=6/FPS)

@@ -38,8 +38,8 @@ class SquareMesh(entity.Entity):

             case 1:

                 return (vec([*np.add(0.5, axis2offset(axis, 0.5)), 1.0]), vec([1.0, 0.0, 0.1, 128.0]))

             case 2:

-                top = (vec([0.5, 0.5, 1.0, 1.0]), vec([1.0, 0.0, 0.0, 1.0]))

-                bottom = (vec([0.0, 0.0, 0.5, 1.0]), vec([1.0, 0.0, 0.0, 1.0]))

+                top = (vec([0.2, 0.2, 1.0, 1.0]), vec([1.0, 0.0, 0.0, 1.0]))

+                bottom = (vec([0.0, 0.0, 0.2, 1.0]), vec([1.0, 0.0, 0.0, 1.0]))

                 match axis:

                     case 2:

                         return top

@@ -58,7 +58,7 @@ class SquareMesh(entity.Entity):

                     case -2:

                         return bottom

                     case a:

-                        return bottom if corner & (2 >> ((a % 4) // 2)) else top

+                        return bottom if corner & (1 << ((a % 4) // 2)) else top

                 return 

             case 5:

                 core = (vec([1.0, 1.0, 0.8, 1.0]), vec([0.4, 1.6, 0.0, 1.0]))

@@ -16,12 +16,26 @@ class Player(interactive.InteractiveCamera):

             roll_vec3(offset, 1)

             for s in range(2):

                 self.hud["skybox"].add_sq((d + 1) * (-1) ** s, 2 * VIEW_DIST, (-1) ** s * vec(offset), 2)

+        self.hud["sun"] = entity.Entity(

+            [[0.0, 0.0, 0.0], *[[2 * np.cos(2 * np.pi * k), 0, 2 * np.sin(2 * np.pi * k)] for k in np.arange(0, 1.01, 0.05)]],

+            [1.0, 1.0, 0.8, 1.0], normalise(LIGHT_POS) * VIEW_DIST, mode=GL_TRIANGLE_FAN

+        )

+        h = mesh.SquareMesh(hud=True)

+        self.hud["hand"] = h

+        h.add_sq(1, 1, [0.5, 0, 0], 1)

+        h.add_sq(2, 1, [0, 0.5, 0], 1)

+        h.add_sq(3, 1, [0, 0, 0.5], 1)

+        h.pos = [0.8, -0.8, 0.5]

+        h.rotate(2, [0, 1, 0])

+        h.rotate(-0.1, [1, 0, 0])

+        h.orient[:3, :3] *= 0.2

         self.hud["shl"] = mesh.SquareMesh()

         self.hud["shl"].draw_mode = GL_LINE_STRIP

-        self.hud["shl"].add_sq(2, 0.96, [0, 0, 0], 2)

+        self.hud["shl"].add_sq(-2, 0.96, [0, 0, 0], 2)

         self.hud["shl"].verts[:] = self.hud["shl"].verts[[0, 1, 3, 2, 0, 3]]

         self.hand = 1

         self.collides = True

+        self.falls = True

     def update_motion(self, pk, mg):

         netv = [pk[a] - pk[b] for (a, b) in zip(ARROWS[::2], ARROWS[1::2])]

@@ -29,10 +43,20 @@ class Player(interactive.InteractiveCamera):

             for i in range(len(netv)):

                 for s in range(2):

                     o = (-1) ** s * self.vdof()[i]

-                    if mg.voxel_at(self.pos + o):

+                    va = mg.voxel_at(self.pos + o)

+                    if va:

                         netv[i] = (max if s else min)(netv[i], 0)

+                    elif self.falls and i == 1 and s == 1:

+                        netv[i] = self.rv[i] - GRAVITY / FPS

         self.rv = vec(netv)

+    def set_hand(self, nh):

+        nh = int(nh)

+        self.hand = nh

+        self.hud["hand"].faces = [(a, self.hand) for (a, _) in self.hud["hand"].faces]

+        for i in range(1, 4, 2):

+            update_attr(self.hud["hand"], i)

+

     def handle_event(self, ev, mg, scene):

         super().handle_event(ev, mg)

         match ev.type:

@@ -40,15 +64,19 @@ class Player(interactive.InteractiveCamera):

                 if ev.unicode == "\x1b":

                     self.set_focus(False)

                 elif "1" <= ev.unicode <= "9":

-                    self.hand = int(ev.unicode)

+                    self.set_hand(int(ev.unicode))

                 elif ev.unicode == "n":

                     self.collides = not self.collides

+                elif ev.unicode == "f":

+                    self.falls = not self.falls

             case pygame.MOUSEBUTTONUP if ev.button == 1:

                 self.set_focus(True)

             case pygame.MOUSEBUTTONDOWN if self.get_focus():

                 t, n = self.target(scene)

                 if t:

-                    t.click(ev.button, n, self.hand)

+                    cr = t.click(ev.button, n, self.hand)

+                    if cr is not None:

+                        cr(self)

     def draw_hud(self, wrs, perf):

         self.hud["skybox"].pos = self.pos

@@ -57,8 +57,8 @@ class WorldRegion(mesh.SquareMesh):

                         bp, bc = bool(prev), bool(curr)

                         if bp ^ bc:

                             sq = vec([

-                                [0, 1, 1], [0, -1, 1], [0, 1, -1],

-                                [0, -1, -1], [0, 1, -1], [0, -1, 1]

+                                [0, 1, 1], [0, 1, -1], [0, -1, 1],

+                                [0, -1, -1], [0, -1, 1], [0, 1, -1]

                             ])

                             sq /= 2

                             if bp:

@@ -15,7 +15,7 @@ class WorldHolder():

             self.regions[pos] = wr

             self.world_natural(wr)

             wr.remesh()

-            wr.onclick = lambda s, b, c, h: self.click_region(s, b, c, h)

+            wr.onclick = (lambda s, b, c, h: self.click_region(s, b, c, h))

             return wr

     def voxel_at(self, pos, vt=None):

@@ -36,7 +36,7 @@ class WorldHolder():

             case 1:

                 wr.set_voxel(coords[1])

             case 2:

-                print(f"coords {coords}")

+                return (lambda pl: pl.set_hand(wr.grid[*coords[1]]))

             case 3:

                 offset = axis2offset(coords[0])

                 p = wr.set_voxel(coords[1] + offset, hand)