From 5a581c1fd116c51df13e09c5c320feba48d069bb Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Mon, 16 Jul 2012 23:29:12 +0000 Subject: Better handling of the ESC key during Freestyle rendering. This commit is meant to improve the response of the ESC key for stopping Freestyle rendering throughout the rendering process. The rendering with Freestyle consists of several steps including: (1) mesh data loading, (2) winged edge construction, (3) silhouette edge detection, (4) view map construction, and (5) stroke drawing. All these steps have been extended to frequently check if the ESC key is pressed, so that users can abort time-consuming rendering at any point of time. --- source/blender/freestyle/intern/view_map/ViewMapBuilder.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/freestyle/intern/view_map/ViewMapBuilder.h') diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h index 2e37a41df3c..a41df92062e 100755 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h @@ -40,6 +40,7 @@ # include "../geometry/GeomUtils.h" # include "../geometry/Grid.h" # include "../system/ProgressBar.h" +# include "../system/RenderMonitor.h" # include "../geometry/SweepLine.h" # include "ViewMap.h" # include "SilhouetteGeomEngine.h" @@ -58,6 +59,7 @@ private: ViewMap * _ViewMap; // result //SilhouetteGeomEngine _GeomEngine; ProgressBar *_pProgressBar; + RenderMonitor *_pRenderMonitor; Vec3r _viewpoint; bool _orthographicProjection; Grid* _Grid; @@ -91,6 +93,7 @@ public: inline ViewMapBuilder() { _pProgressBar = 0; + _pRenderMonitor = 0; _Grid = 0; _currentId = 1; _currentFId = 0; @@ -185,6 +188,7 @@ public: /*! Modifiers */ inline void setProgressBar(ProgressBar *iProgressBar) {_pProgressBar = iProgressBar;} + inline void setRenderMonitor(RenderMonitor *iRenderMonitor) {_pRenderMonitor = iRenderMonitor;} inline void setEnableQI(bool iBool) {_EnableQI = iBool;} protected: -- cgit v1.2.3