voxels

@@ -54,6 +54,9 @@ class Camera:

         ])

     def mvp(self, ent):

+        if ent.hud:

+            return ent.translate() @ ent.orient

+        else:

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

     def draw(self, ent, loc_mvp):

@@ -67,7 +70,9 @@ class Camera:

         l = self.looking()

         d, c, n = None, None, None

         for ent in scene:

-            if ent.draw_mode == GL_TRIANGLE_STRIP:

+            if ent.hud:

+                continue

+            elif ent.draw_mode == GL_TRIANGLE_STRIP:

                 tl = ((i, ent.verts[i:i + 3]) for i in range(len(ent.verts) - 2))

             elif ent.draw_mode == GL_TRIANGLES:

                 tl = ((i, ent.verts[3 * i:3 * (i + 1)]) for i in range(len(ent.verts) // 3))

@@ -1,11 +1,12 @@

 from libs import *

 class Entity:

-    def __init__(self, verts, col, pos, mode=GL_TRIANGLE_STRIP):

+    def __init__(self, verts, col, pos, **kwargs):

         self.verts = vec(verts)

         self.col = vec(col)

         self.pos = vec(pos)

-        self.draw_mode = mode

+        self.draw_mode = kwargs.get("mode", GL_TRIANGLE_STRIP)

+        self.hud = kwargs.get("hud", False)

         self.orient = np.identity(4, dtype=FLOAT)

         self.onclick = lambda s, b, n: print(f"clicked {s}:{n} with button {b}")

         self.vao = None

@@ -3,6 +3,7 @@ import numpy as np

 import pygame

 FLOAT = np.float32

+VOXEL_TYPE = np.uint8

 def vec(l):

     return np.array(l, dtype=FLOAT)

@@ -1,8 +1,8 @@

 from OpenGL.GL import shaders

 from libs import *

-from player import Player

 from entity import Entity

-from mesh import SquareMesh

+from player import Player

+from region import WorldRegion

 VS = """

 #version 120

@@ -24,46 +24,31 @@ void main() {

 }

 """

-WORLD_SIZE = 8

+def click_mesh(self, button, ind):

+    a, p = self.faces[ind]

+    match button:

+        case 1:

+            self.del_voxel(ind)

+        case 2:

+            print(f"face {a} of {p}")

+        case 3:

+            self.add_voxel(p + np.sign(a) * np.roll([0, 0, 1], abs(a)))

+    if button % 2 == 1:

+        self.update_attr(0)

+        self.update_attr(1)

-world = np.zeros((WORLD_SIZE, WORLD_SIZE, WORLD_SIZE), dtype=np.uint8)

+def build_scene():

+    box = WorldRegion()

     for i in range(2):

         for j in range(2):

             for k in range(2):

-            world[-i % WORLD_SIZE, -j % WORLD_SIZE, -k % WORLD_SIZE] = 1

-cubes = []

-

-def place_voxel(mesh, ind):

-    a = mesh.faces[ind][0]

-    p = cubes[ind // 12] + np.sign(a) * np.roll([0, 0, 1], abs(a))

-    world[p] = 1

-    mesh.add_cube(1, p)

-    cubes.append(p)

-    mesh.update_attr(0)

-    mesh.update_attr(1)

-

-def break_voxel(mesh, ind):

-    p = cubes[ind // 12]

-    world[p] = 0

-    mesh.del_cube((ind // 12) * 12)

-    del cubes[ind // 12]

-

-def click_mesh(self, button, ind):

-    if button == 1:

-        break_voxel(self, ind)

-    elif button == 3:

-        place_voxel(self, ind)

-

-def build_scene():

-    box = SquareMesh()

-    for i in range(world.shape[0]):

-        for j in range(world.shape[1]):

-            for k in range(world.shape[2]):

-                if world[i, j, k] == 1:

-                    box.add_cube(1, [i, j, k])

-                    cubes.append(np.array((i, j, k), dtype=np.uint8))

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

     box.onclick = click_mesh

-    return [box]

+    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]

 def main():

     pygame.init()

@@ -15,11 +15,11 @@ class SquareMesh(entity.Entity):

             np.empty((0, 3), dtype=FLOAT),

             [0.0, 1.0, 0.0, 1.0],

             [0.0, 0.0, 0.0],

-            GL_TRIANGLES

+            mode=GL_TRIANGLES

         )

         self.faces = []

-    def add_sq(self, axis, width, pos):

+    def add_sq(self, axis, width, pos, fd=1):

         w = width / 2

         sq = pos + np.roll(vec([

             [w, w, 0], [-w, w, 0], [w, -w, 0],

@@ -29,21 +29,11 @@ class SquareMesh(entity.Entity):

             sq = np.flip(sq, 0)

         self.verts = np.concatenate((self.verts, sq), dtype=FLOAT)

         for i in range(2):

-            self.faces.append((axis, 1))

+            self.faces.append((axis, fd))

-    def add_cube(self, width, pos):

-        offset = vec([width / 2, 0, 0])

-        for a in range(1, 4):

-            self.add_sq(a, width, pos + offset)

-            self.add_sq(-a, width, pos - offset)

-            offset = np.roll(offset, 1, 0)

-        return len(self.faces) - 12

-

-    def del_cube(self, ind):

-        self.verts = np.delete(self.verts, np.s_[3 * ind:3 * (ind + 12)], 0)

-        del self.faces[ind:ind + 12]

-        self.update_attr(0)

-        self.update_attr(1)

+    def del_sq(self, ind):

+        self.verts = np.delete(self.verts, np.s_[3 * ind:3 * (ind + 2)], 0)

+        del self.faces[ind:ind + 2]

     def col_list(self):

         return np.repeat([cube_col(x[0]) for x in self.faces], 3, 0)

@@ -0,0 +1,22 @@

+from libs import *

+import mesh

+

+class WorldRegion(mesh.SquareMesh):

+    def __init__(self, size=16):

+        super().__init__()

+        self.grid = np.zeros((size, size, size), dtype=VOXEL_TYPE)

+

+    def add_voxel(self, pos, vt=1):

+        offset = vec([0.5, 0.0, 0.0])

+        for a in range(1, 4):

+            self.add_sq(a, 1, pos + offset, pos)

+            self.add_sq(-a, 1, pos - offset, pos)

+            offset = np.roll(offset, 1, 0)

+        self.grid[pos] = vt

+        return len(self.faces) - 12

+

+    def del_voxel(self, ind):

+        b = (ind // 12) * 12

+        self.grid[self.faces[ind][1]] = 0

+        for i in range(6):

+            self.del_sq(b)