[Rendering] WIP on re-adding lighting support;

Author: LittleCodingFox

BuiltinResources/Hidden/Shaders/Default/Standard.shader

@@ -13,7 +13,6 @@ texture displacementTexture
 texture emissiveTexture
 texture heightTexture
 texture specularTexture
-float3 viewPosition;
 color diffuseColor = #FFFFFFFF
 color emissiveColor
 color specularColor
@@ -41,7 +40,6 @@ Begin Common
 [[vk::binding(StapleUniformBufferStart, StapleUniformBufferSet)]]
 cbuffer Uniforms
 {
-	float3 viewPosition;
 	float4 diffuseColor;
 	float4 emissiveColor;
 	float4 specularColor;
@@ -53,7 +51,9 @@ struct VertexOutput
 {
 	float4 position : SV_Position;
 	float3 worldPosition;
+#ifdef LIT
 	float3 lightNormal;
+#endif
 	float2 coords;
 	float3 normal;
 #ifdef NORMALMAP
@@ -111,26 +111,25 @@ VertexOutput VertexMain(Input input)
 
 	output.coords = input.coords;
 	output.normal = input.normal;
+
 #ifdef NORMALMAP
 	output.tangent = input.tangent;
 	output.bitangent = input.bitangent;
 #endif
+
+#ifdef LIT
 	output.lightNormal = StapleLightNormal(input.normal, model);
+#endif
+
 	output.instanceID = input.instanceID;
 
-//TODO: handle light array
-/*
 #if defined(LIT) && defined(PER_VERTEX_LIGHTING)
-	output.color = float4x4(diffuseColor.rgb * StapleProcessLights(viewPosition, output.worldPosition, input.normal), diffuseColor.a);
+	output.color = float4(diffuseColor.rgb * StapleProcessLights(output.worldPosition, output.lightNormal), diffuseColor.a);
 
 	#ifdef VERTEX_COLORS
 		output.color = input.color * output.color;
 	#endif
-#else
-	output.color = input.color;
-#endif
-*/
-#if defined(VERTEX_COLORS) || defined(PER_VERTEX_LIGHTING)
+#elif defined(VERTEX_COLORS) || defined(PER_VERTEX_LIGHTING)
 	output.color = input.color;
 #endif
 
@@ -168,28 +167,24 @@ float4 FragmentMain(VertexOutput input) : SV_Target
 	}
 #endif
 
-//TODO: handle light array
-/*
 #if defined(LIT) && defined(PER_VERTEX_LIGHTING)
 	return diffuse;
 #elif defined(LIT)
 
 #ifdef NORMALMAP
 	float3x3 tbn = float3x3(normalize(input.tangent), normalize(input.bitangent), normalize(input.normal));
 
-	float3 normalMapNormal = normalize(normalTexture.Sample(v_texcoord0).xyz * 2.0 - 1.0);
+	float3 normalMapNormal = normalize(normalTexture.Sample(input.coords).xyz * 2.0 - 1.0);
 
-	float3 light = StapleProcessLightsTangent(viewPosition, input.worldPosition, normalMapNormal, tbn);
+	float3 light = StapleProcessLightsTangent(input.worldPosition, normalMapNormal, tbn);
 #else
-	float3 light = StapleProcessLights(viewPosition, input.worldPosition, input.lightNormal);
+	float3 light = StapleProcessLights(input.worldPosition, input.lightNormal);
 #endif
 
 	return float4(light, 1) * diffuse;
 #else
 	return diffuse;
 #endif
-*/
-	return diffuse;
 }
 
 End Fragment

Engine/Staple.Core/Math/Color.cs

@@ -97,6 +97,8 @@ public Color(string value)
 
     public static implicit operator Vector4(Color v) => new(v.r, v.g, v.b, v.a);
 
+    public static implicit operator Vector3(Color v) => new(v.r, v.g, v.b);
+
     public static Color operator+(Color a, Color b) => new(a.r + b.r, a.g + b.g, a.b + b.b, a.a + b.a);
 
     public static Color operator-(Color a, Color b) => new(a.r - b.r, a.g - b.g, a.b - b.b, a.a - b.a);

Engine/Staple.Core/Math/Color32.cs

@@ -98,6 +98,8 @@ public Color32(uint value)
 
     public static implicit operator Vector4(Color32 v) => new(v.r / 255.0f, v.g / 255.0f, v.b / 255.0f, v.a / 255.0f);
 
+    public static implicit operator Vector3(Color32 v) => new(v.r / 255.0f, v.g / 255.0f, v.b / 255.0f);
+
     public static Color32 operator+(Color32 a, Color32 b) => new((byte)Math.Clamp(a.r + b.r, 0, 255),
         (byte)Math.Clamp(a.g + b.g, 0, 255),
         (byte)Math.Clamp(a.b + b.b, 0, 255),

Engine/Staple.Core/Rendering/Animation/SkinnedMeshRenderSystem.cs

@@ -317,11 +317,9 @@ void SetupMaterial()
 
                 renderer.mesh.SetActive(ref renderState, j);
 
-                lightSystem?.ApplyLightProperties(material, RenderSystem.CurrentCamera.Item2.Position, lighting);
+                lightSystem?.ApplyLightProperties(material, RenderSystem.CurrentCamera.Item2.Position, lighting, ref renderState);
 
-                var buffer = instance.boneBuffer;
-
-                renderState.storageBuffers = [(0, buffer)];
+                renderState.ApplyStorageBufferIfNeeded("StapleBoneMatrices", instance.boneBuffer);
 
                 RenderSystem.Submit(renderState, renderer.mesh.SubmeshTriangleCount(j), 1);
             }

Engine/Staple.Core/Rendering/Graphics.cs

@@ -76,7 +76,7 @@ public static void RenderGeometry(VertexBuffer vertex, IndexBuffer index,
                 return;
             }
 
-            lightSystem?.ApplyLightProperties(material, RenderSystem.CurrentCamera.Item2.Position, lighting);
+            lightSystem?.ApplyLightProperties(material, RenderSystem.CurrentCamera.Item2.Position, lighting, ref renderState);
 
             RenderSystem.Submit(renderState, Mesh.TriangleCount(topology, indexCount), 1);
         }
@@ -121,7 +121,7 @@ public static void RenderSimple<T>(Span<T> vertices, VertexLayout layout, Span<u
                 return;
             }
 
-            lightSystem?.ApplyLightProperties(material, RenderSystem.CurrentCamera.Item2.Position, lighting);
+            lightSystem?.ApplyLightProperties(material, RenderSystem.CurrentCamera.Item2.Position, lighting, ref renderState);
 
             RenderSystem.Backend.RenderTransient(vertices, layout, indices, renderState);
         }
@@ -166,7 +166,7 @@ public static void RenderSimple<T>(Span<T> vertices, VertexLayout layout, Span<u
                 return;
             }
 
-            lightSystem?.ApplyLightProperties(material, RenderSystem.CurrentCamera.Item2.Position, lighting);
+            lightSystem?.ApplyLightProperties(material, RenderSystem.CurrentCamera.Item2.Position, lighting, ref renderState);
 
             RenderSystem.Backend.RenderTransient(vertices, layout, indices, renderState);
         }