Implement spot light

Author: yozhijk

App/CL/light.cl

@@ -448,6 +448,72 @@ float PointLight_GetPdf(// Emissive object
     return 0.f;
 }
 
+/*
+ Spot light
+ */
+// Get intensity for a given direction
+float3 SpotLight_GetLe(// Emissive object
+                        Light const* light,
+                        // Scene
+                        Scene const* scene,
+                        // Geometry
+                        DifferentialGeometry const* dg,
+                        // Direction to light source
+                        float3* wo,
+                        // Textures
+                        TEXTURE_ARG_LIST
+                        )
+{
+    return 0.f;
+}
+
+/// Sample direction to the light
+float3 SpotLight_Sample(// Emissive object
+                         Light const* light,
+                         // Scene
+                         Scene const* scene,
+                         // Geometry
+                         DifferentialGeometry const* dg,
+                         // Textures
+                         TEXTURE_ARG_LIST,
+                         // Sample
+                         float2 sample,
+                         // Direction to light source
+                         float3* wo,
+                         // PDF
+                         float* pdf)
+{
+    *wo = light->p - dg->p;
+    float ddotwo = dot(-normalize(*wo), light->d);
+    
+    if (ddotwo > light->oa)
+    {
+        *pdf = 1.f;
+        return ddotwo > light->ia ? light->intensity : light->intensity * (1.f - (light->ia - ddotwo) / (light->ia - light->oa));
+    }
+    else
+    {
+        *pdf = 0.f;
+        return 0.f;
+    }
+}
+
+/// Get PDF for a given direction
+float SpotLight_GetPdf(// Emissive object
+                        Light const* light,
+                        // Scene
+                        Scene const* scene,
+                        // Geometry
+                        DifferentialGeometry const* dg,
+                        // Direction to light source
+                        float3 wo,
+                        // Textures
+                        TEXTURE_ARG_LIST
+                        )
+{
+    return 0.f;
+}
+
 
 
 
@@ -480,6 +546,8 @@ float3 Light_GetLe(// Light index
             return DirectionalLight_GetLe(&light, scene, dg, wo, TEXTURE_ARGS);
         case kPoint:
             return PointLight_GetLe(&light, scene, dg, wo, TEXTURE_ARGS);
+        case kSpot:
+            return SpotLight_GetLe(&light, scene, dg, wo, TEXTURE_ARGS);
     }
 
     return make_float3(0.f, 0.f, 0.f);
@@ -513,6 +581,8 @@ float3 Light_Sample(// Light index
             return DirectionalLight_Sample(&light, scene, dg, TEXTURE_ARGS, sample, wo, pdf);
         case kPoint:
             return PointLight_Sample(&light, scene, dg, TEXTURE_ARGS, sample, wo, pdf);
+        case kSpot:
+            return SpotLight_Sample(&light, scene, dg, TEXTURE_ARGS, sample, wo, pdf);
     }
 
     *pdf = 0.f;
@@ -544,6 +614,8 @@ float Light_GetPdf(// Light index
             return DirectionalLight_GetPdf(&light, scene, dg, wo, TEXTURE_ARGS);
         case kPoint:
             return PointLight_GetPdf(&light, scene, dg, wo, TEXTURE_ARGS);
+        case kSpot:
+            return SpotLight_GetPdf(&light, scene, dg, wo, TEXTURE_ARGS);
     }
 
     return 0.f;

App/CL/payload.cl

@@ -87,8 +87,6 @@ typedef struct _Emissive
 } Emissive;
 
 
-
-
 typedef enum _PathFlags
 {
     kNone = 0x0,
@@ -169,6 +167,15 @@ typedef struct _Light
             int texdiffuse;
             float multiplier;
         };
+        
+        
+        // Spot
+        struct
+        {
+            float ia;
+            float oa;
+            float f;
+        };
     };
 
     float3 p;

App/Scene/scene.cpp

@@ -919,7 +919,7 @@ Scene* Scene::LoadFromObj(std::string const& filename, std::string const& basepa
             matmap[i] = scene->materials_.size() - 1;
             continue;
         }
-        else if (objmaterials[i].name == "light" || objmaterials[i].name == "Emit1" || objmaterials[i].name == "Light3" || objmaterials[i].name == "dayLight_portal")
+        else if (objmaterials[i].name == "light1" || objmaterials[i].name == "Emit1" || objmaterials[i].name == "Light3" || objmaterials[i].name == "dayLight_portal")
         {
             Material emissive;
             emissive.kx = 10.f * float3(0.8f, 0.8f, 0.8f);
@@ -1261,7 +1261,7 @@ void Scene::AddDirectionalLight(RadeonRays::float3 const& d, RadeonRays::float3
 {
     Light light;
     light.type = kDirectional;
-    light.d = d;
+    light.d = normalize(d);
     light.intensity = e;
     lights_.push_back(light);
 }
@@ -1275,6 +1275,18 @@ void Scene::AddPointLight(RadeonRays::float3 const& p, RadeonRays::float3 const&
     lights_.push_back(light);
 }
 
+void Scene::AddSpotLight(RadeonRays::float3 const& p, RadeonRays::float3 const& d, RadeonRays::float3 const& e, float ia, float oa)
+{
+    Light light;
+    light.type = kSpot;
+    light.p = p;
+    light.d = normalize(d);
+    light.intensity = e;
+    light.ia = ia;
+    light.oa = oa;
+    lights_.push_back(light);
+}
+    
 void Scene::SetEnvironment(std::string const& filename, std::string const& basepath, float envmapmul)
 {
     // Save multiplier

App/Scene/scene.h

@@ -46,6 +46,8 @@ namespace Baikal
         void AddDirectionalLight(RadeonRays::float3 const& d, RadeonRays::float3 const& e);
 
         void AddPointLight(RadeonRays::float3 const& p, RadeonRays::float3 const& e);
+        
+        void AddSpotLight(RadeonRays::float3 const& p, RadeonRays::float3 const& d, RadeonRays::float3 const& e, float ia, float oa);
 
         enum DirtyFlags
         {
@@ -200,6 +202,14 @@ namespace Baikal
                         int texdiffuse;
                         float multiplier;
                     };
+                    
+                    // Spot
+                    struct
+                    {
+                        float ia;
+                        float oa;
+                        float f;
+                    };
                 };
 
                 RadeonRays::float3 p;

App/main.cpp

@@ -364,9 +364,10 @@ void InitData()
     std::cout << "Sensor size: " << g_camera_sensor_size.x * 1000.f << "x" << g_camera_sensor_size.y * 1000.f << "mm\n";
 
     //g_scene->SetEnvironment(g_envmapname, "", g_envmapmul);
-    g_scene->AddDirectionalLight(RadeonRays::float3(-0.3f, -1.f, -0.4f), RadeonRays::float3(1.f, 1.f, 1.f));
-    g_scene->AddPointLight(RadeonRays::float3(0.5f, 1.5f, 0.0f), RadeonRays::float3(1.f, 0.6f, 1.f));
-
+    //g_scene->AddDirectionalLight(RadeonRays::float3(-0.3f, -1.f, -0.4f), 2.f * RadeonRays::float3(1.f, 1.f, 1.f));
+    //g_scene->AddPointLight(RadeonRays::float3(0.5f, 1.5f, 0.0f), RadeonRays::float3(1.f, 0.9f, 0.6f));
+    g_scene->AddSpotLight(RadeonRays::float3(0.5f, 1.5f, 0.0f), RadeonRays::float3(-0.5f, -1.0f, 0.1f), RadeonRays::float3(1.f, 0.9f, 0.6f),
+                           std::cos(M_PI_4/2), std::cos(M_PI_4));
 #pragma omp parallel for
     for (int i = 0; i < g_cfgs.size(); ++i)
     {