Layer calls for pm3d queue flush

dkogan · Nov 19, 2016 · 0390141 · 0390141
1 parent 7420760
commit 0390141
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/pm3d.c b/src/pm3d.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid() { return RCSid("$Id: pm3d.c,v 1.114 2016-11-05 21:21:07 sfeam Exp $"); }
+static char *RCSid() { return RCSid("$Id: pm3d.c,v 1.115 2016-11-19 06:43:49 markisch Exp $"); }
 #endif
 
 /* GNUPLOT - pm3d.c */
@@ -384,6 +384,8 @@ void pm3d_depth_queue_flush(void)
     if (pm3d.direction != PM3D_DEPTH && !track_pm3d_quadrangles)
 	return;
 
+    term->layer(TERM_LAYER_BEGIN_PM3D_FLUSH);
+
     if (current_quadrangle > 0 && quadrangles) {
 
 	quadrangle* qp;
@@ -442,6 +444,8 @@ void pm3d_depth_queue_flush(void)
     }
 
     pm3d_depth_queue_clear();
+
+    term->layer(TERM_LAYER_END_PM3D_FLUSH);
 }
 
 /*

diff --git a/src/term_api.h b/src/term_api.h
@@ -1,5 +1,5 @@
 /*
- * $Id: term_api.h,v 1.149 2016-10-08 20:13:17 markisch Exp $
+ * $Id: term_api.h,v 1.150 2016-11-19 06:43:49 markisch Exp $
  */
 
 /* GNUPLOT - term_api.h */
@@ -202,6 +202,8 @@ typedef enum termlayer {
 	TERM_LAYER_BEFORE_ZOOM,
 	TERM_LAYER_BEGIN_PM3D_MAP,
 	TERM_LAYER_END_PM3D_MAP,
+	TERM_LAYER_BEGIN_PM3D_FLUSH,
+	TERM_LAYER_END_PM3D_FLUSH,
 	TERM_LAYER_BEGIN_IMAGE,
 	TERM_LAYER_END_IMAGE,
 	TERM_LAYER_BEGIN_COLORBOX,

diff --git a/src/win/wgdiplus.cpp b/src/win/wgdiplus.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: wgdiplus.cpp,v 1.45 2016-11-19 06:31:07 markisch Exp $
+ * $Id: wgdiplus.cpp,v 1.46 2016-11-19 06:43:49 markisch Exp $
  */
 
 /*
@@ -742,7 +742,8 @@ do_draw_gdiplus(LPGW lpgw, Graphics &graphics, LPRECT rect, enum draw_target tar
 					plotno = 0;
 					break;
 				case TERM_LAYER_BEGIN_PM3D_MAP:
-					// Antialiasing of pm3d polygons is obtained by drawing to
+				case TERM_LAYER_BEGIN_PM3D_FLUSH:
+					// Antialiasing of pm3d polygons is obtained by drawing to a
 					// bitmap four times as large and copying it back with interpolation
 					if (lpgw->antialiasing && lpgw->polyaa) {
 						float scale = 2.f;
@@ -754,6 +755,7 @@ do_draw_gdiplus(LPGW lpgw, Graphics &graphics, LPRECT rect, enum draw_target tar
 					}
 					break;
 				case TERM_LAYER_END_PM3D_MAP:
+				case TERM_LAYER_END_PM3D_FLUSH:
 					if (poly_graphics != NULL) {
 						delete poly_graphics;
 						poly_graphics = NULL;