Revision: 28114
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28114
Author: kjym3
Date: 2010-04-10 16:46:02 +0200 (Sat, 10 Apr 2010)
Log Message:
-----------
Removed duplicated definitions of verticesBegin(), verticesEnd(),
pointsBegin(), and pointsEnd(). All these methods are inherited
from the Interface1D class.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
2010-04-10 14:29:11 UTC (rev 28113)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
2010-04-10 14:46:02 UTC (rev 28114)
@@ -30,10 +30,6 @@
static PyObject * FEdge_setSmooth( BPy_FEdge *self , PyObject *args);
static PyObject * FEdge_setNature( BPy_FEdge *self, PyObject *args );
static PyObject * FEdge_setViewEdge( BPy_FEdge *self, PyObject *args );
-static PyObject * FEdge_verticesBegin( BPy_FEdge *self );
-static PyObject * FEdge_verticesEnd( BPy_FEdge *self );
-static PyObject * FEdge_pointsBegin( BPy_FEdge *self, PyObject *args );
-static PyObject * FEdge_pointsEnd( BPy_FEdge *self, PyObject *args );
/*----------------------FEdge instance definitions
----------------------------*/
static PyMethodDef BPy_FEdge_methods[] = {
@@ -53,10 +49,6 @@
{"setSmooth", ( PyCFunction ) FEdge_setSmooth, METH_VARARGS, "(bool b)
Sets the flag telling whether this FEdge is smooth or sharp. true for Smooth,
false for Sharp. "},
{"setViewEdge", ( PyCFunction ) FEdge_setViewEdge, METH_VARARGS,
"(ViewEdge ve) Sets the ViewEdge to which this FEdge belongs to."},
{"setNature", ( PyCFunction ) FEdge_setNature, METH_VARARGS, "(Nature
n) Sets the nature of this FEdge. "},
- {"verticesBegin", ( PyCFunction ) FEdge_verticesBegin, METH_NOARGS, "()
Returns an iterator over the 2 (!) SVertex pointing to the first SVertex."},
- {"verticesEnd", ( PyCFunction ) FEdge_verticesEnd, METH_NOARGS, "()
Returns an iterator over the 2 (!) SVertex pointing after the last SVertex. "},
- {"pointsBegin", ( PyCFunction ) FEdge_pointsBegin, METH_VARARGS,
"(float t=0) Returns an iterator over the FEdge points, pointing to the first
point. The difference with verticesBegin() is that here we can iterate over
points of the FEdge at a any given sampling t. Indeed, for each iteration, a
virtual point is created."},
- {"pointsEnd", ( PyCFunction ) FEdge_pointsEnd, METH_VARARGS, "(float
t=0) Returns an iterator over the FEdge points, pointing after the last point.
The difference with verticesEnd() is that here we can iterate over points of
the FEdge at a any given sampling t. Indeed, for each iteration, a virtual
point is created."},
{NULL, NULL, 0, NULL}
};
@@ -305,37 +297,6 @@
Py_RETURN_NONE;
}
-
-PyObject * FEdge_verticesBegin( BPy_FEdge *self ) {
- Interface0DIterator if0D_it( self->fe->verticesBegin() );
- return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 );
-}
-
-PyObject * FEdge_verticesEnd( BPy_FEdge *self ) {
- Interface0DIterator if0D_it( self->fe->verticesEnd() );
- return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 );
-}
-
-
-PyObject * FEdge_pointsBegin( BPy_FEdge *self, PyObject *args ) {
- float f = 0;
-
- if(!( PyArg_ParseTuple(args, "|f", &f) ))
- return NULL;
-
- Interface0DIterator if0D_it( self->fe->pointsBegin(f) );
- return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 );
-}
-
-PyObject * FEdge_pointsEnd( BPy_FEdge *self, PyObject *args ) {
- float f = 0;
-
- if(!( PyArg_ParseTuple(args, "|f", &f) ))
- return NULL;
-
- Interface0DIterator if0D_it( self->fe->pointsEnd(f) );
- return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 );
-}
///////////////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
2010-04-10 14:29:11 UTC (rev 28113)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
2010-04-10 14:46:02 UTC (rev 28114)
@@ -17,11 +17,6 @@
static PyObject * FrsCurve_push_vertex_front( BPy_FrsCurve *self, PyObject
*args );
static PyObject * FrsCurve_empty( BPy_FrsCurve *self );
static PyObject * FrsCurve_nSegments( BPy_FrsCurve *self );
-// point_iterator points_begin (float step=0)
-static PyObject * FrsCurve_verticesBegin( BPy_FrsCurve *self );
-static PyObject * FrsCurve_verticesEnd( BPy_FrsCurve *self );
-static PyObject * FrsCurve_pointsBegin( BPy_FrsCurve *self, PyObject *args );
-static PyObject * FrsCurve_pointsEnd( BPy_FrsCurve *self, PyObject *args );
/*----------------------FrsCurve instance definitions
----------------------------*/
static PyMethodDef BPy_FrsCurve_methods[] = {
@@ -29,10 +24,6 @@
{"push_vertex_front", ( PyCFunction ) FrsCurve_push_vertex_front,
METH_VARARGS, "(CurvePoint cp | SVertex sv) Adds a single vertex at the end of
the Curve."},
{"empty", ( PyCFunction ) FrsCurve_empty, METH_NOARGS, "() Returns true
is the Curve doesn't have any Vertex yet."},
{"nSegments", ( PyCFunction ) FrsCurve_nSegments, METH_NOARGS, "()
Returns the number of segments in the oplyline constituing the Curve."},
- {"verticesBegin", ( PyCFunction ) FrsCurve_verticesBegin, METH_NOARGS,
"() Returns an Interface0DIterator pointing onto the first vertex of the Curve
and that can iterate over the vertices of the Curve."},
- {"verticesEnd", ( PyCFunction ) FrsCurve_verticesEnd, METH_NOARGS, "()
Returns an Interface0DIterator pointing after the last vertex of the Curve and
that can iterate over the vertices of the Curve."},
- {"pointsBegin", ( PyCFunction ) FrsCurve_pointsBegin, METH_VARARGS,
"(float t=0) Returns an Interface0DIterator pointing onto the first point of
the Curve and that can iterate over the points of the Curve at any resolution
t. At each iteration a virtual temporary CurvePoint is created."},
- {"pointsEnd", ( PyCFunction ) FrsCurve_pointsEnd, METH_VARARGS, "(float
t=0) Returns an Interface0DIterator pointing after the last point of the Curve
and that can iterate over the points of the Curve at any resolution t. At each
iteration a virtual temporary CurvePoint is created."},
{NULL, NULL, 0, NULL}
};
@@ -154,43 +145,6 @@
return PyLong_FromLong( self->c->nSegments() );
}
-// point_iterator points_begin (float step=0)
-// not implemented
-
-
-PyObject * FrsCurve_verticesBegin( BPy_FrsCurve *self ) {
- Interface0DIterator if0D_it( self->c->verticesBegin() );
- return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 );
-}
-
-PyObject * FrsCurve_verticesEnd( BPy_FrsCurve *self ) {
- Interface0DIterator if0D_it( self->c->verticesEnd() );
- return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 );
-}
-
-
-PyObject * FrsCurve_pointsBegin( BPy_FrsCurve *self, PyObject *args ) {
- float f = 0;
-
- if(!( PyArg_ParseTuple(args, "|f", &f) ))
- return NULL;
-
- Interface0DIterator if0D_it( self->c->pointsBegin(f) );
- return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 );
-}
-
-PyObject * FrsCurve_pointsEnd( BPy_FrsCurve *self, PyObject *args ) {
- float f = 0;
-
- if(!( PyArg_ParseTuple(args, "|f", &f) ))
- return NULL;
-
- Interface0DIterator if0D_it( self->c->pointsEnd(f) );
- return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 );
-}
-
-
-
///////////////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
2010-04-10 14:29:11 UTC (rev 28113)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
2010-04-10 14:46:02 UTC (rev 28114)
@@ -36,10 +36,6 @@
static PyObject * Stroke_strokeVerticesBegin( BPy_Stroke *self , PyObject
*args);
static PyObject * Stroke_strokeVerticesEnd( BPy_Stroke *self );
static PyObject * Stroke_strokeVerticesSize( BPy_Stroke *self );
-static PyObject * Stroke_verticesBegin( BPy_Stroke *self );
-static PyObject * Stroke_verticesEnd( BPy_Stroke *self );
-static PyObject * Stroke_pointsBegin( BPy_Stroke *self , PyObject *args);
-static PyObject * Stroke_pointsEnd( BPy_Stroke *self , PyObject *args);
/*----------------------Stroke instance definitions
----------------------------*/
static PyMethodDef BPy_Stroke_methods[] = {
@@ -59,11 +55,6 @@
{"strokeVerticesBegin", ( PyCFunction ) Stroke_strokeVerticesBegin,
METH_VARARGS, "(float t=0.f) Returns a StrokeVertexIterator pointing on the
first StrokeVertex of the Stroke. One can specifly a sampling value t to
resample the Stroke on the fly if needed. "},
{"strokeVerticesEnd", ( PyCFunction ) Stroke_strokeVerticesEnd,
METH_NOARGS, "() Returns a StrokeVertexIterator pointing after the last
StrokeVertex of the Stroke."},
{"strokeVerticesSize", ( PyCFunction ) Stroke_strokeVerticesSize,
METH_NOARGS, "() Returns the number of StrokeVertex constituing the Stroke."},
- {"verticesBegin", ( PyCFunction ) Stroke_verticesBegin, METH_NOARGS,
"() Returns an Interface0DIterator pointing on the first StrokeVertex of the
Stroke. "},
- {"verticesEnd", ( PyCFunction ) Stroke_verticesEnd, METH_NOARGS, "()
Returns an Interface0DIterator pointing after the last StrokeVertex of the
Stroke. "},
- {"pointsBegin", ( PyCFunction ) Stroke_pointsBegin, METH_VARARGS,
"(float t=0.f) Returns an iterator over the Interface1D points, pointing to the
first point. The difference with verticesBegin() is that here we can iterate
over points of the 1D element at a any given sampling t. Indeed, for each
iteration, a virtual point is created. "},
- {"pointsEnd", ( PyCFunction ) Stroke_pointsEnd, METH_VARARGS, "(float
t=0.f) Returns an iterator over the Interface1D points, pointing after the last
point. The difference with verticesEnd() is that here we can iterate over
points of the 1D element at a any given sampling t. Indeed, for each iteration,
a virtual point is created. "},
-
{NULL, NULL, 0, NULL}
};
@@ -334,37 +325,7 @@
PyObject * Stroke_strokeVerticesSize( BPy_Stroke *self ) {
return PyLong_FromLong( self->s->strokeVerticesSize() );
}
-
-PyObject * Stroke_verticesBegin( BPy_Stroke *self ) {
- Interface0DIterator if0D_it( self->s->verticesBegin() );
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
