Skip to content

Commit 7ddb4a7

Browse files
committed
Added sponzas
1 parent 1120e1d commit 7ddb4a7

9 files changed

Lines changed: 2059 additions & 1034409 deletions

File tree

Engine/Shaders/DeferredForwardPipeline/fragment.glsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void main()
103103
// Sample the normal map
104104
vec3 tangentNormal = texture(sampler2D(normalTexture[nonuniformEXT(outDrawId)],textureAnisotropic_sampler),outUv).rgb;
105105
//OpenGL to Vulkan
106-
tangentNormal.y=1-tangentNormal.y;
106+
//tangentNormal.y=1-tangentNormal.y;
107107
// also store the per-fragment normals into the gbuffer
108108
gNormal.rgb = normalize(outTBN*normalize(tangentNormal * 2.0 - 1.0));
109109

Engine/Shaders/ForwardPipeline/fragment.glsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void main()
1717
vec3 tangentNormal = texture(sampler2D(normalTexture[nonuniformEXT(outDrawId)],textureAnisotropic_sampler),outUv).rgb;
1818

1919
//OpenGL to Vulkan
20-
tangentNormal.y=1-tangentNormal.y;
20+
//tangentNormal.y=1-tangentNormal.y;
2121

2222
vec3 worldNormal = normalize(outTBN*normalize(tangentNormal * 2.0 - 1.0));
2323

Engine/Shaders/ForwardPipeline/fragment_transparent.glsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void main()
2323
// Transform from tangent space to world space
2424
vec3 tangentNormal = texture(sampler2D(normalTexture[nonuniformEXT(outDrawId)],textureRepeat_sampler),outUv).rgb;
2525

26-
tangentNormal.y=1-tangentNormal.y;
26+
//tangentNormal.y=1-tangentNormal.y;
2727

2828
vec3 worldNormal = normalize(outTBN*normalize(tangentNormal * 2.0 - 1.0));
2929

Engine/Shaders/RayTracingPipeline/hit.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void main(inout PrimaryRayPayload payload, in BuiltInTriangleIntersectionAttribu
6262
float3 normalMap = normalTexture[NonUniformResourceIndex(InstanceID())].SampleLevel(g_SamLinearWrap, uv, 0).xyz;
6363

6464
//OpenGL to Vulkan
65-
normalMap.y = 1 - normalMap.y;
65+
//normalMap.y = 1 - normalMap.y;
6666
normalMap = normalMap * 2.0 - 1.0;
6767

6868
// Transform to world space

Engine/src/SceneObjects/Sprite.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ Prisma::Sprite::Sprite(BLENDING blending) : Prisma::Node{} {
8989
DepthStencilDesc.DepthEnable = Diligent::True;
9090
DepthStencilDesc.DepthWriteEnable = Diligent::False;
9191
DepthStencilDesc.DepthFunc = Diligent::COMPARISON_FUNC_LESS;
92+
9293
// clang-format on
9394
if (!privateSprite.createShader) {
9495
Diligent::ShaderCreateInfo ShaderCI;

Resources/DefaultScene/default.bin

-5.28 MB
Binary file not shown.

0 commit comments

Comments
 (0)