voxels

@@ -31,18 +31,21 @@ void main() {{

     ), 0.0), reflsF.w);

     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;

+{"\n".join([

+    f"if (abs(j - {i}.0) < 1e-3)" +

+        f"c = texture2D(tex[{i}], texcF.xy).xyz;" for i in range(TEX_COUNT)

+])}

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

 }}

 """

-def load_texture(i, fname):

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

+def load_texture(i, img_data):

+    if isinstance(img_data, str):

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

         (tw, th) = pli.get_size()

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

+    elif isinstance(img_data, np.ndarray):

+        (tw, th) = img_data.shape[:2]

     tex = glGenTextures(1)

     glActiveTexture(GL_TEXTURE0 + i)

     glBindTexture(GL_TEXTURE_2D, tex)

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

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

         v[2] = glGetUniformLocation(sp, k)

     glUseProgram(sp)

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

+    glUniform1iv(UNIFORMS["tex"][2], TEX_COUNT, np.array(range(TEX_COUNT)))

     glEnable(GL_DEPTH_TEST)

     glEnable(GL_BLEND)

     glEnable(GL_CULL_FACE)

@@ -26,14 +26,14 @@ def hand():

     return h

 def selection():

-    s = mesh.SquareMesh()

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

     s.draw_mode = GL_LINE_STRIP

     s.add_sq(-2, 0.96, [0, 0, 0], 2)

     s.verts[:] = s.verts[[0, 1, 3, 2, 0, 3]]

     return s

 def skybox():

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

+    sb = mesh.SquareMesh()

     offset = [0, 0, VIEW_DIST]

     for d in range(3):

         roll_vec3(offset, 1)

@@ -3,18 +3,8 @@ import itertools

 import numpy as np

 import pygame

-FLOAT = np.float32

-VOXEL_TYPE = np.uint8

-VERTEX_ATTRS = [

-    "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[2]", None]

-}

-

+TEX_COUNT = 7

+TEX_RES = 64

 LIGHT_POS = [5, 30, 10]

 REGION_SIZE = 8

 GRAVITY = 1

@@ -27,6 +17,18 @@ ARROWS = [

 ]

 ARROWS = [[getattr(pygame, f"K_{n}") for n in opts] for opts in ARROWS]

+FLOAT = np.float32

+VOXEL_TYPE = np.uint8

+VERTEX_ATTRS = [

+    "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", f"sampler2D[{TEX_COUNT}]", None]

+}

+

 def vec(l):

     return np.array(l, dtype=FLOAT)

@@ -1,11 +1,16 @@

 from libs import *

-from display import init_display

+import display

 from mapgen import MapGen

 from player import Player

 def debug_mode(mg, cam):

     pass

+def build_texture(i, mg, name, mid, offset, period):

+    display.load_texture(i, mg.make_texture(

+        name, (TEX_RES, TEX_RES), mid, offset, period

+    ))

+

 def in_view(wr, cam):

     rwrc = wr.pos + wr.r / 2 - cam.pos

     close = np.linalg.norm(rwrc) < VIEW_DIST

@@ -15,9 +20,14 @@ def in_view(wr, cam):

     return close and frust

 def main():

-    init_display()

+    display.init_display()

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

     mg = MapGen()

+    build_texture(2, mg, "sky", [0.5, 0.5, 0.8], [0.4, 0.4, 0.1], (20, 8))

+    build_texture(3, mg, "stone", [0.7, 0.7, 0.8], [0.1, 0.1, 0.1], (12, 15))

+    build_texture(4, mg, "grass", [0.3, 0.6, 0.3], [0.2, 0.1, 0.2], (3, 5))

+    build_texture(5, mg, "bark", [0.2, 0.1, 0.0], [0.1, 0.1, 0.0], (2, 8))

+    build_texture(6, mg, "leaves", [0.2, 0.5, 0.2], [0.2, 0.4, 0.2], (10, 14))

     clock = pygame.time.Clock()

     cam = Player(speed=6/FPS)

     cam.pos = [4, 8, 4]

@@ -83,3 +83,7 @@ class MapGen(world.WorldHolder):

                         wr.grid[i, j, k] = 1

                         n += 1

         return n

+

+    def make_texture(self, name, dims, mid, offset, period):

+        mid, offset = vec(mid), vec(offset)

+        return np.multiply(256, [[mid + offset * self.perlin(name, vec((i, j)), period) for j in range(dims[1])] for i in range(dims[0])], dtype=FLOAT)