[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15902] branches/soc-2008-mxcurioni/source /blender/freestyle: soc-2008-mxcurioni: clean-up #2

Maxime Curioni maxime.curioni at gmail.com
Fri Aug 1 04:25:22 CEST 2008


Revision: 15902
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15902
Author:   mxcurioni
Date:     2008-08-01 04:25:21 +0200 (Fri, 01 Aug 2008)

Log Message:
-----------
soc-2008-mxcurioni: clean-up #2

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Stroke.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/Iterator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/freestyle_init.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/shaders.py

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp	2008-08-01 02:16:36 UTC (rev 15901)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp	2008-08-01 02:25:21 UTC (rev 15902)
@@ -1,7 +1,7 @@
 #include "BPy_Convert.h"
 
 #include "BPy_BBox.h"
-#include "BPy_Material.h"
+#include "BPy_FrsMaterial.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -190,9 +190,9 @@
 	return py_vs;
 }
 
-PyObject * BPy_Material_from_Material( Material& m ){
-	PyObject *py_m = Material_Type.tp_new( &Material_Type, 0, 0 );
-	((BPy_Material*) py_m)->m = new Material( m );
+PyObject * BPy_FrsMaterial_from_Material( Material& m ){
+	PyObject *py_m = FrsMaterial_Type.tp_new( &FrsMaterial_Type, 0, 0 );
+	((BPy_FrsMaterial*) py_m)->m = new Material( m );
 
 	return py_m;
 }

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h	2008-08-01 02:16:36 UTC (rev 15901)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h	2008-08-01 02:25:21 UTC (rev 15902)
@@ -76,7 +76,7 @@
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D );
 PyObject * BPy_IntegrationType_from_IntegrationType( int i );
-PyObject * BPy_Material_from_Material( Material& m );
+PyObject * BPy_FrsMaterial_from_Material( Material& m );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
 PyObject * BPy_MediumType_from_MediumType( int n );
 PyObject * BPy_SShape_from_SShape( SShape& ss );

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Freestyle.cpp	2008-08-01 02:16:36 UTC (rev 15901)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Freestyle.cpp	2008-08-01 02:25:21 UTC (rev 15902)
@@ -3,7 +3,7 @@
 #include "BPy_BBox.h"
 #include "BPy_BinaryPredicate0D.h"
 #include "BPy_BinaryPredicate1D.h"
-#include "BPy_Material.h"
+#include "BPy_FrsMaterial.h"
 #include "BPy_FrsNoise.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
@@ -147,7 +147,7 @@
 	BBox_Init( module );
 	BinaryPredicate0D_Init( module );
 	BinaryPredicate1D_Init( module );
-	Material_Init( module );
+	FrsMaterial_Init( module );
 	FrsNoise_Init( module );
 	Id_Init( module );
 	IntegrationType_Init( module );

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp	2008-08-01 02:16:36 UTC (rev 15901)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp	2008-08-01 02:25:21 UTC (rev 15902)
@@ -1,4 +1,4 @@
-#include "BPy_Material.h"
+#include "BPy_FrsMaterial.h"
 
 #include "BPy_Convert.h"
 
@@ -8,85 +8,85 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  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);
+/*---------------  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 * 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 );
+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 );
 
-/*----------------------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"},

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list