[ViewVC] Diff of: Development/ray/src/rt/raytrace.c

Comparing ray/src/rt/raytrace.c (file contents):
Revision 2.19 by greg, Thu Jan 26 15:34:55 1995 UTC vs.
Revision 2.21 by greg, Thu Nov 2 17:38:02 1995 UTC

+                        error(USER, errmsg);
+                ******/
-<
+                if ((*ofun[m->otype].funp)(m, r))
-<
+                        objerror(r->ro, USER, "conflicting materials");
->
+                if ((*ofun[m->otype].funp)(m, r)) {
->
+                        sprintf(errmsg, "conflicting material \"%s\"",
->
+                                        m->oname);
->
+                        objerror(r->ro, USER, errmsg);
->
+                }
+        depth--;                        /* end here */
+                                        /* return value tells if material */
+        return(foremat);
-+
+}
-+
-+
-+
+double
-+
+raydist(r, flags)               /* compute (cumulative) ray distance */
-+
+register RAY  *r;
-+
+register int  flags;
-+
+{
-+
+        double  sum = 0.0;
-+
-+
+        while (r != NULL && r->crtype&flags) {
-+
+                sum += r->rot;
-+
+                r = r->parent;
-+
+        }
-+
+        return(sum);

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