[Rendering] WIP on shader handling;

Author: LittleCodingFox

BuiltinResources/Hidden/Shaders/Debug/NormalDebug.shader

@@ -2,6 +2,11 @@ Begin Parameters
 
 End Parameters
 
+Begin Input
+POSITION
+NORMAL
+End Input
+
 Begin Instancing
 End Instancing
 
@@ -31,7 +36,7 @@ VertexOutput VertexMain(Input input)
     float3 position = input.position;
 
     output.normal = input.normal;
-    output.position = mul(mul(mul(projection, view), world), float4(position, 1.0));
+    output.position = mul(ProjectionViewWorld(world), float4(position, 1.0));
 
     return output;
 }

BuiltinResources/Hidden/Shaders/Debug/TangentDebug.shader

@@ -2,13 +2,15 @@ Variants BITANGENT_COLOR
 
 Begin Parameters
 
-varying vec3 v_tangent : TANGENT
-varying vec3 v_bitangent : BITANGENT
-
 variant: BITANGENT_COLOR uniform float tangentOrBitangent
 
 End Parameters
 
+Begin Input
+POSITION
+TANGENT
+End Input
+
 Begin Instancing
 End Instancing
 
@@ -43,7 +45,7 @@ VertexOutput VertexMain(Input input)
     float3 position = input.position;
 
     output.tangent = input.tangent;
-    output.position = mul(mul(mul(projection, view), world), float4(position, 1.0));
+    output.position = mul(ProjectionViewWorld(world), float4(position, 1.0));
 
     return output;
 }

BuiltinResources/Hidden/Shaders/Default/SolidColor.shader

@@ -6,6 +6,10 @@ uniform color mainColor
 
 End Parameters
 
+Begin Input
+POSITION
+End Input
+
 Begin Instancing
 End Instancing
 
@@ -21,11 +25,13 @@ End Common
 
 Begin Vertex
 
+/*
 [[vk::binding(1, StapleUniformBufferSet)]]
 cbuffer Uniforms
 {
     float4 mainColor;
 };
+*/
 
 struct Input
 {
@@ -38,10 +44,10 @@ VertexOutput VertexMain(Input input)
     VertexOutput output;
 
     float3 position = input.position;
-    float4 color = mainColor;
+    float4 color = float4(1, 0, 0, 1);//mainColor;
 
     output.color = color;
-    output.position = mul(mul(mul(projection, view), world), float4(position, 1.0));
+    output.position = mul(ProjectionViewWorld(world), float4(position, 1.0));
 
     return output;
 }

BuiltinResources/Hidden/Shaders/Default/Standard.shader

@@ -22,11 +22,21 @@ uniform float alphaThreshold = 0.25
 
 End Parameters
 
+Begin Input
+POSITION
+TEXCOORD0
+NORMAL
+TANGENT
+BITANGENT
+COLOR0
+End Input
+
 Begin Instancing
 End Instancing
 
 Begin Common
 
+/*
 [[vk::binding(1, StapleUniformBufferSet)]]
 cbuffer Uniforms
 {
@@ -37,10 +47,11 @@ cbuffer Uniforms
 	float cutout;
 	float alphaThreshold;
 };
+*/
 
 struct VertexOutput
 {
-	float3 position : SV_Position;
+	float4 position : SV_Position;
 	float3 worldPosition;
 	float3 lightNormal;
 	float2 coords;
@@ -73,12 +84,12 @@ VertexOutput VertexMain(Input input)
 
 	float4x4 model = world;
 
-	float4x4 projectionViewWorld = mul(mul(projection, view), model);
-	float4x4 viewWorld = mul(view, model);
+	float4x4 projectionViewWorld = ProjectionViewWorld(model);
+	float4x4 viewWorld = ViewWorld(model);
 
 	float4 vertexPosition = mul(projectionViewWorld, float4(input.position, 1.0));
 
-	output.position = vertexPosition.xyz;
+	output.position = vertexPosition;
 
 	output.worldPosition = mul(model, float4(input.position, 1.0)).xyz;
 
@@ -122,17 +133,19 @@ cbuffer Textures
 float4 FragmentMain(VertexOutput input) : SV_Target
 {
 #if defined(VERTEX_COLORS) || defined(PER_VERTEX_LIGHTING)
-	float4 diffuse = input.color * diffuseColor;
+	float4 diffuse = input.color;// * diffuseColor;
 #else
-	float4 diffuse = diffuseTexture.Sample(input.coords) * diffuseColor;
+	float4 diffuse = diffuseTexture.Sample(input.coords);// * diffuseColor;
 #endif
-	
+
+/*	
 #ifdef CUTOUT
 	if(diffuse.a < alphaThreshold)
 	{
 		discard;
 	}
 #endif
+*/
 
 //TODO: handle light array
 /*

BuiltinResources/Hidden/Shaders/Sprite/Sprite.shader

@@ -9,13 +9,20 @@ uniform texture mainTexture
 
 End Parameters
 
+Begin Input
+POSITION
+TEXCOORD0
+End Input
+
 Begin Common
 
+/*
 [[vk::binding(1, StapleUniformBufferSet)]]
 cbuffer Uniforms
 {
 	float4 mainColor;
 };
+*/
 
 struct VertexOutput
 {
@@ -40,11 +47,11 @@ VertexOutput VertexMain(Input input)
     VertexOutput output;
 
     float3 position = input.position;
-    float4 color = mainColor;
+    float4 color = float4(1, 1, 1, 1);//mainColor;
 
     output.color = color;
 	output.coord = input.coord;
-    output.position = mul(mul(mul(projection, view), world), float4(position, 1.0));
+    output.position = mul(ProjectionViewWorld(world), float4(position, 1.0));
 
     return output;
 }

BuiltinResources/Hidden/Shaders/UI/imgui.shader

@@ -7,13 +7,19 @@ uniform texture mainTexture
 
 End Parameters
 
+Begin Input
+POSITION
+TEXCOORD0
+COLOR0
+End Input
+
 Begin Common
 
 struct VertexOutput
 {
     float4 position : SV_Position;
-	float2 coord;
-    float4 color;
+	float2 coord : TEXCOORD0;
+    float4 color : COLOR0;
 };
 
 End Common
@@ -42,7 +48,7 @@ VertexOutput VertexMain(Input input)
     );
 
 	output.coord = input.coord;
-    output.position = mul(mul(mul(projection, view), world), float4(position, 1.0));
+    output.position = mul(ProjectionViewWorld(world), float4(position, 1.0));
 
     return output;
 }