voxels

@@ -30,6 +30,7 @@ void main() {{

         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);

 }}

 """

@@ -46,6 +47,16 @@ 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

+    )

     sp = shaders.compileProgram(

         shaders.compileShader(VS, GL_VERTEX_SHADER),

         shaders.compileShader(FS, GL_FRAGMENT_SHADER)

@@ -53,6 +64,7 @@ def init_display():

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

         v[2] = glGetUniformLocation(sp, k)

     glUseProgram(sp)

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

     glEnable(GL_DEPTH_TEST)

     glEnable(GL_BLEND)

     glEnable(GL_CULL_FACE)

@@ -5,11 +5,14 @@ import pygame

 FLOAT = np.float32

 VOXEL_TYPE = np.uint8

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

+VERTEX_ATTRS = [

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

+]

 UNIFORMS = {

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

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

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

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

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

 }

 LIGHT_POS = [5, 30, 10]

@@ -74,6 +77,11 @@ def update_attr(ent, n, l=None):

                 l = ent.norm_list()

             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)

     if ent.vao:

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

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

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

 from libs import *

 from display import init_display

-from entity import Entity

 from mapgen import MapGen

-from mesh import SquareMesh

 from player import Player

-from region import WorldRegion

 def debug_mode(mg, cam):

     pass