no message

Samples/Data/shaders/texture.frag

@@ -4,22 +4,10 @@ layout (binding = 1) uniform sampler2D samplerColor;
 
 layout (location = 0) in vec2 inUV;
 layout (location = 1) in float inLodBias;
-layout (location = 2) in vec3 inNormal;
-layout (location = 3) in vec3 inViewVec;
-layout (location = 4) in vec3 inLightVec;
 
 layout (location = 0) out vec4 outFragColor;
 
 void main() 
 {
-	vec4 color = texture(samplerColor, inUV, inLodBias);
-
-	vec3 N = normalize(inNormal);
-	vec3 L = normalize(inLightVec);
-	vec3 V = normalize(inViewVec);
-	vec3 R = reflect(-L, N);
-	vec3 diffuse = max(dot(N, L), 0.0) * vec3(1.0);
-	float specular = pow(max(dot(R, V), 0.0), 16.0) * color.a;
-
-	outFragColor = vec4(diffuse * color.rgb + specular, 1.0);	
+	outFragColor = texture(samplerColor, inUV, inLodBias);
 }

Samples/Data/shaders/texture.vert

@@ -14,9 +14,6 @@ layout (binding = 0) uniform UBO
 
 layout (location = 0) out vec2 outUV;
 layout (location = 1) out float outLodBias;
-layout (location = 2) out vec3 outNormal;
-layout (location = 3) out vec3 outViewVec;
-layout (location = 4) out vec3 outLightVec;
 
 out gl_PerVertex 
 {
@@ -28,14 +25,5 @@ void main()
 	outUV = inUV;
 	outLodBias = ubo.lodBias;
 
-	vec3 worldPos = vec3(ubo.model * vec4(inPos, 1.0));
-
-	gl_Position = ubo.projection * ubo.model * vec4(inPos.xyz, 1.0);
-
-    vec4 pos = ubo.model * vec4(inPos, 1.0);
-	outNormal = mat3(inverse(transpose(ubo.model))) * inNormal;
-	vec3 lightPos = vec3(0.0);
-	vec3 lPos = mat3(ubo.model) * lightPos.xyz;
-    outLightVec = lPos - pos.xyz;
-    outViewVec = ubo.viewPos.xyz - pos.xyz;		
+	gl_Position = vec4(inPos.xyz, 1.0);
 }

Samples/Texture/Texture.cpp

@@ -65,12 +65,6 @@ public:
 		DKObject<DKGraphicsDevice> device = DKGraphicsDevice::SharedInstance();
         DKObject<DKCommandQueue> queue = device->CreateCommandQueue(DKCommandQueue::Graphics);
 
-        // create texture
-        DKObject<DKTexture> texture = LoadTexture2D(queue, resourcePool.LoadResourceData("textures/deathstar3.png"));
-        // create sampler
-        DKSamplerDescriptor samplerDesc = {};
-        DKObject<DKSamplerState> sampler = device->CreateSamplerState(samplerDesc);
-
         // create shaders
 		DKObject<DKShaderModule> vertShaderModule = device->CreateShaderModule(&vertShader);
 		DKObject<DKShaderModule> fragShaderModule = device->CreateShaderModule(&fragShader);
@@ -95,10 +89,10 @@ public:
 		};
 		DKArray<Vertex> vertexData =
 		{
-            { {  1.0f,  1.0f, 0.0f }, { 1.0f, 1.0f }, { 0.0f, 0.0f, 1.0f } },
-            { { -1.0f,  1.0f, 0.0f }, { 0.0f, 1.0f }, { 0.0f, 0.0f, 1.0f } },
-            { { -1.0f, -1.0f, 0.0f }, { 0.0f, 0.0f }, { 0.0f, 0.0f, 1.0f } },
-            { {  1.0f, -1.0f, 0.0f }, { 1.0f, 0.0f }, { 0.0f, 0.0f, 1.0f } }
+            { {  0.5f,  0.5f, 0.0f }, { 1.0f, 0.0f }, { 0.0f, 0.0f, 1.0f } },
+            { { -0.5f,  0.5f, 0.0f }, { 0.0f, 0.0f }, { 0.0f, 0.0f, 1.0f } },
+            { { -0.5f, -0.5f, 0.0f }, { 0.0f, 1.0f }, { 0.0f, 0.0f, 1.0f } },
+            { {  0.5f, -0.5f, 0.0f }, { 1.0f, 1.0f }, { 0.0f, 0.0f, 1.0f } }
 		};
 		uint32_t vertexBufferSize = static_cast<uint32_t>(vertexData.Count()) * sizeof(Vertex);
         DKArray<uint32_t> indexData = { 0, 1, 2, 2, 3, 0 };
@@ -117,6 +111,9 @@ public:
 		pipelineDescriptor.fragmentFunction = fragShaderFunction;
 		pipelineDescriptor.colorAttachments.Resize(1);
 		pipelineDescriptor.colorAttachments.Value(0).pixelFormat = swapChain->ColorPixelFormat();
+        pipelineDescriptor.colorAttachments.Value(0).blendingEnabled = true;
+        pipelineDescriptor.colorAttachments.Value(0).sourceRGBBlendFactor = DKBlendFactor::SourceAlpha;
+        pipelineDescriptor.colorAttachments.Value(0).destinationRGBBlendFactor = DKBlendFactor::OneMinusSourceAlpha;
 		pipelineDescriptor.depthStencilAttachmentPixelFormat = DKPixelFormat::Invalid; // no depth buffer
 		pipelineDescriptor.vertexDescriptor.attributes = {
 			{ DKVertexFormat::Float3, 0, 0, 0 },
@@ -143,13 +140,21 @@ public:
         DKShaderBindingSetLayout layout;
         if (1)
         {
-            DKShaderBinding binding = {
-                0,
-                DKShader::DescriptorTypeUniformBuffer,
-                1,
-                nullptr
+            DKShaderBinding bindings[2] = {
+                {
+                    0,
+                    DKShader::DescriptorTypeUniformBuffer,
+                    1,
+                    nullptr
+                },
+                {
+                    1,
+                    DKShader::DescriptorTypeTextureSampler,
+                    1,
+                    nullptr
+                },
             };
-            layout.bindings.Add(binding);
+            layout.bindings.Add(bindings, 2);
         }
         DKObject<DKShaderBindingSet> bindSet = device->CreateShaderBindingSet(layout);
         if (bindSet)
@@ -172,6 +177,15 @@ public:
                 bindSet->SetBuffer(0, uboBuffer, 0, sizeof(ubo));
                 uboBuffer->Flush();
             }
+
+            // create texture
+            DKObject<DKTexture> texture = LoadTexture2D(queue, resourcePool.LoadResourceData("textures/deathstar3.png"));
+            // create sampler
+            DKSamplerDescriptor samplerDesc = {};
+            DKObject<DKSamplerState> sampler = device->CreateSamplerState(samplerDesc);
+
+            bindSet->SetTexture(1, texture);
+            bindSet->SetSamplerState(1, sampler);
         }
 
 		DKTimer timer;