Multi texture blocks

+Logs render properly
+Textures were shifted before, which was now fixed

Author: BitcoderCZ

Program.cs

@@ -91,8 +91,8 @@ static void Main(string[] args)
                 texturesPath += '/';
             World.textureBasePath = texturesPath;
 #if DEBUG
-            //World.targetFilePath = @"C:\Users\Tomas\Desktop\Project Earth\Api\data\buildplates\7cd6d53b-1715-4b22-9a99-d6d43edd61df.json";
-            World.targetFilePath = @"C:\Users\Tomas\Desktop\Project Earth\Api\data\buildplates\2cb8bda2-c49b-4ead-887f-593d37bc2784.json";
+            World.targetFilePath = @"C:\Users\Tomas\Desktop\Project Earth\Api\data\buildplates\70c9c5eb-580d-41d2-8201-2577fec29dd6.json";
+            //World.targetFilePath = @"C:\Users\Tomas\Desktop\Project Earth\Api\data\buildplates\2cb8bda2-c49b-4ead-887f-593d37bc2784.json";
 #else
             Console.Write("Build plate to edit (.json): ");
             // json - api, plate - data only, plate64 - base64 encoded data

SkyBox.cs

@@ -117,77 +117,4 @@ public static void Render(Shader s)
             GL.DepthMask(true);
         }
     }
-
-    /*public static class SkyBox
-    {
-        private static Vertex2[] verts = new Vertex2[0];
-        private static uint[] tris = new uint[0];
-
-        public static Vector3 pos;
-
-        private static int vao;
-        private static int vbo;
-        private static int ebo;
-
-        public static int texId { get; private set; }
-
-        public static void Init(string texturePath, Vector3 cameraPos, float size)
-        {
-            if (File.Exists(texturePath)) {
-                Texture tex = new Texture(texturePath);
-                texId = tex.id;
-            }
-            else
-                texId = -1;
-            pos = cameraPos;
-            //Util.SkyboxTex(Vector3.One * size, ref verts, ref tris);
-            SphereMesh.Create(5, size, ref tris, ref verts);
-            InitMesh();
-        }
-
-        static void InitMesh()
-        {
-            GL.CreateVertexArrays(1, out vao);
-            GL.BindVertexArray(vao);
-            GL.CreateBuffers(1, out ebo);
-            GL.CreateBuffers(1, out vbo);
-            CreateMesh();
-        }
-
-        static void CreateMesh()
-        {
-            GL.NamedBufferData(ebo, tris.Length * sizeof(uint), tris, BufferUsageHint.DynamicDraw);
-            GL.VertexArrayElementBuffer(vao, ebo);
-
-            int vertexBindingPoint = 0;
-            GL.NamedBufferData(vbo, verts.Length * Vertex2.Size, verts, BufferUsageHint.DynamicDraw);
-            GL.VertexArrayVertexBuffer(vao, vertexBindingPoint, vbo, IntPtr.Zero, Vertex2.Size);
-
-            // pos
-            GL.VertexArrayAttribFormat(vao, 0, 3, VertexAttribType.Float, false, 0);
-            GL.VertexArrayAttribBinding(vao, 0, vertexBindingPoint);
-            GL.EnableVertexArrayAttrib(vao, 0);
-            // uv
-            GL.VertexArrayAttribFormat(vao, 1, 2, VertexAttribType.Float, false, 3 * sizeof(float));
-            GL.VertexArrayAttribBinding(vao, 1, vertexBindingPoint);
-            GL.EnableVertexArrayAttrib(vao, 1);
-        }
-
-        public static void Render(Shader s)
-        {
-            if (texId == -1)
-                return;
-
-            Matrix4 transform = Matrix4.CreateTranslation(pos);
-
-            s.Bind();
-            s.UploadMat4("uTransform", ref transform);
-            GL.ActiveTexture(TextureUnit.Texture0);
-            GL.BindTexture(TextureTarget.Texture2D, texId);
-            s.UploadInt("tex", 0);
-
-            GL.BindVertexArray(vao);
-            GL.DrawElements(BeginMode.Triangles, tris.Length, DrawElementsType.UnsignedInt, 0);
-        }
-    }*/
 }

SubChunk.cs

@@ -70,9 +70,11 @@ public void CreateMeshData()
                     y = 16;
 
                 int renderer = renderers[currentBlock];
-                if (renderer > -1 && blocks[currentBlock] < palette.Length) // don't render air
-                    World.blockRenderers[renderer](new Vector3(x, y, z), pos * 16, palette[blocks[currentBlock]].textures, palette[blocks[currentBlock]].data,
+                if (renderer > -1 && blocks[currentBlock] < palette.Length) { // don't render air
+                    Palette pal = palette[blocks[currentBlock]];
+                    World.blockRenderers[renderer](new Vector3(x, y, z), pos * 16, pal.textures, pal.data,
                         ref vertices, ref triangles);
+                }
 
                 z = origz;
                 y = origy;

World.cs

@@ -35,6 +35,7 @@ public static class World
             { "jungle_stairs", new []{ "planks_jungle" } },
             { "spruce_stairs", new []{ "planks_spruce" } },
             { "dark_oak_stairs", new []{ "planks_big_oak" } },
+            { "birch_stairs", new []{ "planks_birch" } },
             { "stone_brick_stairs", new []{ "stonebrick" } },
             { "polished_andesite_stairs", new []{ "stone_andesite_smooth" } },
             { "polished_diorite_stairs", new []{ "stone_diorite_smooth" } },
@@ -177,15 +178,15 @@ public static class World
                     int logType = data & 0b_0011;
                     switch (logType) {
                         case 0:
-                            return new [] { "log_oak_top" } ;
+                            return new [] { "log_oak", "log_oak_top" } ;
                         case 1:
-                            return new [] { "log_spruce_top" } ;
+                            return new [] { "log_spruce", "log_spruce_top" } ;
                         case 2:
-                            return new [] { "log_birch_top" } ;
+                            return new [] { "log_birch", "log_birch_top" } ;
                         case 3:
-                            return new [] { "log_jungle_top" } ;
+                            return new [] { "log_jungle", "log_jungle_top" } ;
                         default:
-                            return new [] { "log_oak_top" } ;
+                            return new [] { "log_oak", "log_oak_top" } ;
                     }
                 }
             },
@@ -695,6 +696,19 @@ public static class World
                     }
                 } // oak
             },
+            { "birch_door", (int data) =>
+                {
+                    int upper_block_bit = (data & 0b_1000) >> 3;
+                    switch (upper_block_bit) {
+                        case 0:
+                            return new [] { "door_birch_lower" };
+                        case 1:
+                            return new [] { "door_birch_upper" };
+                        default:
+                            return new [] { "door_birch_lower" };
+                    }
+                } // oak
+            },
 
 
             { "", (int data) =>
@@ -775,12 +789,13 @@ public static class World
             { "snow_layer", 15 },
             { "powered_repeater", 16 },
             { "unpowered_repeater", 16 },
+            { "vine", 19 },
         };
 
 
         public delegate void RenderBlock(Vector3 pos, Vector3i cp/*chunk pos, pre multiplied*/, int[] tex, int data, ref List<Vertex> vertices, ref List<uint> triangles);
 
-        // TODO stair other corner
+        // TODO stair other corner, Data meaning from: https://minecraft.fandom.com/wiki/Block_states
         public static Dictionary<int, RenderBlock> blockRenderers = new Dictionary<int, RenderBlock>()
         {
             { 0, (Vector3 pos, Vector3i cp, int[] tex, int data, ref List<Vertex> vertices, ref List<uint> triangles) => // full
@@ -1360,6 +1375,57 @@ public static class World
                     }
                 }
             },
+            { 17, (Vector3 pos, Vector3i cp, int[] texA, int data, ref List<Vertex> vertices, ref List<uint> triangles) => // log
+                {
+                    Vector3 offset = new Vector3(-0.5f, -0.5f, -0.5f);
+
+                    uint texSide = (uint)texA[0];
+                    uint texTopBottom = (uint)texA[1];
+
+                    int dir = (data & 0b_1100) >> 2; // 0 - y, 1 - x, 2 - z
+                    Matrix3 mat = Matrix3.Identity;
+
+                    if (dir == 1) {
+                        mat = Matrix3.CreateRotationZ(1.5708f); // 90 degrees
+                    } else if (dir == 2) {
+                        mat = Matrix3.CreateRotationX(1.5708f); // 90 degrees
+                    }
+
+                    for (int p = 0; p < 6; p++) {
+                        uint firstVertIndex = (uint)vertices.Count;
+                        if (p == 2 || p == 3) { // top/bottom
+                            vertices.Add(new Vertex(pos + VoxelData.voxelVerts[VoxelData.voxelTris[p, 0]] + offset, VoxelData.voxelUvs[0], texTopBottom));
+                            vertices.Add(new Vertex(pos + VoxelData.voxelVerts[VoxelData.voxelTris[p, 1]] + offset, VoxelData.voxelUvs[1], texTopBottom));
+                            vertices.Add(new Vertex(pos + VoxelData.voxelVerts[VoxelData.voxelTris[p, 2]] + offset, VoxelData.voxelUvs[2], texTopBottom));
+                            vertices.Add(new Vertex(pos + VoxelData.voxelVerts[VoxelData.voxelTris[p, 3]] + offset, VoxelData.voxelUvs[3], texTopBottom));
+                        } else {
+                            vertices.Add(new Vertex(pos + VoxelData.voxelVerts[VoxelData.voxelTris[p, 0]] + offset, VoxelData.voxelUvs[0], texSide));
+                            vertices.Add(new Vertex(pos + VoxelData.voxelVerts[VoxelData.voxelTris[p, 1]] + offset, VoxelData.voxelUvs[1], texSide));
+                            vertices.Add(new Vertex(pos + VoxelData.voxelVerts[VoxelData.voxelTris[p, 2]] + offset, VoxelData.voxelUvs[2], texSide));
+                            vertices.Add(new Vertex(pos + VoxelData.voxelVerts[VoxelData.voxelTris[p, 3]] + offset, VoxelData.voxelUvs[3], texSide));
+                        }
+                        triangles.Add(firstVertIndex);
+                        triangles.Add(firstVertIndex + 1);
+                        triangles.Add(firstVertIndex + 2);
+                        triangles.Add(firstVertIndex + 2);
+                        triangles.Add(firstVertIndex + 1);
+                        triangles.Add(firstVertIndex + 3);
+                    }
+                }
+            },
+            { 18, (Vector3 pos, Vector3i cp, int[] texA, int data, ref List<Vertex> vertices, ref List<uint> triangles) => // log stripped
+                {
+                    blockRenderers[17](pos, cp, texA, data << 2/*here axis is 0b0011, for normal logs it's 0b1100 so we need to shift it*/, 
+                        ref vertices, ref triangles);
+                }
+            },
+            { 19, (Vector3 pos, Vector3i cp, int[] tex, int data, ref List<Vertex> vertices, ref List<uint> triangles) => // vine
+                {
+                    Vector3 offset = new Vector3(0f, 0f, 0f);
+                    Vector3 size = new Vector3(1f, 1f, 1f);
+                    CubeTex(tex[0], pos + offset, size, ref vertices, ref triangles);
+                }
+            },
         };
 
         private static BuildPlate plate;
@@ -1556,6 +1622,10 @@ public static void Init()
                     string blockName = blockNames[subchunk][plate.sub_chunks[subchunk].blocks[block]];
                     if (blockRenderersLookUp.ContainsKey(blockName))
                         renderers[block] = blockRenderersLookUp[blockName];
+                    else if (blockName.Contains("stripped")) // stripped log
+                        renderers[block] = 18;
+                    else if (blockName.Contains("log"))
+                        renderers[block] = 17;
                     else if (blockName.Contains("pressure_plate"))
                         renderers[block] = 14;
                     else if (blockName.Contains("gate"))
@@ -1580,7 +1650,11 @@ public static void Init()
 
                 Palette[] palette = new Palette[plate.sub_chunks[subchunk].block_palette.Count - 1];
                 for (int i = 0; i < palette.Length; i++) {
-                    palette[i] = new Palette(plate.sub_chunks[subchunk].block_palette[i + 1].name, plate.sub_chunks[subchunk].block_palette[i].data, textures[i + 1]);
+                    int[] _tex = textures[i].Cloned();
+                    for (int j = 0; j < _tex.Length; j++) {
+                        _tex[j] = _tex[j] + 1; 
+                    }
+                    palette[i] = new Palette(plate.sub_chunks[subchunk].block_palette[i + 1].name, plate.sub_chunks[subchunk].block_palette[i].data, _tex);
                     Console.WriteLine($"[{i}] Block: {palette[i].name}, Data: {palette[i].data}, Texture: {palette[i].textures[0]}");
                 }