- restored functionality for ESC detection during rendering which doesnt

eat up cpu time.
  in fact it was in pre-ghost blender already.

works now for all posix OS's, except for windows. now working on getting
that fixed as well. until then, rendering will be slow at win32...


cvS: ----------------------------------------------------------------------

source/blender/render/intern/source/rendercore.c

@@ -1052,10 +1052,8 @@ void scanlinehaloPS(unsigned int *rectz, long *rectdelta, unsigned int *rectt, s
 		if((a & 255)==0) har= R.bloha[a>>8];
 		else har++;
 
-		if( !(a % 256) && RE_local_test_break() ) break;  /* Hos, RPW - fix slow render bug, */
+		if(RE_local_test_break() ) break;
-													/* !(loopvar%256) keeps checking for */
+		
-													/* ESC too often and bogging down render */
-													/* (Based on discovery by Rob Haarsma) */
 		if(ys>har->maxy);
 		else if(ys<har->miny);
 		else {
@@ -1161,7 +1159,7 @@ void scanlinehalo(unsigned int *rectz, unsigned int *rectt, short ys)
 		if((a & 255)==0) har= R.bloha[a>>8];
 		else har++;
 
-		if( !(a % 256) && RE_local_test_break() ) break; /* Hos, RPW, fixes Slow Render Bug */
+		if(RE_local_test_break() ) break; 
 
 		if(ys>har->maxy);
 		else if(ys<har->miny);
@@ -1215,7 +1213,7 @@ void halovert()
 		if((a & 255)==0) har= R.bloha[a>>8];
 		else har++;
 
-		if( !(a % 256) && RE_local_test_break() ) break; /* Hos, RPW, fixes slow render bug */
+		if(RE_local_test_break() ) break; 
 
 		if(har->maxy<0);
 		else if(R.recty<har->miny);
@@ -1269,7 +1267,7 @@ void halovert()
 					rectt+= R.rectx;
 					rectz+= R.rectx;
 					
-					if( !(y % 256) && RE_local_test_break() ) break; /* Hos,RPW, Fixes slow render bug */
+					if(RE_local_test_break() ) break; 
 				}
 
 			}
@@ -2477,7 +2475,7 @@ void zbufshadeDA(void)	/* Delta Accum Pixel Struct */
 			/* 1 is for osa */
 		if(R.r.mode & R_EDGE) edge_enhance();
 		
-		if( !(v % 256) && RE_local_test_break()) break; /*Hos,RPW, fixes slow render bug*/
+		if(RE_local_test_break()) break;
 	}
 	if(R.flag & (R_ZTRA+R_HALO) ) {	 /* to get back correct values of zbuffer Z for transp and halos */
 		xd= jit[0][0];
@@ -2609,7 +2607,7 @@ void zbufshadeDA(void)	/* Delta Accum Pixel Struct */
 			}
 			rz+= R.rectx;
 		}
-		if(!(y % 256) && RE_local_test_break()) break; /* Hos,RPW, fixes slow render bug */
+		if(RE_local_test_break()) break; 
 	}
 
 	if( (R.r.mode & R_EDGE) && RE_local_test_break()==0) {
@@ -2708,7 +2706,7 @@ void zbufshade(void)
 									R.rectot);
 		}
 		
-		if(!(y % 256) && RE_local_test_break()) break; /*Hos,RPW, Fixes Slow render bug */
+		if(RE_local_test_break()) break; 
 	}
 
 	if(R.flag & R_ZTRA) endaccumbuf();
@@ -2771,7 +2769,7 @@ void renderhalo(HaloRen *har)	/* postprocess version */
 	
 				rectt+= R.rectx;
 				
-				if( !(y % 256) && RE_local_test_break()) break; /* Hos,RPW, fixes slow render bug */
+				if(RE_local_test_break()) break; 
 			}
 	
 		}

source/blender/render/intern/source/zbuf.c

@@ -2112,7 +2112,7 @@ void zbuffer_abuf()
 					}
 				}
 			}
-			if(!(v % 256) && RE_local_test_break()) break; /*RPW, HOS */
+			if(RE_local_test_break()) break; 
 		}
 		
 		if((R.r.mode & R_OSA)==0) break;

source/blender/src/renderwin.c

@@ -39,6 +39,11 @@
 
 #ifdef WIN32
 #include "BLI_winstuff.h"
+#else
+ /* for signal callback, not (fully) supported at windows */
+#include <sys/time.h>
+#include <signal.h>
+
 #endif
 
 #include "BLI_blenlib.h"
@@ -601,23 +606,6 @@ static void renderview_progress_display_cb(int y1, int y2, int w, int h, unsigne
 /* -------------- callbacks for render loop: interactivity ----------------------- */
 
 
-/* callback for break rendering process */
-static int test_break(void)
-{
-	if (!G.afbreek) {
-		if (blender_test_break()) {
-			;
-		} else if (render_win) {
-			winlay_process_events(0);
-			// render_win can be closed in winlay_process_events()
-			if (render_win == 0 || (render_win->flags & RW_FLAGS_ESCAPE))
-				G.afbreek= 1;
-		}
-	}
-	
-	return G.afbreek;
-}
-
 /* callback for print info in top header in interface */
 static void printrenderinfo_cb(double time, int sample)
 {
@@ -639,6 +627,115 @@ static void printrenderinfo_cb(double time, int sample)
 	screen_draw_info_text(G.curscreen, str);
 }
 
+/* -------------- callback system to allow ESC from rendering ----------------------- */
+
+#ifdef _WIN32
+/* we use the SetTimer here */
+
+static int test_break()
+{
+
+	if(G.afbreek==2) { /* code for testing queue */
+
+		G.afbreek= 0;
+
+		blender_test_break(); /* tests blender interface */
+
+		if (G.afbreek==0 && render_win) { /* tests window */
+			winlay_process_events(0);
+			// render_win can be closed in winlay_process_events()
+			if (render_win == 0 || (render_win->flags & RW_FLAGS_ESCAPE))
+				G.afbreek= 1;
+		}
+	}
+
+	if(G.afbreek==1) return 1;
+	else return 0;
+}
+
+
+static void init_test_break_callback()
+{
+	;
+}
+
+static void end_test_break_callback()
+{
+	;
+}
+
+#else
+/* all other OS's support signal(SIGVTALRM) */
+
+/* this function can be called anywhere during render, it should not eat resources
+   or cpu time, can be called a million times or so
+*/
+
+static int test_break()
+{
+	short val;
+
+	if(G.afbreek==2) { /* code for testing queue */
+
+		G.afbreek= 0;
+
+		blender_test_break(); /* tests blender interface */
+
+		if (G.afbreek==0 && render_win) { /* tests window */
+			winlay_process_events(0);
+			// render_win can be closed in winlay_process_events()
+			if (render_win == 0 || (render_win->flags & RW_FLAGS_ESCAPE))
+				G.afbreek= 1;
+		}
+	}
+
+	if(G.afbreek==1) return 1;
+	else return 0;
+}
+
+/* this function goes in the signal() callback */
+static void interruptESC(int sig)
+{
+
+	if(G.afbreek==0) G.afbreek= 2;	/* code for read queue */
+
+	/* call again, timer was reset */
+	signal(SIGVTALRM, interruptESC);
+}
+
+
+static void init_test_break_callback()
+{
+
+	struct itimerval tmevalue;
+
+	tmevalue.it_interval.tv_sec = 0;
+	tmevalue.it_interval.tv_usec = 250000;
+	/* wanneer de eerste ? */
+	tmevalue.it_value.tv_sec = 0;
+	tmevalue.it_value.tv_usec = 10000;
+
+	signal(SIGVTALRM, interruptESC);
+	setitimer(ITIMER_VIRTUAL, &tmevalue, 0);
+
+}
+
+static void end_test_break_callback()
+{
+	struct itimerval tmevalue;
+
+	tmevalue.it_value.tv_sec = 0;
+	tmevalue.it_value.tv_usec = 0;
+	setitimer(ITIMER_VIRTUAL, &tmevalue, 0);
+	signal(SIGVTALRM, SIG_IGN);
+
+}
+
+
+#endif
+
+
+
 /* -------------- callbacks for render loop: init & run! ----------------------- */
 
 
@@ -664,7 +761,9 @@ static void do_render(View3D *ogl_render_view3d, int anim, int force_dispwin)
 		RE_set_renderdisplay_callback(renderview_progress_display_cb);
 	}
 
+	init_test_break_callback();
 	RE_set_test_break_callback(test_break);
+	
 	RE_set_timecursor_callback(set_timecursor);
 	RE_set_printrenderinfo_callback(printrenderinfo_cb);
 	
@@ -691,7 +790,7 @@ static void do_render(View3D *ogl_render_view3d, int anim, int force_dispwin)
 	free_filesel_spec(G.scene->r.pic);
 
 	G.afbreek= 0;
-
+	end_test_break_callback();
 	mainwindow_make_active();
 }