10 |
|
*/ |
11 |
|
|
12 |
|
#include <ctype.h> |
13 |
– |
#include <unistd.h> |
13 |
|
|
15 |
– |
#include "standard.h" |
14 |
|
#include "platform.h" |
15 |
+ |
#include "rtmath.h" |
16 |
+ |
#include "rtprocess.h" /* win_popen() */ |
17 |
|
#include "paths.h" |
18 |
|
#include "object.h" |
19 |
|
#include "otypes.h" |
73 |
|
if (argv[a][0] == '-') |
74 |
|
switch (argv[a][1]) { |
75 |
|
case 'm': |
76 |
< |
if (argv[a][2] | a+1 >= argc) |
76 |
> |
if (argv[a][2] | (a+1 >= argc)) |
77 |
|
break; |
78 |
|
a++; |
79 |
|
if (newmod == NULL) |
80 |
|
newmod = argv[a]; |
81 |
|
continue; |
82 |
|
case 'n': |
83 |
< |
if (argv[a][2] | a+1 >= argc) |
83 |
> |
if (argv[a][2] | (a+1 >= argc)) |
84 |
|
break; |
85 |
|
a++; |
86 |
|
if (idprefix == NULL) |
122 |
|
|
123 |
|
a += xf(&tot, argc-a, argv+a); |
124 |
|
|
125 |
< |
if (reverse = tot.sca < 0.0) |
125 |
> |
if ( (reverse = tot.sca < 0.0) ) |
126 |
|
tot.sca = -tot.sca; |
127 |
|
if (invert) |
128 |
|
reverse = !reverse; |
221 |
|
skipspaces: |
222 |
|
while (isspace(*cp)) /* nullify spaces */ |
223 |
|
*cp++ = '\0'; |
224 |
< |
if ((*cp == '"' | *cp == '\'')) |
224 |
> |
if ((*cp == '"') | (*cp == '\'')) |
225 |
|
inquote = *cp++; |
226 |
|
if (!*cp) /* all done? */ |
227 |
|
break; |
837 |
|
ofun[OBJ_CYLINDER].funp = |
838 |
|
ofun[OBJ_TUBE].funp = o_cylinder; |
839 |
|
ofun[OBJ_RING].funp = o_ring; |
840 |
< |
ofun[OBJ_INSTANCE].funp = addxform; |
840 |
> |
ofun[OBJ_INSTANCE].funp = |
841 |
> |
ofun[OBJ_MESH].funp = addxform; |
842 |
|
ofun[MAT_GLOW].funp = m_glow; |
843 |
|
ofun[MAT_SPOT].funp = m_spot; |
844 |
|
ofun[MAT_DIELECTRIC].funp = m_dielectric; |