From 7115f60b91b5717d90f643fd692010905c7004db Mon Sep 17 00:00:00 2001 From: Bryan Galdrikian Date: Thu, 31 May 2018 11:36:08 -0700 Subject: Blast 1.1.3. See docs/release_notes.txt. --- samples/resources/shaders/physx_primitive.hlsl | 72 +++++++++++++------------- 1 file changed, 36 insertions(+), 36 deletions(-) mode change 100644 => 100755 samples/resources/shaders/physx_primitive.hlsl (limited to 'samples/resources/shaders/physx_primitive.hlsl') diff --git a/samples/resources/shaders/physx_primitive.hlsl b/samples/resources/shaders/physx_primitive.hlsl old mode 100644 new mode 100755 index 03fd137..d0c2d47 --- a/samples/resources/shaders/physx_primitive.hlsl +++ b/samples/resources/shaders/physx_primitive.hlsl @@ -1,37 +1,37 @@ -#include "common_buffers.hlsl" -#include "lighting.hlsl" - -struct VS_INPUT -{ - float3 position : POSITION0; - float3 normal : NORMAL0; -}; - -struct VS_OUTPUT -{ - float4 position : SV_POSITION; - float4 worldPos : POSITION0; - float3 normal : NORMAL0; -}; - -VS_OUTPUT VS(VS_INPUT iV) -{ - VS_OUTPUT oV; - - float4 worldSpacePos = mul(float4(iV.position, 1.0f), model); - oV.position = mul(worldSpacePos, viewProjection); - - oV.worldPos = worldSpacePos; - - // normals - float3 worldNormal = mul(iV.normal, (float3x3)model); - oV.normal = worldNormal; - - return oV; -} - -float4 PS(VS_OUTPUT iV) : SV_Target0 -{ - float3 lightColor = CalcPixelLight(defaultColor.xyz, iV.worldPos.xyz, iV.normal); - return float4(lightColor, 1); +#include "common_buffers.hlsl" +#include "lighting.hlsl" + +struct VS_INPUT +{ + float3 position : POSITION0; + float3 normal : NORMAL0; +}; + +struct VS_OUTPUT +{ + float4 position : SV_POSITION; + float4 worldPos : POSITION0; + float3 normal : NORMAL0; +}; + +VS_OUTPUT VS(VS_INPUT iV) +{ + VS_OUTPUT oV; + + float4 worldSpacePos = mul(float4(iV.position, 1.0f), model); + oV.position = mul(worldSpacePos, viewProjection); + + oV.worldPos = worldSpacePos; + + // normals + float3 worldNormal = mul(iV.normal, (float3x3)model); + oV.normal = worldNormal; + + return oV; +} + +float4 PS(VS_OUTPUT iV) : SV_Target0 +{ + float3 lightColor = CalcPixelLight(defaultColor.xyz, iV.worldPos.xyz, iV.normal); + return float4(lightColor, 1); } \ No newline at end of file -- cgit v1.2.3