Merge pull request #1 from pixelreyn/Part3-FirstSplashOfColor

Part 3, adding vertex colors

Assets/VoxelProjectSeries/Data/Container.cs

@@ -3,7 +3,7 @@
 using Unity.Mathematics;
 using UnityEngine;
 
-namespace PixelReyn.VoxelSeries.Part2
+namespace PixelReyn.VoxelSeries.Part3
 {
 
     [RequireComponent(typeof(MeshFilter))]
@@ -33,13 +33,6 @@ public void ClearData()
             data.Clear();
         }
 
-        private void ConfigureComponents()
-        {
-            meshFilter = GetComponent<MeshFilter>();
-            meshRenderer = GetComponent<MeshRenderer>();
-            meshCollider = GetComponent<MeshCollider>();
-        }
-
         public void GenerateMesh()
         {
             meshData.ClearData();
@@ -51,17 +44,27 @@ public void GenerateMesh()
             Vector3[] faceVertices = new Vector3[4];
             Vector2[] faceUVs = new Vector2[4];
 
+            VoxelColor voxelColor;
+            Color voxelColorAlpha;
+            Vector2 voxelSmoothness;
+
             foreach (KeyValuePair<Vector3, Voxel> kvp in data)
             {
+                //Only check on solid blocks
                 if (!kvp.Value.isSolid)
                     continue;
 
                 blockPos = kvp.Key;
                 block = kvp.Value;
 
+                voxelColor = WorldManager.Instance.WorldColors[block.ID - 1];
+                voxelColorAlpha = voxelColor.color;
+                voxelColorAlpha.a = 1;
+                voxelSmoothness = new Vector2(voxelColor.metallic, voxelColor.smoothness);
                 //Iterate over each face direction
                 for (int i = 0; i < 6; i++)
                 {
+                    //Check if there's a solid block against this face
                     if (this[blockPos + voxelFaceChecks[i]].isSolid)
                         continue;
 
@@ -78,13 +81,19 @@ public void GenerateMesh()
                     {
                         meshData.vertices.Add(faceVertices[voxelTris[i, j]]);
                         meshData.UVs.Add(faceUVs[voxelTris[i, j]]);
+                        meshData.colors.Add(voxelColorAlpha);
+                        meshData.UVs2.Add(voxelSmoothness);
 
                         meshData.triangles.Add(counter++);
+
                     }
                 }
+
             }
         }
 
+
+
         public void UploadMesh()
         {
             meshData.UploadMesh();
@@ -93,10 +102,15 @@ public void UploadMesh()
                 ConfigureComponents();
 
             meshFilter.mesh = meshData.mesh;
-
             if (meshData.vertices.Count > 3)
                 meshCollider.sharedMesh = meshData.mesh;
+        }
 
+        private void ConfigureComponents()
+        {
+            meshFilter = GetComponent<MeshFilter>();
+            meshRenderer = GetComponent<MeshRenderer>();
+            meshCollider = GetComponent<MeshCollider>();
         }
 
         public Voxel this[Vector3 index]
@@ -128,7 +142,8 @@ public struct MeshData
             public List<Vector3> vertices;
             public List<int> triangles;
             public List<Vector2> UVs;
-
+            public List<Vector2> UVs2;
+            public List<Color> colors;
             public bool Initialized;
 
             public void ClearData()
@@ -138,6 +153,8 @@ public void ClearData()
                     vertices = new List<Vector3>();
                     triangles = new List<int>();
                     UVs = new List<Vector2>();
+                    UVs2 = new List<Vector2>();
+                    colors = new List<Color>();
 
                     Initialized = true;
                     mesh = new Mesh();
@@ -147,17 +164,20 @@ public void ClearData()
                     vertices.Clear();
                     triangles.Clear();
                     UVs.Clear();
+                    UVs2.Clear();
+                    colors.Clear();
 
                     mesh.Clear();
                 }
             }
-
             public void UploadMesh(bool sharedVertices = false)
             {
                 mesh.SetVertices(vertices);
                 mesh.SetTriangles(triangles, 0, false);
+                mesh.SetColors(colors);
 
                 mesh.SetUVs(0, UVs);
+                mesh.SetUVs(2, UVs2);
 
                 mesh.Optimize();
 
@@ -170,9 +190,7 @@ public void UploadMesh(bool sharedVertices = false)
         }
         #endregion
 
-
-        #region Voxel Statics
-
+        #region Static Variables
         static readonly Vector3[] voxelVertices = new Vector3[8]
         {
             new Vector3(0,0,0),//0
@@ -185,6 +203,7 @@ public void UploadMesh(bool sharedVertices = false)
             new Vector3(0,1,1),//6
             new Vector3(1,1,1),//7
         };
+
         static readonly Vector3[] voxelFaceChecks = new Vector3[6]
         {
             new Vector3(0,0,-1),//back
@@ -222,7 +241,7 @@ public void UploadMesh(bool sharedVertices = false)
             {0,1,2,1,3,2},
             {0,2,3,0,3,1},
         };
-
         #endregion
     }
+
 }

Assets/VoxelProjectSeries/Data/Voxel.cs

@@ -1,11 +1,10 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-namespace PixelReyn.VoxelSeries.Part2
+namespace PixelReyn.VoxelSeries.Part3
 {
     public struct Voxel
     {
-        //Convert to single float and access via accessors...
         public byte ID;
 
         public bool isSolid

Assets/VoxelProjectSeries/Data/VoxelColor.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace PixelReyn.VoxelSeries.Part3
+{
+    [System.Serializable]
+    public class VoxelColor
+    {
+        public Color color;
+        public float metallic;
+        public float smoothness;
+    }
+}

Assets/VoxelProjectSeries/Managers/WorldManager.cs

@@ -2,18 +2,26 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace PixelReyn.VoxelSeries.Part2
+namespace PixelReyn.VoxelSeries.Part3
 {
     public class WorldManager : MonoBehaviour
     {
         public Material worldMaterial;
-
+        public VoxelColor[] WorldColors;
         private Container container;
 
-
-        // Start is called before the first frame update
         void Start()
         {
+            if(_instance != null)
+            {
+                if (_instance != this)
+                    Destroy(this);
+            }
+            else
+            {
+                _instance = this;
+            }
+
             GameObject cont = new GameObject("Container");
             cont.transform.parent = transform;
             container = cont.AddComponent<Container>();
@@ -31,16 +39,20 @@ void Start()
                 }
             }
 
-
             container.GenerateMesh();
             container.UploadMesh();
         }
 
-        // Update is called once per frame
-        void Update()
-        {
+        private static WorldManager _instance;
 
+        public static WorldManager Instance
+        {
+            get
+            {
+                if (_instance == null)
+                    _instance = FindObjectOfType<WorldManager>();
+                return _instance;
+            }
         }
-
     }
 }

Assets/VoxelProjectSeries/Scenes/World.unity

@@ -363,7 +363,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 1755072223}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 35997360c8b74f543b623a3524b58bc9, type: 3}
+  m_Script: {fileID: 11500000, guid: e0e65ef4e51bde8429033f2ff79c2aa4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  worldMaterial: {fileID: 2100000, guid: 4021f579d8ff00b4ca1a8c7d355362b3, type: 2}
+  worldMaterial: {fileID: 2100000, guid: d41578d92bc26b04bb2355aed476d2cb, type: 2}
+  WorldColors:
+  - color: {r: 0, g: 0.4834163, b: 0.9811321, a: 0}
+    metallic: 0.5
+    smoothness: 1