[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15901] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/python: soc-2008-mxcurioni: clean-up #1
Maxime Curioni
maxime.curioni at gmail.com
Fri Aug 1 04:16:36 CEST 2008
Revision: 15901
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15901
Author: mxcurioni
Date: 2008-08-01 04:16:36 +0200 (Fri, 01 Aug 2008)
Log Message:
-----------
soc-2008-mxcurioni: clean-up #1
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
Removed Paths:
-------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Material.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Material.h
Copied: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp (from rev 15899, branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Material.cpp)
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp (rev 0)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp 2008-08-01 02:16:36 UTC (rev 15901)
@@ -0,0 +1,407 @@
+#include "BPy_Material.h"
+
+#include "BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*--------------- Python API function prototypes for Material instance -----------*/
+static int Material___init__(BPy_Material *self, PyObject *args, PyObject *kwds);
+static void Material___dealloc__(BPy_Material *self);
+static PyObject * Material___repr__(BPy_Material *self);
+
+static PyObject * Material_diffuse( BPy_Material* self);
+static PyObject * Material_diffuseR( BPy_Material* self);
+static PyObject * Material_diffuseG( BPy_Material* self) ;
+static PyObject * Material_diffuseB( BPy_Material* self) ;
+static PyObject * Material_diffuseA( BPy_Material* self);
+static PyObject * Material_specular( BPy_Material* self);
+static PyObject * Material_specularR( BPy_Material* self);
+static PyObject * Material_specularG( BPy_Material* self);
+static PyObject * Material_specularB( BPy_Material* self) ;
+static PyObject * Material_specularA( BPy_Material* self) ;
+static PyObject * Material_ambient( BPy_Material* self) ;
+static PyObject * Material_ambientR( BPy_Material* self);
+static PyObject * Material_ambientG( BPy_Material* self);
+static PyObject * Material_ambientB( BPy_Material* self);
+static PyObject * Material_ambientA( BPy_Material* self);
+static PyObject * Material_emission( BPy_Material* self);
+static PyObject * Material_emissionR( BPy_Material* self);
+static PyObject * Material_emissionG( BPy_Material* self) ;
+static PyObject * Material_emissionB( BPy_Material* self);
+static PyObject * Material_emissionA( BPy_Material* self);
+static PyObject * Material_shininess( BPy_Material* self);
+static PyObject * Material_setDiffuse( BPy_Material *self, PyObject *args );
+static PyObject * Material_setSpecular( BPy_Material *self, PyObject *args );
+static PyObject * Material_setAmbient( BPy_Material *self, PyObject *args );
+static PyObject * Material_setEmission( BPy_Material *self, PyObject *args );
+static PyObject * Material_setShininess( BPy_Material *self, PyObject *args );
+
+/*----------------------Material instance definitions ----------------------------*/
+static PyMethodDef BPy_Material_methods[] = {
+ {"diffuse", ( PyCFunction ) Material_diffuse, METH_NOARGS, "() Returns the diffuse color as a 4 float array"},
+ {"diffuseR", ( PyCFunction ) Material_diffuseR, METH_NOARGS, "() Returns the red component of the diffuse color "},
+ {"diffuseG", ( PyCFunction ) Material_diffuseG, METH_NOARGS, "() Returns the green component of the diffuse color "},
+ {"diffuseB", ( PyCFunction ) Material_diffuseB, METH_NOARGS, "() Returns the blue component of the diffuse color "},
+ {"diffuseA", ( PyCFunction ) Material_diffuseA, METH_NOARGS, "() Returns the alpha component of the diffuse color "},
+ {"specular", ( PyCFunction ) Material_specular, METH_NOARGS, "() Returns the specular color as a 4 float array"},
+ {"specularR", ( PyCFunction ) Material_specularR, METH_NOARGS, "() Returns the red component of the specular color "},
+ {"specularG", ( PyCFunction ) Material_specularG, METH_NOARGS, "() Returns the green component of the specular color "},
+ {"specularB", ( PyCFunction ) Material_specularB, METH_NOARGS, "() Returns the blue component of the specular color "},
+ {"specularA", ( PyCFunction ) Material_specularA, METH_NOARGS, "() Returns the alpha component of the specular color "},
+ {"ambient", ( PyCFunction ) Material_ambient, METH_NOARGS, "() Returns the ambient color as a 4 float array"},
+ {"ambientR", ( PyCFunction ) Material_ambientR, METH_NOARGS, "() Returns the red component of the ambient color "},
+ {"ambientG", ( PyCFunction ) Material_ambientG, METH_NOARGS, "() Returns the green component of the ambient color "},
+ {"ambientB", ( PyCFunction ) Material_ambientB, METH_NOARGS, "() Returns the blue component of the ambient color "},
+ {"ambientA", ( PyCFunction ) Material_ambientA, METH_NOARGS, "() Returns the alpha component of the ambient color "},
+ {"emission", ( PyCFunction ) Material_emission, METH_NOARGS, "() Returns the emission color as a 4 float array"},
+ {"emissionR", ( PyCFunction ) Material_emissionR, METH_NOARGS, "() Returns the red component of the emission color "},
+ {"emissionG", ( PyCFunction ) Material_emissionG, METH_NOARGS, "() Returns the green component of the emission color "},
+ {"emissionB", ( PyCFunction ) Material_emissionB, METH_NOARGS, "() Returns the blue component of the emission color "},
+ {"emissionA", ( PyCFunction ) Material_emissionA, METH_NOARGS, "() Returns the alpha component of the emission color "},
+ {"shininess", ( PyCFunction ) Material_shininess, METH_NOARGS, "() Returns the shininess coefficient "},
+ {"setDiffuse", ( PyCFunction ) Material_setDiffuse, METH_NOARGS, "(float r, float g, float b, float a) Sets the diffuse color"},
+ {"setSpecular", ( PyCFunction ) Material_setSpecular, METH_NOARGS, "(float r, float g, float b, float a) Sets the specular color"},
+ {"setAmbient", ( PyCFunction ) Material_setAmbient, METH_NOARGS, "(float r, float g, float b, float a) Sets the ambient color"},
+ {"setEmission", ( PyCFunction ) Material_setEmission, METH_NOARGS, "(float r, float g, float b, float a) Sets the emission color"},
+ {"setShininess", ( PyCFunction ) Material_setShininess, METH_NOARGS, "(float r, float g, float b, float a) Sets the shininess color"},
+ {NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Material type definition ------------------------------*/
+
+PyTypeObject Material_Type = {
+ PyObject_HEAD_INIT( NULL )
+ 0, /* ob_size */
+ "Material", /* tp_name */
+ sizeof( BPy_Material ), /* tp_basicsize */
+ 0, /* tp_itemsize */
+
+ /* methods */
+ (destructor)Material___dealloc__, /* tp_dealloc */
+ NULL, /* printfunc tp_print; */
+ NULL, /* getattrfunc tp_getattr; */
+ NULL, /* setattrfunc tp_setattr; */
+ NULL, /* tp_compare */
+ (reprfunc)Material___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_Material_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)Material___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 Material_Init( PyObject *module )
+{
+ if( module == NULL )
+ return;
+
+ if( PyType_Ready( &Material_Type ) < 0 )
+ return;
+
+ Py_INCREF( &Material_Type );
+ PyModule_AddObject(module, "Material", (PyObject *)&Material_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Material___init__(BPy_Material *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 Material();
+
+ } else if( BPy_Material_Check(obj1) ) {
+ if( ((BPy_Material *) obj1)->m )
+ self->m = new Material(*( ((BPy_Material *) obj1)->m ));
+ else
+ return -1;
+
+ } else if( PyFloat_Check(obj1) ) {
+ f1 = PyFloat_AsDouble(obj1);
+ self->m = new Material(&f1, &f2, &f3, &f4, f5);
+
+ } else {
+ return -1;
+ }
+
+ return 0;
+}
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list