diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-17 03:29:12 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-17 03:29:12 +0400 |
| commit | 5a581c1fd116c51df13e09c5c320feba48d069bb (patch) | |
| tree | 91df14a7a43b19af4ecac736460cbbd8c1b1e291 /source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h | |
| parent | 9d2a957a0d440b07d1a5e9e0ee5fb613d93637d9 (diff) | |
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.
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index 804b1eb635d..c5c06567c41 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -5,6 +5,7 @@ # include <float.h> # include "../system/FreestyleConfig.h" +# include "../system/RenderMonitor.h" # include "../scene_graph/NodeGroup.h" # include "../scene_graph/NodeTransform.h" # include "../scene_graph/NodeShape.h" @@ -64,6 +65,9 @@ public: /*! Gets the smallest edge size read */ inline real minEdgeSize() {return _minEdgeSize;} + /*! Modifiers */ + inline void setRenderMonitor(RenderMonitor *iRenderMonitor) {_pRenderMonitor = iRenderMonitor;} + protected: void insertShapeNode(ObjectInstanceRen *obi, int id); int testDegenerateTriangle(float v1[3], float v2[3], float v3[3]); @@ -93,6 +97,8 @@ protected: float _viewplane_bottom; float _viewplane_top; float _z_near, _z_far; + + RenderMonitor *_pRenderMonitor; }; #endif // BLENDER_FILE_LOADER_H |