diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-15 19:21:27 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-08-12 05:10:20 +0400 |
| commit | fc85446c500fbe70515567e94122fc0d8746f3e5 (patch) | |
| tree | f468d3d79cf395ea443682cdb1a92b42640e2550 /source/blender/freestyle/intern/stroke/StrokeRep.h | |
| parent | 4677684cfd18ea92f72bc5f24dc453cb1919e513 (diff) | |
Freestyle: Added preliminary support for textured strokes in Cycles.
Now the shader node tree of a line style ID datablock is used to define textures
as well as their mapping and influence.
TODO: Textures alpha channel mapping and influence.
TODO: Blend mode in the Output Line Style shader node.
Diffstat (limited to 'source/blender/freestyle/intern/stroke/StrokeRep.h')
| -rw-r--r-- | source/blender/freestyle/intern/stroke/StrokeRep.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.h b/source/blender/freestyle/intern/stroke/StrokeRep.h index 50615e0c571..dad36cd01ed 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRep.h +++ b/source/blender/freestyle/intern/stroke/StrokeRep.h @@ -38,6 +38,7 @@ extern "C" { #include "DNA_material_types.h" // for MAX_MTEX +struct FreestyleLineStyle; } namespace Freestyle { @@ -186,6 +187,7 @@ protected: float _textureStep; MTex *_mtex[MAX_MTEX]; Material *_material; + FreestyleLineStyle *_lineStyle; // float _averageTextureAlpha; @@ -222,6 +224,11 @@ public: return _material; } + inline FreestyleLineStyle *getLineStyle() const + { + return _lineStyle; + } + inline vector<Strip*>& getStrips() { return _strips; @@ -258,6 +265,11 @@ public: _mtex[idx] = mtex_ptr; }*/ + inline void setLineStyle(FreestyleLineStyle *iLineStyle) + { + _lineStyle = iLineStyle; + } + #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeRep") #endif |