ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/cv/bsdf2rad.c

Comparing ray/src/cv/bsdf2rad.c (file contents):
Revision 2.19 by greg, Mon Apr 10 01:31:37 2017 UTC vs.
Revision 2.21 by greg, Mon Apr 10 15:44:19 2017 UTC

#	Line 26 | Line 26 | double overall_max = .0;               /* overall maximum BSDF valu
26
27		char    ourTempDir[TEMPLEN] = "";       /* our temporary directory */
28
29	–	const FVECT     Xaxis = {1., 0., 0.};
29		const FVECT     Yaxis = {0., 1., 0.};
31	–	const FVECT     Zaxis = {0., 0., 1.};
30
31		const char      frpref[] = "frefl";
32		const char      ftpref[] = "ftrans";
#	Line 68 | Line 66 | get_ivector(FVECT iv, int i)
66		static RREAL *
67		cvt_sposition(FVECT sp, const FVECT iv, int inc_side)
68		{
69	<	sp[0] = -iv[0]*sph_rad - inc_side*sph_xoffset;
69	>	sp[0] = -iv[0]*sph_rad + inc_side*sph_xoffset;
70		sp[1] = -iv[1]*sph_rad;
71		sp[2] = iv[2]*sph_rad;
72
#	Line 387 | Line 385 | put_BSDFs(void)
385		NINCIDENT);
386
387		printf("\nvoid glow arrow_glow\n0\n0\n4 1 0 1 0\n");
388	<	printf("\nvoid mixfunc arrow_mat\n4 arrow_glow void .5 .\n0\n0\n");
388	>	printf("\nvoid mixfunc arrow_mat\n4 arrow_glow void 0.5 .\n0\n0\n");
389
390		if (front_comp & SDsampR)                       /* front reflection */
391		for (i = 0; i < NINCIDENT; i++) {
#	Line 409 | Line 407 | put_BSDFs(void)
407		nxfa += 6;
408		fname = tfile_name(frpref, dsuffix, i);
409		sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform %s",
410	<	frpref, i+1, fname, fname, fname, SAMPRES-1, SAMPRES-1,
410	>	frpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
411		xfargs);
412		if (!run_cmd(cmdbuf))
413		return(0);
#	Line 434 | Line 432 | put_BSDFs(void)
432		nxfa += 6;
433		fname = tfile_name(ftpref, dsuffix, i);
434		sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -I %s",
435	<	ftpref, i+1, fname, fname, fname, SAMPRES-1, SAMPRES-1,
435	>	ftpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
436		xfargs);
437		if (!run_cmd(cmdbuf))
438		return(0);
#	Line 459 | Line 457 | put_BSDFs(void)
457		nxfa += 6;
458		fname = tfile_name(brpref, dsuffix, i);
459		sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -I -ry 180 %s",
460	<	brpref, i+1, fname, fname, fname, SAMPRES-1, SAMPRES-1,
460	>	brpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
461		xfargs);
462		if (!run_cmd(cmdbuf))
463		return(0);
#	Line 484 | Line 482 | put_BSDFs(void)
482		nxfa += 6;
483		fname = tfile_name(btpref, dsuffix, i);
484		sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -ry 180 %s",
485	<	btpref, i+1, fname, fname, fname, SAMPRES-1, SAMPRES-1,
485	>	btpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
486		xfargs);
487		if (!run_cmd(cmdbuf))
488		return(0);
#	Line 502 | Line 500 | put_matBSDF(const char *XMLfile)
500		printf("\n# Simplified material because we have no XML input\n");
501		printf("\nvoid brightfunc latlong\n2 latlong bsdf2rad.cal\n0\n0\n");
502		if ((front_comp|back_comp) & SDsampT)
503	<	printf("\nlatlong trans %s\n0\n0\n7 .75 .75 .75 0 0 .5 .8\n",
503	>	printf("\nlatlong trans %s\n0\n0\n7 .75 .75 .75 0 .04 .5 .8\n",
504		sph_mat);
505		else
506		printf("\nlatlong plastic %s\n0\n0\n5 .5 .5 .5 0 0\n",
#	Line 532 | Line 530 | static void
530		put_source(void)
531		{
532		printf("\n# Overhead parallel light source\n");
533	<	printf("\nvoid light bright\n0\n0\n3 2000 2000 2000\n");
533	>	printf("\nvoid light bright\n0\n0\n3 2500 2500 2500\n");
534		printf("\nbright source light\n0\n0\n4 0 0 1 2\n");
535		printf("\n# Material used for labels\n");
536		printf("\nvoid trans vellum\n0\n0\n7 1 1 1 0 0 .5 0\n");
#	Line 542 | Line 540 | put_source(void)
540		static void
541		put_hemispheres(void)
542		{
543	+	const int       nsegs = 131;
544	+
545		printf("\n# Hemisphere(s) for showing BSDF appearance (if XML file)\n");
546	–	printf("\nvoid antimatter anti_sph\n2 void %s\n0\n0\n", sph_mat);
546		if (front_comp) {
547	<	printf("\n%s sphere Front\n0\n0\n4 %f 0 0 %f\n",
548	<	sph_mat, -sph_xoffset, sph_rad);
549	<	printf("\n!genbox anti_sph sph_eraser %f %f %f | xform -t %f %f %f\n",
551	<	2.02*sph_rad, 2.02*sph_rad, 1.02*sph_rad,
552	<	-1.01*sph_rad - sph_xoffset, -1.01*sph_rad, -1.01*sph_rad);
547	>	printf(
548	>	"\n!genrev %s Front \"R*sin(A*t)\" \"R*cos(A*t)\" %d -e \"R:%g;A:%f\" -s | xform -t %g 0 0\n",
549	>	sph_mat, nsegs, sph_rad, 0.495*PI, sph_xoffset);
550		printf("\nvoid brighttext front_text\n3 helvet.fnt . FRONT\n0\n");
551		printf("12\n\t%f %f 0\n\t%f 0 0\n\t0 %f 0\n\t.01 1 -.1\n",
552	<	-.22*sph_rad - sph_xoffset, -1.4*sph_rad,
552	>	-.22*sph_rad + sph_xoffset, -1.4*sph_rad,
553		.35/5.*sph_rad, -1.6*.35/5.*sph_rad);
554		printf("\nfront_text alias front_label_mat vellum\n");
555		printf("\nfront_label_mat polygon front_label\n0\n0\n12");
556		printf("\n\t%f %f 0\n\t%f %f 0\n\t%f %f 0\n\t%f %f 0\n",
557	<	-.25*sph_rad - sph_xoffset, -1.3*sph_rad,
558	<	-.25*sph_rad - sph_xoffset, (-1.4-1.6*.35/5.-.1)*sph_rad,
559	<	.25*sph_rad - sph_xoffset, (-1.4-1.6*.35/5.-.1)*sph_rad,
560	<	.25*sph_rad - sph_xoffset, -1.3*sph_rad );
557	>	-.25*sph_rad + sph_xoffset, -1.3*sph_rad,
558	>	-.25*sph_rad + sph_xoffset, (-1.4-1.6*.35/5.-.1)*sph_rad,
559	>	.25*sph_rad + sph_xoffset, (-1.4-1.6*.35/5.-.1)*sph_rad,
560	>	.25*sph_rad + sph_xoffset, -1.3*sph_rad );
561		}
562		if (back_comp) {
563	<	printf("\n%s bubble Back\n0\n0\n4 %f 0 0 %f\n",
564	<	sph_mat, sph_xoffset, sph_rad);
565	<	printf("\n!genbox anti_sph sph_eraser %f %f %f | xform -t %f %f %f\n",
569	<	2.02*sph_rad, 2.02*sph_rad, 1.02*sph_rad,
570	<	-1.01*sph_rad + sph_xoffset, -1.01*sph_rad, -1.01*sph_rad);
563	>	printf(
564	>	"\n!genrev %s Back \"R*cos(A*t)\" \"R*sin(A*t)\" %d -e \"R:%g;A:%f\" -s | xform -t %g 0 0\n",
565	>	sph_mat, nsegs, sph_rad, 0.495*PI, -sph_xoffset);
566		printf("\nvoid brighttext back_text\n3 helvet.fnt . BACK\n0\n");
567		printf("12\n\t%f %f 0\n\t%f 0 0\n\t0 %f 0\n\t.01 1 -.1\n",
568	<	-.22*sph_rad + sph_xoffset, -1.4*sph_rad,
568	>	-.22*sph_rad - sph_xoffset, -1.4*sph_rad,
569		.35/4.*sph_rad, -1.6*.35/4.*sph_rad);
570		printf("\nback_text alias back_label_mat vellum\n");
571		printf("\nback_label_mat polygon back_label\n0\n0\n12");
572		printf("\n\t%f %f 0\n\t%f %f 0\n\t%f %f 0\n\t%f %f 0\n",
573	<	-.25*sph_rad + sph_xoffset, -1.3*sph_rad,
574	<	-.25*sph_rad + sph_xoffset, (-1.4-1.6*.35/4.-.1)*sph_rad,
575	<	.25*sph_rad + sph_xoffset, (-1.4-1.6*.35/4.-.1)*sph_rad,
576	<	.25*sph_rad + sph_xoffset, -1.3*sph_rad );
573	>	-.25*sph_rad - sph_xoffset, -1.3*sph_rad,
574	>	-.25*sph_rad - sph_xoffset, (-1.4-1.6*.35/4.-.1)*sph_rad,
575	>	.25*sph_rad - sph_xoffset, (-1.4-1.6*.35/4.-.1)*sph_rad,
576	>	.25*sph_rad - sph_xoffset, -1.3*sph_rad );
577		}
578		}
579
#	Line 587 | Line 582 | static void
582		put_scale(void)
583		{
584		const double    max_log10 = log10(overall_max);
585	<	const double    leg_width = 2.*.75*(sph_xoffset - sph_rad);
585	>	const double    leg_width = 2.*.75*(fabs(sph_xoffset) - sph_rad);
586		const double    leg_height = 2.*sph_rad;
587		const int       text_lines = 6;
588		const int       text_digits = 8;
#	Line 686 | Line 681 | convert_mgf(const char *mgfdata)
681		sprintf(cmdbuf, "xform -t %f %f %f -s %f -t %f %f 0 %s",
682		-.5*(xmin+xmax), -.5*(ymin+ymax), -zmax,
683		1.5*sph_rad/max_dim,
684	<	-sph_xoffset, -2.5*sph_rad,
684	>	sph_xoffset, -2.5*sph_rad,
685		radfn);
686		if (!run_cmd(cmdbuf))
687		return;
#	Line 696 | Line 691 | convert_mgf(const char *mgfdata)
691		sprintf(cmdbuf, "xform -t %f %f %f -s %f -ry 180 -t %f %f 0 %s",
692		-.5*(xmin+xmax), -.5*(ymin+ymax), -zmin,
693		1.5*sph_rad/max_dim,
694	<	sph_xoffset, -2.5*sph_rad,
694	>	-sph_xoffset, -2.5*sph_rad,
695		radfn);
696		if (!run_cmd(cmdbuf))
697		return;

Diff Legend

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