clray

diff src/rt.cc @ 5:9f0ddb701882

caught up
author John Tsiombikas <nuclear@member.fsf.org>
date Thu, 15 Jul 2010 08:39:38 +0300
parents 3c95d568d3c7
children 575383f3a239
line diff
     1.1 --- a/src/rt.cc	Thu Jul 15 07:37:05 2010 +0300
     1.2 +++ b/src/rt.cc	Thu Jul 15 08:39:38 2010 +0300
     1.3 @@ -11,9 +11,8 @@
     1.4  
     1.5  struct Sphere {
     1.6  	cl_float4 pos;
     1.7 +	cl_float4 kd, ks;
     1.8  	cl_float radius;
     1.9 -
    1.10 -	cl_float4 kd, ks;
    1.11  	cl_float spow;
    1.12  	cl_float kr, kt;
    1.13  } __attribute__((packed));
    1.14 @@ -34,8 +33,8 @@
    1.15  static int global_size;
    1.16  
    1.17  static Sphere sphlist[] = {
    1.18 -	{{0, 0, 8, 1}, 1.0, {0.7, 0.2, 0.15, 1}, {1, 1, 1, 1}, 60, 0, 0},
    1.19 -	{{-0.2, 0.4, 5, 1}, 0.25, {0.2, 0.9, 0.3, 1}, {1, 1, 1, 1}, 40, 0, 0}
    1.20 +	{{0, 0, 8, 1}, {0.7, 0.2, 0.15, 1}, {1, 1, 1, 1}, 1.0, 60, 0, 0},
    1.21 +	{{-0.2, 0.4, 5, 1}, {0.2, 0.9, 0.3, 1}, {1, 1, 1, 1}, 0.25, 40, 0, 0}
    1.22  };
    1.23  
    1.24  static Light lightlist[] = {