diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/freestyle/intern/stroke/StyleModule.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/freestyle/intern/stroke/StyleModule.h')
-rw-r--r-- | source/blender/freestyle/intern/stroke/StyleModule.h | 270 |
1 files changed, 136 insertions, 134 deletions
diff --git a/source/blender/freestyle/intern/stroke/StyleModule.h b/source/blender/freestyle/intern/stroke/StyleModule.h index fe902299f9f..64095e971d6 100644 --- a/source/blender/freestyle/intern/stroke/StyleModule.h +++ b/source/blender/freestyle/intern/stroke/StyleModule.h @@ -33,150 +33,152 @@ #include "../system/StringUtils.h" #ifdef WITH_CXX_GUARDEDALLOC -#include "MEM_guardedalloc.h" +# include "MEM_guardedalloc.h" #endif using namespace std; namespace Freestyle { -class StyleModule -{ -public: - StyleModule(const string& file_name, Interpreter *inter) : _file_name(file_name) - { - _always_refresh = false; - _causal = false; - _drawable = true; - _modified = true; - _displayed = true; - _inter = inter; - } - - virtual ~StyleModule() {} - - StrokeLayer *execute() - { - if (!_inter) { - cerr << "Error: no interpreter was found to execute the script" << endl; - return NULL; - } - - if (!_drawable) { - cerr << "Error: not drawable" << endl; - return NULL; - } - - Operators::reset(); - - if (interpret()) { - cerr << "Error: interpretation failed" << endl; - Operators::reset(); - return NULL; - } - - Operators::StrokesContainer *strokes_set = Operators::getStrokesSet(); - if (strokes_set->empty()) { - cerr << "Error: strokes set empty" << endl; - Operators::reset(); - return NULL; - } - - StrokeLayer *sl = new StrokeLayer; - for (Operators::StrokesContainer::iterator it = strokes_set->begin(); it != strokes_set->end(); ++it) - sl->AddStroke(*it); - - Operators::reset(); - return sl; - } - -protected: - virtual int interpret() - { - return _inter->interpretFile(_file_name); - } - -public: - // accessors - const string getFileName() const - { - return _file_name; - } - - bool getAlwaysRefresh() const - { - return _always_refresh; - } - - bool getCausal() const - { - return _causal; - } - - bool getDrawable() const - { - return _drawable; - } - - bool getModified() const - { - return _modified; - } - - bool getDisplayed() const - { - return _displayed; - } - - // modifiers - void setFileName(const string& file_name) - { - _file_name = file_name; - } - - void setAlwaysRefresh(bool b = true) - { - _always_refresh = b; - } - - void setCausal(bool b = true) - { - _causal = b; - } - - void setDrawable(bool b = true) - { - _drawable = b; - } - - void setModified(bool b = true) - { - if (_always_refresh) - return; - _modified = b; - } - - void setDisplayed(bool b = true) - { - _displayed = b; - } - -private: - string _file_name; - bool _always_refresh; - bool _causal; - bool _drawable; - bool _modified; - bool _displayed; - -protected: - Interpreter *_inter; +class StyleModule { + public: + StyleModule(const string &file_name, Interpreter *inter) : _file_name(file_name) + { + _always_refresh = false; + _causal = false; + _drawable = true; + _modified = true; + _displayed = true; + _inter = inter; + } + + virtual ~StyleModule() + { + } + + StrokeLayer *execute() + { + if (!_inter) { + cerr << "Error: no interpreter was found to execute the script" << endl; + return NULL; + } + + if (!_drawable) { + cerr << "Error: not drawable" << endl; + return NULL; + } + + Operators::reset(); + + if (interpret()) { + cerr << "Error: interpretation failed" << endl; + Operators::reset(); + return NULL; + } + + Operators::StrokesContainer *strokes_set = Operators::getStrokesSet(); + if (strokes_set->empty()) { + cerr << "Error: strokes set empty" << endl; + Operators::reset(); + return NULL; + } + + StrokeLayer *sl = new StrokeLayer; + for (Operators::StrokesContainer::iterator it = strokes_set->begin(); it != strokes_set->end(); + ++it) + sl->AddStroke(*it); + + Operators::reset(); + return sl; + } + + protected: + virtual int interpret() + { + return _inter->interpretFile(_file_name); + } + + public: + // accessors + const string getFileName() const + { + return _file_name; + } + + bool getAlwaysRefresh() const + { + return _always_refresh; + } + + bool getCausal() const + { + return _causal; + } + + bool getDrawable() const + { + return _drawable; + } + + bool getModified() const + { + return _modified; + } + + bool getDisplayed() const + { + return _displayed; + } + + // modifiers + void setFileName(const string &file_name) + { + _file_name = file_name; + } + + void setAlwaysRefresh(bool b = true) + { + _always_refresh = b; + } + + void setCausal(bool b = true) + { + _causal = b; + } + + void setDrawable(bool b = true) + { + _drawable = b; + } + + void setModified(bool b = true) + { + if (_always_refresh) + return; + _modified = b; + } + + void setDisplayed(bool b = true) + { + _displayed = b; + } + + private: + string _file_name; + bool _always_refresh; + bool _causal; + bool _drawable; + bool _modified; + bool _displayed; + + protected: + Interpreter *_inter; #ifdef WITH_CXX_GUARDEDALLOC - MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StyleModule") + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StyleModule") #endif }; } /* namespace Freestyle */ -#endif // __FREESTYLE_STYLE_MODULE_H__ +#endif // __FREESTYLE_STYLE_MODULE_H__ |