From 5f8ce1e256462a9addbe318966a70a4bc6399bad Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Tue, 26 Jul 2011 09:20:06 -0600 Subject: Support multiple texture assignment properly. --- libdimension/cone.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'libdimension/cone.c') diff --git a/libdimension/cone.c b/libdimension/cone.c index 87f1fde..9f7a8fc 100644 --- a/libdimension/cone.c +++ b/libdimension/cone.c @@ -101,11 +101,8 @@ dmnsn_cone_intersection_fn(const dmnsn_object *cone, dmnsn_line l, && (tcap < t || p.y <= -1.0 || p.y >= 1.0) && pcap.x*pcap.x + pcap.z*pcap.z < r*r) { - intersection->ray = l; - intersection->t = tcap; - intersection->normal = norm; - intersection->texture = cone->texture; - intersection->interior = cone->interior; + intersection->t = tcap; + intersection->normal = norm; return true; } } @@ -114,11 +111,8 @@ dmnsn_cone_intersection_fn(const dmnsn_object *cone, dmnsn_line l, dmnsn_vector norm = dmnsn_vector_normalized( dmnsn_new_vector(p.x, -(r2 - r1)*sqrt(p.x*p.x + p.z*p.z)/2.0, p.z) ); - intersection->ray = l; - intersection->t = t; - intersection->normal = norm; - intersection->texture = cone->texture; - intersection->interior = cone->interior; + intersection->t = t; + intersection->normal = norm; return true; } } -- cgit v1.2.3