46 |
|
r->rox = NULL; |
47 |
|
} else { /* else use theirs */ |
48 |
|
r->ro = rcont.ro; |
49 |
– |
newrayxf(r); /* allocate transformation */ |
50 |
– |
/* NOTE: r->rox may equal rcont.rox! */ |
49 |
|
if (rcont.rox != NULL) { |
50 |
+ |
newrayxf(r); /* allocate transformation */ |
51 |
+ |
/* NOTE: r->rox may equal rcont.rox! */ |
52 |
|
multmat4(r->rox->f.xfm, rcont.rox->f.xfm, in->x.f.xfm); |
53 |
|
r->rox->f.sca = rcont.rox->f.sca * in->x.f.sca; |
54 |
|
multmat4(r->rox->b.xfm, in->x.b.xfm, rcont.rox->b.xfm); |
55 |
|
r->rox->b.sca = in->x.b.sca * rcont.rox->b.sca; |
56 |
|
} else |
57 |
< |
copystruct(r->rox, &in->x); |
57 |
> |
r->rox = &in->x; |
58 |
|
} |
59 |
|
/* transform it back */ |
60 |
|
r->rot = rcont.rot * in->x.f.sca; |