Binary files a/doc/output.tga and b/doc/output.tga differ

@@ -36,31 +36,39 @@ struct Ray

     vec3 direction;

 };

+//// Material

+struct Material

+{

+    vec3 color;

+};

+

 //// Trace

 struct Trace

 {

-    float distance;

+    float    distance;

+    Material material;

 };

 //// Circle

 struct Circle

 {

-    vec3  center;

-    float radius;

+    vec3     center;

+    float    radius;

+    Material material;

     Trace trace(Ray const & ray) const

     {

         auto const offs = center - ray.origin;

         auto const proj = dot(offs, ray.direction);

         if (proj < 0.0F) // Past.

-            return {infinity};

+            return {infinity, {}};

         auto const perp2 = dot(offs, offs) - proj * proj;

         auto const pene2 = radius * radius - perp2;

         if (pene2 < 0.0F) // Miss.

-            return {infinity};

+            return {infinity, {}};

         auto const dist = proj - sqrt(pene2);

         if (dist < 0.0F) // Inside.

-            return {infinity};

-        return {dist};

+            return {infinity, {}};

+        return {dist, material};

     }

 };

@@ -70,10 +78,11 @@ using Shapes = std::vector<Circle>;

 //// Scene

 struct Scene

 {

-    Shapes shapes;

+    Material background;

+    Shapes   shapes;

     Trace trace(Ray const & ray) const

     {

-        auto nearest = Trace{infinity};

+        auto nearest = Trace{infinity, background};

         for (auto const & shape : shapes)

         {

             auto const trace = shape.trace(ray);

@@ -181,12 +190,14 @@ int main(int argc, char const * argv[])

         100.0F,                  // far

     };

     auto const scene = Scene{

+        // background

+        {vec3(0.2F, 0.2F, 0.5F)},

         // shapes

         {

-            {vec3( 2.0F, -1.0F, -10.0F), 3.0F},

-            {vec3( 1.0F,  2.0F,  -7.0F), 2.0F},

-            {vec3(-1.0F,  0.0F,  -4.0F), 1.0F},

-            {vec3( 0.0F, -1.0F,  -3.0F), 0.2F},

+            {vec3( 2.0F, -1.0F, -10.0F), 3.0F, {vec3(1.0F, 0.0F, 0.0F)}},

+            {vec3( 1.0F,  2.0F,  -7.0F), 2.0F, {vec3(0.0F, 1.0F, 0.0F)}},

+            {vec3(-1.0F,  0.0F,  -4.0F), 1.0F, {vec3(0.0F, 0.0F, 1.0F)}},

+            {vec3( 0.0F, -1.0F,  -3.0F), 0.2F, {vec3(0.0F, 1.0F, 1.0F)}},

         },

     };

     auto const tonemap = ACES{vec3(1.0F)};

@@ -195,7 +206,7 @@ int main(int argc, char const * argv[])

     output.render([&](uvec2 const & size, uvec2 const & pixel) {

         auto const ray   = camera.ray(size, pixel);

         auto const trace = scene.trace(ray);

-        auto const rgb   = vec3(min(trace.distance / 100.0F, 100.0F));

+        auto const rgb   = trace.material.color;

         auto const srgb  = convertLinearToSRGB(tonemap.transform(rgb));

         auto const alpha = 1.0F;

         return vec4(srgb, alpha);