===Python API===
New API for accessing surface data (SurbNurb type). Right now it's hooked in through the Curve API, since Curve.Get() doesn't differentiate between curves and surfaces. If the curve object is 2D (pntsv > 1), the SurfNurb object is created. It is similar to the CurNurb type but not identical. There are only attributes and no methods yet, and the only methods which will be added are the non-getStuff/setStuff kind. Read the documentation to see how it works (sorry, no examples yet). This is a work in progress. Don't be surprised if the API changes some more.
This commit is contained in:
Ken Hughes
@@ -85,6 +85,7 @@ struct ID; /*keep me up here */
|
||||
#include "Registry.h"
|
||||
#include "Scene.h"
|
||||
#include "Sound.h"
|
||||
#include "SurfNurb.h"
|
||||
#include "Sys.h"
|
||||
#include "Text.h"
|
||||
#include "Texture.h"
|
||||
@@ -960,6 +961,7 @@ void M_Blender_Init(void)
|
||||
PyDict_SetItemString(dict, "Registry", Registry_Init());
|
||||
PyDict_SetItemString(dict, "Scene", Scene_Init());
|
||||
PyDict_SetItemString(dict, "Sound", Sound_Init());
|
||||
PyDict_SetItemString(dict, "SurfNurb", SurfNurb_Init());
|
||||
PyDict_SetItemString(dict, "sys", sys_Init());
|
||||
PyDict_SetItemString(dict, "Types", Types_Init());
|
||||
PyDict_SetItemString(dict, "Text", Text_Init());
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "BKE_curve.h"
|
||||
#include "MEM_guardedalloc.h" /* because we wil be mallocing memory */
|
||||
#include "CurNurb.h"
|
||||
#include "SurfNurb.h"
|
||||
#include "Material.h"
|
||||
#include "Object.h"
|
||||
#include "Key.h"
|
||||
@@ -1455,14 +1456,15 @@ static PyObject *Curve_iterNext( BPy_Curve * self )
|
||||
if( self->iter_pointer ) {
|
||||
pnurb = self->iter_pointer;
|
||||
self->iter_pointer = pnurb->next; /* advance iterator */
|
||||
po = CurNurb_CreatePyObject( pnurb ); /* make a bpy_nurb */
|
||||
|
||||
return ( PyObject * ) po;
|
||||
if( pnurb->pntsv == 1 )
|
||||
return CurNurb_CreatePyObject( pnurb ); /* make a bpy_curnurb */
|
||||
else
|
||||
return SurfNurb_CreatePyObject( pnurb ); /* make a bpy_surfnurb */
|
||||
}
|
||||
|
||||
/* if iter_pointer was null, we are at end */
|
||||
return ( EXPP_ReturnPyObjError
|
||||
( PyExc_StopIteration, "iterator at end" ) );
|
||||
return EXPP_ReturnPyObjError( PyExc_StopIteration,
|
||||
"iterator at end" );
|
||||
}
|
||||
|
||||
|
||||
@@ -1517,9 +1519,10 @@ PyObject *Curve_getNurb( BPy_Curve * self, int n )
|
||||
if( !pNurb ) /* we came to the end of the list */
|
||||
return ( EXPP_ReturnPyObjError( PyExc_IndexError,
|
||||
"index out of range" ) );
|
||||
|
||||
pyo = CurNurb_CreatePyObject( pNurb ); /* make a bpy_curnurb */
|
||||
return ( PyObject * ) pyo;
|
||||
if( pNurb->pntsv == 1 )
|
||||
return CurNurb_CreatePyObject( pNurb ); /* make a bpy_curnurb */
|
||||
else
|
||||
return SurfNurb_CreatePyObject( pNurb ); /* make a bpy_surfnurb */
|
||||
|
||||
}
|
||||
|
||||
|
||||
859
source/blender/python/api2_2x/SurfNurb.c
Normal file
859
source/blender/python/api2_2x/SurfNurb.c
Normal file
@@ -0,0 +1,859 @@
|
||||
/*
|
||||
* $Id$
|
||||
* ***** BEGIN GPL/BL DUAL 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. The Blender
|
||||
* Foundation also sells licenses for use in proprietary software under
|
||||
* the Blender License. See http://www.blender.org/BL/ for information
|
||||
* about this.
|
||||
*
|
||||
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This is a new part of Blender.
|
||||
*
|
||||
* Contributor(s): Stephen Swaney
|
||||
*
|
||||
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#include "SurfNurb.h" /*This must come first */
|
||||
|
||||
#include "BKE_curve.h"
|
||||
#include "BDR_editcurve.h" /* for convertspline */
|
||||
#include "MEM_guardedalloc.h"
|
||||
#include "gen_utils.h"
|
||||
#include "BezTriple.h"
|
||||
|
||||
/*
|
||||
* forward declarations go here
|
||||
*/
|
||||
|
||||
static int SurfNurb_setPoint( BPy_SurfNurb * self, int index, PyObject * ob );
|
||||
static int SurfNurb_length( PyInstanceObject * inst );
|
||||
static PyObject *SurfNurb_getIter( BPy_SurfNurb * self );
|
||||
static PyObject *SurfNurb_iterNext( BPy_SurfNurb * self );
|
||||
PyObject *SurfNurb_append( BPy_SurfNurb * self, PyObject * args );
|
||||
|
||||
char M_SurfNurb_doc[] = "SurfNurb";
|
||||
|
||||
/*
|
||||
table of module methods
|
||||
these are the equivalent of class or static methods.
|
||||
you do not need an object instance to call one.
|
||||
*/
|
||||
|
||||
static PyMethodDef M_SurfNurb_methods[] = {
|
||||
/* name, method, flags, doc_string */
|
||||
/* {"Get", (PyCFunction) M_SurfNurb_method, METH_NOARGS, " () - doc string"}, */
|
||||
/* {"method", (PyCFunction) M_SurfNurb_method, METH_NOARGS, " () - doc string"}, */
|
||||
|
||||
{NULL, NULL, 0, NULL}
|
||||
};
|
||||
|
||||
/*
|
||||
* method table
|
||||
* table of instance methods
|
||||
* these methods are invoked on an instance of the type.
|
||||
*/
|
||||
|
||||
static PyMethodDef BPy_SurfNurb_methods[] = {
|
||||
# if 0
|
||||
{"append", ( PyCFunction ) SurfNurb_append, METH_VARARGS,
|
||||
"( point ) - add a new point. arg is BezTriple or list of x,y,z,w floats"},
|
||||
#endif
|
||||
{NULL, NULL, 0, NULL}
|
||||
};
|
||||
|
||||
/*
|
||||
* SurfNurb_appendPointToNurb
|
||||
* this is a non-bpy utility func to add a point to a given nurb.
|
||||
* notice the first arg is Nurb*.
|
||||
*/
|
||||
|
||||
#if 0
|
||||
static PyObject *SurfNurb_appendPointToNurb( Nurb * nurb, PyObject * args )
|
||||
{
|
||||
|
||||
int i;
|
||||
int size;
|
||||
PyObject *pyOb;
|
||||
int npoints = nurb->pntsu;
|
||||
|
||||
/*
|
||||
do we have a list of four floats or a BezTriple?
|
||||
*/
|
||||
if( !PyArg_ParseTuple( args, "O", &pyOb ))
|
||||
return EXPP_ReturnPyObjError
|
||||
( PyExc_RuntimeError,
|
||||
"Internal error parsing arguments" );
|
||||
|
||||
|
||||
|
||||
/* if curve is empty, adjust type depending on input type */
|
||||
if (nurb->bezt==NULL && nurb->bp==NULL) {
|
||||
if (BezTriple_CheckPyObject( pyOb ))
|
||||
nurb->type |= CU_BEZIER;
|
||||
else if (PySequence_Check( pyOb ))
|
||||
nurb->type |= CU_NURBS;
|
||||
else
|
||||
return( EXPP_ReturnPyObjError( PyExc_TypeError,
|
||||
"Expected a BezTriple or a Sequence of 4 (or 5) floats" ) );
|
||||
}
|
||||
|
||||
|
||||
|
||||
if ((nurb->type & 7)==CU_BEZIER) {
|
||||
BezTriple *tmp;
|
||||
|
||||
if( !BezTriple_CheckPyObject( pyOb ) )
|
||||
return( EXPP_ReturnPyObjError( PyExc_TypeError,
|
||||
"Expected a BezTriple\n" ) );
|
||||
|
||||
/* printf("\ndbg: got a BezTriple\n"); */
|
||||
tmp = nurb->bezt; /* save old points */
|
||||
nurb->bezt =
|
||||
( BezTriple * ) MEM_mallocN( sizeof( BezTriple ) *
|
||||
( npoints + 1 ),
|
||||
"SurfNurb_append2" );
|
||||
|
||||
if( !nurb->bezt )
|
||||
return ( EXPP_ReturnPyObjError
|
||||
( PyExc_MemoryError, "allocation failed" ) );
|
||||
|
||||
/* copy old points to new */
|
||||
if( tmp ) {
|
||||
memmove( nurb->bezt, tmp, sizeof( BezTriple ) * npoints );
|
||||
MEM_freeN( tmp );
|
||||
}
|
||||
|
||||
nurb->pntsu++;
|
||||
/* add new point to end of list */
|
||||
memcpy( nurb->bezt + npoints,
|
||||
BezTriple_FromPyObject( pyOb ), sizeof( BezTriple ) );
|
||||
|
||||
}
|
||||
else if( PySequence_Check( pyOb ) ) {
|
||||
size = PySequence_Size( pyOb );
|
||||
/* printf("\ndbg: got a sequence of size %d\n", size ); */
|
||||
if( size == 4 || size == 5 ) {
|
||||
BPoint *tmp;
|
||||
|
||||
tmp = nurb->bp; /* save old pts */
|
||||
|
||||
nurb->bp =
|
||||
( BPoint * ) MEM_mallocN( sizeof( BPoint ) *
|
||||
( npoints + 1 ),
|
||||
"SurfNurb_append1" );
|
||||
if( !nurb->bp )
|
||||
return ( EXPP_ReturnPyObjError
|
||||
( PyExc_MemoryError,
|
||||
"allocation failed" ) );
|
||||
|
||||
memmove( nurb->bp, tmp, sizeof( BPoint ) * npoints );
|
||||
if( tmp )
|
||||
MEM_freeN( tmp );
|
||||
|
||||
++nurb->pntsu;
|
||||
/* initialize new BPoint from old */
|
||||
memcpy( nurb->bp + npoints, nurb->bp,
|
||||
sizeof( BPoint ) );
|
||||
|
||||
for( i = 0; i < 4; ++i ) {
|
||||
PyObject *item = PySequence_GetItem( pyOb, i );
|
||||
|
||||
if (item == NULL)
|
||||
return NULL;
|
||||
|
||||
|
||||
nurb->bp[npoints].vec[i] = ( float ) PyFloat_AsDouble( item );
|
||||
Py_DECREF( item );
|
||||
}
|
||||
|
||||
if (size == 5) {
|
||||
PyObject *item = PySequence_GetItem( pyOb, i );
|
||||
|
||||
if (item == NULL)
|
||||
return NULL;
|
||||
|
||||
nurb->bp[npoints].alfa = ( float ) PyFloat_AsDouble( item );
|
||||
Py_DECREF( item );
|
||||
}
|
||||
else {
|
||||
nurb->bp[npoints].alfa = 0.0f;
|
||||
}
|
||||
|
||||
makeknots( nurb, 1, nurb->flagu >> 1 );
|
||||
|
||||
} else {
|
||||
return EXPP_ReturnPyObjError( PyExc_TypeError,
|
||||
"expected a sequence of 4 or 5 floats" );
|
||||
}
|
||||
|
||||
} else {
|
||||
/* bail with error */
|
||||
return EXPP_ReturnPyObjError( PyExc_TypeError,
|
||||
"expected a sequence of 4 or 5 floats" );
|
||||
|
||||
}
|
||||
|
||||
return ( EXPP_incr_ret( Py_None ) );
|
||||
}
|
||||
|
||||
/*
|
||||
* SurfNurb_append( point )
|
||||
* append a new point to a nurb curve.
|
||||
* arg is BezTriple or list of xyzw floats
|
||||
*/
|
||||
|
||||
PyObject *SurfNurb_append( BPy_SurfNurb * self, PyObject * args )
|
||||
{
|
||||
Nurb *nurb = self->nurb;
|
||||
|
||||
return SurfNurb_appendPointToNurb( nurb, args );
|
||||
}
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* SurfNurb_getMatIndex
|
||||
*
|
||||
* returns index into material list
|
||||
*/
|
||||
|
||||
static PyObject *SurfNurb_getMatIndex( BPy_SurfNurb * self )
|
||||
{
|
||||
return PyInt_FromLong( ( long ) self->nurb->mat_nr );
|
||||
}
|
||||
|
||||
/*
|
||||
* SurfNurb_setMatIndex
|
||||
*
|
||||
* set index into material list
|
||||
*/
|
||||
|
||||
static int SurfNurb_setMatIndex( BPy_SurfNurb * self, PyObject * args )
|
||||
{
|
||||
args = PyNumber_Int( args );
|
||||
|
||||
if( !args )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected integer argument" );
|
||||
|
||||
/* fixme: some range checking would be nice! */
|
||||
/* can't do range checking without knowing the "parent" curve! */
|
||||
self->nurb->mat_nr = ( short )PyInt_AS_LONG( args );
|
||||
Py_DECREF( args );
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* SurfNurb_getPointsU
|
||||
*
|
||||
* returns number of control points in U direction
|
||||
*/
|
||||
|
||||
static PyObject *SurfNurb_getPointsU( BPy_SurfNurb * self )
|
||||
{
|
||||
return PyInt_FromLong( ( long ) self->nurb->pntsu );
|
||||
}
|
||||
|
||||
/*
|
||||
* SurfNurb_getPointsV
|
||||
*
|
||||
* returns number of control points in V direction
|
||||
*/
|
||||
|
||||
static PyObject *SurfNurb_getPointsV( BPy_SurfNurb * self )
|
||||
{
|
||||
return PyInt_FromLong( ( long ) self->nurb->pntsv );
|
||||
}
|
||||
|
||||
/*
|
||||
* SurfNurb_getFlagU
|
||||
*
|
||||
* returns curve's flagu
|
||||
*/
|
||||
|
||||
static PyObject *SurfNurb_getFlagU( BPy_SurfNurb * self )
|
||||
{
|
||||
return PyInt_FromLong( ( long ) (self->nurb->flagu >> 1) );
|
||||
}
|
||||
|
||||
/*
|
||||
* SurfNurb_setFlagU
|
||||
*
|
||||
* set curve's flagu and recalculate the knots
|
||||
*
|
||||
* Possible values: 0 - uniform, 2 - endpoints, 4 - bezier
|
||||
* bit 0 controls CU_CYCLIC
|
||||
*/
|
||||
|
||||
static int SurfNurb_setFlagU( BPy_SurfNurb * self, PyObject * args )
|
||||
{
|
||||
int flagu;
|
||||
|
||||
args = PyNumber_Int( args );
|
||||
if( !args )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected integer argument" );
|
||||
|
||||
flagu = ( int )PyInt_AS_LONG( args );
|
||||
Py_DECREF( args );
|
||||
|
||||
if( flagu < 0 || flagu > 2 )
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"expected integer argument in range [0,2]" );
|
||||
|
||||
flagu = (flagu << 1) | (self->nurb->flagu & CU_CYCLIC);
|
||||
if( self->nurb->flagu != flagu ) {
|
||||
self->nurb->flagu = (short)flagu;
|
||||
makeknots( self->nurb, 1, self->nurb->flagu );
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* SurfNurb_getFlagV
|
||||
*
|
||||
* returns curve's flagu
|
||||
*/
|
||||
|
||||
static PyObject *SurfNurb_getFlagV( BPy_SurfNurb * self )
|
||||
{
|
||||
return PyInt_FromLong( ( long ) (self->nurb->flagv >> 1) );
|
||||
}
|
||||
|
||||
/*
|
||||
* SurfNurb_setFlagV
|
||||
*
|
||||
* set curve's flagu and recalculate the knots
|
||||
*
|
||||
* Possible values: 0 - uniform, 1 - endpoints, 2 - bezier
|
||||
*/
|
||||
|
||||
static int SurfNurb_setFlagV( BPy_SurfNurb * self, PyObject * args )
|
||||
{
|
||||
int flagv;
|
||||
|
||||
args = PyNumber_Int( args );
|
||||
if( !args )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected integer argument" );
|
||||
|
||||
flagv = ( int )PyInt_AS_LONG( args );
|
||||
Py_DECREF( args );
|
||||
|
||||
if( flagv < 0 || flagv > 2 )
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"expected integer argument in range [0,2]" );
|
||||
|
||||
flagv = (flagv << 1) | (self->nurb->flagv & CU_CYCLIC);
|
||||
if( self->nurb->flagv != flagv ) {
|
||||
self->nurb->flagv = (short)flagv;
|
||||
makeknots( self->nurb, 2, self->nurb->flagv );
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* SurfNurb_getOrder
|
||||
*
|
||||
* returns curve's order
|
||||
*/
|
||||
|
||||
static PyObject *SurfNurb_getOrderU( BPy_SurfNurb * self )
|
||||
{
|
||||
return PyInt_FromLong( ( long ) self->nurb->orderu );
|
||||
}
|
||||
|
||||
static int SurfNurb_setOrderU( BPy_SurfNurb * self, PyObject * args )
|
||||
{
|
||||
int order;
|
||||
|
||||
args = PyNumber_Int( args );
|
||||
if( !args )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected integer argument" );
|
||||
|
||||
order = ( int )PyInt_AS_LONG( args );
|
||||
Py_DECREF( args );
|
||||
|
||||
if( order < 2 ) order = 2;
|
||||
else if( order > 6 ) order = 6;
|
||||
|
||||
if( self->nurb->pntsu < order )
|
||||
order = self->nurb->pntsu;
|
||||
|
||||
self->nurb->orderu = (short)order;
|
||||
makeknots( self->nurb, 1, self->nurb->flagu >> 1 );
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static PyObject *SurfNurb_getOrderV( BPy_SurfNurb * self )
|
||||
{
|
||||
return PyInt_FromLong( ( long ) self->nurb->orderv );
|
||||
}
|
||||
|
||||
static int SurfNurb_setOrderV( BPy_SurfNurb * self, PyObject * args )
|
||||
{
|
||||
int order;
|
||||
|
||||
args = PyNumber_Int( args );
|
||||
if( !args )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected integer argument" );
|
||||
|
||||
order = ( int )PyInt_AS_LONG( args );
|
||||
Py_DECREF( args );
|
||||
|
||||
if( order < 2 ) order = 2;
|
||||
else if( order > 6 ) order = 6;
|
||||
|
||||
if( self->nurb->pntsv < order )
|
||||
order = self->nurb->pntsv;
|
||||
|
||||
self->nurb->orderv = (short)order;
|
||||
makeknots( self->nurb, 2, self->nurb->flagv >> 1 );
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* SurfNurb_getCyclic()
|
||||
* test whether surface is cyclic (closed) or not (open)
|
||||
*/
|
||||
|
||||
static PyObject *SurfNurb_getCyclicU( BPy_SurfNurb * self )
|
||||
{
|
||||
if( self->nurb->flagu & CU_CYCLIC )
|
||||
Py_RETURN_TRUE;
|
||||
else
|
||||
Py_RETURN_FALSE;
|
||||
}
|
||||
|
||||
static PyObject *SurfNurb_getCyclicV( BPy_SurfNurb * self )
|
||||
{
|
||||
if( self->nurb->flagv & CU_CYCLIC )
|
||||
Py_RETURN_TRUE;
|
||||
else
|
||||
Py_RETURN_FALSE;
|
||||
}
|
||||
|
||||
static int SurfNurb_setCyclicU( BPy_SurfNurb * self, PyObject * args )
|
||||
{
|
||||
if( PyObject_IsTrue( args ) )
|
||||
self->nurb->flagu |= CU_CYCLIC;
|
||||
else
|
||||
self->nurb->flagu &= ~CU_CYCLIC;
|
||||
makeknots( self->nurb, 1, self->nurb->flagu >> 1 );
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int SurfNurb_setCyclicV( BPy_SurfNurb * self, PyObject * args )
|
||||
{
|
||||
if( PyObject_IsTrue( args ) )
|
||||
self->nurb->flagv |= CU_CYCLIC;
|
||||
else
|
||||
self->nurb->flagv &= ~CU_CYCLIC;
|
||||
makeknots( self->nurb, 2, self->nurb->flagu >> 1 );
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* SurfNurb_getIter
|
||||
*
|
||||
* create an iterator for our SurfNurb.
|
||||
* this iterator returns the points for this SurfNurb.
|
||||
*/
|
||||
|
||||
static PyObject *SurfNurb_getIter( BPy_SurfNurb * self )
|
||||
{
|
||||
self->bp = self->nurb->bp;
|
||||
self->bezt = self->nurb->bezt;
|
||||
self->nextPoint = 0;
|
||||
|
||||
Py_INCREF( self );
|
||||
return ( PyObject * ) self;
|
||||
}
|
||||
|
||||
static PyObject *SurfNurb_iterNext( BPy_SurfNurb * self )
|
||||
{
|
||||
Nurb *pnurb = self->nurb;
|
||||
int npoints = pnurb->pntsu * pnurb->pntsv;
|
||||
|
||||
if( self->bp && self->nextPoint < npoints )
|
||||
return SurfNurb_pointAtIndex( self->nurb, self->nextPoint++ );
|
||||
else
|
||||
return EXPP_ReturnPyObjError( PyExc_StopIteration,
|
||||
"iterator at end" );
|
||||
}
|
||||
|
||||
/*
|
||||
* SurfNurb_length
|
||||
* returns the number of points in a Nurb
|
||||
* this is a tp_as_sequence method, not a regular instance method.
|
||||
*/
|
||||
|
||||
static int SurfNurb_length( PyInstanceObject * inst )
|
||||
{
|
||||
Nurb *nurb;
|
||||
|
||||
if( SurfNurb_CheckPyObject( ( PyObject * ) inst ) ) {
|
||||
nurb = ( ( BPy_SurfNurb * ) inst )->nurb;
|
||||
return (int)(nurb->pntsu * nurb->pntsu);
|
||||
}
|
||||
|
||||
return EXPP_ReturnIntError( PyExc_RuntimeError,
|
||||
"arg is not a BPy_SurfNurb" );
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* SurfNurb_getPoint
|
||||
* returns the Nth point in a Nurb
|
||||
* this is one of the tp_as_sequence methods, hence the int N argument.
|
||||
* it is called via the [] operator, not as a usual instance method.
|
||||
*/
|
||||
|
||||
PyObject *SurfNurb_getPoint( BPy_SurfNurb * self, int index )
|
||||
{
|
||||
Nurb *myNurb;
|
||||
|
||||
int npoints;
|
||||
|
||||
/* for convenince */
|
||||
myNurb = self->nurb;
|
||||
npoints = myNurb->pntsu * myNurb->pntsv;
|
||||
|
||||
/* bail if no Nurbs in Curve */
|
||||
if( npoints == 0 )
|
||||
return ( EXPP_ReturnPyObjError( PyExc_IndexError,
|
||||
"no points in this SurfNurb" ) );
|
||||
|
||||
/* check index limits */
|
||||
if( index >= npoints || index < 0 )
|
||||
return ( EXPP_ReturnPyObjError( PyExc_IndexError,
|
||||
"index out of range" ) );
|
||||
|
||||
return SurfNurb_pointAtIndex( myNurb, index );
|
||||
}
|
||||
|
||||
/*
|
||||
* SurfNurb_setPoint
|
||||
* modifies the Nth point in a Nurb
|
||||
* this is one of the tp_as_sequence methods, hence the int N argument.
|
||||
* it is called via the [] = operator, not as a usual instance method.
|
||||
*/
|
||||
static int SurfNurb_setPoint( BPy_SurfNurb * self, int index, PyObject * pyOb )
|
||||
{
|
||||
Nurb *nurb = self->nurb;
|
||||
int size;
|
||||
|
||||
/* check index limits */
|
||||
if( index < 0 || index >= nurb->pntsu * nurb->pntsv )
|
||||
return EXPP_ReturnIntError( PyExc_IndexError,
|
||||
"array assignment index out of range\n" );
|
||||
|
||||
/* branch by curve type */
|
||||
#if 0
|
||||
if ((nurb->type & 7)==CU_BEZIER) { /* BEZIER */
|
||||
/* check parameter type */
|
||||
if( !BezTriple_CheckPyObject( pyOb ) )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected a BezTriple\n" );
|
||||
|
||||
/* copy bezier in array */
|
||||
memcpy( nurb->bezt + index,
|
||||
BezTriple_FromPyObject( pyOb ), sizeof( BezTriple ) );
|
||||
|
||||
return 0; /* finished correctly */
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{ /* NURBS or POLY */
|
||||
int i;
|
||||
|
||||
/* check parameter type */
|
||||
if (!PySequence_Check( pyOb ))
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected a list of 4 (or optionaly 5 if the curve is 3D) floats\n" );
|
||||
|
||||
size = PySequence_Size( pyOb );
|
||||
|
||||
/* check sequence size */
|
||||
if( size != 4 && size != 5 )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected a list of 4 (or optionaly 5 if the curve is 3D) floats\n" );
|
||||
|
||||
/* copy x, y, z, w */
|
||||
for( i = 0; i < 4; ++i ) {
|
||||
PyObject *item = PySequence_GetItem( pyOb, i );
|
||||
|
||||
if (item == NULL)
|
||||
return -1;
|
||||
|
||||
nurb->bp[index].vec[i] = ( float ) PyFloat_AsDouble( item );
|
||||
Py_DECREF( item );
|
||||
}
|
||||
|
||||
if (size == 5) { /* set tilt, if present */
|
||||
PyObject *item = PySequence_GetItem( pyOb, i );
|
||||
|
||||
if (item == NULL)
|
||||
return -1;
|
||||
|
||||
nurb->bp[index].alfa = ( float ) PyFloat_AsDouble( item );
|
||||
Py_DECREF( item );
|
||||
}
|
||||
else { /* if not, set default */
|
||||
nurb->bp[index].alfa = 0.0f;
|
||||
}
|
||||
|
||||
return 0; /* finished correctly */
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* this is an internal routine. not callable directly from python
|
||||
*/
|
||||
|
||||
PyObject *SurfNurb_pointAtIndex( Nurb * nurb, int index )
|
||||
{
|
||||
PyObject *pyo;
|
||||
|
||||
if( nurb->bp ) { /* we have a nurb curve */
|
||||
int i;
|
||||
|
||||
/* add Tilt only if curve is 3D */
|
||||
if (nurb->flag & CU_3D)
|
||||
pyo = PyList_New( 5 );
|
||||
else
|
||||
pyo = PyList_New( 4 );
|
||||
|
||||
for( i = 0; i < 4; i++ ) {
|
||||
PyList_SetItem( pyo, i,
|
||||
PyFloat_FromDouble( nurb->bp[index].
|
||||
vec[i] ) );
|
||||
}
|
||||
|
||||
/* add Tilt only if curve is 3D */
|
||||
if (nurb->flag & CU_3D)
|
||||
PyList_SetItem( pyo, 4, PyFloat_FromDouble( nurb->bp[index].alfa ) );
|
||||
return pyo;
|
||||
|
||||
} else /* something is horribly wrong */
|
||||
return EXPP_ReturnPyObjError( PyExc_SystemError,
|
||||
"non-NURB surface found" );
|
||||
}
|
||||
|
||||
|
||||
int SurfNurb_CheckPyObject( PyObject * py_obj )
|
||||
{
|
||||
return ( py_obj->ob_type == &SurfNurb_Type );
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* methods for SurfNurb as sequence
|
||||
*/
|
||||
|
||||
static PySequenceMethods SurfNurb_as_sequence = {
|
||||
( inquiry ) SurfNurb_length, /* sq_length */
|
||||
( binaryfunc ) 0, /* sq_concat */
|
||||
( intargfunc ) 0, /* sq_repeat */
|
||||
( intargfunc ) SurfNurb_getPoint, /* sq_item */
|
||||
( intintargfunc ) 0, /* sq_slice */
|
||||
( intobjargproc ) SurfNurb_setPoint, /* sq_ass_item */
|
||||
0, /* sq_ass_slice */
|
||||
( objobjproc ) 0, /* sq_contains */
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
static PyGetSetDef BPy_SurfNurb_getseters[] = {
|
||||
#if 0
|
||||
{"matIndex",
|
||||
(getter)SurfNurb_getMatIndex, (setter)SurfNurb_setMatIndex,
|
||||
"material index", NULL},
|
||||
#endif
|
||||
{"pointsU",
|
||||
(getter)SurfNurb_getPointsU, (setter)NULL,
|
||||
"number of control points in U direction", NULL},
|
||||
{"pointsV",
|
||||
(getter)SurfNurb_getPointsV, (setter)NULL,
|
||||
"number of control points in V direction", NULL},
|
||||
{"flagU",
|
||||
(getter)SurfNurb_getFlagU, (setter)SurfNurb_setFlagU,
|
||||
"knot flag for U direction", NULL},
|
||||
{"flagV",
|
||||
(getter)SurfNurb_getFlagV, (setter)SurfNurb_setFlagV,
|
||||
"knot flag for V direction", NULL},
|
||||
{"cyclicU",
|
||||
(getter)SurfNurb_getCyclicU, (setter)SurfNurb_setCyclicU,
|
||||
"cyclic setting for U direction", NULL},
|
||||
{"cyclicV",
|
||||
(getter)SurfNurb_getCyclicV, (setter)SurfNurb_setCyclicV,
|
||||
"cyclic setting for V direction", NULL},
|
||||
{"orderU",
|
||||
(getter)SurfNurb_getOrderU, (setter)SurfNurb_setOrderU,
|
||||
"order setting for U direction", NULL},
|
||||
{"orderV",
|
||||
(getter)SurfNurb_getOrderV, (setter)SurfNurb_setOrderV,
|
||||
"order setting for V direction", NULL},
|
||||
{NULL,NULL,NULL,NULL,NULL} /* Sentinel */
|
||||
};
|
||||
|
||||
void SurfNurb_dealloc( BPy_SurfNurb * self )
|
||||
{
|
||||
PyObject_DEL( self );
|
||||
}
|
||||
|
||||
/*
|
||||
* compare
|
||||
* in this case, we consider two SurfNurbs equal, if they point to the same
|
||||
* blender data.
|
||||
*/
|
||||
static int SurfNurb_compare( BPy_SurfNurb * a, BPy_SurfNurb * b )
|
||||
{
|
||||
return ( a->nurb == b->nurb ) ? 0 : -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* SurfNurb_repr
|
||||
*/
|
||||
static PyObject *SurfNurb_repr( BPy_SurfNurb * self )
|
||||
{
|
||||
return PyString_FromFormat( "[SurfNurb \"%d\"]", self->nurb->type );
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Python SurfNurb_Type structure definition: */
|
||||
/*****************************************************************************/
|
||||
PyTypeObject SurfNurb_Type = {
|
||||
PyObject_HEAD_INIT( NULL ) /* required py macro */
|
||||
0, /* ob_size */
|
||||
/* For printing, in format "<module>.<name>" */
|
||||
"SurfNurb", /* char *tp_name; */
|
||||
sizeof( BPy_SurfNurb ), /* int tp_basicsize; */
|
||||
0, /* tp_itemsize; For allocation */
|
||||
|
||||
/* Methods to implement standard operations */
|
||||
|
||||
( destructor ) SurfNurb_dealloc,/* destructor tp_dealloc; */
|
||||
NULL, /* printfunc tp_print; */
|
||||
NULL, /* getattrfunc tp_getattr; */
|
||||
NULL, /* setattrfunc tp_setattr; */
|
||||
( cmpfunc ) SurfNurb_compare, /* cmpfunc tp_compare; */
|
||||
( reprfunc ) SurfNurb_repr, /* reprfunc tp_repr; */
|
||||
|
||||
/* Method suites for standard classes */
|
||||
|
||||
NULL, /* PyNumberMethods *tp_as_number; */
|
||||
&SurfNurb_as_sequence, /* PySequenceMethods *tp_as_sequence; */
|
||||
NULL, /* PyMappingMethods *tp_as_mapping; */
|
||||
|
||||
/* More standard operations (here for binary compatibility) */
|
||||
|
||||
NULL, /* hashfunc tp_hash; */
|
||||
NULL, /* ternaryfunc tp_call; */
|
||||
NULL, /* reprfunc tp_str; */
|
||||
NULL, /* getattrofunc tp_getattro; */
|
||||
NULL, /* setattrofunc tp_setattro; */
|
||||
|
||||
/* Functions to access object as input/output buffer */
|
||||
NULL, /* PyBufferProcs *tp_as_buffer; */
|
||||
|
||||
/*** Flags to define presence of optional/expanded features ***/
|
||||
Py_TPFLAGS_DEFAULT, /* long tp_flags; */
|
||||
|
||||
NULL, /* char *tp_doc; Documentation string */
|
||||
/*** Assigned meaning in release 2.0 ***/
|
||||
/* call function for all accessible objects */
|
||||
NULL, /* traverseproc tp_traverse; */
|
||||
|
||||
/* delete references to contained objects */
|
||||
NULL, /* inquiry tp_clear; */
|
||||
|
||||
/*** Assigned meaning in release 2.1 ***/
|
||||
/*** rich comparisons ***/
|
||||
NULL, /* richcmpfunc tp_richcompare; */
|
||||
|
||||
/*** weak reference enabler ***/
|
||||
0, /* long tp_weaklistoffset; */
|
||||
|
||||
/*** Added in release 2.2 ***/
|
||||
/* Iterators */
|
||||
( getiterfunc ) SurfNurb_getIter, /* getiterfunc tp_iter; */
|
||||
( iternextfunc ) SurfNurb_iterNext, /* iternextfunc tp_iternext; */
|
||||
|
||||
/*** Attribute descriptor and subclassing stuff ***/
|
||||
BPy_SurfNurb_methods, /* struct PyMethodDef *tp_methods; */
|
||||
NULL, /* struct PyMemberDef *tp_members; */
|
||||
BPy_SurfNurb_getseters, /* struct PyGetSetDef *tp_getset; */
|
||||
NULL, /* struct _typeobject *tp_base; */
|
||||
NULL, /* PyObject *tp_dict; */
|
||||
NULL, /* descrgetfunc tp_descr_get; */
|
||||
NULL, /* descrsetfunc tp_descr_set; */
|
||||
0, /* long tp_dictoffset; */
|
||||
NULL, /* initproc tp_init; */
|
||||
NULL, /* allocfunc tp_alloc; */
|
||||
NULL, /* newfunc tp_new; */
|
||||
/* Low-level free-memory routine */
|
||||
NULL, /* freefunc tp_free; */
|
||||
/* For PyObject_IS_GC */
|
||||
NULL, /* inquiry tp_is_gc; */
|
||||
NULL, /* PyObject *tp_bases; */
|
||||
/* method resolution order */
|
||||
NULL, /* PyObject *tp_mro; */
|
||||
NULL, /* PyObject *tp_cache; */
|
||||
NULL, /* PyObject *tp_subclasses; */
|
||||
NULL, /* PyObject *tp_weaklist; */
|
||||
NULL
|
||||
};
|
||||
|
||||
/*
|
||||
factory method to create a BPy_SurfNurb from a Blender Nurb
|
||||
*/
|
||||
|
||||
PyObject *SurfNurb_CreatePyObject( Nurb * blen_nurb )
|
||||
{
|
||||
BPy_SurfNurb *pyNurb;
|
||||
|
||||
pyNurb = ( BPy_SurfNurb * ) PyObject_NEW( BPy_SurfNurb, &SurfNurb_Type );
|
||||
|
||||
if( !pyNurb )
|
||||
return EXPP_ReturnPyObjError( PyExc_MemoryError,
|
||||
"could not create BPy_SurfNurb PyObject" );
|
||||
|
||||
pyNurb->nurb = blen_nurb;
|
||||
return ( PyObject * ) pyNurb;
|
||||
}
|
||||
|
||||
|
||||
PyObject *SurfNurb_Init( void )
|
||||
{
|
||||
PyType_Ready( &SurfNurb_Type );
|
||||
return Py_InitModule3( "Blender.SurfNurb", M_SurfNurb_methods,
|
||||
M_SurfNurb_doc );
|
||||
}
|
||||
|
||||
69
source/blender/python/api2_2x/SurfNurb.h
Normal file
69
source/blender/python/api2_2x/SurfNurb.h
Normal file
@@ -0,0 +1,69 @@
|
||||
/*
|
||||
* $Id$
|
||||
* ***** BEGIN GPL/BL DUAL 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. The Blender
|
||||
* Foundation also sells licenses for use in proprietary software under
|
||||
* the Blender License. See http://www.blender.org/BL/ for information
|
||||
* about this.
|
||||
*
|
||||
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This is a new part of Blender.
|
||||
*
|
||||
* Contributor(s): Stephen Swaney
|
||||
*
|
||||
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef EXPP_SURFNURB_H
|
||||
#define EXPP_SURFNURB_H
|
||||
|
||||
#include <Python.h>
|
||||
#include "DNA_curve_types.h"
|
||||
|
||||
extern PyTypeObject SurfNurb_Type;
|
||||
|
||||
#define BPy_SurfNurb_Check(v) ((v)->ob_type == &SurfNurb_Type) /* for type checking */
|
||||
|
||||
/* Python BPy_SurfNurb structure definition */
|
||||
typedef struct {
|
||||
PyObject_HEAD /* required py macro */
|
||||
Nurb * nurb; /* pointer to Blender data */
|
||||
|
||||
/* iterator stuff */
|
||||
/* internal ptrs to point data. do not free */
|
||||
BPoint *bp;
|
||||
BezTriple *bezt;
|
||||
int atEnd; /* iter exhausted flag */
|
||||
int nextPoint;
|
||||
|
||||
} BPy_SurfNurb;
|
||||
|
||||
|
||||
/*
|
||||
* prototypes
|
||||
*/
|
||||
|
||||
PyObject *SurfNurb_Init( void );
|
||||
PyObject *SurfNurb_CreatePyObject( Nurb * bzt );
|
||||
int SurfNurb_CheckPyObject( PyObject * pyobj );
|
||||
Nurb *SurfNurb_FromPyObject( PyObject * pyobj );
|
||||
|
||||
PyObject *SurfNurb_getPoint( BPy_SurfNurb * self, int index );
|
||||
PyObject *SurfNurb_pointAtIndex( Nurb * nurb, int index );
|
||||
|
||||
#endif /* EXPP_SURFNURB_H */
|
||||
@@ -40,7 +40,7 @@ extern PyTypeObject Action_Type, Armature_Type;
|
||||
extern PyTypeObject Pose_Type;
|
||||
extern PyTypeObject BezTriple_Type, Bone_Type, Button_Type;
|
||||
extern PyTypeObject Camera_Type;
|
||||
extern PyTypeObject CurNurb_Type;
|
||||
extern PyTypeObject CurNurb_Type, SurfNurb_Type;
|
||||
extern PyTypeObject Curve_Type;
|
||||
extern PyTypeObject Effect_Type, Font_Type;
|
||||
extern PyTypeObject Image_Type, Ipo_Type, IpoCurve_Type;
|
||||
@@ -109,6 +109,7 @@ void types_InitAll( void )
|
||||
Group_Type.ob_type = &PyType_Type;
|
||||
RenderData_Type.ob_type = &PyType_Type;
|
||||
Scene_Type.ob_type = &PyType_Type;
|
||||
SurfNurb_Type.ob_type = &PyType_Type;
|
||||
Text_Type.ob_type = &PyType_Type;
|
||||
Text3d_Type.ob_type = &PyType_Type;
|
||||
Texture_Type.ob_type = &PyType_Type;
|
||||
@@ -177,6 +178,8 @@ PyObject *Types_Init( void )
|
||||
|
||||
PyDict_SetItemString( dict, "CurNurb_Type",
|
||||
( PyObject * ) &CurNurb_Type );
|
||||
PyDict_SetItemString( dict, "SurfNurb_Type",
|
||||
( PyObject * ) &SurfNurb_Type );
|
||||
PyDict_SetItemString( dict, "CurveType", ( PyObject * ) &Curve_Type );
|
||||
|
||||
PyDict_SetItemString( dict, "IpoType", ( PyObject * ) &Ipo_Type );
|
||||
|
||||
@@ -507,7 +507,7 @@ class CurNurb:
|
||||
|
||||
def __getitem__( n ):
|
||||
"""
|
||||
Get the Nth element in the curve. For Bezier curves, that element is a BezTriple. For the rest (Poly and Nurbs), it is a list of 5 floats: x, y, z, weight, tilt (in radians). NOTE 1: This element element is independant on the curve, modifying it will not affect the curve. NOTE 2: Each successive call returns a new object.
|
||||
Get the Nth element in the curve. For Bezier curves, that element is a BezTriple. For the rest (Poly and Nurbs), it is a list of 5 floats: x, y, z, weight, tilt (in radians). NOTE 1: This element is independent on the curve, modifying it will not affect the curve. NOTE 2: Each successive call returns a new object.
|
||||
@rtype: BezTriple (Bezier Curve) or List of 5 floats [x, y, z, w, t] for Poly or Nurbs
|
||||
@return: The Nth element in the curve
|
||||
@type n: integer
|
||||
@@ -605,3 +605,66 @@ class CurNurb:
|
||||
@rtype: None
|
||||
@return: None
|
||||
"""
|
||||
|
||||
class SurfNurb:
|
||||
"""
|
||||
The SurfNurb Object
|
||||
===================
|
||||
This object provides access to the control points of the surfaces that make
|
||||
up a Blender Curve.
|
||||
|
||||
The SurfNurb supports the Python iterator and sequence protocols which
|
||||
means you can use a python B{for} statement or [] operator to access the
|
||||
points in a surface. Points are accessed linearly; for a N-by-M UV surface,
|
||||
the first N control points correspond to V=0, then second N to V=1, and so
|
||||
on.
|
||||
|
||||
@ivar flagU: The knot flag U. Changing the knot type automatically
|
||||
recalculates the knots. The flag can be one of three values:
|
||||
- 0 : uniform knots
|
||||
- 1 : endpoints knots
|
||||
- 2 : bezier knots
|
||||
@type flagU: int
|
||||
@ivar flagV: The knot flag V. See L{flagU} for description.
|
||||
@type flagV: int
|
||||
@ivar pointsU: The number of control points in the U direction (read only).
|
||||
@type pointsU: int
|
||||
@ivar pointsV: The number of control points in the V direction (read only).
|
||||
@type pointsV: int
|
||||
@ivar cyclicU: The cyclic setting for the U direction (True = cyclic).
|
||||
@type cyclicU: boolean
|
||||
@ivar cyclicV: The cyclic setting for the V direction (True = cyclic).
|
||||
@type cyclicV: boolean
|
||||
@ivar orderU: The order setting for the U direction. Values are clamped
|
||||
to the range [2:6] and not greater than the U dimension.
|
||||
@type orderU: int
|
||||
@ivar orderV: The order setting for the V direction. Values are clamped
|
||||
to the range [2:6] and not greater than the V dimension.
|
||||
@type orderV: int
|
||||
"""
|
||||
|
||||
def __setitem__( n, point ):
|
||||
"""
|
||||
Set the Nth control point in the surface.
|
||||
@rtype: None
|
||||
@return: None
|
||||
@type n: integer
|
||||
@param n: the index of the point to replace
|
||||
@type point: list of 4 floats (optional 5th float is the tilt value
|
||||
in radians)
|
||||
@param point: the point that will replace the one in the curve. The
|
||||
point is list of 4 floats in x,y,z,w (optionally tilt in radians as
|
||||
5th value) format.
|
||||
"""
|
||||
|
||||
def __getitem__( n ):
|
||||
"""
|
||||
Get the Nth control point in the surface.
|
||||
@rtype: List of 5 floats [x, y, z, w, t] for Poly or Nurbs
|
||||
@return: The Nth point in the curve
|
||||
@type n: integer
|
||||
@param n: the index of the point to return
|
||||
@note: This returned value is independent on the curve; modifying it will not affect the curve.
|
||||
@note: Each successive call returns a new object.
|
||||
"""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user