diff options
Diffstat (limited to 'source/blender/freestyle/intern')
6 files changed, 14 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp index 9595f1c51de..8cdb13d131d 100755 --- a/source/blender/freestyle/intern/app_blender/Controller.cpp +++ b/source/blender/freestyle/intern/app_blender/Controller.cpp @@ -636,6 +636,7 @@ void Controller::DrawStrokes() _Canvas->Draw(); real d = _Chrono.stop(); cout << "Strokes generation : " << d << endl; + cout << "Stroke count : " << _Canvas->stroke_count << endl; resetModified(); } diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp index 95045cccfdd..233fe26a38d 100644 --- a/source/blender/freestyle/intern/app_blender/api.cpp +++ b/source/blender/freestyle/intern/app_blender/api.cpp @@ -150,16 +150,17 @@ extern "C" { void FRS_render_Blender(Render* re) { if( controller->_ViewMap ) { + cout << "\n=== Rendering Freestyle with Blender's internal renderer ===" << endl; + // build strokes controller->DrawStrokes(); - - cout << "\n=== Rendering Freestyle with Blender's internal renderer ===" << endl; + controller->RenderBlender(re); controller->CloseFile(); } else { cout << "Freestyle cannot be used because the view map is not available" << endl; } - cout << "###################################################################" << endl; + cout << "\n###################################################################" << endl; } #ifdef __cplusplus diff --git a/source/blender/freestyle/intern/scene_graph/BlenderFileLoader.cpp b/source/blender/freestyle/intern/scene_graph/BlenderFileLoader.cpp index 7c3d41d0018..33a05b4389d 100644 --- a/source/blender/freestyle/intern/scene_graph/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/scene_graph/BlenderFileLoader.cpp @@ -18,7 +18,7 @@ NodeGroup* BlenderFileLoader::Load() ObjectInstanceRen *obi; ObjectRen *obr; - cout << "\nImporting triangular meshes into Blender" << endl; + cout << "\n=== Importing triangular meshes into Blender ===" << endl; // creation of the scene root node _Scene = new NodeGroup; diff --git a/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.cpp index 59f54ce3881..a175620c8d7 100644 --- a/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.cpp @@ -56,7 +56,7 @@ BlenderStrokeRenderer::BlenderStrokeRenderer() lb = scene->r.layers; scene->r= old_scene->r; scene->r.layers= lb; - set_scene( scene ); // scene.makeCurrent() + set_scene( scene ); // image dimensions float width = scene->r.xsch; diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index 84411c20970..01f5b9b6fb1 100755 --- a/source/blender/freestyle/intern/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp @@ -114,6 +114,8 @@ void Canvas::Draw() _Layers[i] = _StyleModules[i]->execute(); + stroke_count += _Layers[i]->strokes_size(); + timestamp->increment(); } postDraw(); @@ -146,6 +148,8 @@ void Canvas::Clear() } if(_steerableViewMap) _steerableViewMap->Reset(); + + stroke_count = 0; } void Canvas::Erase() @@ -161,6 +165,8 @@ void Canvas::Erase() if(_steerableViewMap) _steerableViewMap->Reset(); update(); + +stroke_count = 0; } void Canvas::InsertStyleModule(unsigned index, StyleModule *iStyleModule) { diff --git a/source/blender/freestyle/intern/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h index 4dd13950daf..b61e70099a8 100755 --- a/source/blender/freestyle/intern/stroke/Canvas.h +++ b/source/blender/freestyle/intern/stroke/Canvas.h @@ -175,6 +175,7 @@ public: inline const StrokeRenderer * renderer() const {return _Renderer;} inline StyleModule* getCurrentStyleModule() { return _current_sm; } virtual bool getRecordFlag() const {return false;} + int stroke_count; /*! modifiers */ inline void setSelectedFEdge(FEdge *iFEdge) {_SelectedFEdge = iFEdge;} |