voxels

@@ -0,0 +1,73 @@

+from libs import *

+import entity

+import types

+

+draw_modes = types.SimpleNamespace()

+draw_modes.TRI_STRIP = GL_TRIANGLE_STRIP

+draw_modes.TRI_FAN = GL_TRIANGLE_FAN

+draw_modes.TRIS = GL_TRIANGLES

+draw_modes.LINE_STRIP = GL_LINE_STRIP

+draw_modes.LINES = GL_LINES

+

+class AttributedEntity(entity.Entity):

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

+        super().__init__(verts, pos, **kwargs)

+        self.col = vec(col)

+        refl = [1.0, 0.0, 0.0, 1.0] if self.hud else [0.5, 0.5, 0.0, 32.0]

+        self.refls = vec(kwargs.get("refls", refl))

+        self.texi = kwargs.get("texi", 0)

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

+        self.vao = None

+        self.vbos = [[None, 0] for _ in VERTEX_ATTRS]

+

+    def mat_list(self):

+        return np.repeat(vec([[self.col], [self.refls]]), len(self.verts), 1)

+

+    def norm_list(self):

+        l = []

+        match self.draw_mode:

+            case draw_modes.TRI_STRIP | draw_modes.TRI_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]))

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

+            case draw_modes.TRIS:

+                for i in range(0, len(self.verts), 3):

+                    for _ in range(3):

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

+            case draw_modes.LINE_STRIP | draw_modes.LINES:

+                for _ in range(len(self.verts)):

+                    l.append([1, 0, 0])

+            case _:

+                raise NotImplementedError

+        return (self.orient[:3, :3] @ vec(l).T).T

+

+    def texc_list(self):

+        if self.texi < 0:

+            return np.repeat(vec([[0, 0, self.texi]]), len(self.verts), 0)

+        match self.draw_mode:

+            case draw_modes.TRI_FAN:

+                return np.concatenate((

+                    vec([[0, 0, self.texi]]), np.tile(

+                        [[0, 1, self.texi], [1, 0, self.texi]],

+                        ((len(self.verts) - 1) // 2, 1)

+                    )

+                ))

+            case draw_modes.TRIS | draw_modes.TRI_STRIP:

+                return np.astype(np.tile(

+                    [[0, 0, self.texi], [0, 1, self.texi], [1, 0, self.texi]],

+                    (int(np.ceil(len(self.verts) / 3)), 1)

+                )[:len(self.verts)], FLOAT)

+            case draw_modes.LINE_STRIP | draw_modes.LINES:

+                return np.repeat(vec([[0, 0, 0]]), len(self.verts), 0)

+            case _:

+                raise NotImplementedError

+

+    def build_vao(self):

+        self.vao = glGenVertexArrays(1)

+        glBindVertexArray(self.vao)

+        for i in range(len(VERTEX_ATTRS)):

+            self.vbos[i][0] = glGenBuffers(1)

+            l = update_attr(self, i)

+            glEnableVertexAttribArray(i)

+            glVertexAttribPointer(i, l.shape[1], GL_FLOAT, GL_FALSE, 0, None)

@@ -29,11 +29,29 @@ void main() {{

     float specular = reflsF.z * lightPos.w * pow(max(dot(

         normalize(camPos - positionF), reflect(-lightDir, normalF)

     ), 0.0), reflsF.w);

-    gl_FragColor = vec4((ambient + diffuse + specular) * colF.xyz, colF.w);

-    gl_FragColor = texture2D(tex, texcF);

+    float j = texcF.z;

+    vec3 c = colF.xyz;

+    if (abs(j) < 1e-3)

+        c = texture2D(tex[0], texcF.xy).xyz;

+    if (abs(j - 1.0) < 1e-3)

+        c = texture2D(tex[1], texcF.xy).xyz;

+    gl_FragColor = vec4((ambient + diffuse + specular) * c, colF.w);

 }}

 """

+def load_texture(i, fname):

+    pli = pygame.image.load(fname).convert()

+    (tw, th) = pli.get_size()

+    img_data = np.array(list(pygame.image.tobytes(pli, "RGB")), np.uint8)

+    tex = glGenTextures(1)

+    glActiveTexture(GL_TEXTURE0 + i)

+    glBindTexture(GL_TEXTURE_2D, tex)

+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)

+    glTexImage2D(

+        GL_TEXTURE_2D, 0, GL_RGB, tw, th,

+        0, GL_RGB, GL_UNSIGNED_BYTE, img_data

+    )

+

 def init_display():

     pygame.init()

     full = os.environ.get("FULLSCREEN")

@@ -47,16 +65,8 @@ def init_display():

         pygame.QUIT, pygame.WINDOWRESIZED, pygame.WINDOWSIZECHANGED

     ])

     pygame.display.set_caption("Voxels")

-    pli = pygame.image.load("favicon.png").convert()

-    (tw, th) = pli.get_size()

-    img_data = np.array(list(pygame.image.tobytes(pli, "RGB")), np.uint8)

-    tex = glGenTextures(1)

-    glBindTexture(GL_TEXTURE_2D, tex)

-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)

-    glTexImage2D(

-        GL_TEXTURE_2D, 0, GL_RGB, tw, th,

-        0, GL_RGB, GL_UNSIGNED_BYTE, img_data

-    )

+    load_texture(0, "favicon.png")

+    load_texture(1, "container.jpg")

     sp = shaders.compileProgram(

         shaders.compileShader(VS, GL_VERTEX_SHADER),

         shaders.compileShader(FS, GL_FRAGMENT_SHADER)

@@ -64,7 +74,7 @@ def init_display():

     for (k, v) in UNIFORMS.items():

         v[2] = glGetUniformLocation(sp, k)

     glUseProgram(sp)

-    glUniform1i(UNIFORMS["tex"][2], 0)

+    glUniform1iv(UNIFORMS["tex"][2], 2, np.array([0, 1]))

     glEnable(GL_DEPTH_TEST)

     glEnable(GL_BLEND)

     glEnable(GL_CULL_FACE)

@@ -1,58 +1,13 @@

 from libs import *

 from raycast import intersect_tri

-import types

-

-draw_modes = types.SimpleNamespace()

-draw_modes.TRI_STRIP = GL_TRIANGLE_STRIP

-draw_modes.TRI_FAN = GL_TRIANGLE_FAN

-draw_modes.TRIS = GL_TRIANGLES

-draw_modes.LINE_STRIP = GL_LINE_STRIP

-draw_modes.LINES = GL_LINES

 class Entity:

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

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

         self.verts = vec(verts)

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

-        self.col = vec(col)

-        refl = [1.0, 0.0, 0.0, 1.0] if self.hud else [0.5, 0.5, 0.0, 32.0]

-        self.refls = vec(kwargs.get("refls", refl))

         self.pos = vec(pos)

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

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

         self.onclick = lambda s, b, n, h: print(f"{h}:{b} on {s}:{n}")

-        self.vao = None

-        self.vbos = [[None, 0] for _ in VERTEX_ATTRS]

-

-    def mat_list(self):

-        return np.repeat(vec([[self.col], [self.refls]]), len(self.verts), 1)

-

-    def norm_list(self):

-        l = []

-        match self.draw_mode:

-            case draw_modes.TRI_STRIP | draw_modes.TRI_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]))

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

-            case draw_modes.TRIS:

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

-                    for _ in range(3):

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

-            case draw_modes.LINE_STRIP | draw_modes.LINES:

-                for _ in range(len(self.verts)):

-                    l.append([1, 0, 0])

-            case _:

-                raise NotImplementedError

-        return (self.orient[:3, :3] @ vec(l).T).T

-

-    def build_vao(self):

-        self.vao = glGenVertexArrays(1)

-        glBindVertexArray(self.vao)

-        for i in range(len(VERTEX_ATTRS)):

-            self.vbos[i][0] = glGenBuffers(1)

-            l = update_attr(self, i)

-            glEnableVertexAttribArray(i)

-            glVertexAttribPointer(i, l.shape[1], GL_FLOAT, GL_FALSE, 0, None)

     def translate(self):

         m = np.identity(4, dtype=FLOAT)

@@ -1,21 +1,21 @@

 from libs import *

-import entity

+import attributes

 import mesh

 def crosshair():

-    return entity.Entity(

+    return attributes.AttributedEntity(

         [[-0.03, 0, 0], [0.03, 0, 0], [0, -0.03, 0], [0, 0.03, 0]],

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

+        [0, 0, 0], [1, 1, 1, 1], mode=GL_LINES, hud=True

     )

 def fps():

-    return entity.Entity(

+    return attributes.AttributedEntity(

         [[0, 0, 0], [0, -0.1, 0], [0.1, 0, 0], [0.1, -0.1, 0]],

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

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

     )

 def hand():

-    h = mesh.SquareMesh(hud=True)

+    h = mesh.SquareMesh(hud=True, texi=1)

     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)

@@ -33,7 +33,7 @@ def selection():

     return s

 def skybox():

-    sb = mesh.SquareMesh()

+    sb = mesh.SquareMesh(texi=-1)

     offset = [0, 0, VIEW_DIST]

     for d in range(3):

         roll_vec3(offset, 1)

@@ -47,9 +47,9 @@ def skybox():

     return sb

 def sun():

-    s = entity.Entity(

-        [[0.0, 0.0, 0.0]], [1.0, 1.0, 0.9, 1.0],

-        normalise(LIGHT_POS) * VIEW_DIST, mode=GL_TRIANGLE_FAN

+    s = attributes.AttributedEntity(

+        [[0.0, 0.0, 0.0]], normalise(LIGHT_POS) * VIEW_DIST,

+        [1.0, 1.0, 0.9, 1.0], texi=-1, mode=GL_TRIANGLE_FAN

     )

     cv = []

     for k in np.arange(0, 1.01, 0.05):

@@ -6,13 +6,13 @@ import pygame

 FLOAT = np.float32

 VOXEL_TYPE = np.uint8

 VERTEX_ATTRS = [

-    "vec3 position", "vec4 col", "vec3 normal", "vec4 refls", "vec2 texc"

+    "vec3 position", "vec4 col", "vec3 normal", "vec4 refls", "vec3 texc"

 ]

 UNIFORMS = {

     "MVP": ["vert", "mat4", None],

     "lightPos": ["frag", "vec4", None],

     "camPos": ["frag", "vec3", None],

-    "tex": ["frag", "sampler2D", None]

+    "tex": ["frag", "sampler2D[2]", None]

 }

 LIGHT_POS = [5, 30, 10]

@@ -78,10 +78,9 @@ def update_attr(ent, n, l=None):

             case "refls":

                 l = ent.mat_list()[1]

             case "texc":

-                l = np.astype(np.tile(

-                    [[0.0, 0.0], [1.0, 0.0], [0.0, 1.0]],

-                    (int(np.ceil(len(ent.verts) / 3)), 1)

-                )[:len(ent.verts)], FLOAT)

+                l = ent.texc_list()

+            case "texi":

+                l = vec(np.repeat(ent.texi, len(ent.verts)))

     if ent.vao:

         glBindBuffer(GL_ARRAY_BUFFER, ent.vbos[i][0])

         if l.shape[0] != ent.vbos[i][1]:

@@ -1,7 +1,7 @@

 from libs import *

-import entity

+import attributes

-class SquareMesh(entity.Entity):

+class SquareMesh(attributes.AttributedEntity):

     def __init__(self, **kwargs):

         super().__init__(

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

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

                 i = 6 * s + t

                 cl[0][i], cl[1][i] = self.cube_mat(fd, axis, c)

         return cl

+

+    def texc_list(self):

+        if self.texi < 0:

+            return np.repeat(vec([[0, 0, self.texi]]), len(self.verts), 0)

+        sq = [(0, 0), (0, 1), (1, 0), (1, 1), (1, 0), (0, 1)]

+        l = []

+        hg = hasattr(self, "grid")

+        for i in range(len(self.faces) // 2):

+            for (x, y) in sq:

+                fd = self.faces[2 * i][1]

+                l.append([x, y, self.grid[*fd] if hg else fd])

+        return vec(l)

@@ -32,7 +32,7 @@ class Player(interactive.InteractiveCamera):

         self.hand = int(new_hand)

         hg = self.hud["hand"]

         hg.faces = [(a, self.hand) for (a, _) in hg.faces]

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

+        for i in [1, 3, 4]:

             update_attr(hg, i)

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

@@ -21,7 +21,7 @@ class WorldRegion(mesh.SquareMesh):

             for d in range(3):

                 for s in range(2):

                     oob = pos[d] == self.r - 1 and s == 0

-                    oob |= s == 0 or pos[d] == 0 and s == 1

+                    oob |= pos[d] == 0 and s == 1

                     if oob:

                         continue

                     a = (d + 1) * (-1) ** s