X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=csgray;a=blobdiff_plain;f=src%2Fcsgray.c;h=35bb5a84bd6bf8ac640349458108ab5c6412ebc0;hp=53b01468d021feb2a52c32087b742fc0dcb08d7f;hb=07f86df1b104515376419c7a214253fb435fc396;hpb=3dd5ba3e29ccff62d188bb4e9e8d23d1879a6024

diff --git a/src/csgray.c b/src/csgray.c
index 53b0146..35bb5a8 100644
--- a/src/csgray.c
+++ b/src/csgray.c
@@ -23,7 +23,7 @@ int csg_init(void)
 	oblist = 0;
 	plights = 0;
 
-	csg_ambient(0.05, 0.05, 0.05);
+	csg_ambient(0, 0, 0);
 	csg_view(0, 0, 5, 0, 0, 0);
 	csg_fov(50);
 
@@ -198,7 +198,7 @@ csg_object *csg_plane(float x, float y, float z, float nx, float ny, float nz)
 	o->plane.ny = ny;
 	o->plane.nz = nz;
 	o->plane.d = x * nx + y * ny + z * nz;
-	return 0;
+	return o;
 }
 
 csg_object *csg_box(float x, float y, float z, float xsz, float ysz, float zsz)
@@ -273,6 +273,11 @@ void csg_opacity(csg_object *o, float p)
 	o->ob.opacity = p;
 }
 
+void csg_metallic(csg_object *o, int m)
+{
+	o->ob.metallic = m;
+}
+
 
 void csg_render_pixel(int x, int y, int width, int height, float aspect, float *color)
 {
@@ -326,10 +331,10 @@ static int ray_trace(struct ray *ray, float *col)
 
 static void shade(float *col, struct ray *ray, struct hit *hit)
 {
-	float ndotl, len;
+	float ndotl, ndoth, len, falloff, spec;
 	csg_object *o, *lt = plights;
 	float dcol[3], scol[3] = {0};
-	float ldir[3];
+	float ldir[3], lcol[3], hdir[3];
 	struct ray sray;
 	struct hit tmphit;
 
@@ -350,24 +355,57 @@ static void shade(float *col, struct ray *ray, struct hit *hit)
 		sray.dy = ldir[1];
 		sray.dz = ldir[2];
 
-		if(!find_intersection(&sray, &tmphit) || tmphit.t < 1.0f) {
+		if(!find_intersection(&sray, &tmphit) || tmphit.t > 1.0f) {
 			if((len = sqrt(ldir[0] * ldir[0] + ldir[1] * ldir[1] + ldir[2] * ldir[2])) != 0.0f) {
 				float s = 1.0f / len;
 				ldir[0] *= s;
 				ldir[1] *= s;
 				ldir[2] *= s;
 			}
+			falloff = 1.0f / (len * len);
+
+			lcol[0] = lt->ob.emr * falloff;
+			lcol[1] = lt->ob.emg * falloff;
+			lcol[2] = lt->ob.emb * falloff;
 
 			if((ndotl = hit->nx * ldir[0] + hit->ny * ldir[1] + hit->nz * ldir[2]) < 0.0f) {
 				ndotl = 0.0f;
 			}
 
-			dcol[0] += o->ob.r * lt->ob.emr * ndotl;
-			dcol[1] += o->ob.g * lt->ob.emg * ndotl;
-			dcol[2] += o->ob.b * lt->ob.emb * ndotl;
+			dcol[0] += o->ob.r * lcol[0] * ndotl;
+			dcol[1] += o->ob.g * lcol[1] * ndotl;
+			dcol[2] += o->ob.b * lcol[2] * ndotl;
+
+			if(o->ob.roughness < 1.0f) {
+				float gloss = 1.0f - o->ob.roughness;
+
+				hdir[0] = ldir[0] - ray->dx;
+				hdir[1] = ldir[1] - ray->dy;
+				hdir[2] = ldir[2] - ray->dz;
+				if((len = sqrt(hdir[0] * hdir[0] + hdir[1] * hdir[1] + hdir[2] * hdir[2])) != 0.0f) {
+					float s = 1.0f / len;
+					hdir[0] *= s;
+					hdir[1] *= s;
+					hdir[2] *= s;
+				}
+
+				if((ndoth = hit->nx * hdir[0] + hit->ny * hdir[1] + hit->nz * hdir[2]) < 0.0f) {
+					ndoth = 0.0f;
+				}
+				spec = gloss * pow(ndoth, 100.0f * gloss);
+
+				if(o->ob.metallic) {
+					lcol[0] *= o->ob.r;
+					lcol[1] *= o->ob.g;
+					lcol[2] *= o->ob.b;
+				}
+				scol[0] += lcol[0] * spec;
+				scol[1] += lcol[1] * spec;
+				scol[2] += lcol[2] * spec;
+			}
 		}
 
-		lt = lt->ob.next;
+		lt = lt->ob.plt_next;
 	}
 
 	col[0] = dcol[0] + scol[0];
@@ -382,16 +420,32 @@ static void background(float *col, struct ray *ray)
 
 static int find_intersection(struct ray *ray, struct hit *best)
 {
+	int idx = 0;
 	csg_object *o;
-	struct hit *hit;
+	struct hinterv *hit, *it;
 
 	best->t = FLT_MAX;
 	best->o = 0;
 
 	o = oblist;
 	while(o) {
-		if((hit = ray_intersect(ray, o)) && hit->t < best->t) {
-			*best = *hit;
+		if((hit = ray_intersect(ray, o))) {
+			it = hit;
+			while(it) {
+				if(it->end[0].t > 1e-6) {
+					idx = 0;
+					break;
+				}
+				if(it->end[1].t > 1e-6) {
+					idx = 1;
+					break;
+				}
+				it = it->next;
+			}
+
+			if(it && it->end[idx].t < best->t) {
+				*best = it->end[idx];
+			}
 		}
 		free_hit_list(hit);
 		o = o->ob.next;