ViewVC Help

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

root/Development/ray/src/util/evalglare.c

Comparing ray/src/util/evalglare.c (file contents):
Revision 2.12 by greg, Tue Jun 3 21:31:51 2025 UTC vs.
Revision 3.08 by greg, Wed Oct 1 17:48:15 2025 UTC

#	Line 1 | Line 1
1		#ifndef lint
2	<	static const char RCSid[] = "$Id$";
2	>	static const char RCSid[] = "$Id$";
3		#endif
4	<	/* EVALGLARE V2.10
5	<	* Evalglare Software License, Version 2.0
4	>	/* EVALGLARE V3.06
5	>	* Evalglare Software License, Version 3.0x
6		*
7	<	* Copyright (c) 1995 - 2020 Fraunhofer ISE, EPFL.
7	>	* Copyright (c) 1995 - 2022 Fraunhofer ISE, EPFL.
8		* All rights reserved.
9		*
10		*
#	Line 356 | Line 356 | calculate "illuminance-contribution of zones"
356		2020/06/22 - added Ev contribution from each glare source as output to the multiimage mode
357		-switch for correction modes (-C), value of 0 switches off all corrections
358		*/
359	<
359	>
360	>
361	>	/* evalglare.c, v2.11  2020/07/06
362	>	-add extra output for DGP-contribution in -d mode
363	>	-fix (remove) 1 pixel offset of the mulltiimage-mode
364	>	*/
365	>
366	>	/* evalglare.c, v2.12  2021/07/19
367	>	-bugfix: center of glare source calculation now based on l*omega weighting, before it was just on omega.
368	>	*/
369	>
370	>	/* evalglare.c, v2.13  2021/07/21
371	>	- center of glare source calculation now based on l*l*omega weighting.
372	>	- bugfix: Position-index below line of sight is now corrected and based on the modified equation from Iwata and Osterhaus 2010
373	>	*/
374	>
375	>	/* evalglare.c, v2.14  2021/10/20
376	>	- center of glare source calculation now based on l*omega weighting.
377	>	- adding UGP2 equation to the output
378	>	- new default setting: low-light correction off !
379	>	*/
380	>
381	>	/* evalglare.c, v3.0  2021/12/24
382	>	- adding patch-mode (-z patchangle combineflag ) as glare source grouping method
383	>	*/
384	>
385	>	/* evalglare.c, v3.01  2022/01/05
386	>	- change of multi-image-mode. Adding extra scans with scaled image
387	>	syntax now: -Q n_images n_extrascans_per_image n_images*( imagename x y  n_extrascans*(scale) )
388	>	*/
389	>	/* evalglare.c, v3.02  2022/02/11
390	>	- correction of position index below line of sight after Takuro Kikuchi's comments in radiance-discourse from Dec 2021.
391	>	*/
392	>
393	>	/* evalglare.c, v3.03  2022/03/18, 2024/06/25
394	>	- add no pixels output for zonal analysis.
395	>
396	>	/* evalglare.c, v3.04  2023/09/01
397	>	- test version to include peripherical dependency, changes not (yet) used for following versions
398	>
399	>	/* evalglare.c, v3.05  2024/06/25
400	>	- fix bug of still having lowlight correction even if turned off
401	>	- changing abs_max,Lveil from float to double
402	>	*/
403	>
404	>	/* evalglare.c, v3.06  2024/06/25
405	>	- fix bug missing border pixel when cutting with -G
406	>	*/
407	>
408	>
409	>
410	>
411		#define EVALGLARE
412		#define PROGNAME "evalglare"
413	<	#define VERSION "2.10 release 25.06.2020 by EPFL, J.Wienold"
413	>	#define VERSION "3.06 release 01.10.2025 by J.Wienold, EPFL"
414		#define RELEASENAME PROGNAME " " VERSION
415
416
#	Line 374 | Line 425 | calculate "illuminance-contribution of zones"
425		void add_pixel_to_gs(pict * p, int x, int y, int gsn)
426		{
427		double old_av_posx, old_av_posy, old_av_lum, old_omega, act_omega,
428	<	new_omega, act_lum;
428	>	new_omega, act_lum,temp_av_posx,temp_av_posy,av_lum;
429
430
431		pict_get_npix(p, gsn) = pict_get_npix(p, gsn) + 1;
#	Line 386 | Line 437 | void add_pixel_to_gs(pict * p, int x, int y, int gsn)
437		act_omega = pict_get_omega(p, x, y);
438		act_lum = luminance(pict_get_color(p, x, y));
439		new_omega = old_omega + act_omega;
440	<	pict_get_av_posx(p, gsn) =
441	<	(old_av_posx * old_omega + x * act_omega) / new_omega;
442	<	pict_get_av_posy(p, gsn) =
443	<	(old_av_posy * old_omega + y * act_omega) / new_omega;
440	>	pict_get_av_lum(p, gsn) =
441	>	(old_av_lum * old_omega + act_lum * act_omega) / new_omega;
442	>
443	>	av_lum=pict_get_av_lum(p, gsn);
444	>	temp_av_posx =
445	>	(old_av_posx *  old_omega* old_av_lum + x * act_omega*act_lum) / (old_av_lum*old_omega + act_lum* act_omega );
446	>	pict_get_av_posx(p, gsn) = temp_av_posx;
447	>	temp_av_posy =
448	>	(old_av_posy *  old_omega* old_av_lum + y * act_omega*act_lum) / (old_av_lum*old_omega + act_lum* act_omega );
449	>
450	>	pict_get_av_posy(p, gsn) = temp_av_posy;
451		if (isnan((pict_get_av_posx(p, gsn))))
452		fprintf(stderr,"error in add_pixel_to_gs %d %d %f %f %f %f\n", x, y, old_av_posy, old_omega, act_omega, new_omega);
453
396	–	pict_get_av_lum(p, gsn) =
397	–	(old_av_lum * old_omega + act_lum * act_omega) / new_omega;
454		pict_get_av_omega(p, gsn) = new_omega;
455		pict_get_gsn(p, x, y) = gsn;
456		if (act_lum < pict_get_lum_min(p, gsn)) {
#	Line 769 | Line 825 | void split_pixel_from_gs(pict * p, int x, int y, int n
825		{
826		int old_gsn, icol;
827		double old_av_posx, old_av_posy, old_av_lum, old_omega, act_omega, delta_E,
828	<	new_omega, act_lum;
828	>	new_omega, act_lum,temp_av_posx,temp_av_posy,av_lum;
829
830
831		/* change existing gs */
#	Line 786 | Line 842 | void split_pixel_from_gs(pict * p, int x, int y, int n
842
843		new_omega = old_omega - act_omega;
844		pict_get_av_omega(p, old_gsn) = new_omega;
789	–	pict_get_av_posx(p, old_gsn) =
790	–	(old_av_posx * old_omega - x * act_omega) / new_omega;
791	–	pict_get_av_posy(p, old_gsn) =
792	–	(old_av_posy * old_omega - y * act_omega) / new_omega;
845
794	–
846		act_lum = luminance(pict_get_color(p, x, y));
847		old_av_lum = pict_get_av_lum(p, old_gsn);
848		pict_get_av_lum(p, old_gsn) =
849		(old_av_lum * old_omega - act_lum * act_omega) / new_omega;
850	+
851	+	av_lum = pict_get_av_lum(p, old_gsn);
852	+	temp_av_posx =
853	+	(old_av_posx *old_av_lum* old_omega  - x *act_lum* act_omega ) / (old_av_lum*old_omega  - act_lum* act_omega);
854	+
855	+	pict_get_av_posx(p, old_gsn) = temp_av_posx;
856	+	temp_av_posy =
857	+	(old_av_posy *old_av_lum* old_omega - y *act_lum* act_omega ) / (old_av_lum*old_omega  - act_lum* act_omega);
858	+	pict_get_av_posy(p, old_gsn) = temp_av_posy;
859	+
860		/* add pixel to new  gs */
861
862		add_pixel_to_gs(p, x, y, new_gsn);
#	Line 814 | Line 875 | void split_pixel_from_gs(pict * p, int x, int y, int n
875		float get_posindex(pict * p, float x, float y, int postype)
876		{
877		float posindex;
878	<	double teta, phi, sigma, tau, deg, d, s, r, fact;
878	>	double teta, beta, phi, sigma, tau, deg, d, s, r, fact;
879
880
881		pict_get_vangle(p, x, y, p->view.vdir, p->view.vup, &phi);
#	Line 842 | Line 903 | float get_posindex(pict * p, float x, float y, int pos
903		/* KIM  model */
904		posindex = exp ((sigma-(-0.000009*tau*tau*tau+0.0014*tau*tau+0.0866*tau+21.633))/(-0.000009*tau*tau*tau+0.0013*tau*tau+0.0853*tau+8.772));
905		}else{
906	+
907		/* Guth model, equation from IES lighting handbook */
908		posindex =
909		exp((35.2 - 0.31889 * tau -
#	Line 850 | Line 912 | float get_posindex(pict * p, float x, float y, int pos
912		0.002963 * tau *
913		tau) / 100000 *
914		sigma * sigma);
853	–	/* below line of sight, using Iwata model */
854	–	if (phi < 0) {
855	–	d = 1 / tan(phi);
856	–	s = tan(teta) / tan(phi);
857	–	r = sqrt(1 / d * 1 / d + s * s / d / d);
858	–	if (r > 0.6)
859	–	fact = 1.2;
860	–	if (r > 3) {
861	–	fact = 1.2;
862	–	r = 3;
863	–	}
915
916	<	posindex = 1 + fact * r;
916	>	/* below line of sight, using Iwata model, CIE2010, converted coordinate system according to Takuro Kikuchi */
917	>
918	>	if (phi < 0) {
919	>	beta = atan(tan(sigma/deg)* sqrt(1 + 0.3225 * pow(cos(tau/deg),2))) * deg;
920	>	posindex = exp(6.49 / 1000 * beta + 21.0 / 100000 * beta * beta);
921	>
922		}
923	+
924		if (posindex > 16)
925		posindex = 16;
926		}
#	Line 909 | Line 966 | void cut_view_1(pict*p)
966		{
967		int x,y;
968		double border,ang,teta,phi,phi2;
969	<	for(x=0;x<pict_get_xsize(p)-1;x++)
970	<	for(y=0;y<pict_get_ysize(p)-1;y++) {
969	>	for(x=0;x<pict_get_xsize(p);x++)
970	>	for(y=0;y<pict_get_ysize(p);y++) {
971		if (pict_get_hangle(p,x,y,p->view.vdir,p->view.vup,&ang)) {
972		if (pict_is_validpixel(p, x, y)) {
973		pict_get_vangle(p,x,y,p->view.vdir,p->view.vup,&phi2);
#	Line 963 | Line 1020 | void cut_view_2(pict*p)
1020
1021		int x,y;
1022		double border,ang,teta,phi,phi2;
1023	<	for(x=0;x<pict_get_xsize(p)-1;x++)
1024	<	for(y=0;y<pict_get_ysize(p)-1;y++) {
1023	>	for(x=0;x<pict_get_xsize(p);x++)
1024	>	for(y=0;y<pict_get_ysize(p);y++) {
1025		if (pict_get_hangle(p,x,y,p->view.vdir,p->view.vup,&ang)) {
1026		if (pict_is_validpixel(p, x, y)) {
1027		pict_get_vangle(p,x,y,p->view.vdir,p->view.vup,&phi2);
#	Line 1019 | Line 1076 | void cut_view_3(pict*p)
1076
1077		int x,y;
1078		double border,ang,teta,phi,phi2,lum,newlum;
1079	<	for(x=0;x<pict_get_xsize(p)-1;x++)
1080	<	for(y=0;y<pict_get_ysize(p)-1;y++) {
1079	>	for(x=0;x<pict_get_xsize(p);x++)
1080	>	for(y=0;y<pict_get_ysize(p);y++) {
1081		if (pict_get_hangle(p,x,y,p->view.vdir,p->view.vup,&ang)) {
1082		if (DOT(pict_get_cached_dir(p,x,y),p->view.vdir) >= 0.0) {
1083		pict_get_vangle(p,x,y,p->view.vdir,p->view.vup,&phi2);
#	Line 1157 | Line 1214 | get_dgp(pict * p, double E_v, int igs, double a1, doub
1214		pict_get_av_posy(p, i),
1215		posindex_2),
1216		a4) * pow(pict_get_av_omega(p, i), a2);
1217	<	/*                      printf("i,sum_glare %i %f\n",i,sum_glare);*/
1217	>	/*printf("i,sum_glare %i %f\n",i,sum_glare);    */
1218		}
1219		}
1220		dgp =
#	Line 1311 | Line 1368 | float get_ugp(pict * p, double lum_backg, int igs, int
1368		return ugp;
1369
1370		}
1371	+	/* subroutine for the calculation of the updated unified glare probability (Hirning 2016)*/
1372	+	float get_ugp2(pict * p, double lum_backg, int igs, int posindex_2)
1373	+	{
1374	+	float ugp;
1375	+	double sum_glare,ugp2;
1376	+	int i, i_glare;
1377
1378
1379	+	sum_glare = 0;
1380	+	i_glare = 0;
1381	+	for (i = 0; i <= igs; i++) {
1382	+
1383	+	if (pict_get_npix(p, i) > 0) {
1384	+	i_glare = i_glare + 1;
1385	+	sum_glare +=
1386	+	pow(pict_get_av_lum(p, i) /
1387	+	get_posindex(p, pict_get_av_posx(p, i),
1388	+	pict_get_av_posy(p, i), posindex_2),
1389	+	2) * pict_get_av_omega(p, i);
1390	+
1391	+	}
1392	+	}
1393	+	ugp2 = 1/pow(1.0+2.0/7.0*pow(sum_glare/lum_backg,-0.2),10.0);
1394	+
1395	+	return ugp2;
1396	+
1397	+	}
1398	+
1399	+
1400		/* subroutine for the calculation of the disability glare according to Poynter */
1401		float get_disability(pict * p, double lum_backg, int igs)
1402		{
#	Line 1455 | Line 1539 | int main(int argc, char **argv)
1539		pict *p = pict_create();
1540		pict *pm = pict_create();
1541		pict *pcoeff = pict_create();
1542	<	int     lowlight,skip_second_scan,calcfast,age_corr,cut_view,cut_view_type,calc_vill, output, detail_out2, x1,y1, fill, yfillmax, yfillmin,
1543	<	ext_vill, set_lum_max, set_lum_max2, img_corr,x_disk,y_disk,task_color, i_splitstart,zones,act_gsn,splitgs,j,multi_image_mode,
1542	>	int     add,i1,i2,y_lines,ix_offset,x_offset,y_offset, patchmode,ix, iy, patch_pixdistance_x, patch_pixdistance_y,nx_patch,ny_patch, lowlight,skip_second_scan,
1543	>	calcfast,age_corr,cut_view,cut_view_type,calc_vill, output, detail_out2, x1,y1, fill, yfillmax, yfillmin,
1544	>	ext_vill, set_lum_max, set_lum_max2, img_corr,x_disk,y_disk,task_color, i_splitstart,zones,act_gsn,splitgs,j,jj,multi_image_mode,
1545		i_split, posindex_2, task_lum, checkfile, rval, i, i_max, x, y,x2,y2,x_zone,y_zone, i_z1, i_z2, thres_activate,num_images,xmap,ymap,
1546		igs, actual_igs, lastpixelwas_gs, icol, xt, yt, change,checkpixels, before_igs, sgs, splithigh,uniform_gs,x_max, y_max,y_mid,
1547	<	detail_out, posindex_picture, non_cos_lb, rx, ry,lastpixelwas_peak, rmx,rmy,apply_disability,band_calc,band_color,masking,i_mask,no_glaresources,force;
1548	<	double  LUM_replace,lum_total_max,age_corr_factor,age,dgp_ext,dgp,low_light_corr,omega_cos_contr, setvalue, lum_ideal, E_v_contr, sigma,om,delta_E,
1549	<	E_vl_ext, lum_max, new_lum_max, r_center, ugp, ugr_exp, dgi_mod,lum_a, E_v_mask,angle_disk,dist,n_corner_px,zero_corner_px,
1547	>	detail_out, posindex_picture, non_cos_lb, rx, ry,lastpixelwas_peak, rmx,rmy,apply_disability,band_calc,band_color,masking,i_mask,no_glaresources,force,num_scans;
1548	>	double  abs_max,Lveil,xxx,angle_v,angle_h,patch_angle, r_contrast,r_dgp,r_glare,sum_glare, LUM_replace,lum_total_max,age_corr_factor,age,dgp_ext,dgp,low_light_corr,omega_cos_contr, setvalue,
1549	>	lum_ideal, E_v_contr, sigma,om,delta_E,
1550	>	E_vl_ext, lum_max, new_lum_max, r_center, ugp,ugp2, ugr_exp, dgi_mod,lum_a, E_v_mask,angle_disk,dist,n_corner_px,zero_corner_px,
1551		search_pix, a1, a2, a3, a4, a5, c3, c1, c2, r_split, max_angle,r_actual,lum_actual,dir_ill,
1552		omegat, sang,Ez1,Ez2, E_v, E_v2, E_v_dir, avlum, act_lum, ang, angle_z1, angle_z2,per_95_band,per_75_band,pos,
1553		l_max, lum_backg, lum_backg_cos, omega_sources, lum_sources,per_75_mask,per_95_mask,per_75_z1,per_95_z1,per_75_z2,per_95_z2,
#	Line 1471 | Line 1557 | int main(int argc, char **argv)
1557		lum_z1[1],lum_z1_av,lum_z1_std[1],lum_z1_median[1],omega_z1,bbox_z1[2],
1558		lum_z2[1],lum_z2_av,lum_z2_std[1],lum_z2_median[1],omega_z2,bbox_z2[2],
1559		lum_pos[1],lum_nopos_median[1],lum_pos_median[1],lum_pos2_median[1],lum_pos_mean,lum_pos2_mean;
1560	<	float lum_task, lum_thres, dgi,  vcp, cgi, ugr, limit, dgr,pgsv ,pgsv_sat,pgsv_con,
1475	<	abs_max, Lveil;
1560	>	float lum_task, lum_thres, dgi,  vcp, cgi, ugr, limit, dgr,pgsv ,pgsv_sat,pgsv_con;
1561		char maskfile[500],file_out[500], file_out2[500], version[500],correction_type[500];
1562		char *cline;
1563		char** temp_image_name;
1564	<	int *x_temp_img, *y_temp_img;
1564	>	int *x_temp_img, *y_temp_img;
1565	>	double *scale_image_scans;
1566	>	int *new_gs_number = NULL;
1567		VIEW userview = STDVIEW;
1568		int gotuserview = 0;
1569
#	Line 1514 | Line 1601 | int main(int argc, char **argv)
1601		muc_rvar_clear(s_posweight2);
1602
1603		/*set required user view parameters to invalid values*/
1604	<	lowlight=1;
1604	>	patchmode=0;
1605	>	patch_angle=25.0;
1606	>	patch_pixdistance_x=0;
1607	>	patch_pixdistance_y=0;
1608	>	lowlight=0;
1609		multi_image_mode=0;
1610		lastpixelwas_peak=0;
1611		num_images=0;
#	Line 1613 | Line 1704 | int main(int argc, char **argv)
1704		abs_max = 0;
1705		fixargv0(argv[0]);
1706		E_v_contr = 0.0;
1707	<	strcpy(version, "1.19 release 09.12.2015 by J.Wienold");
1707	>	strcpy(version, "3.06 release 01.10.2025 by J.Wienold");
1708		low_light_corr=1.0;
1709		output = 0;
1710		calc_vill = 0;
#	Line 1693 | Line 1784 | int main(int argc, char **argv)
1784		case 'r':
1785		max_angle = atof(argv[++i]);
1786		break;
1787	+	case 'z':
1788	+	patch_angle = atof(argv[++i]);
1789	+	patchmode= atoi(argv[++i]);
1790	+	if ( patchmode == 3) { output=4;}
1791	+
1792	+	/* patchmode = 0 : deactivated; patchmode =1: patch without combining, normal output; patchmode =3: patch without combining, coefficient output; patchmode =2 patch with combining (not yet implemented...) */
1793	+	break;
1794	+
1795		case 's':
1796		sgs = 1;
1797		break;
#	Line 1887 | Line 1986 | int main(int argc, char **argv)
1986		output= 3;
1987		calcfast=1;
1988		num_images =atoi(argv[++i]);
1989	+	num_scans =atoi(argv[++i]);
1990		temp_image_name = malloc(sizeof(char*)*num_images);
1991
1992		x_temp_img=(int *) malloc(sizeof(int) * num_images);
1993		y_temp_img=(int *) malloc(sizeof(int) * num_images);
1994	<
1895	<
1994	>	scale_image_scans=(double *) malloc(sizeof(double) * (num_scans+1)*num_images);
1995		/* iterate through all images and allocate 256 characters to each: */
1996		for (j = 0; j < num_images; j++) {
1997	+	scale_image_scans[j*(num_scans+1)]=1.0;
1998		temp_image_name[j] = malloc(256*sizeof(char));
1999		strcpy(temp_image_name[j], argv[++i]);
2000		x_temp_img[j] = atoi(argv[++i]);
2001		y_temp_img[j] = atoi(argv[++i]);
2002	+	for (jj=1;jj<=num_scans;jj++){
2003	+	scale_image_scans[j*(num_scans+1)+jj]=atof(argv[++i]);}
2004		}
2005
2006
#	Line 1932 | Line 2034 | int main(int argc, char **argv)
2034		}
2035
2036		/* set multiplier for task method to 5, if not specified */
2037	+
2038
2039	+
2040		if ( task_lum == 1 && thres_activate == 0){
2041		lum_thres = 5.0;
2042		}
#	Line 2000 | Line 2104 | if (masking ==1 && zones >0) {
2104		exit(1);
2105		}
2106
2107	+	if ( patchmode > 0 && p->view.type != VT_ANG) {
2108	+
2109	+	fprintf(stderr, "error: Patchmode only possible with view type vta  !  Stopping... \n");
2110	+	exit(1);
2111	+
2112	+	}
2113	+
2114	+
2115		if (p->view.type == VT_PER) {
2116		fprintf(stderr, "warning: image has perspective view type specified in header ! \n");
2117		}
#	Line 2356 | Line 2468 | if (cut_view==1) {
2468		/*     printf("Ev, avlum, Omega_tot%f %f %f \n",E_v, avlum, sang); */
2469
2470		/* first glare source scan: find primary glare sources */
2471	+
2472	+	if (patchmode==0) {
2473		for (x = 0; x < pict_get_xsize(p); x++) {
2474		lastpixelwas_gs=0;
2475		/*              lastpixelwas_peak=0; */
#	Line 2398 | Line 2512 | if (cut_view==1) {
2512		}
2513		}
2514		}
2515	<	/*      pict_write(p,"firstscan.pic");   */
2515	>	} else {
2516	>	/* patchmode on!
2517	>	calculation only for angular projection!
2518
2519	+	*/
2520
2521
2522	+	angle_v=p->view.vert;
2523	+	angle_h=p->view.horiz;
2524
2525	<	if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 ) {
2525	>
2526	>	/*printf ("angle_v,angle_h: %f %f \n",angle_v,angle_h) ;
2527	>
2528	>	setting up patches as glare sources */
2529	>
2530	>	patch_pixdistance_x=floor(pict_get_xsize(p)/angle_h*patch_angle);
2531	>	patch_pixdistance_y=floor(pict_get_ysize(p)/angle_v*patch_angle);
2532	>
2533	>	nx_patch=floor(angle_v/patch_angle)+1;
2534	>	ny_patch=floor(angle_h/patch_angle)+1;
2535	>
2536	>	y_offset=floor (patch_pixdistance_y/2);
2537	>	x_offset=floor (patch_pixdistance_x/2);
2538	>	/* printf ("nx_patch,ny_patch,x_offset,y_offset,patch_pixdistance_x,patch_pixdistance_y   %i %i %i %i %i %i\n",nx_patch,ny_patch,x_offset,y_offset,patch_pixdistance_x,patch_pixdistance_y) ; */
2539	>
2540	>	ix_offset=0;
2541	>	for (iy=1; iy<=ny_patch;iy++) {
2542	>
2543	>
2544	>
2545	>	for (ix=1; ix<=nx_patch;ix++) {
2546	>	igs = igs + 1;
2547	>	pict_new_gli(p);
2548	>
2549	>	pict_get_lum_min(p, igs) = HUGE_VAL;
2550	>	pict_get_Eglare(p,igs) = 0.0;
2551	>	pict_get_Dglare(p,igs) = 0.0;
2552	>	pict_get_z1_gsn(p,igs) = 0;
2553	>	pict_get_z2_gsn(p,igs) = 0;
2554	>	pict_get_dx_max(p,igs) = (x_offset+ix_offset*x_offset+(ix-1)*patch_pixdistance_x)*1.0;
2555	>	pict_get_dy_max(p,igs) = (y_offset+(iy-1)*patch_pixdistance_y)*1.0;
2556	>
2557	>	/* printf ("igs, x-patch, y-patch : %i %f %f \n",igs,pict_get_dx_max(p,igs),pict_get_dy_max(p,igs) ) ; */
2558	>
2559	>	}
2560	>	ix_offset=ix_offset+1;
2561	>	if (ix_offset==2) {
2562	>	ix_offset =0 ;
2563	>	}
2564	>
2565	>	}
2566	>	for (y = 0; y < pict_get_ysize(p); y++) {
2567	>	for (x = 0; x < pict_get_xsize(p); x++) {
2568	>
2569	>	if (pict_get_hangle(p, x, y, p->view.vdir, p->view.vup, &ang)) {
2570	>	if (pict_is_validpixel(p, x, y)) {
2571	>	act_lum = luminance(pict_get_color(p, x, y));
2572	>	if (act_lum > lum_source) {
2573	>	if (act_lum >lum_total_max) {
2574	>	lum_total_max=act_lum;
2575	>	}
2576	>
2577	>	y_lines = floor((y)/patch_pixdistance_y);
2578	>	xxx = (x+0.0)/(patch_pixdistance_x+0.0)-0.5*(y_lines % 2);
2579	>	if (xxx<0 ) { xxx=0.0 ;}
2580	>	i1 = y_lines*(nx_patch)+floor(xxx)+1;
2581	>	i2=0;
2582	>	add=0;
2583	>	if (y_lines % 2 == 1 ) {add=1;}
2584	>
2585	>	if (y >pict_get_dy_max(p,i1)) {
2586	>
2587	>	if (x > pict_get_dx_max(p,i1)) {
2588	>	i2=i1+nx_patch+add;
2589	>	}else {
2590	>	i2=i1+nx_patch-1+add;
2591	>	}
2592	>	}else {
2593	>
2594	>	if (x > pict_get_dx_max(p,i1)) {
2595	>	i2=i1-nx_patch+add;
2596	>	}else {
2597	>	i2=i1-nx_patch-1+add;
2598	>	}
2599	>	}
2600	>
2601	>
2602	>
2603	>
2604	>	if (i2 > igs || i2 < 1) {actual_igs=i1;}else{
2605	>	if ( ((x-pict_get_dx_max(p,i1))*(x-pict_get_dx_max(p,i1))+(y-pict_get_dy_max(p,i1))*(y-pict_get_dy_max(p,i1))) < ((x-pict_get_dx_max(p,i2))*(x-pict_get_dx_max(p,i2))+(y-pict_get_dy_max(p,i2))*(y-pict_get_dy_max(p,i2))) ) {
2606	>	actual_igs=i1; }else {actual_igs=i2;}}
2607	>
2608	>
2609	>	pict_get_gsn(p, x, y) = actual_igs;
2610	>	pict_get_pgs(p, x, y) = 1;
2611	>	add_pixel_to_gs(p, x, y, actual_igs);
2612	>	/*                      setglcolor(p, x, y, actual_igs, uniform_gs, u_r, u_g , u_b); */
2613	>	}
2614	>	}
2615	>	}
2616	>
2617	>
2618	>
2619	>
2620	>
2621	>	}               }
2622	>
2623	>
2624	>
2625	>
2626	>	}
2627	>	/*                    pict_write(p,"firstscan.pic");   */
2628	>
2629	>
2630	>
2631	>
2632	>	if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 || patchmode > 0) {
2633		skip_second_scan=1;
2634		}
2635
#	Line 2647 | Line 2873 | if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2
2873		i=0;
2874		for (x = 0; x <= igs; x++) {
2875		if (pict_get_npix(p, x) > 0) {
2876	+	sum_glare += pow(pict_get_av_lum(p, x),2.0)* pict_get_av_omega(p, x)/pow(get_posindex(p, pict_get_av_posx(p, x), pict_get_av_posy(p, x),posindex_2), 2.0);
2877		lum_sources += pict_get_av_lum(p, x) * pict_get_av_omega(p, x);
2878		omega_sources += pict_get_av_omega(p, x);
2879		i=i+1;
2880		}}
2881	<
2881	>	sum_glare= c2*log10(1 + sum_glare / pow(E_v, a3));
2882		if (sang == omega_sources) {
2883		lum_backg =avlum;
2884		} else {
#	Line 2769 | Line 2996 | if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2
2996		omega_z1 += pict_get_omega(p, x, y);
2997		lum_z1_av += pict_get_omega(p, x, y)* lum_actual;
2998		Ez1 += DOT(p->view.vdir, pict_get_cached_dir(p, x, y))* pict_get_omega(p, x, y)* lum_actual;
2772	–
2999		setglcolor(p,x,y,1,1 , 0.66, 0.01 ,0.33);
3000		/*check if separation gsn already exist */
3001
#	Line 2849 | Line 3075 | if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2
3075		muc_rvar_get_bounding_box(s_z1,bbox_z1);
3076		if (detail_out == 1) {
3077
3078	<	printf ("zoning:z1_omega,z1_av_lum,z1_median_lum,z1_std_lum,z1_perc_75,z1_perc_95,z1_lum_min,z1_lum_max,Ez1: %f %f %f %f %f %f %f %f %f\n",omega_z1,lum_z1_av,lum_z1_median[0],sqrt(lum_z1_std[0]),per_75_z1,per_95_z1,bbox_z1[0],bbox_z1[1],Ez1 );
3078	>	printf ("zoning:z1_omega,z1_av_lum,z1_median_lum,z1_std_lum,z1_perc_75,z1_perc_95,z1_lum_min,z1_lum_max,Ez1,i_z1: %f %f %f %f %f %f %f %f %f %i\n",omega_z1,lum_z1_av,lum_z1_median[0],sqrt(lum_z1_std[0]),per_75_z1,per_95_z1,bbox_z1[0],bbox_z1[1],Ez1,i_z1 );
3079
3080		if (zones == 2 ) {
3081
3082	<	printf ("zoning:z2_omega,z2_av_lum,z2_median_lum,z2_std_lum,z2_perc_75,z2_perc_95,z2_lum_min,z2_lum_max,Ez1:  %f %f %f %f %f %f %f %f %f\n",omega_z2,lum_z2_av,lum_z2_median[0],sqrt(lum_z2_std[0]),per_75_z2,per_95_z2,bbox_z2[0],bbox_z2[1],Ez2 );
3082	>	printf ("zoning:z2_omega,z2_av_lum,z2_median_lum,z2_std_lum,z2_perc_75,z2_perc_95,z2_lum_min,z2_lum_max,Ez2,i_z2:  %f %f %f %f %f %f %f %f %f %i\n",omega_z2,lum_z2_av,lum_z2_median[0],sqrt(lum_z2_std[0]),per_75_z2,per_95_z2,bbox_z2[0],bbox_z2[1],Ez2,i_z1 );
3083		} }
3084
3085		}
3086
3087	+	new_gs_number = (int *)malloc(sizeof(int)*(igs+1));
3088	+
3089		i = 0;
3090		for (x = 0; x <= igs; x++) {
3091		/* resorting glare source numbers */
3092		if (pict_get_npix(p, x) > 0) {
3093		i = i + 1;
3094	+	pict_get_Dglare(p,x) = i;
3095	+	new_gs_number[x] = i;
3096	+	/*                      printf("%i %i %f %i \n", i,x,pict_get_Dglare(p,x),new_gs_number[x] ); */
3097		}
3098		}
3099		no_glaresources=i;
3100		/*printf("%i",no_glaresources );*/
3101		/* glare sources */
2871	–	if (detail_out == 1 && output != 3) {
3102
3103	+	if (output == 4 ) {
3104	+
3105	+	i=0;
3106	+	for (x = 0; x <= igs; x++) {
3107	+	if (pict_get_npix(p, x) > 0) {
3108	+	i = i + 1;
3109	+
3110	+	x2=pict_get_av_posx(p, x);
3111	+	y2=pict_get_av_posy(p, x);
3112	+
3113	+	printf("%i %f %f %f %f %.10f %f %f %f %f \n",
3114	+	i, pict_get_npix(p, x), pict_get_av_posx(p, x), pict_get_av_posy(p, x),
3115	+	pict_get_av_lum(p, x), pict_get_av_omega(p, x),
3116	+	get_posindex(p, pict_get_av_posx(p, x),pict_get_av_posy(p, x),posindex_2),
3117	+	pict_get_cached_dir(p, x2,y2)[0],pict_get_cached_dir(p, x2,y2)[1],pict_get_cached_dir(p, x2,y2)[2]);
3118	+	}
3119	+	}
3120	+
3121	+
3122	+	for (y = 0; y < pict_get_ysize(p); y++) {
3123	+	for (x = 0; x < pict_get_xsize(p); x++) {
3124	+
3125	+	if (pict_get_hangle(p, x, y, p->view.vdir, p->view.vup, &ang)) {
3126	+	if (pict_is_validpixel(p, x, y)) {
3127	+	if (pict_get_gsn(p,x,y) >0 ) {
3128	+	i=pict_get_gsn(p,x,y);
3129	+	printf("%i %i %f %f %f \n", i, new_gs_number[i], pict_get_cached_dir(p, x,y)[0],pict_get_cached_dir(p, x,y)[1],pict_get_cached_dir(p, x,y)[2] );
3130	+
3131	+	}
3132	+
3133	+
3134	+
3135	+	}}}}
3136	+
3137	+
3138	+	}
3139	+
3140	+
3141	+
3142	+
3143	+	if (detail_out == 1 && output < 3) {
3144	+	dgp = get_dgp(p, E_v, igs, a1, a2, a3, a4, a5, c1, c2, c3, posindex_2);
3145	+
3146		printf
3147	<	("%i No pixels x-pos y-pos L_s Omega_s Posindx L_b L_t E_vert Edir Max_Lum Sigma xdir ydir zdir Eglare_cie Lveil_cie teta glare_zone\n",
3147	>	("%i No pixels x-pos y-pos L_s Omega_s Posindx L_b L_t E_v Edir Max_Lum Sigma xdir ydir zdir Eglare Lveil_cie teta glare_zone r_contrast r_dgp\n",
3148		i);
3149		if (i == 0) {
3150	<	printf("%i %f %f %f %f %.10f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f\n", i, 0.0, 0.0,
3151	<	0.0, 0.0, 0.0, 0.0, lum_backg, lum_task, E_v, E_v_dir,abs_max,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0);
3150	>	printf("%i %f %f %f %f %.10f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f\n", i, 0.0, 0.0,
3151	>	0.0, 0.0, 0.0, 0.0, lum_backg, lum_task, E_v, E_v_dir,abs_max,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0);
3152
3153		} else {
3154		i = 0;
#	Line 2895 | Line 3168 | if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2
3168		Lveil_cie =0 ;
3169		}
3170		Lveil_cie_sum =  Lveil_cie_sum + Lveil_cie;
3171	+	r_glare= c2*log10(1 + pow(pict_get_av_lum(p, x),2)* pict_get_av_omega(p, x)/pow(get_posindex(p, pict_get_av_posx(p, x), pict_get_av_posy(p, x),posindex_2), 2.0) / pow(E_v, a3))  ;
3172	+	r_contrast=r_glare/sum_glare  ;
3173	+	r_dgp=r_glare/dgp ;
3174		if (pict_get_z1_gsn(p,x)<0) {
3175		act_gsn=(int)(-pict_get_z1_gsn(p,x));
3176		}else{
3177		act_gsn=0;
3178		}
3179	<	printf("%i %f %f %f %f %.10f %f %f %f %f %f %f %f %f %f %f %f %f %f %i \n",
3179	>	printf("%i %f %f %f %f %.10f %f %f %f %f %f %f %f %f %f %f %f %f %f %i %f %f \n",
3180		i, pict_get_npix(p, x), pict_get_av_posx(p, x),
3181		pict_get_ysize(p) - pict_get_av_posy(p, x),
3182		pict_get_av_lum(p, x), pict_get_av_omega(p, x),
#	Line 2908 | Line 3184 | if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2
3184		pict_get_av_posy(p, x),
3185		posindex_2), lum_backg, lum_task,
3186		E_v, E_v_dir, abs_max, sigma * 180 / 3.1415927
3187	<	,pict_get_cached_dir(p, x2,y2)[0],pict_get_cached_dir(p, x2,y2)[1],pict_get_cached_dir(p, x2,y2)[2],pict_get_Eglare(p,x),Lveil_cie,teta,act_gsn );
3187	>	,pict_get_cached_dir(p, x2,y2)[0],pict_get_cached_dir(p, x2,y2)[1],pict_get_cached_dir(p, x2,y2)[2],pict_get_Eglare(p,x),Lveil_cie,teta,act_gsn,r_contrast,r_dgp );
3188		}
3189		}
3190		}
3191		}
3192
3193	<	if ( output != 3) {
3193	>	if ( output < 3) {
3194
3195		/* calculation of indicees */
3196
#	Line 2953 | Line 3229 | if (calcfast == 0) {
3229		dgi = get_dgi(p, lum_backg, igs, posindex_2);
3230		ugr = get_ugr(p, lum_backg, igs, posindex_2);
3231		ugp = get_ugp (p,lum_backg, igs, posindex_2);
3232	+	ugp2 = get_ugp2 (p,lum_backg, igs, posindex_2);
3233		ugr_exp = get_ugr_exp (p,lum_backg_cos,lum_a, igs, posindex_2);
3234		dgi_mod = get_dgi_mod(p, lum_a, igs, posindex_2);
3235		cgi = get_cgi(p, E_v, E_v_dir, igs, posindex_2);
#	Line 2963 | Line 3240 | if (calcfast == 0) {
3240		dgi = 0.0;
3241		ugr = 0.0;
3242		ugp = 0.0;
3243	+	ugp2 =0.0;
3244		ugr_exp = 0.0;
3245		dgi_mod = 0.0;
3246		cgi = 0.0;
#	Line 2989 | Line 3267 | if (calcfast == 0) {
3267		get_dgp(p, E_vl_ext, igs, a1, a2, a3, a4, a5, c1, c2, c3,
3268		posindex_2);
3269		dgp = dgp_ext;
3270	<	if (E_vl_ext < 1000) {
3270	>	if (E_vl_ext < 1000 && lowlight ==1) {
3271		low_light_corr=1.0*exp(0.024*E_vl_ext-4)/(1+exp(0.024*E_vl_ext-4));} else {low_light_corr=1.0 ;}
3272		dgp =low_light_corr*dgp;
3273		dgp =age_corr_factor*dgp;
#	Line 3002 | Line 3280 | if (calcfast == 0) {
3280
3281
3282		printf
3283	<	("dgp,av_lum,E_v,lum_backg,E_v_dir,dgi,ugr,vcp,cgi,lum_sources,omega_sources,Lveil,Lveil_cie,dgr,ugp,ugr_exp,dgi_mod,av_lum_pos,av_lum_pos2,med_lum,med_lum_pos,med_lum_pos2: %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f\n",
3283	>	("dgp,av_lum,E_v,lum_backg,E_v_dir,dgi,ugr,vcp,cgi,lum_sources,omega_sources,Lveil,Lveil_cie,dgr,ugp,ugr_exp,dgi_mod,av_lum_pos,av_lum_pos2,med_lum,med_lum_pos,med_lum_pos2,ugp2: %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f\n",
3284		dgp, avlum, E_v, lum_backg, E_v_dir, dgi, ugr, vcp, cgi,
3285	<	lum_sources, omega_sources, Lveil,Lveil_cie_sum,dgr,ugp,ugr_exp,dgi_mod,lum_pos_mean,lum_pos2_mean/sang,lum_nopos_median[0],lum_pos_median[0],lum_pos2_median[0]);
3285	>	lum_sources, omega_sources, Lveil,Lveil_cie_sum,dgr,ugp,ugr_exp,dgi_mod,lum_pos_mean,lum_pos2_mean/sang,lum_nopos_median[0],lum_pos_median[0],lum_pos2_median[0],ugp2);
3286		} else {
3287		if (detail_out2 == 1) {
3288
#	Line 3017 | Line 3295 | if (calcfast == 0) {
3295		if (ext_vill == 1) {
3296		dgp_ext = get_dgp(p, E_vl_ext, igs, a1, a2, a3, a4, a5, c1, c2, c3,posindex_2);
3297
3298	<	if (E_vl_ext < 1000) {
3298	>	if (E_vl_ext < 1000 && lowlight ==1) {
3299		low_light_corr=1.0*exp(0.024*E_vl_ext-4)/(1+exp(0.024*E_vl_ext-4));} else {low_light_corr=1.0 ;}
3300		dgp =low_light_corr*dgp_ext;
3301		dgp =age_corr_factor*dgp;
#	Line 3032 | Line 3310 | if (calcfast == 0) {
3310		get_dgp(p, E_vl_ext, igs, a1, a2, a3, a4, a5, c1, c2, c3,
3311		posindex_2);
3312		dgp = dgp_ext;
3313	<	if (E_vl_ext < 1000) {
3313	>	if (E_vl_ext < 1000 && lowlight ==1) {
3314		low_light_corr=1.0*exp(0.024*E_vl_ext-4)/(1+exp(0.024*E_vl_ext-4)); } else {low_light_corr=1.0 ;}
3315		dgp =low_light_corr*dgp;
3316
#	Line 3048 | Line 3326 | if (calcfast == 0) {
3326		}
3327
3328		}else{
3329	<	/* only multiimagemode */
3329	>	/* only multiimagemode
3330
3331	+	*/
3332
3333	+
3334		for (j = 0; j < num_images; j++) {
3335
3336
#	Line 3061 | Line 3341 | pict_read(pcoeff,temp_image_name[j] );
3341		/*printf ("num_img:%i x-size:%i xpos:%i y-size: %i ypos %i bigimg-xsize %i %i ",num_images,pict_get_xsize(pcoeff),x_temp_img[j],pict_get_ysize(pcoeff),y_temp_img[j],pict_get_xsize(p),pict_get_ysize(p));
3342		*/
3343
3344	+
3345	+	/* loop over scans
3346	+	empty of */
3347	+	for (jj=0;jj<=num_scans;jj++){
3348	+
3349	+	/*printf("scale %i %i %i %f ",j,jj,num_scans,scale_image_scans[j*(num_scans+1)+jj]); */
3350	+
3351	+
3352		/* copy luminance value into big image and remove glare sources*/
3353		for (x = 0; x < pict_get_xsize(pcoeff); x++) {
3354		for (y = 0; y < pict_get_ysize(pcoeff); y++) {
3355	<	xmap=x_temp_img[j]+x-1;
3356	<	ymap=y_temp_img[j]+y-1;
3355	>	xmap=x_temp_img[j]+x;
3356	>	ymap=y_temp_img[j]+y;
3357		if (xmap <0) { xmap=0;}
3358		if (ymap <0) { ymap=0;}
3359
3360	<	pict_get_color(p, xmap, ymap)[RED] = pict_get_color(pcoeff, x, y)[RED];
3361	<	pict_get_color(p, xmap, ymap)[GRN] = pict_get_color(pcoeff, x, y)[GRN];
3362	<	pict_get_color(p, xmap, ymap)[BLU] = pict_get_color(pcoeff, x, y)[BLU];
3360	>	pict_get_color(p, xmap, ymap)[RED] = scale_image_scans[j*(num_scans+1)+jj]*pict_get_color(pcoeff, x, y)[RED];
3361	>	pict_get_color(p, xmap, ymap)[GRN] = scale_image_scans[j*(num_scans+1)+jj]*pict_get_color(pcoeff, x, y)[GRN];
3362	>	pict_get_color(p, xmap, ymap)[BLU] = scale_image_scans[j*(num_scans+1)+jj]*pict_get_color(pcoeff, x, y)[BLU];
3363		pict_get_gsn(p, xmap, ymap) = 0;
3364		pict_get_pgs(p, xmap, ymap) = 0;
3365		}}
3366
3367	+
3368	+
3369	+
3370	+
3371		actual_igs =0;
3372
3373		/* first glare source scan: find primary glare sources */
#	Line 3088 | Line 3380 | actual_igs =0;
3380		if (pict_get_hangle(p, xmap, ymap, p->view.vdir, p->view.vup, &ang)) {
3381		if (pict_is_validpixel(p, xmap, ymap)) {
3382		act_lum = luminance(pict_get_color(p, xmap, ymap));
3383	<	if (act_lum > lum_source) {
3383	>	if (act_lum> lum_source) {
3384		if (act_lum >lum_total_max) {
3385		lum_total_max=act_lum;
3386		}
#	Line 3304 | Line 3596 | printf("\n");
3596		igs=0;
3597
3598
3599	<
3599	>	}
3600
3601
3602		}

Diff Legend

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