--- ray/src/util/evalglare.c 2018/08/31 16:01:45 2.8 +++ ray/src/util/evalglare.c 2025/09/15 20:21:24 3.06 @@ -1,10 +1,10 @@ #ifndef lint -static const char RCSid[] = "$Id: evalglare.c,v 2.8 2018/08/31 16:01:45 greg Exp $"; +static const char RCSid[] = "$Id: evalglare.c,v 3.06 2025/09/15 20:21:24 greg Exp $"; #endif -/* EVALGLARE V2.06 - * Evalglare Software License, Version 2.0 +/* EVALGLARE V3.05 + * Evalglare Software License, Version 3.0x * - * Copyright (c) 1995 - 2016 Fraunhofer ISE, EPFL. + * Copyright (c) 1995 - 2022 Fraunhofer ISE, EPFL. * All rights reserved. * * @@ -334,10 +334,77 @@ change of default options: change of default value of multiplier b to 5.0, if task options (-t or -T ) are activated AND -b NOT used. To be downward compatible when using the task method. */ - +/* evalglare.c, v2.07 2018/11/17 +bugfix: correction of error in the equations of PGSV_con and PGSV_sat +all three PGSV equations are calculated now +illuminance from the masking area (E_v_mask) is also printed +bugfix: in VCPs error fuction equation, value of 6.347 replaced by 6.374 + */ + +/* evalglare.c, v2.08 2018/11/27 +bugfix: checkroutine for same image size for the masking corrected + */ + +/* evalglare.c, v2.09 2019/01/18 +calculate "illuminance-contribution of zones" +-switch to turn off low-light correction: 4 + */ + + /* evalglare.c, v2.10 2019/07/30, 2020/06/25 +-add multiimage-mode for annual glare evaluation -Q +-extra output for multiimage mode +2020/06/22 - added Ev contribution from each glare source as output to the multiimage mode +-switch for correction modes (-C), value of 0 switches off all corrections + */ + + + /* evalglare.c, v2.11 2020/07/06 +-add extra output for DGP-contribution in -d mode +-fix (remove) 1 pixel offset of the mulltiimage-mode + */ + +/* evalglare.c, v2.12 2021/07/19 +-bugfix: center of glare source calculation now based on l*omega weighting, before it was just on omega. + */ + +/* evalglare.c, v2.13 2021/07/21 +- center of glare source calculation now based on l*l*omega weighting. +- bugfix: Position-index below line of sight is now corrected and based on the modified equation from Iwata and Osterhaus 2010 + */ + +/* evalglare.c, v2.14 2021/10/20 +- center of glare source calculation now based on l*omega weighting. +- adding UGP2 equation to the output +- new default setting: low-light correction off ! + */ + +/* evalglare.c, v3.0 2021/12/24 +- adding patch-mode (-z patchangle combineflag ) as glare source grouping method + */ + +/* evalglare.c, v3.01 2022/01/05 +- change of multi-image-mode. Adding extra scans with scaled image +syntax now: -Q n_images n_extrascans_per_image n_images*( imagename x y n_extrascans*(scale) ) + */ +/* evalglare.c, v3.02 2022/02/11 +- correction of position index below line of sight after Takuro Kikuchi's comments in radiance-discourse from Dec 2021. + */ + +/* evalglare.c, v3.03 2022/03/18, 2024/06/25 +- add no pixels output for zonal analysis. + +/* evalglare.c, v3.04 2023/09/01 +- test version to include peripherical dependency, changes not (yet) used for following versions + +/* evalglare.c, v3.05 2024/06/25 +- fix bug of still having lowlight correction even if turned off +- changing abs_max,Lveil from float to double + */ + + #define EVALGLARE #define PROGNAME "evalglare" -#define VERSION "2.06 release 29.08.2018 by EPFL, J.Wienold" +#define VERSION "3.05 release 25.06.2024 by J.Wienold, EPFL" #define RELEASENAME PROGNAME " " VERSION @@ -348,13 +415,11 @@ change of default value of multiplier b to 5.0, if tas #include "platform.h" #include "muc_randvar.h" -char *progname; - /* subroutine to add a pixel to a glare source */ void add_pixel_to_gs(pict * p, int x, int y, int gsn) { double old_av_posx, old_av_posy, old_av_lum, old_omega, act_omega, - new_omega, act_lum; + new_omega, act_lum,temp_av_posx,temp_av_posy,av_lum; pict_get_npix(p, gsn) = pict_get_npix(p, gsn) + 1; @@ -366,15 +431,20 @@ void add_pixel_to_gs(pict * p, int x, int y, int gsn) act_omega = pict_get_omega(p, x, y); act_lum = luminance(pict_get_color(p, x, y)); new_omega = old_omega + act_omega; - pict_get_av_posx(p, gsn) = - (old_av_posx * old_omega + x * act_omega) / new_omega; - pict_get_av_posy(p, gsn) = - (old_av_posy * old_omega + y * act_omega) / new_omega; + pict_get_av_lum(p, gsn) = + (old_av_lum * old_omega + act_lum * act_omega) / new_omega; + + av_lum=pict_get_av_lum(p, gsn); + temp_av_posx = + (old_av_posx * old_omega* old_av_lum + x * act_omega*act_lum) / (old_av_lum*old_omega + act_lum* act_omega ); + pict_get_av_posx(p, gsn) = temp_av_posx; + temp_av_posy = + (old_av_posy * old_omega* old_av_lum + y * act_omega*act_lum) / (old_av_lum*old_omega + act_lum* act_omega ); + + pict_get_av_posy(p, gsn) = temp_av_posy; if (isnan((pict_get_av_posx(p, gsn)))) 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); - pict_get_av_lum(p, gsn) = - (old_av_lum * old_omega + act_lum * act_omega) / new_omega; pict_get_av_omega(p, gsn) = new_omega; pict_get_gsn(p, x, y) = gsn; if (act_lum < pict_get_lum_min(p, gsn)) { @@ -748,8 +818,8 @@ void add_secondary_gs(pict * p, int x, int y, float r, void split_pixel_from_gs(pict * p, int x, int y, int new_gsn, int uniform_gs, double u_r, double u_g , double u_b) { int old_gsn, icol; - double old_av_posx, old_av_posy, old_av_lum, old_omega, act_omega, - new_omega, act_lum; + double old_av_posx, old_av_posy, old_av_lum, old_omega, act_omega, delta_E, + new_omega, act_lum,temp_av_posx,temp_av_posy,av_lum; /* change existing gs */ @@ -760,23 +830,34 @@ void split_pixel_from_gs(pict * p, int x, int y, int n old_av_posx = pict_get_av_posx(p, old_gsn); old_av_posy = pict_get_av_posy(p, old_gsn); old_omega = pict_get_av_omega(p, old_gsn); + + + new_omega = old_omega - act_omega; pict_get_av_omega(p, old_gsn) = new_omega; - pict_get_av_posx(p, old_gsn) = - (old_av_posx * old_omega - x * act_omega) / new_omega; - pict_get_av_posy(p, old_gsn) = - (old_av_posy * old_omega - y * act_omega) / new_omega; - act_lum = luminance(pict_get_color(p, x, y)); old_av_lum = pict_get_av_lum(p, old_gsn); pict_get_av_lum(p, old_gsn) = (old_av_lum * old_omega - act_lum * act_omega) / new_omega; + + av_lum = pict_get_av_lum(p, old_gsn); + temp_av_posx = + (old_av_posx *old_av_lum* old_omega - x *act_lum* act_omega ) / (old_av_lum*old_omega - act_lum* act_omega); + + pict_get_av_posx(p, old_gsn) = temp_av_posx; + temp_av_posy = + (old_av_posy *old_av_lum* old_omega - y *act_lum* act_omega ) / (old_av_lum*old_omega - act_lum* act_omega); + pict_get_av_posy(p, old_gsn) = temp_av_posy; + /* add pixel to new gs */ add_pixel_to_gs(p, x, y, new_gsn); + + + /* color pixel of new gs */ /* icol = setglcolor(p, x, y, new_gsn, uniform_gs, u_r, u_g , u_b); */ @@ -788,7 +869,7 @@ void split_pixel_from_gs(pict * p, int x, int y, int n float get_posindex(pict * p, float x, float y, int postype) { float posindex; - double teta, phi, sigma, tau, deg, d, s, r, fact; + double teta, beta, phi, sigma, tau, deg, d, s, r, fact; pict_get_vangle(p, x, y, p->view.vdir, p->view.vup, &phi); @@ -816,6 +897,7 @@ float get_posindex(pict * p, float x, float y, int pos /* KIM model */ 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)); }else{ + /* Guth model, equation from IES lighting handbook */ posindex = exp((35.2 - 0.31889 * tau - @@ -824,20 +906,15 @@ float get_posindex(pict * p, float x, float y, int pos 0.002963 * tau * tau) / 100000 * sigma * sigma); -/* below line of sight, using Iwata model */ - if (phi < 0) { - d = 1 / tan(phi); - s = tan(teta) / tan(phi); - r = sqrt(1 / d * 1 / d + s * s / d / d); - if (r > 0.6) - fact = 1.2; - if (r > 3) { - fact = 1.2; - r = 3; - } - posindex = 1 + fact * r; +/* below line of sight, using Iwata model, CIE2010, converted coordinate system according to Takuro Kikuchi */ + + if (phi < 0) { + beta = atan(tan(sigma/deg)* sqrt(1 + 0.3225 * pow(cos(tau/deg),2))) * deg; + posindex = exp(6.49 / 1000 * beta + 21.0 / 100000 * beta * beta); + } + if (posindex > 16) posindex = 16; } @@ -1131,7 +1208,7 @@ get_dgp(pict * p, double E_v, int igs, double a1, doub pict_get_av_posy(p, i), posindex_2), a4) * pow(pict_get_av_omega(p, i), a2); -/* printf("i,sum_glare %i %f\n",i,sum_glare);*/ + /*printf("i,sum_glare %i %f\n",i,sum_glare); */ } } dgp = @@ -1189,7 +1266,7 @@ float get_vcp(float dgr ) { float vcp; - vcp = 50 * erf((6.347 - 1.3227 * log(dgr)) / 1.414213562373) + 50; + vcp = 50 * erf((6.374 - 1.3227 * log(dgr)) / 1.414213562373) + 50; if (dgr > 750) { vcp = 0; } @@ -1285,8 +1362,35 @@ float get_ugp(pict * p, double lum_backg, int igs, int return ugp; } +/* subroutine for the calculation of the updated unified glare probability (Hirning 2016)*/ +float get_ugp2(pict * p, double lum_backg, int igs, int posindex_2) +{ + float ugp; + double sum_glare,ugp2; + int i, i_glare; + sum_glare = 0; + i_glare = 0; + for (i = 0; i <= igs; i++) { + + if (pict_get_npix(p, i) > 0) { + i_glare = i_glare + 1; + sum_glare += + pow(pict_get_av_lum(p, i) / + get_posindex(p, pict_get_av_posx(p, i), + pict_get_av_posy(p, i), posindex_2), + 2) * pict_get_av_omega(p, i); + + } + } + ugp2 = 1/pow(1.0+2.0/7.0*pow(sum_glare/lum_backg,-0.2),10.0); + + return ugp2; + +} + + /* subroutine for the calculation of the disability glare according to Poynter */ float get_disability(pict * p, double lum_backg, int igs) { @@ -1360,18 +1464,23 @@ float get_cgi(pict * p, double E_v, double E_v_dir, in return cgi; } -/* subroutine for the calculation of the PGSV; is only applied, when masking is done, since it refers only to the window. Important: masking area must be the window! */ -float get_pgsv(double E_v, double E_mask,double omega_mask,double lum_mask_av) + + +/* subroutine for the calculation of the PGSV_con; is only applied, when masking is done, since it refers only to the window. Important: masking area must be the window! */ +float get_pgsv_con(double E_v, double E_mask,double omega_mask,double lum_mask_av, double Lavg) { - float pgsv; + float pgsv_con; double Lb; - Lb = (E_v-E_mask)/1.414213562373; +/* Lb = (E_v-E_mask)/3.14159265359; */ +/* Lb = (2*E_v-lum_mask_av*omega_mask)/(2*3.14159265359-omega_mask); */ + Lb = (2*3.14159265359*Lavg-lum_mask_av*omega_mask)/(2*3.14159265359-omega_mask); - pgsv =3.2*log10(lum_mask_av)-0.64*log10(omega_mask)+(0.79*log10(omega_mask)-0.61)*log10(Lb)-8.2 ; + pgsv_con =3.2*log10(lum_mask_av)-0.64*log10(omega_mask)+(0.79*log10(omega_mask)-0.61)*log10(Lb)-8.2 ; - return pgsv; + + return pgsv_con; } /* subroutine for the calculation of the PGSV_saturation; is only applied, when masking is done, since it refers only to the window. Important: masking area must be the window! */ @@ -1379,15 +1488,38 @@ float get_pgsv_sat(double E_v) { float pgsv_sat; - pgsv_sat =3.3-(0.57+3.3)/pow((1+E_v/1.414213562373/1250),1.7); + pgsv_sat =3.3-(0.57+3.3)/(1+pow(E_v/3.14159265359/1250,1.7)); return pgsv_sat; } +/* subroutine for the calculation of the PGSV; is only applied, when masking is done, since it refers only to the window. Important: masking area must be the window! */ +float get_pgsv(double E_v, double E_mask,double omega_mask,double lum_mask_av,double Ltask, double Lavg) +{ + float pgsv; + double Lb; +/* Lb = (E_v-E_mask)/3.14159265359; */ +/* Lb = (2*E_v-lum_mask_av*omega_mask)/(2*3.14159265359-omega_mask); */ + Lb = (2*3.14159265359*Lavg-lum_mask_av*omega_mask)/(2*3.14159265359-omega_mask); + + if (Lb==0.0 ) { + fprintf(stderr, " warning: Background luminance is 0 or masking area = full image! pgsv cannot be calculated (set to -99)!!\n"); + pgsv=-99; + }else{ + if ( (lum_mask_av/Lb) > (E_v/(3.14159265359*Ltask))) { + pgsv=get_pgsv_con(E_v,E_mask,omega_mask,lum_mask_av, Lavg); + }else{ + pgsv=get_pgsv_sat(E_v) ; + }} + return pgsv; +} + + + #ifdef EVALGLARE @@ -1397,18 +1529,21 @@ float get_pgsv_sat(double E_v) int main(int argc, char **argv) { - #define CLINEMAX 4095 /* memory allocated for command line string */ + #define CLINEMAX 999999999 /* memory allocated for command line string */ pict *p = pict_create(); pict *pm = pict_create(); - int skip_second_scan,calcfast,age_corr,cut_view,cut_view_type,calc_vill, output, detail_out2, x1,y1, fill, yfillmax, yfillmin, - ext_vill, set_lum_max, set_lum_max2, img_corr,x_disk,y_disk,task_color, i_splitstart,zones,act_gsn,splitgs, - 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, + pict *pcoeff = pict_create(); + 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, + calcfast,age_corr,cut_view,cut_view_type,calc_vill, output, detail_out2, x1,y1, fill, yfillmax, yfillmin, + 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, + 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, igs, actual_igs, lastpixelwas_gs, icol, xt, yt, change,checkpixels, before_igs, sgs, splithigh,uniform_gs,x_max, y_max,y_mid, - detail_out, posindex_picture, non_cos_lb, rx, ry, rmx,rmy,apply_disability,band_calc,band_color,masking,i_mask,no_glaresources,force; - 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, - E_vl_ext, lum_max, new_lum_max, r_center, ugp, ugr_exp, dgi_mod,lum_a, pgsv,E_v_mask,pgsv_sat,angle_disk,dist,n_corner_px,zero_corner_px, + 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; + 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, + lum_ideal, E_v_contr, sigma,om,delta_E, + 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, search_pix, a1, a2, a3, a4, a5, c3, c1, c2, r_split, max_angle,r_actual,lum_actual,dir_ill, - omegat, sang, E_v, E_v2, E_v_dir, avlum, act_lum, ang, angle_z1, angle_z2,per_95_band,per_75_band,pos, + 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, 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, lum, lum_source,teta,Lveil_cie,Lveil_cie_sum,disability_thresh,u_r,u_g,u_b,band_angle,band_avlum, lum_mask[1],lum_mask_av,lum_mask_std[1],lum_mask_median[1],omega_mask,bbox[2], @@ -1416,12 +1551,15 @@ int main(int argc, char **argv) lum_z1[1],lum_z1_av,lum_z1_std[1],lum_z1_median[1],omega_z1,bbox_z1[2], lum_z2[1],lum_z2_av,lum_z2_std[1],lum_z2_median[1],omega_z2,bbox_z2[2], lum_pos[1],lum_nopos_median[1],lum_pos_median[1],lum_pos2_median[1],lum_pos_mean,lum_pos2_mean; - float lum_task, lum_thres, dgi, vcp, cgi, ugr, limit, dgr, - abs_max, Lveil; - char maskfile[500],file_out[500], file_out2[500], version[500]; + float lum_task, lum_thres, dgi, vcp, cgi, ugr, limit, dgr,pgsv ,pgsv_sat,pgsv_con; + char maskfile[500],file_out[500], file_out2[500], version[500],correction_type[500]; char *cline; + char** temp_image_name; + int *x_temp_img, *y_temp_img; + double *scale_image_scans; VIEW userview = STDVIEW; int gotuserview = 0; + struct muc_rvar* s_mask; s_mask = muc_rvar_create(); muc_rvar_set_dim(s_mask, 1); @@ -1456,7 +1594,15 @@ int main(int argc, char **argv) muc_rvar_clear(s_posweight2); /*set required user view parameters to invalid values*/ - dir_ill=0.0; + patchmode=0; + patch_angle=25.0; + patch_pixdistance_x=0; + patch_pixdistance_y=0; + lowlight=0; + multi_image_mode=0; + lastpixelwas_peak=0; + num_images=0; + dir_ill=0.0; delta_E=0.0; no_glaresources=0; n_corner_px=0; @@ -1478,8 +1624,11 @@ int main(int argc, char **argv) lum_band_av = 0.0; omega_band = 0.0; pgsv = 0.0 ; + pgsv_con = 0.0 ; pgsv_sat = 0.0 ; E_v_mask = 0.0; + Ez1 = 0.0; + Ez2 = 0.0; lum_z1_av = 0.0; omega_z1 = 0.0; lum_z2_av = 0.0; @@ -1520,6 +1669,7 @@ int main(int argc, char **argv) lum_ideal = 0.0; max_angle = 0.2; lum_thres = 2000.0; + lum_task = 0.0; task_lum = 0; sgs = 0; splithigh = 1; @@ -1545,9 +1695,9 @@ int main(int argc, char **argv) set_lum_max2 = 0; img_corr=0; abs_max = 0; - progname = argv[0]; + fixargv0(argv[0]); E_v_contr = 0.0; - strcpy(version, "1.19 release 09.12.2015 by J.Wienold"); + strcpy(version, "3.05 release 25.06.2024 by J.Wienold"); low_light_corr=1.0; output = 0; calc_vill = 0; @@ -1563,7 +1713,7 @@ int main(int argc, char **argv) thres_activate=0; /* command line for output picture*/ - cline = (char *) malloc(CLINEMAX+1); + cline = (char *) malloc(CLINEMAX+100); cline[0] = '\0'; for (i = 0; i < argc; i++) { /* fprintf(stderr, "%d %d \n",i,strlen(argv[i]));*/ @@ -1611,6 +1761,7 @@ int main(int argc, char **argv) break; case 'b': lum_thres = atof(argv[++i]); + lum_source =lum_thres; thres_activate = 1; break; case 'c': @@ -1626,6 +1777,14 @@ int main(int argc, char **argv) case 'r': max_angle = atof(argv[++i]); break; + case 'z': + patch_angle = atof(argv[++i]); + patchmode= atoi(argv[++i]); + if ( patchmode == 3) { output=4;} + + /* 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...) */ + break; + case 's': sgs = 1; break; @@ -1783,7 +1942,25 @@ int main(int argc, char **argv) /*case 'v': printf("evalglare %s \n",version); exit(1); */ + case 'C': + strcpy(correction_type,argv[++i]); + + if (!strcmp(correction_type,"l-") ){ + /* printf("low light off!\n"); */ + lowlight = 0; } + if (!strcmp(correction_type,"l+") ){ + /* printf("low light on!\n"); */ + lowlight = 1; } + if (!strcmp(correction_type,"0") ){ + /* printf("all corrections off!\n"); */ + lowlight = 0; } + + break; + /*case 'v': + printf("evalglare %s \n",version); + exit(1); */ + case '1': output = 1; break; @@ -1791,7 +1968,36 @@ int main(int argc, char **argv) output = 2; dir_ill = atof(argv[++i]); break; - + case '3': + output = 3; + break; + case '4': + lowlight = 0; + break; + case 'Q': + multi_image_mode=1; + output= 3; + calcfast=1; + num_images =atoi(argv[++i]); + num_scans =atoi(argv[++i]); + temp_image_name = malloc(sizeof(char*)*num_images); + + x_temp_img=(int *) malloc(sizeof(int) * num_images); + y_temp_img=(int *) malloc(sizeof(int) * num_images); + scale_image_scans=(double *) malloc(sizeof(double) * (num_scans+1)*num_images); + /* iterate through all images and allocate 256 characters to each: */ + for (j = 0; j < num_images; j++) { + scale_image_scans[j*(num_scans+1)]=1.0; + temp_image_name[j] = malloc(256*sizeof(char)); + strcpy(temp_image_name[j], argv[++i]); + x_temp_img[j] = atoi(argv[++i]); + y_temp_img[j] = atoi(argv[++i]); + for (jj=1;jj<=num_scans;jj++){ + scale_image_scans[j*(num_scans+1)+jj]=atof(argv[++i]);} + } + + + break; case 'v': if (argv[i][2] == '\0') { printf("%s \n",RELEASENAME); @@ -1821,7 +2027,9 @@ int main(int argc, char **argv) } /* set multiplier for task method to 5, if not specified */ + + if ( task_lum == 1 && thres_activate == 0){ lum_thres = 5.0; } @@ -1889,13 +2097,21 @@ if (masking ==1 && zones >0) { exit(1); } + if ( patchmode > 0 && p->view.type != VT_ANG) { + + fprintf(stderr, "error: Patchmode only possible with view type vta ! Stopping... \n"); + exit(1); + + } + + if (p->view.type == VT_PER) { fprintf(stderr, "warning: image has perspective view type specified in header ! \n"); } if (masking == 1) { - if (!pict_get_xsize(p)==pict_get_xsize(pm) || !pict_get_ysize(p)==pict_get_ysize(pm)) { + if (pict_get_xsize(p)!=pict_get_xsize(pm) || pict_get_ysize(p)!=pict_get_ysize(pm)) { fprintf(stderr, "error: masking image has other resolution than main image ! \n"); fprintf(stderr, "size must be identical \n"); printf("resolution main image : %dx%d\n",pict_get_xsize(p),pict_get_ysize(p)); @@ -1930,7 +2146,8 @@ if (masking ==1 && zones >0) { } } - + + /* Check task position */ if (task_lum == 1) { @@ -1954,7 +2171,9 @@ if (masking ==1 && zones >0) { pict_get_z1_gsn(p,igs) = 0; pict_get_z2_gsn(p,igs) = 0; +if (multi_image_mode<1) { + /* cut out GUTH field of view and exit without glare evaluation */ if (cut_view==2) { if (cut_view_type==1) { @@ -2242,8 +2461,11 @@ if (cut_view==1) { /* printf("Ev, avlum, Omega_tot%f %f %f \n",E_v, avlum, sang); */ /* first glare source scan: find primary glare sources */ + +if (patchmode==0) { for (x = 0; x < pict_get_xsize(p); x++) { -/* lastpixelwas_gs=0; */ + lastpixelwas_gs=0; +/* lastpixelwas_peak=0; */ for (y = 0; y < pict_get_ysize(p); y++) { if (pict_get_hangle(p, x, y, p->view.vdir, p->view.vup, &ang)) { if (pict_is_validpixel(p, x, y)) { @@ -2253,11 +2475,11 @@ if (cut_view==1) { lum_total_max=act_lum; } /* speed improvement first scan: when last pixel was glare source, then use this glare source number instead of searching. - has been deactivated with v1.25 + has been deactivated with v1.25, reactivated with v2.10 */ - if (lastpixelwas_gs==0 || search_pix <= 1.0 ) { */ + if (lastpixelwas_gs==0 || search_pix <= 1.0 ) { actual_igs = find_near_pgs(p, x, y, max_angle, 0, igs, 1); -/* }*/ + } if (actual_igs == 0) { igs = igs + 1; pict_new_gli(p); @@ -2273,22 +2495,134 @@ if (cut_view==1) { pict_get_gsn(p, x, y) = actual_igs; pict_get_pgs(p, x, y) = 1; add_pixel_to_gs(p, x, y, actual_igs); -/* lastpixelwas_gs=actual_igs; */ + lastpixelwas_gs=actual_igs; } else { pict_get_pgs(p, x, y) = 0; - /* lastpixelwas_gs=0;*/ + lastpixelwas_gs=0; } } } } } -/* pict_write(p,"firstscan.pic"); */ + } else { +/* patchmode on! +calculation only for angular projection! +*/ +angle_v=p->view.vert; +angle_h=p->view.horiz; -if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 ) { + +/*printf ("angle_v,angle_h: %f %f \n",angle_v,angle_h) ; + + setting up patches as glare sources */ + +patch_pixdistance_x=floor(pict_get_xsize(p)/angle_h*patch_angle); +patch_pixdistance_y=floor(pict_get_ysize(p)/angle_v*patch_angle); + +nx_patch=floor(angle_v/patch_angle)+1; +ny_patch=floor(angle_h/patch_angle)+1; + +y_offset=floor (patch_pixdistance_y/2); +x_offset=floor (patch_pixdistance_x/2); +/* 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) ; */ + +ix_offset=0; +for (iy=1; iy<=ny_patch;iy++) { + + + +for (ix=1; ix<=nx_patch;ix++) { + igs = igs + 1; + pict_new_gli(p); + + pict_get_lum_min(p, igs) = HUGE_VAL; + pict_get_Eglare(p,igs) = 0.0; + pict_get_Dglare(p,igs) = 0.0; + pict_get_z1_gsn(p,igs) = 0; + pict_get_z2_gsn(p,igs) = 0; + pict_get_dx_max(p,igs) = (x_offset+ix_offset*x_offset+(ix-1)*patch_pixdistance_x)*1.0; + pict_get_dy_max(p,igs) = (y_offset+(iy-1)*patch_pixdistance_y)*1.0; + +/* printf ("igs, x-patch, y-patch : %i %f %f \n",igs,pict_get_dx_max(p,igs),pict_get_dy_max(p,igs) ) ; */ + +} +ix_offset=ix_offset+1; +if (ix_offset==2) { + ix_offset =0 ; + } + +} + for (y = 0; y < pict_get_ysize(p); y++) { + for (x = 0; x < pict_get_xsize(p); x++) { + + if (pict_get_hangle(p, x, y, p->view.vdir, p->view.vup, &ang)) { + if (pict_is_validpixel(p, x, y)) { + act_lum = luminance(pict_get_color(p, x, y)); + if (act_lum > lum_source) { + if (act_lum >lum_total_max) { + lum_total_max=act_lum; + } + + y_lines = floor((y)/patch_pixdistance_y); + xxx = (x+0.0)/(patch_pixdistance_x+0.0)-0.5*(y_lines % 2); + if (xxx<0 ) { xxx=0.0 ;} + i1 = y_lines*(nx_patch)+floor(xxx)+1; + i2=0; + add=0; + if (y_lines % 2 == 1 ) {add=1;} + + if (y >pict_get_dy_max(p,i1)) { + + if (x > pict_get_dx_max(p,i1)) { + i2=i1+nx_patch+add; + }else { + i2=i1+nx_patch-1+add; + } + }else { + + if (x > pict_get_dx_max(p,i1)) { + i2=i1-nx_patch+add; + }else { + i2=i1-nx_patch-1+add; + } + } + + + + + if (i2 > igs || i2 < 1) {actual_igs=i1;}else{ + 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))) ) { + actual_igs=i1; }else {actual_igs=i2;}} + + + pict_get_gsn(p, x, y) = actual_igs; + pict_get_pgs(p, x, y) = 1; + add_pixel_to_gs(p, x, y, actual_igs); + /* setglcolor(p, x, y, actual_igs, uniform_gs, u_r, u_g , u_b); */ + } + } + } + + + + + +} } + + + + + } + /* pict_write(p,"firstscan.pic"); */ + + + + +if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 || patchmode > 0) { skip_second_scan=1; } @@ -2372,6 +2706,7 @@ if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 /* extract extremes from glare sources to extra glare source */ if (splithigh == 1 && lum_total_max>limit) { +/* fprintf(stderr, " split of glare source!\n"); */ r_split = max_angle / 2.0; for (i = 0; i <= i_max; i++) { @@ -2531,11 +2866,12 @@ if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 i=0; for (x = 0; x <= igs; x++) { if (pict_get_npix(p, x) > 0) { + 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); lum_sources += pict_get_av_lum(p, x) * pict_get_av_omega(p, x); omega_sources += pict_get_av_omega(p, x); i=i+1; }} - + sum_glare= c2*log10(1 + sum_glare / pow(E_v, a3)); if (sang == omega_sources) { lum_backg =avlum; } else { @@ -2610,12 +2946,21 @@ if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 muc_rvar_get_median(s_mask,lum_mask_median); muc_rvar_get_bounding_box(s_mask,bbox); /* PSGV only why masking of window is applied! */ - pgsv = get_pgsv(E_v, E_v_mask, omega_mask, lum_mask_av); + + + if (task_lum == 0 || lum_task == 0.0 ) { + fprintf(stderr, " warning: Task area not set or task luminance=0 ! pgsv cannot be calculated (set to -99)!!\n"); + pgsv = -99; + } else { + pgsv = get_pgsv(E_v, E_v_mask, omega_mask, lum_mask_av,lum_task,avlum); + } + + pgsv_con = get_pgsv_con(E_v, E_v_mask, omega_mask, lum_mask_av,avlum); pgsv_sat =get_pgsv_sat(E_v); if (detail_out == 1) { - printf ("masking:no_pixels,omega,av_lum,median_lum,std_lum,perc_75,perc_95,lum_min,lum_max,pgsv,pgsv_sat: %i %f %f %f %f %f %f %f %f %f %f\n",i_mask,omega_mask,lum_mask_av,lum_mask_median[0],sqrt(lum_mask_std[0]),per_75_mask,per_95_mask,bbox[0],bbox[1],pgsv,pgsv_sat ); + printf ("masking:no_pixels,omega,av_lum,median_lum,std_lum,perc_75,perc_95,lum_min,lum_max,pgsv_con,pgsv_sat,pgsv,Ev_mask: %i %f %f %f %f %f %f %f %f %f %f %f %f\n",i_mask,omega_mask,lum_mask_av,lum_mask_median[0],sqrt(lum_mask_std[0]),per_75_mask,per_95_mask,bbox[0],bbox[1],pgsv_con,pgsv_sat,pgsv,E_v_mask ); } @@ -2643,6 +2988,7 @@ if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 muc_rvar_add_sample(s_z1, lum_z1); omega_z1 += pict_get_omega(p, x, y); lum_z1_av += pict_get_omega(p, x, y)* lum_actual; + Ez1 += DOT(p->view.vdir, pict_get_cached_dir(p, x, y))* pict_get_omega(p, x, y)* lum_actual; setglcolor(p,x,y,1,1 , 0.66, 0.01 ,0.33); /*check if separation gsn already exist */ @@ -2659,6 +3005,12 @@ if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 splitgs=(int)(pict_get_z1_gsn(p,act_gsn)); /* printf("splitgs%i \n",splitgs); */ split_pixel_from_gs(p, x, y, splitgs, uniform_gs, u_r, u_g , u_b); + /* move direct illuminance contribution into zone -value */ + delta_E=DOT(p->view.vdir, pict_get_cached_dir(p, x, y))* pict_get_omega(p, x, y)* luminance(pict_get_color(p, x, y)); + pict_get_Eglare(p,act_gsn ) = pict_get_Eglare(p,act_gsn ) - delta_E; + pict_get_Eglare(p,igs ) = pict_get_Eglare(p,igs ) + delta_E; + + } } /*zone2 */ @@ -2670,6 +3022,7 @@ if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 muc_rvar_add_sample(s_z2, lum_z2); omega_z2 += pict_get_omega(p, x, y); lum_z2_av += pict_get_omega(p, x, y)* lum_actual; + Ez2 += DOT(p->view.vdir, pict_get_cached_dir(p, x, y))* pict_get_omega(p, x, y)* lum_actual; setglcolor(p,x,y,1,1 , 0.65, 0.33 ,0.02); /* printf("zone 2 x y act_gsn pict_get_z1_gsn(p,act_gsn) pict_get_z2_gsn(p,act_gsn): %i %i %f 1:%f 2:%f \n",x,y,act_gsn,pict_get_z1_gsn(p,act_gsn),pict_get_z2_gsn(p,act_gsn)); */ if (act_gsn > 0){ @@ -2684,6 +3037,11 @@ if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 splitgs=(int)(pict_get_z2_gsn(p,act_gsn)); /* printf("splitgs %i \n",splitgs);*/ split_pixel_from_gs(p, x, y, splitgs, uniform_gs, u_r, u_g , u_b); + /* move direct illuminance contribution into zone -value */ + delta_E=DOT(p->view.vdir, pict_get_cached_dir(p, x, y))* pict_get_omega(p, x, y)* luminance(pict_get_color(p, x, y)); + pict_get_Eglare(p,act_gsn ) = pict_get_Eglare(p,act_gsn ) - delta_E; + pict_get_Eglare(p,igs ) = pict_get_Eglare(p,igs ) + delta_E; + } } @@ -2710,33 +3068,80 @@ if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 muc_rvar_get_bounding_box(s_z1,bbox_z1); if (detail_out == 1) { - 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: %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] ); + 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 ); if (zones == 2 ) { - 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: %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] ); + 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 ); } } } +int new_gs_number[igs+1]; + i = 0; for (x = 0; x <= igs; x++) { /* resorting glare source numbers */ if (pict_get_npix(p, x) > 0) { i = i + 1; + pict_get_Dglare(p,x) = i; + new_gs_number[x] = i; +/* printf("%i %i %f %i \n", i,x,pict_get_Dglare(p,x),new_gs_number[x] ); */ } } no_glaresources=i; - +/*printf("%i",no_glaresources );*/ /* glare sources */ - if (detail_out == 1) { + if (output == 4 ) { + + i=0; + for (x = 0; x <= igs; x++) { + if (pict_get_npix(p, x) > 0) { + i = i + 1; + + x2=pict_get_av_posx(p, x); + y2=pict_get_av_posy(p, x); + + printf("%i %f %f %f %f %.10f %f %f %f %f \n", + i, pict_get_npix(p, x), pict_get_av_posx(p, x), pict_get_av_posy(p, x), + pict_get_av_lum(p, x), pict_get_av_omega(p, x), + get_posindex(p, pict_get_av_posx(p, x),pict_get_av_posy(p, x),posindex_2), + pict_get_cached_dir(p, x2,y2)[0],pict_get_cached_dir(p, x2,y2)[1],pict_get_cached_dir(p, x2,y2)[2]); + } + } + + + for (y = 0; y < pict_get_ysize(p); y++) { + for (x = 0; x < pict_get_xsize(p); x++) { + + if (pict_get_hangle(p, x, y, p->view.vdir, p->view.vup, &ang)) { + if (pict_is_validpixel(p, x, y)) { + if (pict_get_gsn(p,x,y) >0 ) { + i=pict_get_gsn(p,x,y); + 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] ); + + } + + + +}}}} + + +} + + + + + if (detail_out == 1 && output < 3) { + dgp = get_dgp(p, E_v, igs, a1, a2, a3, a4, a5, c1, c2, c3, posindex_2); + printf - ("%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", + ("%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", i); if (i == 0) { - 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, - 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); + 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, + 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); } else { i = 0; @@ -2756,12 +3161,15 @@ if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 Lveil_cie =0 ; } Lveil_cie_sum = Lveil_cie_sum + Lveil_cie; + 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)) ; + r_contrast=r_glare/sum_glare ; + r_dgp=r_glare/dgp ; if (pict_get_z1_gsn(p,x)<0) { act_gsn=(int)(-pict_get_z1_gsn(p,x)); }else{ act_gsn=0; } - printf("%i %f %f %f %f %.10f %f %f %f %f %f %f %f %f %f %f %f %f %f %i \n", + printf("%i %f %f %f %f %.10f %f %f %f %f %f %f %f %f %f %f %f %f %f %i %f %f \n", i, pict_get_npix(p, x), pict_get_av_posx(p, x), pict_get_ysize(p) - pict_get_av_posy(p, x), pict_get_av_lum(p, x), pict_get_av_omega(p, x), @@ -2769,14 +3177,14 @@ if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 pict_get_av_posy(p, x), posindex_2), lum_backg, lum_task, E_v, E_v_dir, abs_max, sigma * 180 / 3.1415927 - ,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 ); + ,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 ); } } } } +if ( output < 3) { - /* calculation of indicees */ /* check vertical illuminance range */ @@ -2789,10 +3197,11 @@ if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2 dgp = get_dgp(p, E_v2, igs, a1, a2, a3, a4, a5, c1, c2, c3, posindex_2); /* low light correction */ + if (lowlight ==1) { if (E_v < 1000) { low_light_corr=1.0*exp(0.024*E_v-4)/(1+exp(0.024*E_v-4));} else {low_light_corr=1.0 ;} dgp =low_light_corr*dgp; - + } /* age correction */ if (age_corr == 1) { @@ -2813,6 +3222,7 @@ if (calcfast == 0) { dgi = get_dgi(p, lum_backg, igs, posindex_2); ugr = get_ugr(p, lum_backg, igs, posindex_2); ugp = get_ugp (p,lum_backg, igs, posindex_2); + ugp2 = get_ugp2 (p,lum_backg, igs, posindex_2); ugr_exp = get_ugr_exp (p,lum_backg_cos,lum_a, igs, posindex_2); dgi_mod = get_dgi_mod(p, lum_a, igs, posindex_2); cgi = get_cgi(p, E_v, E_v_dir, igs, posindex_2); @@ -2823,6 +3233,7 @@ if (calcfast == 0) { dgi = 0.0; ugr = 0.0; ugp = 0.0; + ugp2 =0.0; ugr_exp = 0.0; dgi_mod = 0.0; cgi = 0.0; @@ -2849,7 +3260,7 @@ if (calcfast == 0) { get_dgp(p, E_vl_ext, igs, a1, a2, a3, a4, a5, c1, c2, c3, posindex_2); dgp = dgp_ext; - if (E_vl_ext < 1000) { + if (E_vl_ext < 1000 && lowlight ==1) { 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 ;} dgp =low_light_corr*dgp; dgp =age_corr_factor*dgp; @@ -2862,9 +3273,9 @@ if (calcfast == 0) { printf - ("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", + ("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", dgp, avlum, E_v, lum_backg, E_v_dir, dgi, ugr, vcp, cgi, - 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]); + 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); } else { if (detail_out2 == 1) { @@ -2877,7 +3288,7 @@ if (calcfast == 0) { if (ext_vill == 1) { dgp_ext = get_dgp(p, E_vl_ext, igs, a1, a2, a3, a4, a5, c1, c2, c3,posindex_2); - if (E_vl_ext < 1000) { + if (E_vl_ext < 1000 && lowlight ==1) { 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 ;} dgp =low_light_corr*dgp_ext; dgp =age_corr_factor*dgp; @@ -2892,7 +3303,7 @@ if (calcfast == 0) { get_dgp(p, E_vl_ext, igs, a1, a2, a3, a4, a5, c1, c2, c3, posindex_2); dgp = dgp_ext; - if (E_vl_ext < 1000) { + if (E_vl_ext < 1000 && lowlight ==1) { 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 ;} dgp =low_light_corr*dgp; @@ -2905,7 +3316,287 @@ if (calcfast == 0) { printf("%f\n", dgp); } } +} +}else{ +/* only multiimagemode + +*/ + + + for (j = 0; j < num_images; j++) { + + +/* loop over temporal images */ + +pict_read(pcoeff,temp_image_name[j] ); + +/*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)); +*/ + + +/* loop over scans + empty of */ +for (jj=0;jj<=num_scans;jj++){ + +/*printf("scale %i %i %i %f ",j,jj,num_scans,scale_image_scans[j*(num_scans+1)+jj]); */ + + +/* copy luminance value into big image and remove glare sources*/ + for (x = 0; x < pict_get_xsize(pcoeff); x++) { + for (y = 0; y < pict_get_ysize(pcoeff); y++) { + xmap=x_temp_img[j]+x; + ymap=y_temp_img[j]+y; + if (xmap <0) { xmap=0;} + if (ymap <0) { ymap=0;} + + pict_get_color(p, xmap, ymap)[RED] = scale_image_scans[j*(num_scans+1)+jj]*pict_get_color(pcoeff, x, y)[RED]; + pict_get_color(p, xmap, ymap)[GRN] = scale_image_scans[j*(num_scans+1)+jj]*pict_get_color(pcoeff, x, y)[GRN]; + pict_get_color(p, xmap, ymap)[BLU] = scale_image_scans[j*(num_scans+1)+jj]*pict_get_color(pcoeff, x, y)[BLU]; + pict_get_gsn(p, xmap, ymap) = 0; + pict_get_pgs(p, xmap, ymap) = 0; +}} + + + + + +actual_igs =0; + +/* first glare source scan: find primary glare sources */ + for (x = 0; x < pict_get_xsize(pcoeff); x++) { + lastpixelwas_gs=0; +/* lastpixelwas_peak=0; */ + for (y = 0; y < pict_get_ysize(pcoeff); y++) { + xmap=x_temp_img[j]+x; + ymap=y_temp_img[j]+y; + if (pict_get_hangle(p, xmap, ymap, p->view.vdir, p->view.vup, &ang)) { + if (pict_is_validpixel(p, xmap, ymap)) { + act_lum = luminance(pict_get_color(p, xmap, ymap)); + if (act_lum> lum_source) { + if (act_lum >lum_total_max) { + lum_total_max=act_lum; + } + + if (lastpixelwas_gs==0 || search_pix <= 1.0 ) { + actual_igs = find_near_pgs(p, xmap, ymap, max_angle, 0, igs, 1); + } + if (actual_igs == 0) { + igs = igs + 1; + pict_new_gli(p); + pict_get_Eglare(p,igs) = 0.0; +/* not necessary here pict_get_lum_min(p, igs) = HUGE_VAL; + pict_get_Eglare(p,igs) = 0.0; + pict_get_Dglare(p,igs) = 0.0; + pict_get_z1_gsn(p,igs) = 0; + pict_get_z2_gsn(p,igs) = 0; */ + actual_igs = igs; + + } + pict_get_gsn(p, xmap, ymap) = actual_igs; + pict_get_pgs(p, xmap, ymap) = 1; + add_pixel_to_gs(p, xmap, ymap, actual_igs); + lastpixelwas_gs=actual_igs; + + + + delta_E=DOT(p->view.vdir, pict_get_cached_dir(p, xmap, ymap))* pict_get_omega(p, xmap, ymap)* luminance(pict_get_color(p, xmap, ymap)); + pict_get_Eglare(p,actual_igs ) = pict_get_Eglare(p,actual_igs ) + delta_E; + + + + + } else { + pict_get_pgs(p, xmap, ymap) = 0; + lastpixelwas_gs=0; + } + } + } + } + } + + +/* here should be peak extraction */ +i_max=igs; + r_split = max_angle / 2.0; + for (i = 0; i <= i_max; i++) { + + if (pict_get_npix(p, i) > 0) { + l_max = pict_get_lum_max(p, i); + i_splitstart = igs + 1; + if (l_max >= limit) { + for (x = 0; x < pict_get_xsize(pcoeff); x++) + for (y = 0; y < pict_get_ysize(pcoeff); y++) { + xmap=x_temp_img[j]+x; + ymap=y_temp_img[j]+y; + + + if (pict_get_hangle + (p, xmap, ymap, p->view.vdir, p->view.vup, &ang)) + { + if (pict_is_validpixel(p, xmap, ymap) + && luminance(pict_get_color(p, xmap, ymap)) + >= limit + && pict_get_gsn(p, xmap, ymap) == i) { + if (i_splitstart == (igs + 1)) { + igs = igs + 1; + pict_new_gli(p); + pict_get_z1_gsn(p,igs) = 0; + pict_get_z2_gsn(p,igs) = 0; + + pict_get_Eglare(p,igs) = 0.0; + pict_get_Dglare(p,igs) = 0.0; + pict_get_lum_min(p, igs) = + 99999999999999.999; + i_split = igs; + } else { + i_split = + find_split(p, xmap, ymap, r_split, + i_splitstart, igs); + } + if (i_split == 0) { + igs = igs + 1; + pict_new_gli(p); + pict_get_z1_gsn(p,igs) = 0; + pict_get_z2_gsn(p,igs) = 0; + + pict_get_Eglare(p,igs) = 0.0; + pict_get_Dglare(p,igs) = 0.0; + pict_get_lum_min(p, igs) = + 99999999999999.999; + i_split = igs; + } + split_pixel_from_gs(p, xmap, ymap, i_split, uniform_gs, u_r, u_g , u_b); + + } + } + } + + } + change = 1; + while (change == 1) { + change = 0; + for (x = 0; x < pict_get_xsize(pcoeff); x++) + for (y = 0; y < pict_get_ysize(pcoeff); y++) { + xmap=x_temp_img[j]+x; + ymap=y_temp_img[j]+y; + before_igs = pict_get_gsn(p, xmap, ymap); + if (before_igs >= i_splitstart) { + if (pict_get_hangle + (p, xmap, ymap, p->view.vdir, p->view.vup, + &ang)) { + if (pict_is_validpixel(p, xmap, ymap) + && before_igs > 0) { + actual_igs = + find_near_pgs(p, xmap, ymap, + max_angle, + before_igs, igs, + i_splitstart); + if (!(actual_igs == before_igs)) { + change = 1; + } + if (before_igs > 0) { + actual_igs = + pict_get_gsn(p, xmap, ymap); + /* icol = + setglcolor(p, x, y, + actual_igs, uniform_gs, u_r, u_g , u_b);*/ + } + + } + } + } + + } + } + + + } + } + +/* end peak extraction */ + + +/* calculation of direct vertical illuminance for th multi-image-mode */ + + + for (x = 0; x < pict_get_xsize(pcoeff); x++) + for (y = 0; y < pict_get_ysize(pcoeff); y++) { + xmap=x_temp_img[j]+x; + ymap=y_temp_img[j]+y; + if (pict_get_hangle(p, xmap, ymap, p->view.vdir, p->view.vup, &ang)) { + if (pict_is_validpixel(p, xmap, ymap)) { + if (pict_get_gsn(p, xmap, ymap) > 0) { + actual_igs = pict_get_gsn(p, xmap, ymap); + delta_E=DOT(p->view.vdir, pict_get_cached_dir(p, xmap, ymap))* pict_get_omega(p, xmap, ymap)* luminance(pict_get_color(p, xmap, ymap)); + pict_get_Eglare(p,actual_igs ) = pict_get_Eglare(p,actual_igs ) + delta_E; + } + } + } + } + + + + + + + + + i = 0; + for (x = 0; x <= igs; x++) { + if (pict_get_npix(p, x) > 0) { + i = i + 1; + }} +no_glaresources=i; + +/* + +sprintf(file_out, "%s%i%s","ray2/img_",j,".hdr"); +pict_write(p, file_out); +*/ +printf("%i ",no_glaresources); + i = 0; + for (x = 0; x <= igs; x++) { + if (pict_get_npix(p, x) > 0) { + i = i + 1; + pict_get_sigma(p, pict_get_av_posx(p, x), pict_get_av_posy(p, x), p->view.vdir, p->view.vup, &sigma); + + x2=pict_get_av_posx(p, x); + y2=pict_get_av_posy(p, x); + printf("%f %.10f %f %f %f %f %f ", pict_get_av_lum(p, x), pict_get_av_omega(p, x), get_posindex(p, pict_get_av_posx(p, x), pict_get_av_posy(p, x), + posindex_2),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) ); + } +pict_get_npix(p, x)=0; +pict_get_av_lum(p, x)=0; +pict_get_av_posy(p, x)=0; +pict_get_av_posx(p, x)=0; +pict_get_av_omega(p, x)=0; + } +printf("\n"); + + +/* empty big image and remove glare sources*/ + for (x = 0; x < pict_get_xsize(pcoeff); x++) { + for (y = 0; y < pict_get_ysize(pcoeff); y++) { + xmap=x_temp_img[j]+x; + ymap=y_temp_img[j]+y; + pict_get_color(p, xmap, ymap)[RED] = 0; + pict_get_color(p, xmap, ymap)[GRN] = 0; + pict_get_color(p, xmap, ymap)[BLU] = 0; + pict_get_gsn(p, xmap, ymap) = 0; + pict_get_pgs(p, xmap, ymap) = 0; +}} +igs=0; + + +} + + +} + +} + +/* end multi-image-mode */ /*printf("lowlight=%f\n", low_light_corr); */