ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/cv/bsdf2rad.c
(Generate patch)

Comparing ray/src/cv/bsdf2rad.c (file contents):
Revision 2.16 by greg, Sun Apr 9 21:39:26 2017 UTC vs.
Revision 2.17 by greg, Sun Apr 9 22:06:07 2017 UTC

# Line 524 | Line 524 | static void
524   put_source(void)
525   {
526          printf("\n# Overhead parallel light source\n");
527 <        printf("\nvoid light bright\n0\n0\n3 1000 1000 1000\n");
527 >        printf("\nvoid light bright\n0\n0\n3 2000 2000 2000\n");
528          printf("\nbright source light\n0\n0\n4 0 0 1 2\n");
529          printf("\n# Material used for labels\n");
530          printf("\nvoid trans vellum\n0\n0\n7 1 1 1 0 0 .5 0\n");
# Line 582 | Line 582 | put_scale(void)
582          const double    leg_width = 2.*.75*(sph_xoffset - sph_rad);
583          const double    leg_height = 2.*sph_rad;
584          const int       text_lines = 6;
585 <        const int       text_digits = 7;
585 >        const int       text_digits = 8;
586          char            fmt[16];
587          int             i;
588  
589          printf("\n# BSDF legend with falsecolor scale\n");
590          printf("\nvoid colorfunc lscale\n10 sca_red(Py) sca_grn(Py) sca_blu(Py)");
591          printf("\n\tbsdf2rad.cal -s %f -t 0 %f 0\n0\n0\n", leg_height, -.5*leg_height);
592 <        sprintf(fmt, "%%%dg", text_digits-2);
592 >        sprintf(fmt, "%%.%df", text_digits-3);
593          for (i = 0; i < text_lines; i++) {
594                  char    vbuf[16];
595                  sprintf(vbuf, fmt, pow(10., (i+.5)/text_lines*(max_log10-min_log10)+min_log10));
596                  printf("\nlscale brighttext lscale\n");
597                  printf("3 helvet.fnt . %s\n0\n12\n", vbuf);
598                  printf("\t%f %f 0\n", -.45*leg_width, ((i+.9)/text_lines-.5)*leg_height);
599 <                printf("\t%f 0 0\n", .9*leg_width/strlen(vbuf));
599 >                printf("\t%f 0 0\n", .8*leg_width/strlen(vbuf));
600                  printf("\t0 %f 0\n", -.9/text_lines*leg_height);
601                  printf("\t.01 1 -.1\n");
602          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines