Some fixes

Author: yozhijk

App/CL/camera.cl

@@ -38,10 +38,10 @@ typedef struct _Camera
         float3 right;
         float3 up;
         float3 p;
-        
+
         // Image plane width & height in current units
         float2 dim;
-        
+
         // Near and far Z
         float2 zcap;
         // Focal lenght
@@ -78,7 +78,7 @@ __kernel void PerspectiveCamera_GeneratePaths(
     int2 globalid;
     globalid.x  = get_global_id(0);
     globalid.y  = get_global_id(1);
-    
+
     // Check borders
     if (globalid.x < imgwidth && globalid.y < imgheight)
     {
@@ -88,7 +88,7 @@ __kernel void PerspectiveCamera_GeneratePaths(
 #ifndef NO_PATH_DATA
         __global Path* mypath = paths + globalid.y * imgwidth + globalid.x;
 #endif
-        
+
         // Prepare RNG
         Rng rng;
         InitRng(randseed +  globalid.x * 157 + 10433 * globalid.y, &rng);
@@ -112,17 +112,17 @@ __kernel void PerspectiveCamera_GeneratePaths(
 #else
         float2 sample0 = UniformSampler_Sample2D(&rng);
 #endif
-        
+
         // Calculate [0..1] image plane sample
         float2 imgsample;
         imgsample.x = (float)globalid.x / imgwidth + sample0.x / imgwidth;
         imgsample.y = (float)globalid.y / imgheight + sample0.y / imgheight;
-        
+
         // Transform into [-0.5, 0.5]
         float2 hsample = imgsample - make_float2(0.5f, 0.5f);
         // Transform into [-dim/2, dim/2]
         float2 csample = hsample * camera->dim;
-        
+
         // Calculate direction to image plane
         myray->d.xyz = normalize(camera->focal_length * camera->forward + csample.x * camera->right + csample.y * camera->up);
         // Origin == camera position + nearz * d

App/CL/integrator_pt.cl

@@ -474,7 +474,7 @@ __kernel void ShadeSurface(
             return;
         }
 
-        /*if (!bxdf_singular)
+        if (!bxdf_singular)
         {
             // Sample light
             float3 le = Light_Sample(light_idx, &scene, &diffgeo, TEXTURE_ARGS, sample1, &lightwo, &lightpdf);
@@ -524,18 +524,16 @@ __kernel void ShadeSurface(
             }
         }
         else
-        {*/
+        {
             // Otherwise save some intersector cycles
             Ray_SetInactive(shadowrays + 2 * globalid);
             lightsamples[2 * globalid] = 0;
-        //}
+        }
 
-        if (1/*!light_singular*/)
+        if (!light_singular)
         {
             // Sample bxdf
             float3 bxdf = Bxdf_Sample(&diffgeo, wi, TEXTURE_ARGS, sample2, &bxdfwo, &bxdfpdf);
-            bxdfwo *= CRAZY_HIGH_DISTANCE;
-
             bxdflightpdf = Light_GetPdf(light_idx, &scene, &diffgeo, bxdfwo, TEXTURE_ARGS);
             bxdfweight = BalanceHeuristic(1, bxdfpdf, 1, bxdflightpdf);
 
@@ -544,16 +542,18 @@ __kernel void ShadeSurface(
             {
                 wo = bxdfwo;
                 float ndotwo = fabs(dot(diffgeo.n, normalize(wo)));
-                radiance = Light_GetLe(light_idx, &scene, &diffgeo, &wo, TEXTURE_ARGS) * bxdf * throughput * ndotwo * bxdfweight / bxdfpdf / selection_pdf;
+                float3 le = Light_GetLe(light_idx, &scene, &diffgeo, &wo, TEXTURE_ARGS);
+                radiance =  le * bxdf * throughput * ndotwo * bxdfweight / bxdfpdf / selection_pdf;
 
                 if (NON_BLACK(radiance))
                 {
                     // Generate shadow ray
-                    float shadow_ray_length = CRAZY_HIGH_DISTANCE;
+                    float shadow_ray_length = (1.f - 2.f * CRAZY_LOW_DISTANCE) * length(wo);
                     float3 shadow_ray_dir = normalize(wo);
                     float3 shadow_ray_o = diffgeo.p + CRAZY_LOW_DISTANCE * s * diffgeo.n;
                     int shadow_ray_mask = Bxdf_IsSingular(&diffgeo) ? 0xFFFFFFFF : 0x0000FFFF;
 
+
                     Ray_Init(shadowrays + 2 * globalid + 1, shadow_ray_o, shadow_ray_dir, shadow_ray_length, 0.f, shadow_ray_mask);
 
                     // Apply the volume to shadow ray if needed
@@ -575,8 +575,8 @@ __kernel void ShadeSurface(
                 }
             }
             else
-            {
                 // Otherwise save some intersector cycles
+                {
                 Ray_SetInactive(shadowrays + 2 * globalid + 1);
                 lightsamples[2 * globalid + 1] = 0;
             }
@@ -587,7 +587,7 @@ __kernel void ShadeSurface(
             Ray_SetInactive(shadowrays + 2 * globalid + 1);
             lightsamples[2 * globalid + 1] = 0;
         }
-       
+
         // Apply Russian roulette
         float q = max(min(0.5f,
             // Luminance

App/CL/light.cl

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include <../App/CL/texture.cl>
 
 
-int IntersectTriangle(ray const* r, float3 v1, float3 v2, float3 v3, float* a, float* b)
+bool IntersectTriangle(ray const* r, float3 v1, float3 v2, float3 v3, float* a, float* b)
 {
     const float3 e1 = v2 - v1;
     const float3 e2 = v3 - v1;
@@ -40,15 +40,15 @@ int IntersectTriangle(ray const* r, float3 v1, float3 v2, float3 v3, float* a, f
     const float  b2 = dot(r->d.xyz, s2) * invd;
     const float temp = dot(e2, s2) * invd;
 
-    if (b1 < 0.f || b1 > 1.f || b2 < 0.f || b1 + b2 > 1.f || temp < 0.f || temp > r->o.w)
+    if (b1 < 0.f || b1 > 1.f || b2 < 0.f || b1 + b2 > 1.f)
     {
-        return 0;
+        return false;
     }
     else
     {
         *a = b1;
         *b = b2;
-        return 1;
+        return true;
     }
 }
 
@@ -138,9 +138,8 @@ float3 AreaLight_GetLe(// Emissive object
                        )
 {
     ray r;
-    r.o.xyz = dg->p + normalize(*wo) * 0.01f;
-    r.o.w = 100000.f;
-    r.d.xyz = *wo;
+    r.o.xyz = dg->p;
+    r.d.xyz = normalize(*wo);
 
     int shapeidx = light->shapeidx;
     int primidx = light->primidx;
@@ -170,6 +169,7 @@ float3 AreaLight_GetLe(// Emissive object
 
 
     // Intersect ray against this area light
+
     float a, b;
     if (IntersectTriangle(&r, v0, v1, v2, &a, &b))
     {
@@ -179,27 +179,18 @@ float3 AreaLight_GetLe(// Emissive object
 
         float3 d = p - dg->p;
         float  ld = length(d);
+        *wo = p - dg->p;
 
         int matidx = scene->materialids[shape.startidx / 3 + primidx];
         Material mat = scene->materials[matidx];
 
         const float3 ke = Texture_GetValue3f(mat.kx.xyz, tx, TEXTURE_ARGS_IDX(mat.kxmapidx));
         float ndotv = dot(n, -(normalize(d)));
-
-        if (ndotv > 0.f)
-        {
-            *wo = d;
-            float denom = ld * ld;
-            return  denom > 0.f ? ke * ndotv / denom : 0.f;
-        }
-        else
-        {
-            return 1.f;
-        }
+        return  ke;
     }
     else
     {
-        return 1.f;
+        return 0.f;
     }
 }
 
@@ -297,7 +288,7 @@ float AreaLight_GetPdf(// Emissive object
                        )
 {
     ray r;
-    r.o.xyz = dg->p + normalize(wo) * 0.001f;
+    r.o.xyz = dg->p;
     r.d.xyz = wo;
 
     int shapeidx = light->shapeidx;