star-3d

commit b91876373f0d663bcb1dc573213d8cad9f3b5563
parent 783df142c3a5f0549ff313315cbfc6abc94b317b
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Mon, 22 Jan 2018 18:50:14 +0100

Fix CL warnings and relax some tests

Diffstat:
M
src/s3d_geometry.c
 | 
4
++--
M
src/test_s3d_sample_sphere.c
 | 
2
+-
M
src/test_s3d_sphere_instance.c
 | 
2
+-

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/s3d_geometry.c b/src/s3d_geometry.c
@@ -191,7 +191,7 @@ geometry_rtc_sphere_intersect(void* data, RTCRay& ray, size_t item)
   D = B*B - 4*A*C;
 
   if(D < 0.0f) return;
-  Q = sqrt(D);
+  Q = (float)sqrt(D);
   rcpA = 1.f / A;
   t0 = 0.5f * rcpA * (-B - Q);
   t1 = 0.5f * rcpA * (-B + Q);
@@ -218,7 +218,7 @@ geometry_rtc_sphere_occluded(void* data, RTCRay& ray, size_t item)
   D = B*B - 4*A*C;
 
   if(D < 0.0f) return;
-  Q = sqrt(D);
+  Q = (float)sqrt(D);
   rcpA = 1.f / A;
   t0 = 0.5f * rcpA * (-B - Q);
   t1 = 0.5f * rcpA * (-B + Q);
diff --git a/src/test_s3d_sample_sphere.c b/src/test_s3d_sample_sphere.c
@@ -127,7 +127,7 @@ main(int argc, char** argv)
   E = sum / (float)N;
   V = sum / (float)N - E*E;
   SE = (float)sqrt(V/(float)N);
-  CHK(eq_epsf(E, 0.5, SE));
+  CHK(eq_epsf(E, 0.5, 2*SE));
 
   CHK(s3d_device_ref_put(dev) == RES_OK);
   CHK(s3d_scene_ref_put(scn) == RES_OK);
diff --git a/src/test_s3d_sphere_instance.c b/src/test_s3d_sphere_instance.c
@@ -101,7 +101,7 @@ test_sampling
   E = sum / (float)N;
   V = sum / (float)N - E*E;
   SE = (float)sqrt(V/(float)N);
-  CHK(eq_epsf(E, 0.5, SE));
+  CHK(eq_epsf(E, 0.5, 2*SE));
 }
 
 static void