Directional light

2 files changed, 3 insertions, 6 deletions

diff --git a/include/swgfx.h b/include/swgfx.h
index d527f02..f849ba5 100644
--- a/include/swgfx.h
+++ b/include/swgfx.h
@@ -31,7 +31,7 @@ typedef float R;
 typedef struct sgVec2i { int x, y; }       sgVec2i;
 typedef struct sgVec2  { R   x, y; }       sgVec2;
 typedef struct sgVec3 { union { struct { R r, g, b; };    struct { R x, y, z; };    }; } sgVec3;
-typedef struct sgVec4 { union { struct { R r, g, b, a; }; struct { R x, y, z, w; }; }; } sgVec4;
+typedef struct sgVec4 { union { struct { R r, g, b, a; }; struct { R x, y, z, w; }; struct { sgVec3 rgb; R _; }; }; } sgVec4;
 
 typedef sgVec3 sgNormal;
 
diff --git a/src/swgfx.c b/src/swgfx.c
index 33b453d..1901057 100644
--- a/src/swgfx.c
+++ b/src/swgfx.c
@@ -1011,7 +1011,7 @@ void sgAmbient(swgfx* gfx, sgColour3 ambient) {
     if (depth != DepthClearValue) {
       const sgColour3* albedo = &gfx->albedo[i];
       sgColour4* colour       = &gfx->colour[i];
-      *colour = Vec4FromVec3(mul3(*albedo, ambient), 1.f);
+      colour->rgb = add3(colour->rgb, mul3(*albedo, ambient));
     }
   }
 }
@@ -1027,10 +1027,7 @@ void sgDirectional(swgfx* gfx, sgColour3 lightColour, sgVec3 direction) {
       const sgVec3*  normal   = &gfx->normals[i];
       const R        NdotL    = fmaxf(0.f, dot3(*normal, L));
       sgColour4* colour       = &gfx->colour[i];
-      // TODO: Here and in sgAmbient() we need to accumulate colour, so this
-      //  should be +=. But colour also needs to be sgVec4, not sgPixel. We
-      //  should transform sgVec4 to sgPixel colour on sgPresent() instead.
-      *colour = Vec4FromVec3(scale3(mul3(*albedo, lightColour), NdotL), 1.f);
+      colour->rgb = add3(colour->rgb, scale3(mul3(*albedo, lightColour), NdotL));
     }
   }
 }