kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Removed duplicated definitions of verticesBegin(), verticesEnd(),

Browse Source 
pointsBegin(), and pointsEnd().  All these methods are inherited
from the Interface1D class.
This commit is contained in:
Tamito Kajiyama 2010-04-10 14:46:02 +00:00
parent cc3ca0f041
commit 7a4a3ec626
4 changed files with 0 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
View File

@ -30,10 +30,6 @@ static PyObject * FEdge_setPreviousEdge( BPy_FEdge *self , PyObject *args);
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 @@ static PyMethodDef BPy_FEdge_methods[] = {
{"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 @@ PyObject *FEdge_setSmooth( BPy_FEdge *self , PyObject *args) {
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

46
source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
View File

@ -17,11 +17,6 @@ static PyObject * FrsCurve_push_vertex_back( BPy_FrsCurve *self, PyObject *args
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 @@ static PyMethodDef BPy_FrsCurve_methods[] = {
{"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 @@ PyObject * FrsCurve_nSegments( BPy_FrsCurve *self ) {
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

39
source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
View File

@ -36,10 +36,6 @@ static PyObject * Stroke_setTips( BPy_Stroke *self , PyObject *args);
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 @@ static PyMethodDef BPy_Stroke_methods[] = {
{"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,36 +325,6 @@ PyObject * Stroke_strokeVerticesEnd( BPy_Stroke *self ) {
PyObject * Stroke_strokeVerticesSize( BPy_Stroke *self ) {
return PyLong_FromLong( self->s->strokeVerticesSize() );
}
PyObject * Stroke_verticesBegin( BPy_Stroke *self ) {
Interface0DIterator if0D_it( self->s->verticesBegin() );
return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 );
}
PyObject * Stroke_verticesEnd( BPy_Stroke *self ) {
Interface0DIterator if0D_it( self->s->verticesEnd() );
return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 );
}
PyObject * Stroke_pointsBegin( BPy_Stroke *self , PyObject *args) {
float f = 0;
if(!( PyArg_ParseTuple(args, "|f", &f) ))
return NULL;
Interface0DIterator if0D_it( self->s->pointsBegin(f) );
return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 );
}
PyObject * Stroke_pointsEnd( BPy_Stroke *self , PyObject *args) {
float f = 0;
if(!( PyArg_ParseTuple(args, "|f", &f) ))
return NULL;
Interface0DIterator if0D_it( self->s->pointsEnd(f) );
return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 );
}
///////////////////////////////////////////////////////////////////////////////////////////

39
source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
View File

@ -36,10 +36,6 @@ static PyObject * ViewEdge_setId( BPy_ViewEdge *self, PyObject *args ) ;
static PyObject * ViewEdge_UpdateFEdges( BPy_ViewEdge *self );
static PyObject * ViewEdge_setaShape( BPy_ViewEdge *self, PyObject *args );
static PyObject * ViewEdge_setQI( BPy_ViewEdge *self, PyObject *args );
static PyObject * ViewEdge_verticesBegin( BPy_ViewEdge *self );
static PyObject * ViewEdge_verticesEnd( BPy_ViewEdge *self );
static PyObject * ViewEdge_pointsBegin( BPy_ViewEdge *self, PyObject *args );
static PyObject * ViewEdge_pointsEnd( BPy_ViewEdge *self, PyObject *args );
static PyObject * ViewEdge_qi( BPy_ViewEdge *self );
@ -64,10 +60,6 @@ static PyMethodDef BPy_ViewEdge_methods[] = {
{"UpdateFEdges", ( PyCFunction ) ViewEdge_UpdateFEdges, METH_NOARGS, "() Sets ViewEdge to this for all embedded fedges"},
{"setaShape", ( PyCFunction ) ViewEdge_setaShape, METH_VARARGS, "(ViewShape vs) Sets the occluded ViewShape"},
{"setQI", ( PyCFunction ) ViewEdge_setQI, METH_VARARGS, "(int qi) Sets the quantitative invisibility value."},
{"verticesBegin", ( PyCFunction ) ViewEdge_verticesBegin, METH_NOARGS, "() Returns an Interface0DIterator to iterate over the SVertex constituing the embedding of this ViewEdge. The returned Interface0DIterator points to the first SVertex of the ViewEdge."},
{"verticesEnd", ( PyCFunction ) ViewEdge_verticesEnd, METH_NOARGS, "() Returns an Interface0DIterator to iterate over the SVertex constituing the embedding of this ViewEdge. The returned Interface0DIterator points after the last SVertex of the ViewEdge."},
{"pointsBegin", ( PyCFunction ) ViewEdge_pointsBegin, METH_VARARGS, "(float t=0) Returns an Interface0DIterator to iterate over the points of this ViewEdge at a given resolution t. The returned Interface0DIterator points on the first Point of the ViewEdge."},
{"pointsEnd", ( PyCFunction ) ViewEdge_pointsEnd, METH_VARARGS, "(float t=0) Returns an Interface0DIterator to iterate over the points of this ViewEdge at a given resolution t. The returned Interface0DIterator points after the last Point of the ViewEdge."},
{"qi", ( PyCFunction ) ViewEdge_qi, METH_NOARGS, "() Returns the quantitative invisibility of the ViewEdge."},
{NULL, NULL, 0, NULL}
};
@ -310,37 +302,6 @@ PyObject * ViewEdge_setQI( BPy_ViewEdge *self, PyObject *args ) {
Py_RETURN_NONE;
}
PyObject * ViewEdge_verticesBegin( BPy_ViewEdge *self ) {
Interface0DIterator if0D_it( self->ve->verticesBegin() );
return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 );
}
PyObject * ViewEdge_verticesEnd( BPy_ViewEdge *self ) {
Interface0DIterator if0D_it( self->ve->verticesEnd() );
return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 );
}
PyObject * ViewEdge_pointsBegin( BPy_ViewEdge *self, PyObject *args ) {
float f = 0;
if(!( PyArg_ParseTuple(args, "|f", &f) ))
return NULL;
Interface0DIterator if0D_it( self->ve->pointsBegin(f) );
return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 0 );
}
PyObject * ViewEdge_pointsEnd( BPy_ViewEdge *self, PyObject *args ) {
float f = 0;
if(!( PyArg_ParseTuple(args, "|f", &f) ))
return NULL;
Interface0DIterator if0D_it( self->ve->pointsEnd(f) );
return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it, 1 );
}
PyObject * ViewEdge_qi( BPy_ViewEdge *self ) {
return PyLong_FromLong( self->ve->qi() );
}