diff options
Diffstat (limited to 'source/blender/freestyle/intern/python/StrokeShader')
30 files changed, 59 insertions, 1122 deletions
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp index 045377e747e..26b83791585 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char BackboneStretcherShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`BackboneStretcherShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`BackboneStretcherShader`\n" "\n" "[Geometry shader]\n" "\n" @@ -52,7 +52,7 @@ static char BackboneStretcherShader___doc__[] = " respective directions: v(1)v(0) and v(n-1)v(n).\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int BackboneStretcherShader___init__(BPy_BackboneStretcherShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp index 002d6798df9..df076e0453a 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char BezierCurveShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`BezierCurveShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`BezierCurveShader`\n" "\n" "[Geometry shader]\n" "\n" @@ -54,7 +54,7 @@ static char BezierCurveShader___doc__[] = " Bezier Curve approximation of the original backbone geometry.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int BezierCurveShader___init__(BPy_BezierCurveShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp index c8b9d7098e4..0e603e00f97 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp @@ -37,42 +37,51 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char BlenderTextureShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`BlenderTextureShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`BlenderTextureShader`\n" "\n" "[Texture shader]\n" "\n" -".. method:: __init__(LineStyleTextureSlot)\n" +".. method:: __init__(texture)\n" "\n" " Builds a BlenderTextureShader object.\n" "\n" -" :arg mtex: texture slot to add to stroke shading.\n" -" :type mtex: LineStyleTextureSlot\n" - +" :arg texture: A line style texture slot or a shader node tree to define\n" +" a set of textures.\n" +" :type texture: :class:`bpy.types.LineStyleTextureSlot` or\n" +" :class:`bpy.types.ShaderNodeTree`\n" "\n" ".. method:: shade(stroke)\n" "\n" -" Assigns a blender texture slot to the stroke shading\n" -" in order to simulate marks.\n" +" Assigns a blender texture slot to the stroke shading in order to\n" +" simulate marks.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int BlenderTextureShader___init__(BPy_BlenderTextureShader *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"LineStyleTextureSlot", NULL}; - PyObject *py_mtex; + static const char *kwlist[] = {"texture", NULL}; + PyObject *obj; MTex *_mtex; + bNodeTree *_nodetree; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", (char **)kwlist, &py_mtex)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", (char **)kwlist, &obj)) return -1; - - _mtex = (MTex*)PyC_RNA_AsPointer(py_mtex, "LineStyleTextureSlot"); - + _mtex = (MTex *)PyC_RNA_AsPointer(obj, "LineStyleTextureSlot"); if (_mtex) { self->py_ss.ss = new StrokeShaders::BlenderTextureShader(_mtex); + return 0; } - - return 0; + PyErr_Clear(); + _nodetree = (bNodeTree *)PyC_RNA_AsPointer(obj, "ShaderNodeTree"); + if (_nodetree) { + self->py_ss.ss = new StrokeShaders::BlenderTextureShader(_nodetree); + return 0; + } + PyErr_Format(PyExc_TypeError, + "expected either 'LineStyleTextureSlot' or 'ShaderNodeTree', " + "found '%.200s' instead", Py_TYPE(obj)->tp_name); + return -1; } /*-----------------------BPy_BlenderTextureShader type definition ------------------------------*/ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp index 814d03b42d4..fb85ee5a792 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp @@ -36,7 +36,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char CalligraphicShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`CalligraphicShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`CalligraphicShader`\n" "\n" "[Thickness Shader]\n" "\n" @@ -65,12 +65,7 @@ static char CalligraphicShader___doc__[] = " perpendicular to this one, and an interpolation inbetween.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; - -static int convert_v2(PyObject *obj, void *v) -{ - return float_array_from_PyObject(obj, (float *)v, 2); -} +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int CalligraphicShader___init__(BPy_CalligraphicShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp index f3b9167de09..c4ed45ec820 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char ColorNoiseShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`ColorNoiseShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`ColorNoiseShader`\n" "\n" "[Color shader]\n" "\n" @@ -53,7 +53,7 @@ static char ColorNoiseShader___doc__[] = " Shader to add noise to the stroke colors.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int ColorNoiseShader___init__(BPy_ColorNoiseShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp deleted file mode 100644 index 183edd1f6a0..00000000000 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp +++ /dev/null @@ -1,122 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp - * \ingroup freestyle - */ - -#include "BPy_ColorVariationPatternShader.h" - -#include "../../stroke/BasicStrokeShaders.h" -#include "../BPy_Convert.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/////////////////////////////////////////////////////////////////////////////////////////// - -//------------------------INSTANCE METHODS ---------------------------------- - -static char ColorVariationPatternShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`ColorVariationPatternShader`\n" -"\n" -"[Color shader]\n" -"\n" -".. method:: __init__(pattern_name, stretch=True)\n" -"\n" -" Builds a ColorVariationPatternShader object.\n" -"\n" -" :arg pattern_name: The file name of the texture file to use as\n" -" pattern.\n" -" :type pattern_name: str\n" -" :arg stretch: Tells whether the texture must be strecthed or\n" -" repeted to fit the stroke.\n" -" :type stretch: bool\n" -"\n" -".. method:: shade(stroke)\n" -"\n" -" Applies a pattern to vary the original color. The new color is the\n" -" result of the multiplication of the pattern and the original color.\n" -"\n" -" :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; - -static int ColorVariationPatternShader___init__(BPy_ColorVariationPatternShader *self, PyObject *args, PyObject *kwds) -{ - static const char *kwlist[] = {"pattern_name", "stretch", NULL}; - const char *s; - PyObject *obj = 0; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|O!", (char **)kwlist, &s, &PyBool_Type, &obj)) - return -1; - bool b = (!obj) ? true : bool_from_PyBool(obj); - self->py_ss.ss = new StrokeShaders::ColorVariationPatternShader(s, b); - return 0; -} - -/*-----------------------BPy_ColorVariationPatternShader type definition ------------------------------*/ - -PyTypeObject ColorVariationPatternShader_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "ColorVariationPatternShader", /* tp_name */ - sizeof(BPy_ColorVariationPatternShader), /* tp_basicsize */ - 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - ColorVariationPatternShader___doc__, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - &StrokeShader_Type, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)ColorVariationPatternShader___init__, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ -}; - -/////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h deleted file mode 100644 index af5cf17caff..00000000000 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h - * \ingroup freestyle - */ - -#ifndef __FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H__ -#define __FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H__ - -#include "../BPy_StrokeShader.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/////////////////////////////////////////////////////////////////////////////////////////// - -extern PyTypeObject ColorVariationPatternShader_Type; - -#define BPy_ColorVariationPatternShader_Check(v) \ - (PyObject_IsInstance((PyObject *)v, (PyObject *)&ColorVariationPatternShader_Type)) - -/*---------------------------Python BPy_ColorVariationPatternShader structure definition----------*/ -typedef struct { - BPy_StrokeShader py_ss; -} BPy_ColorVariationPatternShader; - - -/////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif - - -#endif /* __FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp index b5607f7a7b4..6607d5798f4 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char ConstantColorShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`ConstantColorShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`ConstantColorShader`\n" "\n" "[Color shader]\n" "\n" @@ -57,7 +57,7 @@ static char ConstantColorShader___doc__[] = " Assigns a constant color to every vertex of the Stroke.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int ConstantColorShader___init__(BPy_ConstantColorShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp index 6bc348dd7c5..c8cc41303d8 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char ConstantThicknessShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`ConstantThicknessShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`ConstantThicknessShader`\n" "\n" "[Thickness shader]\n" "\n" @@ -51,7 +51,7 @@ static char ConstantThicknessShader___doc__[] = " Assigns an absolute constant thickness to every vertex of the Stroke.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int ConstantThicknessShader___init__(BPy_ConstantThicknessShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp index 119ba84abd3..6e1886398b6 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char ConstrainedIncreasingThicknessShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`ConstrainedIncreasingThicknessShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`ConstrainedIncreasingThicknessShader`\n" "\n" "[Thickness shader]\n" "\n" @@ -57,7 +57,7 @@ static char ConstrainedIncreasingThicknessShader___doc__[] = " fat short lines.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int ConstrainedIncreasingThicknessShader___init__(BPy_ConstrainedIncreasingThicknessShader *self, PyObject *args, PyObject *kwds) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp index e2a9a99a392..0c9b26fa434 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char GuidingLinesShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`GuidingLinesShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`GuidingLinesShader`\n" "\n" "[Geometry shader]\n" "\n" @@ -59,7 +59,7 @@ static char GuidingLinesShader___doc__[] = " approximation is.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int GuidingLinesShader___init__(BPy_GuidingLinesShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp index cec0aeba58c..1ed98d62dd9 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char IncreasingColorShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`IncreasingColorShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`IncreasingColorShader`\n" "\n" "[Color shader]\n" "\n" @@ -67,7 +67,7 @@ static char IncreasingColorShader___doc__[] = " between the first and the last vertex.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int IncreasingColorShader___init__(BPy_IncreasingColorShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp index ef84b9d6fd3..c9c38a9b70a 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char IncreasingThicknessShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`IncreasingThicknessShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`IncreasingThicknessShader`\n" "\n" "[Thickness shader]\n" "\n" @@ -57,7 +57,7 @@ static char IncreasingThicknessShader___doc__[] = " linearly interpolated from A to B.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int IncreasingThicknessShader___init__(BPy_IncreasingThicknessShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp index f405162a918..f5df1ed929f 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char PolygonalizationShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`PolygonalizationShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`PolygonalizationShader`\n" "\n" "[Geometry shader]\n" "\n" @@ -58,7 +58,7 @@ static char PolygonalizationShader___doc__[] = " error is reached.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int PolygonalizationShader___init__(BPy_PolygonalizationShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp index 94e95362ce7..2fa7b00a3b7 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char SamplingShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`SamplingShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`SamplingShader`\n" "\n" "[Geometry shader]\n" "\n" @@ -51,7 +51,7 @@ static char SamplingShader___doc__[] = " Resamples the stroke.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int SamplingShader___init__(BPy_SamplingShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp index ca69561d8e0..750dc6b9eb1 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char SmoothingShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`SmoothingShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`SmoothingShader`\n" "\n" "[Geometry shader]\n" "\n" @@ -71,7 +71,7 @@ static char SmoothingShader___doc__[] = " prevent the diffusion across corners.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int SmoothingShader___init__(BPy_SmoothingShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp index ae96400de8f..b28c3bd0f96 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp @@ -36,7 +36,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char SpatialNoiseShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`SpatialNoiseShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`SpatialNoiseShader`\n" "\n" "[Geometry shader]\n" "\n" @@ -61,7 +61,7 @@ static char SpatialNoiseShader___doc__[] = " more noisy.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int SpatialNoiseShader___init__(BPy_SpatialNoiseShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp deleted file mode 100644 index 5522dd46f0a..00000000000 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp +++ /dev/null @@ -1,143 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp - * \ingroup freestyle - */ - -#include "BPy_StrokeTextureShader.h" - -#include "../../stroke/BasicStrokeShaders.h" -#include "../BPy_Convert.h" -#include "../BPy_MediumType.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/////////////////////////////////////////////////////////////////////////////////////////// - -//------------------------INSTANCE METHODS ---------------------------------- - -static char StrokeTextureShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`StrokeTextureShader`\n" -"\n" -"[Texture shader]\n" -"\n" -".. method:: __init__(texture_file, medium_type=Stroke.OPAQUE_MEDIUM, tips=False)\n" -"\n" -" Builds a StrokeTextureShader object.\n" -"\n" -" :arg texture_file: \n" -" :type texture_file: str\n" -" :arg medium_type: The medium type and therefore, the blending mode\n" -" that must be used for the rendering of this stroke.\n" -" :type medium_type: :class:`MediumType`\n" -" :arg tips: Tells whether the texture includes tips or not. If it\n" -" is the case, the texture image must respect the following format.\n" -" :type tips: bool\n" -"\n" -" The format of a texture image including tips::\n" -"\n" -" ___________\n" -" | |\n" -" | A |\n" -" |___________|\n" -" | | |\n" -" | B | C |\n" -" |_____|_____|\n" -"\n" -" * A : The stroke's corpus texture.\n" -" * B : The stroke's left extremity texture.\n" -" * C : The stroke's right extremity texture.\n" -"\n" -".. method:: shade(stroke)\n" -"\n" -" Assigns a texture and a blending mode to the stroke in order to\n" -" simulate its marks system.\n" -"\n" -" :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; - -static int StrokeTextureShader___init__(BPy_StrokeTextureShader *self, PyObject *args, PyObject *kwds) -{ - static const char *kwlist[] = {"texture_file", "medium_type", "tips", NULL}; - const char *s1; - PyObject *obj2 = 0, *obj3 = 0; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|O!O!", (char **)kwlist, - &s1, &MediumType_Type, &obj2, &PyBool_Type, &obj3)) - { - return -1; - } - Stroke::MediumType mt = (!obj2) ? Stroke::OPAQUE_MEDIUM : MediumType_from_BPy_MediumType(obj2); - bool b = (!obj3) ? false : bool_from_PyBool(obj3); - self->py_ss.ss = new StrokeShaders::StrokeTextureShader(s1, mt, b); - return 0; -} - -/*-----------------------BPy_StrokeTextureShader type definition ------------------------------*/ - -PyTypeObject StrokeTextureShader_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "StrokeTextureShader", /* tp_name */ - sizeof(BPy_StrokeTextureShader), /* tp_basicsize */ - 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - StrokeTextureShader___doc__, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - &StrokeShader_Type, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)StrokeTextureShader___init__, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ -}; - -/////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h deleted file mode 100644 index d025e8b7c2d..00000000000 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h - * \ingroup freestyle - */ - -#ifndef __FREESTYLE_PYTHON_STROKETEXTURESHADER_H__ -#define __FREESTYLE_PYTHON_STROKETEXTURESHADER_H__ - -#include "../BPy_StrokeShader.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/////////////////////////////////////////////////////////////////////////////////////////// - -extern PyTypeObject StrokeTextureShader_Type; - -#define BPy_StrokeTextureShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&StrokeTextureShader_Type)) - -/*---------------------------Python BPy_StrokeTextureShader structure definition----------*/ -typedef struct { - BPy_StrokeShader py_ss; -} BPy_StrokeTextureShader; - - -/////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif - - -#endif /* __FREESTYLE_PYTHON_STROKETEXTURESHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp index 5a7657f2dad..33962f8e41a 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char StrokeTextureStepShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`StrokeTextureStepShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`StrokeTextureStepShader`\n" "\n" "[Texture shader]\n" "\n" @@ -51,7 +51,7 @@ static char StrokeTextureStepShader___doc__[] = " Assigns a spacing factor to the texture coordinates of the Stroke.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int StrokeTextureStepShader___init__(BPy_StrokeTextureStepShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp deleted file mode 100644 index 11bac684cf0..00000000000 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp +++ /dev/null @@ -1,130 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp - * \ingroup freestyle - */ - -#include "BPy_TextureAssignerShader.h" - -#include "../../stroke/BasicStrokeShaders.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/////////////////////////////////////////////////////////////////////////////////////////// - -//------------------------INSTANCE METHODS ---------------------------------- - -static char TextureAssignerShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`TextureAssignerShader`\n" -"\n" -"[Texture shader]\n" -"\n" -".. method:: __init__(preset)\n" -"\n" -" Builds a TextureAssignerShader object.\n" -"\n" -" :arg preset: The preset number to use.\n" -" :type preset: int\n" -"\n" -".. method:: shade(stroke)\n" -"\n" -" Assigns a texture to the stroke in order to simulate its marks\n" -" system. This shader takes as input an integer value telling which\n" -" texture and blending mode to use among a set of predefined\n" -" textures. Here are the different presets:\n" -"\n" -" * 0: `/brushes/charcoalAlpha.bmp`, `Stroke.HUMID_MEDIUM`\n" -" * 1: `/brushes/washbrushAlpha.bmp`, `Stroke.HUMID_MEDIUM`\n" -" * 2: `/brushes/oil.bmp`, `Stroke.HUMID_MEDIUM`\n" -" * 3: `/brushes/oilnoblend.bmp`, `Stroke.HUMID_MEDIUM`\n" -" * 4: `/brushes/charcoalAlpha.bmp`, `Stroke.DRY_MEDIUM`\n" -" * 5: `/brushes/washbrushAlpha.bmp`, `Stroke.DRY_MEDIUM`\n" -" * 6: `/brushes/opaqueDryBrushAlpha.bmp`, `Stroke.OPAQUE_MEDIUM`\n" -" * 7: `/brushes/opaqueBrushAlpha.bmp`, `Stroke.OPAQUE_MEDIUM`\n" -"\n" -" Any other value will lead to the following preset:\n" -"\n" -" * Default: `/brushes/smoothAlpha.bmp`, `Stroke.OPAQUE_MEDIUM`\n" -"\n" -" :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; - -static int TextureAssignerShader___init__(BPy_TextureAssignerShader *self, PyObject *args, PyObject *kwds) -{ - static const char *kwlist[] = {"preset", NULL}; - int i; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "i", (char **)kwlist, &i)) - return -1; - self->py_ss.ss = new StrokeShaders::TextureAssignerShader(i); - return 0; -} - -/*-----------------------BPy_TextureAssignerShader type definition ------------------------------*/ - -PyTypeObject TextureAssignerShader_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "TextureAssignerShader", /* tp_name */ - sizeof(BPy_TextureAssignerShader), /* tp_basicsize */ - 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - TextureAssignerShader___doc__, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - &StrokeShader_Type, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)TextureAssignerShader___init__, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ -}; - -/////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h deleted file mode 100644 index 046f785dc57..00000000000 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h - * \ingroup freestyle - */ - -#ifndef __FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H__ -#define __FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H__ - -#include "../BPy_StrokeShader.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/////////////////////////////////////////////////////////////////////////////////////////// - -extern PyTypeObject TextureAssignerShader_Type; - -#define BPy_TextureAssignerShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TextureAssignerShader_Type)) - -/*---------------------------Python BPy_TextureAssignerShader structure definition----------*/ -typedef struct { - BPy_StrokeShader py_ss; -} BPy_TextureAssignerShader; - - -/////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif - - -#endif /* __FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp index 655a5c8fe98..acd4f4172fb 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char ThicknessNoiseShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`ThicknessNoiseShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`ThicknessNoiseShader`\n" "\n" "[Thickness shader]\n" "\n" @@ -53,7 +53,7 @@ static char ThicknessNoiseShader___doc__[] = " Adds some noise to the stroke thickness.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int ThicknessNoiseShader___init__(BPy_ThicknessNoiseShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp deleted file mode 100644 index 1f892455b29..00000000000 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp +++ /dev/null @@ -1,128 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp - * \ingroup freestyle - */ - -#include "BPy_ThicknessVariationPatternShader.h" - -#include "../../stroke/BasicStrokeShaders.h" -#include "../BPy_Convert.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/////////////////////////////////////////////////////////////////////////////////////////// - -//------------------------INSTANCE METHODS ---------------------------------- - -static char ThicknessVariationPatternShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`ThicknessVariationPatternShader`\n" -"\n" -"[Thickness shader]\n" -"\n" -".. method:: __init__(pattern_name, thickness_min=1.0, thickness_max=5.0, stretch=True)\n" -"\n" -" Builds a ThicknessVariationPatternShader object.\n" -"\n" -" :arg pattern_name: The texture file name.\n" -" :type pattern_name: str\n" -" :arg thickness_min: The minimum thickness we don't want to exceed.\n" -" :type thickness_min: float\n" -" :arg thickness_max: The maximum thickness we don't want to exceed.\n" -" :type thickness_max: float\n" -" :arg stretch: Tells whether the pattern texture must be stretched\n" -" or repeated to fit the stroke.\n" -" :type stretch: bool\n" -"\n" -".. method:: shade(stroke)\n" -"\n" -" Applies a pattern (texture) to vary thickness. The new thicknesses\n" -" are the result of the multiplication of the pattern and the\n" -" original thickness.\n" -"\n" -" :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; - -static int ThicknessVariationPatternShader___init__(BPy_ThicknessVariationPatternShader *self, - PyObject *args, PyObject *kwds) -{ - static const char *kwlist[] = {"pattern_name", "thickness_min", "thickness_max", "stretch", NULL}; - const char *s1; - float f2 = 1.0, f3 = 5.0; - PyObject *obj4 = 0; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|ffO!", (char **)kwlist, &s1, &f2, &f3, &PyBool_Type, &obj4)) - return -1; - bool b = (!obj4) ? true : bool_from_PyBool(obj4); - self->py_ss.ss = new StrokeShaders::ThicknessVariationPatternShader(s1, f2, f3, b); - return 0; -} - -/*-----------------------BPy_ThicknessVariationPatternShader type definition ------------------------------*/ - -PyTypeObject ThicknessVariationPatternShader_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "ThicknessVariationPatternShader", /* tp_name */ - sizeof(BPy_ThicknessVariationPatternShader), /* tp_basicsize */ - 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - ThicknessVariationPatternShader___doc__, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - &StrokeShader_Type, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)ThicknessVariationPatternShader___init__, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ -}; - -/////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h deleted file mode 100644 index 604e875f815..00000000000 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h - * \ingroup freestyle - */ - -#ifndef __FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H__ -#define __FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H__ - -#include "../BPy_StrokeShader.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/////////////////////////////////////////////////////////////////////////////////////////// - -extern PyTypeObject ThicknessVariationPatternShader_Type; - -#define BPy_ThicknessVariationPatternShader_Check(v) \ - (PyObject_IsInstance((PyObject *)v, (PyObject *)&ThicknessVariationPatternShader_Type)) - -/*---------------------------Python BPy_ThicknessVariationPatternShader structure definition----------*/ -typedef struct { - BPy_StrokeShader py_ss; -} BPy_ThicknessVariationPatternShader; - - -/////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif - - -#endif /* __FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp index 8b04ee0886f..543cd17c01e 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char TipRemoverShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`TipRemoverShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`TipRemoverShader`\n" "\n" "[Geometry shader]\n" "\n" @@ -52,7 +52,7 @@ static char TipRemoverShader___doc__[] = " Removes the stroke's extremities.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int TipRemoverShader___init__(BPy_TipRemoverShader *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp deleted file mode 100644 index 0c060ef6ed9..00000000000 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp +++ /dev/null @@ -1,114 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp - * \ingroup freestyle - */ - -#include "BPy_fstreamShader.h" - -#include "../../stroke/AdvancedStrokeShaders.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/////////////////////////////////////////////////////////////////////////////////////////// - -//------------------------INSTANCE METHODS ---------------------------------- - -static char fstreamShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`fstreamShader`\n" -"\n" -"[Output shader]\n" -"\n" -".. method:: __init__(filename)\n" -"\n" -" Builds a fstreamShader object.\n" -"\n" -" :arg filename: The output file name.\n" -" :type filename: str\n" -"\n" -".. method:: shade(stroke)\n" -"\n" -" Streams the Stroke in a file.\n" -"\n" -" :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; - -static int fstreamShader___init__(BPy_fstreamShader *self, PyObject *args, PyObject *kwds) -{ - static const char *kwlist[] = {"filename", NULL}; - const char *s; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", (char **)kwlist, &s)) - return -1; - self->py_ss.ss = new StrokeShaders::fstreamShader(s); - return 0; -} - -/*-----------------------BPy_fstreamShader type definition ------------------------------*/ - -PyTypeObject fstreamShader_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "fstreamShader", /* tp_name */ - sizeof(BPy_fstreamShader), /* tp_basicsize */ - 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - fstreamShader___doc__, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - &StrokeShader_Type, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)fstreamShader___init__, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ -}; - -/////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h deleted file mode 100644 index 9f2371a3756..00000000000 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h - * \ingroup freestyle - */ - -#ifndef __FREESTYLE_PYTHON_FSTREAMSHADER_H__ -#define __FREESTYLE_PYTHON_FSTREAMSHADER_H__ - -#include "../BPy_StrokeShader.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/////////////////////////////////////////////////////////////////////////////////////////// - -extern PyTypeObject fstreamShader_Type; - -#define BPy_fstreamShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&fstreamShader_Type)) - -/*---------------------------Python BPy_fstreamShader structure definition----------*/ -typedef struct { - BPy_StrokeShader py_ss; -} BPy_fstreamShader; - - -/////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif - - -#endif /* __FREESTYLE_PYTHON_FSTREAMSHADER_H__ */ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp deleted file mode 100644 index daa10e1b38f..00000000000 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp - * \ingroup freestyle - */ - -#include "BPy_streamShader.h" - -#include "../../stroke/BasicStrokeShaders.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/////////////////////////////////////////////////////////////////////////////////////////// - -//------------------------INSTANCE METHODS ---------------------------------- - -static char streamShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`streamShader`\n" -"\n" -"[Output shader]\n" -"\n" -".. method:: __init__()\n" -"\n" -" Builds a streamShader object.\n" -"\n" -".. method:: shade(stroke)\n" -"\n" -" Streams the Stroke into stdout.\n" -"\n" -" :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; - -static int streamShader___init__(BPy_streamShader *self, PyObject *args, PyObject *kwds) -{ - static const char *kwlist[] = {NULL}; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist)) - return -1; - self->py_ss.ss = new StrokeShaders::streamShader(); - return 0; -} - -/*-----------------------BPy_streamShader type definition ------------------------------*/ - -PyTypeObject streamShader_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "streamShader", /* tp_name */ - sizeof(BPy_streamShader), /* tp_basicsize */ - 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - streamShader___doc__, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - &StrokeShader_Type, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)streamShader___init__, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ -}; - -/////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h deleted file mode 100644 index 047ff4b58b5..00000000000 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h - * \ingroup freestyle - */ - -#ifndef __FREESTYLE_PYTHON_STREAMSHADER_H__ -#define __FREESTYLE_PYTHON_STREAMSHADER_H__ - -#include "../BPy_StrokeShader.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/////////////////////////////////////////////////////////////////////////////////////////// - -extern PyTypeObject streamShader_Type; - -#define BPy_streamShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&streamShader_Type)) - -/*---------------------------Python BPy_streamShader structure definition----------*/ -typedef struct { - BPy_StrokeShader py_ss; -} BPy_streamShader; - - -/////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif - - -#endif /* __FREESTYLE_PYTHON_STREAMSHADER_H__ */ |