From f8f2fd6835698af55437f3ff084da5a11d1b0dfd Mon Sep 17 00:00:00 2001
From: Lightling <contactlightling@gmail.com>
Date: Sun, 27 Feb 2022 13:43:18 -0500
Subject: [PATCH] update shaders

---
 Game.cpp          |  6 ++++--
 PixelShader.hlsl  | 10 +++++++---
 VertexShader.hlsl | 11 +++++------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Game.cpp b/Game.cpp
index 5539c8d..86960a2 100644
--- a/Game.cpp
+++ b/Game.cpp
@@ -190,14 +190,16 @@ void Game::Draw(float deltaTime, float totalTime)
 
 	for (auto entity : entities)
 	{
-		// create constant buffer
 		std::shared_ptr<SimpleVertexShader> vs = entity->GetMaterial()->GetVertexShader();
-		vs->SetFloat4("colorTint", entity->GetMaterial()->GetTint());
 		vs->SetMatrix4x4("world", entity->GetTransform()->GetWorldMatrix());
 		vs->SetMatrix4x4("view", camera->GetViewMatrix());
 		vs->SetMatrix4x4("projection", camera->GetProjectionMatrix());
 		vs->CopyAllBufferData();
 
+		std::shared_ptr<SimplePixelShader> ps = entity->GetMaterial()->GetPixelShader();
+		ps->SetFloat4("tint", entity->GetMaterial()->GetTint());
+		ps->CopyAllBufferData();
+
 		entity->GetMaterial()->GetVertexShader()->SetShader();
 		entity->GetMaterial()->GetPixelShader()->SetShader();
 		entity->GetMesh()->Draw();
diff --git a/PixelShader.hlsl b/PixelShader.hlsl
index b0a1025..fbc68fb 100644
--- a/PixelShader.hlsl
+++ b/PixelShader.hlsl
@@ -1,3 +1,7 @@
+cbuffer ExternalData : register(b0)
+{
+	float4 tint;
+}
 
 // Struct representing the data we expect to receive from earlier pipeline stages
 // - Should match the output of our corresponding vertex shader
@@ -12,7 +16,7 @@ struct VertexToPixel
 	//  |    |                |
 	//  v    v                v
 	float4 screenPosition	: SV_POSITION;
-	float4 color			: COLOR;
+	float2 uv				: TEXCOORD;
 };
 
 // --------------------------------------------------------
@@ -26,9 +30,9 @@ struct VertexToPixel
 // --------------------------------------------------------
 float4 main(VertexToPixel input) : SV_TARGET
 {
-	// Just return the input color
+	// Just return the tint
 	// - This color (like most values passing through the rasterizer) is 
 	//   interpolated for each pixel between the corresponding vertices 
 	//   of the triangle we're rendering
-	return input.color;
+	return tint;
 }
\ No newline at end of file
diff --git a/VertexShader.hlsl b/VertexShader.hlsl
index e33cda5..471a4d8 100644
--- a/VertexShader.hlsl
+++ b/VertexShader.hlsl
@@ -1,6 +1,5 @@
 cbuffer ExternalData : register(b0)
 {
-	float4 colorTint;
 	matrix world;
 	matrix view;
 	matrix projection;
@@ -19,7 +18,7 @@ struct VertexShaderInput
 	//  |    |                |
 	//  v    v                v
 	float3 localPosition	: POSITION;
-	float3 color			: NORMAL;
+	float3 normal			: NORMAL;
 	float2 uv				: UV;
 };
 
@@ -35,8 +34,8 @@ struct VertexToPixel
 	//  |   Name          Semantic
 	//  |    |                |
 	//  v    v                v
-	float4 screenPosition	: SV_POSITION;	// XYZW position (System Value Position)
-	float4 color			: COLOR;        // RGBA color
+	float4 screenPosition	: SV_POSITION;
+	float2 uv				: TEXCOORD;
 };
 
 // --------------------------------------------------------
@@ -64,10 +63,10 @@ VertexToPixel main( VertexShaderInput input )
 	//   a perspective projection matrix, which we'll get to in the future).
 	output.screenPosition = mul(worldViewProjection, float4(input.localPosition, 1.0f));
 
-	// Pass the color through 
+	// Pass the uvs through 
 	// - The values will be interpolated per-pixel by the rasterizer
 	// - We don't need to alter it here, but we do need to send it to the pixel shader
-	output.color = colorTint;
+	output.uv = input.uv;
 
 	// Whatever we return will make its way through the pipeline to the
 	// next programmable stage we're using (the pixel shader for now)