From: Joshua Simmons <josh@nega.tv>
Date: Wed, 16 Nov 2022 23:42:12 +0000 (+0100)
Subject: Let there be light!
X-Git-Url: https://git.nega.tv//gitweb.cgi?a=commitdiff_plain;h=7d8602aacbdd96f18a77ff2a750e9577fc478740;p=josh%2Fnarcissus

Let there be light!
---

diff --git a/narcissus/src/main.rs b/narcissus/src/main.rs
index 277d13c..fa32f45 100644
--- a/narcissus/src/main.rs
+++ b/narcissus/src/main.rs
@@ -6,9 +6,8 @@ use narcissus_gpu::{
     create_vulkan_device, Access, Bind, BindGroupLayoutDesc, BindGroupLayoutEntryDesc, BindingType,
     Buffer, BufferDesc, BufferImageCopy, BufferUsageFlags, ClearValue, CompareOp, CullingMode,
     Device, Extent2d, Extent3d, FrontFace, GraphicsPipelineDesc, GraphicsPipelineLayout, Image,
-    ImageAspectFlags, ImageBarrier, ImageDesc, ImageDimension, ImageFormat, ImageLayout,
-    ImageSubresourceLayers, ImageSubresourceRange, ImageUsageFlags, IndexType, LoadOp,
-    MemoryLocation, Offset2d, Offset3d, PolygonMode, RenderingAttachment, RenderingDesc,
+    ImageBarrier, ImageDesc, ImageDimension, ImageFormat, ImageLayout, ImageUsageFlags, IndexType,
+    LoadOp, MemoryLocation, Offset2d, Offset3d, PolygonMode, RenderingAttachment, RenderingDesc,
     SamplerAddressMode, SamplerDesc, SamplerFilter, Scissor, ShaderDesc, ShaderStageFlags, StoreOp,
     ThreadToken, Topology, TypedBind, Viewport,
 };
@@ -469,7 +468,7 @@ pub fn main() {
             device.acquire_swapchain(&frame, main_window, ImageFormat::BGRA8_SRGB);
 
         let frame_start = Instant::now() - start_time;
-        let frame_start = frame_start.as_secs_f32() * 0.01;
+        let frame_start = frame_start.as_secs_f32() * 0.125;
 
         for (i, transform) in shark_transforms.iter_mut().enumerate() {
             let direction = if i & 1 == 0 { 1.0 } else { -1.0 };
diff --git a/narcissus/src/shaders/basic.frag.glsl b/narcissus/src/shaders/basic.frag.glsl
index 26205a1..5b23cbd 100644
--- a/narcissus/src/shaders/basic.frag.glsl
+++ b/narcissus/src/shaders/basic.frag.glsl
@@ -8,7 +8,7 @@ layout(location = 1) in vec3 normal;
 layout(location = 0) out vec4 outColor;
 
 void main() {
-    float NdotL = max(dot(normal, vec3(0.0, 1.0, 0.0)), 0.2f);
+    float NdotL = max(dot(normal, vec3(0.0, 1.0, 0.0)), 0.1f);
     vec3 rgb = texture(sampler2D(tex, texSampler), vec2(texcoord.x, texcoord.y)).rgb;
-    outColor = vec4(rgb, 1.0);
+    outColor = vec4(rgb * NdotL, 1.0);
 }
\ No newline at end of file
diff --git a/narcissus/src/shaders/basic.frag.spv b/narcissus/src/shaders/basic.frag.spv
index bc78ab3..a297aed 100644
Binary files a/narcissus/src/shaders/basic.frag.spv and b/narcissus/src/shaders/basic.frag.spv differ