ambient

README.md

@@ -21,7 +21,7 @@ wasm build.
 - [x] [minimal](https://github.khronos.org/glTF-Tutorials/gltfTutorial/gltfTutorial_003_MinimalGltfFile.html)
 - [x] [glb](https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/CesiumMilkTruck/glTF-Binary)
   - [x] node
-  - [ ] texture
+  - [x] texture
   - [ ] animation
 - [ ] draco
 - [ ] basisu

deps/sokol_samples/sample_framework/Scene.zig

@@ -13,6 +13,10 @@ const Quat = rowmath.Quat;
 const Mesh = @import("Mesh.zig");
 pub const Scene = @This();
 
+const light_pos = [3]f32{ -10, -10, -10 };
+const light_color = [3]f32{ 1,1,1 };
+const ambient = [3]f32{ 0.2, 0.2, 0.2 };
+
 allocator: std.mem.Allocator = undefined,
 meshes: []Mesh = &.{},
 pip: sg.Pipeline = undefined,
@@ -261,7 +265,9 @@ fn draw_mesh(self: *@This(), mesh_index: u32, vp: Mat4, model: Mat4) void {
     sg.applyUniforms(.VS, shader.SLOT_vs_params, sg.asRange(&vs_params));
 
     const fs_params = shader.FsParams{
-        .lightPos = .{ 10, 10, 10 },
+        .lightPos = light_pos,
+        .lightColor = light_color,
+        .ambient = ambient,
     };
     sg.applyUniforms(.FS, shader.SLOT_fs_params, sg.asRange(&fs_params));
 

deps/sokol_samples/sample_framework/gltf.glsl

@@ -23,6 +23,8 @@ void main() {
 @fs fs
 uniform fs_params {
     vec3 lightPos;  
+    vec3 lightColor;
+    vec3 ambient;
 };
 uniform submesh_params {
     vec4 material_rgba;
@@ -40,14 +42,15 @@ out vec4 frag_color;
 void main() {
     vec3 norm = normalize(Normal);
     vec3 lightDir = normalize(lightPos - FragPos);  
-    float diff = max(dot(norm, lightDir), 0.0);
+    float diffuse = max(dot(norm, lightDir), 0.0);
+
     vec4 texel = texture(colorTexture, TexCoord);
-    // vec3 diffuse = diff * lightColor;
     frag_color = texel * vec4(
-        material_rgba.r * diff, 
-        material_rgba.g * diff, 
-        material_rgba.b * diff, 
-        material_rgba.a);
+        material_rgba.r * diffuse * lightColor.r + ambient.r, 
+        material_rgba.g * diffuse * lightColor.r + ambient.g, 
+        material_rgba.b * diffuse * lightColor.r + ambient.b,
+        material_rgba.a
+        );
 }
 @end