diff options
Diffstat (limited to 'source/blender/freestyle/intern/stroke/StrokeRenderer.h')
| -rw-r--r-- | source/blender/freestyle/intern/stroke/StrokeRenderer.h | 146 |
1 files changed, 70 insertions, 76 deletions
diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h index 35e206a73c0..03e6893b578 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h @@ -34,7 +34,7 @@ #include "../system/FreestyleConfig.h" #ifdef WITH_CXX_GUARDEDALLOC -#include "MEM_guardedalloc.h" +# include "MEM_guardedalloc.h" #endif namespace Freestyle { @@ -47,72 +47,67 @@ namespace Freestyle { /* */ /**********************************/ - /*! Class to load textures */ -class TextureManager -{ -public: - TextureManager (); - virtual ~TextureManager (); - - static TextureManager *getInstance() - { - return _pInstance; - } - - void load(); - unsigned getBrushTextureIndex(string name, Stroke::MediumType iType = Stroke::OPAQUE_MEDIUM); - - inline bool hasLoaded() const - { - return _hasLoadedTextures; - } - - inline unsigned int getDefaultTextureId() const - { - return _defaultTextureId; - } - - struct Options - { - static void setPatternsPath(const string& path); - static string getPatternsPath(); - - static void setBrushesPath(const string& path); - static string getBrushesPath(); - }; - -protected: - virtual void loadStandardBrushes() = 0; - virtual unsigned loadBrush(string fileName, Stroke::MediumType = Stroke::OPAQUE_MEDIUM) = 0; - - typedef std::pair<string, Stroke::MediumType> BrushTexture; - struct cmpBrushTexture - { - bool operator()(const BrushTexture& bt1, const BrushTexture& bt2) const - { - int r = strcmp(bt1.first.c_str(), bt2.first.c_str()); - if (r != 0) - return (r < 0); - else - return (bt1.second < bt2.second); - } - }; - typedef std::map<BrushTexture, unsigned, cmpBrushTexture> brushesMap; - - static TextureManager *_pInstance; - bool _hasLoadedTextures; - brushesMap _brushesMap; - static string _patterns_path; - static string _brushes_path; - unsigned int _defaultTextureId; +class TextureManager { + public: + TextureManager(); + virtual ~TextureManager(); + + static TextureManager *getInstance() + { + return _pInstance; + } + + void load(); + unsigned getBrushTextureIndex(string name, Stroke::MediumType iType = Stroke::OPAQUE_MEDIUM); + + inline bool hasLoaded() const + { + return _hasLoadedTextures; + } + + inline unsigned int getDefaultTextureId() const + { + return _defaultTextureId; + } + + struct Options { + static void setPatternsPath(const string &path); + static string getPatternsPath(); + + static void setBrushesPath(const string &path); + static string getBrushesPath(); + }; + + protected: + virtual void loadStandardBrushes() = 0; + virtual unsigned loadBrush(string fileName, Stroke::MediumType = Stroke::OPAQUE_MEDIUM) = 0; + + typedef std::pair<string, Stroke::MediumType> BrushTexture; + struct cmpBrushTexture { + bool operator()(const BrushTexture &bt1, const BrushTexture &bt2) const + { + int r = strcmp(bt1.first.c_str(), bt2.first.c_str()); + if (r != 0) + return (r < 0); + else + return (bt1.second < bt2.second); + } + }; + typedef std::map<BrushTexture, unsigned, cmpBrushTexture> brushesMap; + + static TextureManager *_pInstance; + bool _hasLoadedTextures; + brushesMap _brushesMap; + static string _patterns_path; + static string _brushes_path; + unsigned int _defaultTextureId; #ifdef WITH_CXX_GUARDEDALLOC - MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:TextureManager") + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:TextureManager") #endif }; - /**********************************/ /* */ /* */ @@ -122,28 +117,27 @@ protected: /**********************************/ /*! Class to render a stroke. Creates a triangle strip and stores it strip is lazily created at the first rendering */ -class StrokeRenderer -{ -public: - StrokeRenderer(); - virtual ~StrokeRenderer(); +class StrokeRenderer { + public: + StrokeRenderer(); + virtual ~StrokeRenderer(); - /*! Renders a stroke rep */ - virtual void RenderStrokeRep(StrokeRep *iStrokeRep) const = 0; - virtual void RenderStrokeRepBasic(StrokeRep *iStrokeRep) const = 0; + /*! Renders a stroke rep */ + virtual void RenderStrokeRep(StrokeRep *iStrokeRep) const = 0; + virtual void RenderStrokeRepBasic(StrokeRep *iStrokeRep) const = 0; - // initializes the texture manager - // lazy, checks if it has already been done - static bool loadTextures(); + // initializes the texture manager + // lazy, checks if it has already been done + static bool loadTextures(); - //static unsigned int getTextureIndex(unsigned int index); - static TextureManager *_textureManager; + //static unsigned int getTextureIndex(unsigned int index); + static TextureManager *_textureManager; #ifdef WITH_CXX_GUARDEDALLOC - MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeRenderer") + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeRenderer") #endif }; } /* namespace Freestyle */ -#endif // __FREESTYLE_STROKE_RENDERER_H__ +#endif // __FREESTYLE_STROKE_RENDERER_H__ |