Proper UVs and mapping

Author: mario-deluna

resources/shader/voxelchunk.frag.glsl

@@ -5,10 +5,20 @@ layout(location = 0) out vec4 color;
 in vec3 v_position;
 in vec3 v_normal;
 in vec2 v_uv;
+in float v_blocktype;
 
-uniform sampler2DArray textureArray;
+uniform sampler2D u_texture;
 
 void main()
 {
-    color = vec4(v_uv, 0.0, 1.0);
+    // we have a 10x10 texture atlas
+    // the blocktype represents the index of the texture in the atlas
+    float atlasSize = 10.0;
+    float cellX = mod(v_blocktype, atlasSize);
+    float cellY = floor(v_blocktype / atlasSize);
+    vec2 uvOffset = vec2(cellX / atlasSize, cellY / atlasSize);
+    vec2 uvScale = vec2(1.0 / atlasSize, 1.0 / -atlasSize);
+
+    vec2 atlasUV = uvScale * v_uv + uvOffset;
+    color = texture(u_texture, atlasUV);
 }

resources/shader/voxelchunk.vert.glsl

@@ -3,6 +3,7 @@
 layout(location = 0) in vec3 position;
 layout(location = 1) in vec3 normal;
 layout(location = 2) in vec2 uv;
+layout(location = 3) in float blocktype;
 
 uniform mat4 model;
 uniform mat4 view;
@@ -11,11 +12,13 @@ uniform mat4 projection;
 out vec3 v_position;
 out vec3 v_normal;
 out vec2 v_uv;
+out float v_blocktype;
 
 void main()
 {
     v_position = position;
     v_normal = normal;
     v_uv = uv;
+    v_blocktype = blocktype;
     gl_Position = projection * view * model * vec4(position, 1.0);
 }

resources/sprites/textures.png

@@ -2,9 +2,6 @@
 
 namespace App\System;
 
-use App\Component\ExampleImage;
-use App\Renderer\BackgroundRenderer;
-use App\Renderer\ExampleImageRenderer;
 use App\Voxel\ChunkRenderer;
 use GL\Math\{GLM, Quat, Vec2, Vec3};
 use VISU\ECS\EntitiesInterface;
@@ -21,16 +18,6 @@
 
 class RenderingSystem implements SystemInterface
 {
-    /**
-     * Background renderer
-     */
-    private BackgroundRenderer $backgroundRenderer;
-
-    /**
-     * The example image renderer
-     */
-    private ExampleImageRenderer $exampleImageRenderer;
-
     /**
      * Fullscreen Texture Debug Renderer
      */
@@ -49,10 +36,8 @@ public function __construct(
         private ShaderCollection $shaders
     )
     {
-        $this->backgroundRenderer = new BackgroundRenderer($this->gl, $this->shaders);
-        $this->exampleImageRenderer = new ExampleImageRenderer($this->gl, $this->shaders);
         $this->fullscreenRenderer = new FullscreenTextureRenderer($this->gl);
-        $this->voxelRenderer = new ChunkRenderer($this->shaders);
+        $this->voxelRenderer = new ChunkRenderer($this->gl, $this->shaders);
     }
 
     /**