griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
acf97994bc9b5a9be1fc6cdd3907eaa198719b11
test2/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
Tamito Kajiyama acf97994bc SWIG/directors dependency removal (cont'd) 
* Added to python/BPy_Convert.{cpp,h} 4 utility converters below for
better introspection-based automatic type conversion.

  PyObject * Any_BPy_Interface0D_from_Interface0D( Interface0D& if0D );
  PyObject * Any_BPy_Interface1D_from_Interface1D( Interface1D& if1D );
  PyObject * Any_BPy_FEdge_from_FEdge( FEdge& fe );
  PyObject * Any_BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );

There are 4 corresponding converters without the "Any_" prefix.  All
calls of them in the code base were replaced with these new converters
so that the introspection-based automatic conversion would take place
universally.

* python/BPy_Convert.{cpp,h}: Those C++ to Python converters having
had a "_ptr" suffix were renamed to a name without the suffix, and
their arguments were changed so as to take a reference (e.g.,
ViewVertex&) instead of a pointer (e.g., ViewVertex *).  The changed
converters and their new function prototypes are listed below.  These
converters now return a Python wrapper object that retains the passed
reference, instead of retaining a newly created C++ object by the
converters.

  // Interface0D converters
  PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
  PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp );
  PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
  PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
  PyObject * BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );
  PyObject * BPy_TVertex_from_TVertex( TVertex& tv );
  PyObject * BPy_NonTVertex_from_NonTVertex( NonTVertex& ntv );
  // Interface1D converters
  PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D );
  PyObject * BPy_Chain_from_Chain( Chain& c );
  PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
  PyObject * BPy_FEdgeSharp_from_FEdgeSharp( FEdgeSharp& fes );
  PyObject * BPy_FEdgeSmooth_from_FEdgeSmooth( FEdgeSmooth& fes );
  PyObject * BPy_Stroke_from_Stroke( Stroke& s );
  PyObject * BPy_ViewEdge_from_ViewEdge( ViewEdge& ve );
  PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve );
  // some other converters
  PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs );
  PyObject * BPy_SShape_from_SShape( SShape& ss );
  PyObject * BPy_FrsMaterial_from_FrsMaterial( FrsMaterial& m );
  PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );

* Added a "borrowed" flag to the definitions of Python types being
used to wrap C++ components of Freestyle's internal data structures.
The flag indicates whether or not a Python wrapper object has a
reference to a C++ object that comprises the internal data structures.
The deallocation routines of the Python types check this flag and
release a wrapped C++ object only when it is not part of the internal
data structures.  The following files were modified:

  python/BPy_FrsMaterial.{cpp,h}
  python/BPy_Interface0D.{cpp,h}
  python/BPy_Interface1D.{cpp,h}
  python/BPy_SShape.{cpp,h}
  python/BPy_StrokeAttribute.{cpp,h}
  python/BPy_ViewShape.{cpp,h}
  python/Interface0D/BPy_CurvePoint.cpp
  python/Interface0D/BPy_SVertex.cpp
  python/Interface0D/BPy_ViewVertex.cpp
  python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
  python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
  python/Interface0D/ViewVertex/BPy_TVertex.cpp
  python/Interface1D/BPy_FEdge.cpp
  python/Interface1D/BPy_FrsCurve.cpp
  python/Interface1D/BPy_Stroke.cpp
  python/Interface1D/BPy_ViewEdge.cpp
  python/Interface1D/Curve/BPy_Chain.cpp
  python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
  python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp

* view_map/Interface[01]D.h, python/BPy_Interface[01]D.cpp: Removed
from the Interface0D and Interface1D C++ classes a back pointer to a
Python wrapper object and all "director" calls.  These classes (and
their subclasses) are used to build Freestyle's main data structures
(such as a view map and strokes) and their class hierarchy is static.
Python wrappers of these C++ classes are only used to access the data
structures from the Python layer, and not intended to extend the data
structures by subclassing the Python wrappers.  Without the necessity
of subclassing in the Python layer, the back pointer to a wrapping
Python object and "director" calls would be useless (actually they
were not used at all), so they were all removed.

* python/Director.{cpp,h}: Removed the definitions of directors that
were no longer used.

* stroke/Stroke.{cpp,h}: Removed an (unused) back pointer to a Python
wrapper object.

* python/BPy_ViewMap.cpp: Fixed a possible null pointer reference.

* python/Interface1D/BPy_FEdge.cpp: Fixed parameter checking in
FEdge___init__().
2009-08-02 16:23:18 +00:00

401 lines
16 KiB
C++
Raw Blame History

#include "BPy_FrsMaterial.h"
#include "BPy_Convert.h"
#ifdef __cplusplus
extern "C" {
#endif
///////////////////////////////////////////////////////////////////////////////////////////
/*--------------- Python API function prototypes for FrsMaterial instance -----------*/
static int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds);
static void FrsMaterial___dealloc__(BPy_FrsMaterial *self);
static PyObject * FrsMaterial___repr__(BPy_FrsMaterial *self);
static PyObject * FrsMaterial_diffuse( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_diffuseR( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_diffuseG( BPy_FrsMaterial* self) ;
static PyObject * FrsMaterial_diffuseB( BPy_FrsMaterial* self) ;
static PyObject * FrsMaterial_diffuseA( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_specular( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_specularR( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_specularG( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_specularB( BPy_FrsMaterial* self) ;
static PyObject * FrsMaterial_specularA( BPy_FrsMaterial* self) ;
static PyObject * FrsMaterial_ambient( BPy_FrsMaterial* self) ;
static PyObject * FrsMaterial_ambientR( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_ambientG( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_ambientB( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_ambientA( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_emission( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_emissionR( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_emissionG( BPy_FrsMaterial* self) ;
static PyObject * FrsMaterial_emissionB( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_emissionA( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_shininess( BPy_FrsMaterial* self);
static PyObject * FrsMaterial_setDiffuse( BPy_FrsMaterial *self, PyObject *args );
static PyObject * FrsMaterial_setSpecular( BPy_FrsMaterial *self, PyObject *args );
static PyObject * FrsMaterial_setAmbient( BPy_FrsMaterial *self, PyObject *args );
static PyObject * FrsMaterial_setEmission( BPy_FrsMaterial *self, PyObject *args );
static PyObject * FrsMaterial_setShininess( BPy_FrsMaterial *self, PyObject *args );
/*----------------------FrsMaterial instance definitions ----------------------------*/
static PyMethodDef BPy_FrsMaterial_methods[] = {
{"diffuse", ( PyCFunction ) FrsMaterial_diffuse, METH_NOARGS, "() Returns the diffuse color as a 4 float array"},
{"diffuseR", ( PyCFunction ) FrsMaterial_diffuseR, METH_NOARGS, "() Returns the red component of the diffuse color "},
{"diffuseG", ( PyCFunction ) FrsMaterial_diffuseG, METH_NOARGS, "() Returns the green component of the diffuse color "},
{"diffuseB", ( PyCFunction ) FrsMaterial_diffuseB, METH_NOARGS, "() Returns the blue component of the diffuse color "},
{"diffuseA", ( PyCFunction ) FrsMaterial_diffuseA, METH_NOARGS, "() Returns the alpha component of the diffuse color "},
{"specular", ( PyCFunction ) FrsMaterial_specular, METH_NOARGS, "() Returns the specular color as a 4 float array"},
{"specularR", ( PyCFunction ) FrsMaterial_specularR, METH_NOARGS, "() Returns the red component of the specular color "},
{"specularG", ( PyCFunction ) FrsMaterial_specularG, METH_NOARGS, "() Returns the green component of the specular color "},
{"specularB", ( PyCFunction ) FrsMaterial_specularB, METH_NOARGS, "() Returns the blue component of the specular color "},
{"specularA", ( PyCFunction ) FrsMaterial_specularA, METH_NOARGS, "() Returns the alpha component of the specular color "},
{"ambient", ( PyCFunction ) FrsMaterial_ambient, METH_NOARGS, "() Returns the ambient color as a 4 float array"},
{"ambientR", ( PyCFunction ) FrsMaterial_ambientR, METH_NOARGS, "() Returns the red component of the ambient color "},
{"ambientG", ( PyCFunction ) FrsMaterial_ambientG, METH_NOARGS, "() Returns the green component of the ambient color "},
{"ambientB", ( PyCFunction ) FrsMaterial_ambientB, METH_NOARGS, "() Returns the blue component of the ambient color "},
{"ambientA", ( PyCFunction ) FrsMaterial_ambientA, METH_NOARGS, "() Returns the alpha component of the ambient color "},
{"emission", ( PyCFunction ) FrsMaterial_emission, METH_NOARGS, "() Returns the emission color as a 4 float array"},
{"emissionR", ( PyCFunction ) FrsMaterial_emissionR, METH_NOARGS, "() Returns the red component of the emission color "},
{"emissionG", ( PyCFunction ) FrsMaterial_emissionG, METH_NOARGS, "() Returns the green component of the emission color "},
{"emissionB", ( PyCFunction ) FrsMaterial_emissionB, METH_NOARGS, "() Returns the blue component of the emission color "},
{"emissionA", ( PyCFunction ) FrsMaterial_emissionA, METH_NOARGS, "() Returns the alpha component of the emission color "},
{"shininess", ( PyCFunction ) FrsMaterial_shininess, METH_NOARGS, "() Returns the shininess coefficient "},
{"setDiffuse", ( PyCFunction ) FrsMaterial_setDiffuse, METH_NOARGS, "(float r, float g, float b, float a) Sets the diffuse color"},
{"setSpecular", ( PyCFunction ) FrsMaterial_setSpecular, METH_NOARGS, "(float r, float g, float b, float a) Sets the specular color"},
{"setAmbient", ( PyCFunction ) FrsMaterial_setAmbient, METH_NOARGS, "(float r, float g, float b, float a) Sets the ambient color"},
{"setEmission", ( PyCFunction ) FrsMaterial_setEmission, METH_NOARGS, "(float r, float g, float b, float a) Sets the emission color"},
{"setShininess", ( PyCFunction ) FrsMaterial_setShininess, METH_NOARGS, "(float r, float g, float b, float a) Sets the shininess color"},
{NULL, NULL, 0, NULL}
};
/*-----------------------BPy_FrsMaterial type definition ------------------------------*/
PyTypeObject FrsMaterial_Type = {
PyObject_HEAD_INIT( NULL )
0, /* ob_size */
"FrsMaterial", /* tp_name */
sizeof( BPy_FrsMaterial ), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor)FrsMaterial___dealloc__, /* tp_dealloc */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
NULL, /* tp_compare */
(reprfunc)FrsMaterial___repr__, /* tp_repr */
/* Method suites for standard classes */
NULL, /* PyNumberMethods *tp_as_number; */
NULL, /* 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 | Py_TPFLAGS_BASETYPE, /* 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 */
NULL, /* getiterfunc tp_iter; */
NULL, /* iternextfunc tp_iternext; */
/*** Attribute descriptor and subclassing stuff ***/
BPy_FrsMaterial_methods, /* struct PyMethodDef *tp_methods; */
NULL, /* struct PyMemberDef *tp_members; */
NULL, /* 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; */
(initproc)FrsMaterial___init__, /* initproc tp_init; */
NULL, /* allocfunc tp_alloc; */
PyType_GenericNew, /* 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
};
//-------------------MODULE INITIALIZATION--------------------------------
PyMODINIT_FUNC FrsMaterial_Init( PyObject *module )
{
if( module == NULL )
return;
if( PyType_Ready( &FrsMaterial_Type ) < 0 )
return;
Py_INCREF( &FrsMaterial_Type );
PyModule_AddObject(module, "FrsMaterial", (PyObject *)&FrsMaterial_Type);
}
//------------------------INSTANCE METHODS ----------------------------------
int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds)
{
PyObject *obj1 = 0;
float f1 = 0, f2 = 0., f3 = 0., f4 = 0., f5 = 0.;
if (! PyArg_ParseTuple(args, "|Offff", &obj1, &f2, &f3, &f4, &f5) )
return -1;
if( !obj1 ){
self->m = new FrsMaterial();
} else if( BPy_FrsMaterial_Check(obj1) ) {
if( ((BPy_FrsMaterial *) obj1)->m )
self->m = new FrsMaterial(*( ((BPy_FrsMaterial *) obj1)->m ));
else
return -1;
} else if( PyFloat_Check(obj1) ) {
f1 = PyFloat_AsDouble(obj1);
self->m = new FrsMaterial(&f1, &f2, &f3, &f4, f5);
} else {
PyErr_SetString(PyExc_TypeError, "invalid arguments");
return -1;
}
self->borrowed = 0;
return 0;
}
void FrsMaterial___dealloc__( BPy_FrsMaterial* self)
{
if( self->m && !self->borrowed )
delete self->m;
self->ob_type->tp_free((PyObject*)self);
}
PyObject * FrsMaterial___repr__( BPy_FrsMaterial* self)
{
return PyString_FromFormat("FrsMaterial - address: %p", self->m );
}
PyObject * FrsMaterial_diffuse( BPy_FrsMaterial* self) {
PyObject *tmp;
const float *diffuse = self->m->diffuse();
PyObject *py_diffuse = PyList_New(4);
tmp = PyFloat_FromDouble( diffuse[0] ); PyList_SetItem( py_diffuse, 0, tmp); Py_DECREF(tmp);
tmp = PyFloat_FromDouble( diffuse[1] ); PyList_SetItem( py_diffuse, 1, tmp); Py_DECREF(tmp);
tmp = PyFloat_FromDouble( diffuse[2] ); PyList_SetItem( py_diffuse, 2, tmp); Py_DECREF(tmp);
tmp = PyFloat_FromDouble( diffuse[3] ); PyList_SetItem( py_diffuse, 3, tmp); Py_DECREF(tmp);
return py_diffuse;
}
PyObject * FrsMaterial_diffuseR( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->diffuseR() );
}
PyObject * FrsMaterial_diffuseG( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->diffuseG() );
}
PyObject * FrsMaterial_diffuseB( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->diffuseB() );
}
PyObject * FrsMaterial_diffuseA( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->diffuseA() );
}
PyObject * FrsMaterial_specular( BPy_FrsMaterial* self) {
PyObject *tmp;
const float *specular = self->m->specular();
PyObject *py_specular = PyList_New(4);
tmp = PyFloat_FromDouble( specular[0] ); PyList_SetItem( py_specular, 0, tmp); Py_DECREF(tmp);
tmp = PyFloat_FromDouble( specular[1] ); PyList_SetItem( py_specular, 1, tmp); Py_DECREF(tmp);
tmp = PyFloat_FromDouble( specular[2] ); PyList_SetItem( py_specular, 2, tmp); Py_DECREF(tmp);
tmp = PyFloat_FromDouble( specular[3] ); PyList_SetItem( py_specular, 3, tmp); Py_DECREF(tmp);
return py_specular;
}
PyObject * FrsMaterial_specularR( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->specularR() );
}
PyObject * FrsMaterial_specularG( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->specularG() );
}
PyObject * FrsMaterial_specularB( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->specularB() );
}
PyObject * FrsMaterial_specularA( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->specularA() );
}
PyObject * FrsMaterial_ambient( BPy_FrsMaterial* self) {
PyObject *tmp;
const float *ambient = self->m->ambient();
PyObject *py_ambient = PyList_New(4);
tmp = PyFloat_FromDouble( ambient[0] ); PyList_SetItem( py_ambient, 0, tmp); Py_DECREF(tmp);
tmp = PyFloat_FromDouble( ambient[1] ); PyList_SetItem( py_ambient, 1, tmp); Py_DECREF(tmp);
tmp = PyFloat_FromDouble( ambient[2] ); PyList_SetItem( py_ambient, 2, tmp); Py_DECREF(tmp);
tmp = PyFloat_FromDouble( ambient[3] ); PyList_SetItem( py_ambient, 3, tmp); Py_DECREF(tmp);
return py_ambient;
}
PyObject * FrsMaterial_ambientR( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->ambientR() );
}
PyObject * FrsMaterial_ambientG( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->ambientG() );
}
PyObject * FrsMaterial_ambientB( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->ambientB() );
}
PyObject * FrsMaterial_ambientA( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->ambientA() );
}
PyObject * FrsMaterial_emission( BPy_FrsMaterial* self) {
PyObject *tmp;
const float *emission = self->m->emission();
PyObject *py_emission = PyList_New(4);
tmp = PyFloat_FromDouble( emission[0] ); PyList_SetItem( py_emission, 0, tmp); Py_DECREF(tmp);
tmp = PyFloat_FromDouble( emission[1] ); PyList_SetItem( py_emission, 1, tmp); Py_DECREF(tmp);
tmp = PyFloat_FromDouble( emission[2] ); PyList_SetItem( py_emission, 2, tmp); Py_DECREF(tmp);
tmp = PyFloat_FromDouble( emission[3] ); PyList_SetItem( py_emission, 3, tmp); Py_DECREF(tmp);
return py_emission;
}
PyObject * FrsMaterial_emissionR( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->emissionR() );
}
PyObject * FrsMaterial_emissionG( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->emissionG() );
}
PyObject * FrsMaterial_emissionB( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->emissionB() );
}
PyObject * FrsMaterial_emissionA( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->emissionA() );
}
PyObject * FrsMaterial_shininess( BPy_FrsMaterial* self) {
return PyFloat_FromDouble( self->m->shininess() );
}
PyObject * FrsMaterial_setDiffuse( BPy_FrsMaterial *self, PyObject *args ) {
float f1, f2, f3, f4;
if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4) ))
return NULL;
self->m->setDiffuse(f1, f2, f3, f4);
Py_RETURN_NONE;
}
PyObject * FrsMaterial_setSpecular( BPy_FrsMaterial *self, PyObject *args ) {
float f1, f2, f3, f4;
if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4) ))
return NULL;
self->m->setSpecular(f1, f2, f3, f4);
Py_RETURN_NONE;
}
PyObject * FrsMaterial_setAmbient( BPy_FrsMaterial *self, PyObject *args ) {
float f1, f2, f3, f4;
if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4) ))
return NULL;
self->m->setAmbient(f1, f2, f3, f4);
Py_RETURN_NONE;
}
PyObject * FrsMaterial_setEmission( BPy_FrsMaterial *self, PyObject *args ) {
float f1, f2, f3, f4;
if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4) ))
return NULL;
self->m->setEmission(f1, f2, f3, f4);
Py_RETURN_NONE;
}
PyObject * FrsMaterial_setShininess( BPy_FrsMaterial *self, PyObject *args ) {
float f;
if(!( PyArg_ParseTuple(args, "f", &f) ))
return NULL;
self->m->setShininess(f);
Py_RETURN_NONE;
}
///////////////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
}
#endif
Reference in New Issue View Git Blame Copy Permalink