Rev 18455 | Rev 18516 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 18455 | Rev 18492 | ||
|---|---|---|---|
| Line 1939... | Line 1939... | ||
| 1939 | { |
1939 | { |
| 1940 | double rx,ry,data[8],res[7]; |
1940 | double rx,ry,data[8],res[7]; |
| 1941 | int i, *qq=pm->p; |
1941 | int i, *qq=pm->p; |
| 1942 | for(i=0; i<8; i++) data[i]=pm->pd[i%6]; |
1942 | for(i=0; i<8; i++) data[i]=pm->pd[i%6]; |
| 1943 | if (tikz_file) fprintf(tikz_file, "\\draw[%s]",tikz_options(pm->color[0],0)); |
1943 | if (tikz_file) fprintf(tikz_file, "\\draw[%s]",tikz_options(pm->color[0],0)); |
| 1944 | for(i=0; i<3; i++) |
1944 | for(i=0; i<3; i++){ |
| 1945 | if(hypgeodaux(data+2*i,res)){ |
1945 | if(hypgeodaux(data+2*i,res)){ |
| 1946 | scale2(res[2],res[2],&rx,&ry); |
1946 | scale2(res[2],res[2],&rx,&ry); |
| 1947 | scale(res,qq,1); |
1947 | scale(res,qq,1); |
| 1948 | myGdImageArc(image,qq[0],qq[1],rx,ry,res[3]/DEG,res[4]/DEG,pm->color[0]); |
1948 | myGdImageArc(image,qq[0],qq[1],rx,ry,res[3]/DEG,res[4]/DEG,pm->color[0]); |
| 1949 | if(tikz_file) |
1949 | if(tikz_file) |
| Line 1966... | Line 1966... | ||
| 1966 | scale(res+5,qq,1); |
1966 | scale(res+5,qq,1); |
| 1967 | //patchgdImageFill(image,qq[0],qq[1],pm->color[0]); |
1967 | //patchgdImageFill(image,qq[0],qq[1],pm->color[0]); |
| 1968 | patchgdImageFillToBorder(image,qq[0],qq[1],pm->color[0],pm->color[0]); |
1968 | patchgdImageFillToBorder(image,qq[0],qq[1],pm->color[0],pm->color[0]); |
| 1969 | if(tikz_file) tikz_fill(qq[0],qq[1],1,1,0,pm->color[0],grid); |
1969 | if(tikz_file) tikz_fill(qq[0],qq[1],1,1,0,pm->color[0],grid); |
| 1970 | } |
1970 | } |
| - | 1971 | } |
|
| 1971 | } |
1972 | } |
| 1972 | 1973 | ||
| 1973 | /* polygon */ |
1974 | /* polygon */ |
| 1974 | void obj_hyppoly(objparm *pm) |
1975 | void obj_hyppoly(objparm *pm) |
| 1975 | { |
1976 | { |