Primitive sampling

RayTracer/applications/Rayt.cpp

@@ -51,7 +51,7 @@ void renderCommand(const String& scenePath) {
 
   auto start = get_time();
 
-  rayt.render(scene, output);
+  rayt.render(scene, output, settings);
 
   auto end = get_time();
 

RayTracer/applications/SceneLoad.cpp

@@ -46,26 +46,68 @@ bool loadMeshes(tp::Scene& scene, const tp::String& objetsPath) {
   return scene.mObjects.size();
 }
 
-bool getVector(lua_State* L, const char* name, tp::Vec3F& out, const char* parent) {
-  lua_getglobal(L, name);
-
-  if (lua_istable(L, -1)) {
-    lua_pushstring(L, "x");
-    lua_gettable(L, -2);
-
-    if (lua_isnumber(L, -1)) {
-      out.x = lua_tonumber(L, -1);
-    } else {
-      printf("Component of vector '%s' is not found in %s\n\n", name, parent);
-      return false;
-    }
-
-    lua_pop(L, 1);
-
-  } else {
-    printf("Vector '%s' is not found in %s\n\n", name, parent);
-    return false;
+// Function to read a Lua table representing RenderSettings
+int readRenderSettings(lua_State* L, tp::RayTracer::RenderSettings& settings) {
+  lua_getglobal(L, "RenderSettings");
+  if (!lua_istable(L, -1)) {
+    printf("RenderSettings is not a table.\n");
+    return 0; // Error
   }
+
+  // Read depth field
+  lua_getfield(L, -1, "depth");
+  if (lua_isnumber(L, -1)) {
+    settings.depth = (int) lua_tonumber(L, -1);
+  } else {
+    printf("RenderSettings 'depth' field is missing or not a number.\n");
+    lua_pop(L, 1); // Pop the 'depth' field
+    return 0;      // Error
+  }
+  lua_pop(L, 1); // Pop the 'depth' field
+
+  // Read spray field
+  lua_getfield(L, -1, "spray");
+  if (lua_isnumber(L, -1)) {
+    settings.spray = (int) lua_tonumber(L, -1);
+  } else {
+    printf("RenderSettings 'spray' field is missing or not a number.\n");
+    lua_pop(L, 1); // Pop the 'spray' field
+    return 0;      // Error
+  }
+  lua_pop(L, 1); // Pop the 'spray' field
+
+  return 1; // Success
+}
+
+// Function to read a Lua table representing a light
+int readLight(lua_State* L, tp::PointLight* light) {
+  lua_getfield(L, -1, "pos"); // Get the "pos" field from the light table
+  if (!lua_istable(L, -1)) {
+    printf("Light is missing the 'pos' table.\n");
+    return 0; // Error
+  }
+  for (int i = 0; i < 3; i++) {
+    lua_rawgeti(L, -1, i + 1); // Index is 1-based in Lua
+    if (!lua_isnumber(L, -1)) {
+      printf("Light 'pos' field is not a number at index %d.\n", i);
+      lua_pop(L, 2); // Pop both the number and the 'pos' table
+      return 0;      // Error
+    }
+    light->pos[i] = lua_tonumber(L, -1);
+    lua_pop(L, 1); // Pop the number
+  }
+  lua_pop(L, 1); // Pop the 'pos' table
+
+  lua_getfield(L, -1, "intensity"); // Get the "intensity" field from the light table
+  if (!lua_isnumber(L, -1)) {
+    printf("Light is missing the 'intensity' field or it's not a number.\n");
+    lua_pop(L, 1); // Pop the 'intensity' field
+    return 0;      // Error
+  }
+  light->intensity = lua_tonumber(L, -1);
+  lua_pop(L, 1); // Pop the 'intensity' field
+
+  return 1; // Success
 }
 
 void loadScene(tp::Scene& scene, const tp::String& scenePath, tp::RayTracer::RenderSettings& settings) {
@@ -154,5 +196,38 @@ void loadScene(tp::Scene& scene, const tp::String& scenePath, tp::RayTracer::Ren
   scene.mCamera.setFar(100);
   scene.mCamera.setRatio((tp::halnf) size_y / (tp::halnf) size_x);
 
+  // ---------- LIGHTS
+  {
+    lua_getglobal(L, "Lights");
+    if (!lua_istable(L, -1)) {
+      printf("Lights is not a table.\n");
+      lua_close(L);
+      return; // Error
+    }
+
+    // Read and process each light in the "Lights" table
+    int numLights = lua_rawlen(L, -1); // Get the number of lights in the table
+    for (int i = 1; i <= numLights; i++) {
+      lua_rawgeti(L, -1, i); // Get the i-th element (light) from the table
+      if (lua_istable(L, -1)) {
+        tp::PointLight light;
+        if (!readLight(L, &light)) {
+          printf("Cant read lights data\n");
+          lua_close(L);
+          return; // Error
+        }
+        scene.mLights.append(light);
+      }
+      lua_pop(L, 1); // Pop the i-th light table
+    }
+  }
+
+  // ----------- settings --------------
+  if (!readRenderSettings(L, settings)) {
+    printf("Cant Read Render Settings");
+    lua_close(L);
+    return; // Error
+  }
+
   lua_close(L);
 }

RayTracer/applications/rsc/cube/script.lua

@@ -6,3 +6,10 @@ Camera = {
 	size_x = 400,
 	size_y = 600,
 }
+
+Lights = {
+    {
+        pos = { 4, 3, 3 },
+        intensity = 4
+    }
+}

RayTracer/applications/rsc/scene/meshes.obj

@@ -11,31 +11,31 @@ v -1.039076 -1.039076 -1.285234
 v 1.039076 -1.039076 1.792917
 v 1.039076 -1.039076 -1.285234
 vt 0.625000 0.500000
-vt 0.875000 0.500000
-vt 0.875000 0.750000
 vt 0.625000 0.750000
+vt 0.875000 0.750000
+vt 0.875000 0.500000
 vt 0.375000 0.750000
-vt 0.625000 1.000000
 vt 0.375000 1.000000
+vt 0.625000 1.000000
 vt 0.375000 0.000000
-vt 0.625000 0.000000
-vt 0.625000 0.250000
 vt 0.375000 0.250000
+vt 0.625000 0.250000
+vt 0.625000 0.000000
 vt 0.125000 0.500000
-vt 0.375000 0.500000
 vt 0.125000 0.750000
-vn 0.0000 0.0000 1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 -1.0000 0.0000
+vt 0.375000 0.500000
 vn 0.0000 0.0000 -1.0000
 vn -1.0000 0.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 0.0000 1.0000
+vn 1.0000 0.0000 0.0000
 usemtl Material
 s off
-f 1/1/1 5/2/1 7/3/1 3/4/1
-f 4/5/2 3/4/2 7/6/2 8/7/2
-f 8/8/3 7/9/3 5/10/3 6/11/3
-f 6/12/4 2/13/4 4/5/4 8/14/4
-f 6/11/5 5/10/5 1/1/5 2/13/5
+f 1/1/1 3/2/1 7/3/1 5/4/1
+f 4/5/2 8/6/2 7/7/2 3/2/2
+f 8/8/3 6/9/3 5/10/3 7/11/3
+f 6/12/4 8/13/4 4/5/4 2/14/4
+f 6/9/5 2/14/5 1/1/5 5/10/5
 o Cube.001
 v 0.411013 -0.208216 -1.264212
 v 0.411013 -0.208216 -0.612621

RayTracer/applications/rsc/scene/script.lua

@@ -3,6 +3,22 @@ Meshes = "meshes.obj"
 
 Camera = {
 	pos = { 0.5, 4.5, 0.2 },
-	size_x = 500,
-	size_y = 700,
+	size_x = 600,
+	size_y = 800,
 }
+
+Lights = {
+    {
+        pos = { -0.5, 3.5, 1 },
+        intensity = 1
+    },
+    {
+        pos = { 0, 0, 1 },
+        intensity = 0.5
+    },
+}
+
+RenderSettings = {
+    depth = 1,
+    spray = 10,
+}