ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/o_instance.c

Comparing ray/src/rt/o_instance.c (file contents):
Revision 1.1 by greg, Thu Feb 2 10:41:32 1989 UTC vs.
Revision 1.2 by greg, Tue Apr 11 13:30:30 1989 UTC

#	Line 46 | Line 46 | register RAY  *r;
46		r->ro = o;
47		else {                          /* else use theirs */
48		r->ro = rcont.ro;
49	<	multmat4(r->rox, in->b.xfm, rcont.rox);
50	<	r->ros = in->b.sca * rcont.ros;
49	>	multmat4(r->rofx, in->f.xfm, rcont.rofx);
50	>	r->rofs = in->f.sca * rcont.rofs;
51	>	multmat4(r->robx, in->b.xfm, rcont.robx);
52	>	r->robs = in->b.sca * rcont.robs;
53		}
54		/* transform it back */
55		r->rot = rcont.rot * in->f.sca;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)