[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10940] branches/pyapi_devel/source/ blender/python/api2_2x: Made Material.c use ken's utility functions for get /setting floats and ints.
Campbell Barton
cbarton at metavr.com
Sat Jun 16 04:19:41 CEST 2007
Revision: 10940
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10940
Author: campbellbarton
Date: 2007-06-16 04:19:37 +0200 (Sat, 16 Jun 2007)
Log Message:
-----------
Made Material.c use ken's utility functions for get/setting floats and ints.
Modified Paths:
--------------
branches/pyapi_devel/source/blender/python/api2_2x/Curve.c
branches/pyapi_devel/source/blender/python/api2_2x/Lattice.c
branches/pyapi_devel/source/blender/python/api2_2x/Material.c
branches/pyapi_devel/source/blender/python/api2_2x/Metaball.c
Modified: branches/pyapi_devel/source/blender/python/api2_2x/Curve.c
===================================================================
--- branches/pyapi_devel/source/blender/python/api2_2x/Curve.c 2007-06-16 01:10:53 UTC (rev 10939)
+++ branches/pyapi_devel/source/blender/python/api2_2x/Curve.c 2007-06-16 02:19:37 UTC (rev 10940)
@@ -136,18 +136,6 @@
return 0;
}
-static PyObject *Curve_getTotcol( BPy_Curve * self )
-{
- PyObject *attr = PyInt_FromLong( ( long ) self->curve->totcol );
-
- if( attr )
- return attr;
-
- return EXPP_ReturnPyObjError( PyExc_RuntimeError,
- "couldn't get Curve.totcol attribute" );
-}
-
-
PyObject *Curve_getMode( BPy_Curve * self )
{
PyObject *attr = PyInt_FromLong( ( long ) self->curve->flag );
@@ -1183,10 +1171,6 @@
(getter)Curve_getPathLen, (setter)Curve_setPathLen,
"The path length, used to set the number of frames for an animation (not the physical length)",
NULL},
- {"totcol",
- (getter)Curve_getTotcol, (setter)NULL,
- "The maximum number of linked materials",
- NULL},
{"flag",
(getter)Curve_getMode, (setter)Curve_setMode,
"The flag bitmask",
Modified: branches/pyapi_devel/source/blender/python/api2_2x/Lattice.c
===================================================================
--- branches/pyapi_devel/source/blender/python/api2_2x/Lattice.c 2007-06-16 01:10:53 UTC (rev 10939)
+++ branches/pyapi_devel/source/blender/python/api2_2x/Lattice.c 2007-06-16 02:19:37 UTC (rev 10940)
@@ -623,10 +623,6 @@
/*****************************************************************************/
static PyMethodDef BPy_Lattice_methods[] = {
/* name, method, flags, doc */
- {"getName", ( PyCFunction ) GenericLib_getName, METH_NOARGS,
- Lattice_getName_doc},
- {"setName", ( PyCFunction ) GenericLib_setName_with_method, METH_VARARGS,
- Lattice_setName_doc},
{"setPartitions", ( PyCFunction ) Lattice_setPartitions, METH_VARARGS,
Lattice_setPartitions_doc},
{"getPartitions", ( PyCFunction ) Lattice_getPartitions, METH_NOARGS,
Modified: branches/pyapi_devel/source/blender/python/api2_2x/Material.c
===================================================================
--- branches/pyapi_devel/source/blender/python/api2_2x/Material.c 2007-06-16 01:10:53 UTC (rev 10939)
+++ branches/pyapi_devel/source/blender/python/api2_2x/Material.c 2007-06-16 02:19:37 UTC (rev 10940)
@@ -56,116 +56,8 @@
#include "gen_library.h"
#include "IDProp.h"
-/*****************************************************************************/
-/* Python BPy_Material defaults: */
-/*****************************************************************************/
-/* Material MIN, MAX values */
-#define EXPP_MAT_ADD_MIN 0.0f
-#define EXPP_MAT_ADD_MAX 1.0f
-#define EXPP_MAT_ALPHA_MIN 0.0f
-#define EXPP_MAT_ALPHA_MAX 1.0f
-#define EXPP_MAT_AMB_MIN 0.0f
-#define EXPP_MAT_AMB_MAX 1.0f
-#define EXPP_MAT_COL_MIN 0.0f /* min/max for all ... */
-#define EXPP_MAT_COL_MAX 1.0f /* ... color triplets */
-#define EXPP_MAT_EMIT_MIN 0.0f
-#define EXPP_MAT_EMIT_MAX 1.0f
-#define EXPP_MAT_REF_MIN 0.0f
-#define EXPP_MAT_REF_MAX 1.0f
-#define EXPP_MAT_SPEC_MIN 0.0f
-#define EXPP_MAT_SPEC_MAX 2.0f
-#define EXPP_MAT_SPECTRA_MIN 0.0f
-#define EXPP_MAT_SPECTRA_MAX 1.0f
-
-/* Shader specific settings */
-
-#define EXPP_MAT_ROUGHNESS_MIN 0.0f
-#define EXPP_MAT_ROUGHNESS_MAX 3.140f
-#define EXPP_MAT_SPECSIZE_MIN 0.0f
-#define EXPP_MAT_SPECSIZE_MAX 1.530f
-#define EXPP_MAT_DIFFUSESIZE_MIN 0.0f
-#define EXPP_MAT_DIFFUSESIZE_MAX 3.140f
-#define EXPP_MAT_SPECSMOOTH_MIN 0.0f
-#define EXPP_MAT_SPECSMOOTH_MAX 1.0f
-#define EXPP_MAT_DIFFUSESMOOTH_MIN 0.0f
-#define EXPP_MAT_DIFFUSESMOOTH_MAX 1.0f
-#define EXPP_MAT_DIFFUSE_DARKNESS_MIN 0.0f
-#define EXPP_MAT_DIFFUSE_DARKNESS_MAX 2.0f
-#define EXPP_MAT_REFRACINDEX_MIN 1.0f
-#define EXPP_MAT_REFRACINDEX_MAX 10.0f
-#define EXPP_MAT_RMS_MIN 0.0f
-#define EXPP_MAT_RMS_MAX 0.4f
-/* End shader settings */
-
-#define EXPP_MAT_ZOFFS_MIN 0.0
-#define EXPP_MAT_ZOFFS_MAX 10.0
-#define EXPP_MAT_HALOSIZE_MIN 0.0
-#define EXPP_MAT_HALOSIZE_MAX 100.0
-#define EXPP_MAT_FLARESIZE_MIN 0.1f
-#define EXPP_MAT_FLARESIZE_MAX 25.0
-#define EXPP_MAT_FLAREBOOST_MIN 0.1f
-#define EXPP_MAT_FLAREBOOST_MAX 10.0
-#define EXPP_MAT_SUBSIZE_MIN 0.1f
-#define EXPP_MAT_SUBSIZE_MAX 25.0
-
-#define EXPP_MAT_HARD_MIN 1
-#define EXPP_MAT_HARD_MAX 255 /* 127 with MODE HALO ON */
-#define EXPP_MAT_HALOSEED_MIN 0
-#define EXPP_MAT_HALOSEED_MAX 255
-#define EXPP_MAT_NFLARES_MIN 1
-#define EXPP_MAT_NFLARES_MAX 32
-#define EXPP_MAT_FLARESEED_MIN 0
-#define EXPP_MAT_FLARESEED_MAX 255
-#define EXPP_MAT_NSTARS_MIN 3
-#define EXPP_MAT_NSTARS_MAX 50
-#define EXPP_MAT_NLINES_MIN 0
-#define EXPP_MAT_NLINES_MAX 250
-#define EXPP_MAT_NRINGS_MIN 0
-#define EXPP_MAT_NRINGS_MAX 24
-
-#define EXPP_MAT_RAYMIRR_MIN 0.0
-#define EXPP_MAT_RAYMIRR_MAX 1.0
-#define EXPP_MAT_MIRRDEPTH_MIN 0
-#define EXPP_MAT_MIRRDEPTH_MAX 10
-#define EXPP_MAT_FRESNELMIRR_MIN 0.0
-#define EXPP_MAT_FRESNELMIRR_MAX 5.0
-#define EXPP_MAT_FRESNELMIRRFAC_MIN 1.0
-#define EXPP_MAT_FRESNELMIRRFAC_MAX 5.0
-#define EXPP_MAT_FILTER_MIN 0.0
-#define EXPP_MAT_FILTER_MAX 1.0
-#define EXPP_MAT_TRANSLUCENCY_MIN 0.0
-#define EXPP_MAT_TRANSLUCENCY_MAX 1.0
-#define EXPP_MAT_ZOFFS_MIN 0.0
-#define EXPP_MAT_ZOFFS_MAX 10.0
-#define EXPP_MAT_IOR_MIN 1.0
-#define EXPP_MAT_IOR_MAX 3.0
-#define EXPP_MAT_TRANSDEPTH_MIN 0
-#define EXPP_MAT_TRANSDEPTH_MAX 10
-#define EXPP_MAT_FRESNELTRANS_MIN 0.0
-#define EXPP_MAT_FRESNELTRANS_MAX 5.0
-#define EXPP_MAT_FRESNELTRANSFAC_MIN 1.0
-#define EXPP_MAT_FRESNELTRANSFAC_MAX 5.0
-#define EXPP_MAT_SPECTRANS_MIN 0.0
-#define EXPP_MAT_SPECTRANS_MAX 1.0
-#define EXPP_MAT_MIRRTRANSADD_MIN 0.0
-#define EXPP_MAT_MIRRTRANSADD_MAX 1.0
-
/* closure values for getColorComponent()/setColorComponent() */
-#define EXPP_MAT_COMP_R 0
-#define EXPP_MAT_COMP_G 1
-#define EXPP_MAT_COMP_B 2
-#define EXPP_MAT_COMP_SPECR 3
-#define EXPP_MAT_COMP_SPECG 4
-#define EXPP_MAT_COMP_SPECB 5
-#define EXPP_MAT_COMP_MIRR 6
-#define EXPP_MAT_COMP_MIRG 7
-#define EXPP_MAT_COMP_MIRB 8
-#define EXPP_MAT_COMP_SSSR 9
-#define EXPP_MAT_COMP_SSSG 10
-#define EXPP_MAT_COMP_SSSB 11
-
-
#define IPOKEY_RGB 0
#define IPOKEY_ALPHA 1
#define IPOKEY_HALOSIZE 2
@@ -176,21 +68,81 @@
#define IPOKEY_SIZE 13
#define IPOKEY_ALLMAPPING 11
-/* SSS Settings */
-#define EXPP_MAT_SSS_SCALE_MIN 0.001
-#define EXPP_MAT_SSS_SCALE_MAX 1000.0
-#define EXPP_MAT_SSS_RADIUS_MIN 0.0
-#define EXPP_MAT_SSS_RADIUS_MAX 10000.0
-#define EXPP_MAT_SSS_IOR_MIN 0.1
-#define EXPP_MAT_SSS_IOR_MAX 2.0
-#define EXPP_MAT_SSS_ERROR_MIN 0.0
-#define EXPP_MAT_SSS_ERROR_MAX 1.0
-#define EXPP_MAT_SSS_FRONT_MIN 0.0
-#define EXPP_MAT_SSS_FRONT_MAX 2.0
-#define EXPP_MAT_SSS_BACK_MIN 0.0
-#define EXPP_MAT_SSS_BACK_MAX 10.0
+enum mat_float_consts {
+ EXPP_MAT_COMP_R = 0,
+ EXPP_MAT_COMP_G,
+ EXPP_MAT_COMP_B,
+ EXPP_MAT_COMP_SPECR,
+ EXPP_MAT_COMP_SPECG,
+ EXPP_MAT_COMP_SPECB,
+ EXPP_MAT_COMP_MIRR,
+ EXPP_MAT_COMP_MIRG,
+ EXPP_MAT_COMP_MIRB,
+ EXPP_MAT_COMP_SSSR,
+ EXPP_MAT_COMP_SSSG,
+ EXPP_MAT_COMP_SSSB,
+ EXPP_MAT_ATTR_ADD,
+ EXPP_MAT_ATTR_ALPHA,
+ EXPP_MAT_ATTR_SHADOWALPHA,
+ EXPP_MAT_ATTR_AMB,
+ EXPP_MAT_ATTR_EMIT,
+ EXPP_MAT_ATTR_REF,
+ EXPP_MAT_ATTR_SPEC,
+ EXPP_MAT_ATTR_SPECTRA,
+ EXPP_MAT_ATTR_ROUGHNESS,
+ EXPP_MAT_ATTR_SPECSIZE,
+ EXPP_MAT_ATTR_DIFFUSESIZE,
+ EXPP_MAT_ATTR_SPECSMOOTH,
+ EXPP_MAT_ATTR_DIFFUSESMOOTH,
+ EXPP_MAT_ATTR_DIFFUSE_DARKNESS,
+ EXPP_MAT_ATTR_REFRACINDEX,
+ EXPP_MAT_ATTR_RMS,
+ EXPP_MAT_ATTR_HALOSIZE,
+ EXPP_MAT_ATTR_FLARESIZE,
+ EXPP_MAT_ATTR_FLAREBOOST,
+ EXPP_MAT_ATTR_SUBSIZE,
+ EXPP_MAT_ATTR_RAYMIRR,
+ EXPP_MAT_ATTR_FRESNELMIRR,
+ EXPP_MAT_ATTR_FRESNELMIRRFAC,
+ EXPP_MAT_ATTR_FILTER,
+ EXPP_MAT_ATTR_TRANSLUCENCY,
+ EXPP_MAT_ATTR_ZOFFS,
+ EXPP_MAT_ATTR_IOR,
+ EXPP_MAT_ATTR_FRESNELTRANS,
+ EXPP_MAT_ATTR_FRESNELTRANSFAC,
+ EXPP_MAT_ATTR_SPECTRANS,
+ EXPP_MAT_ATTR_MIRRTRANSADD,
+ EXPP_MAT_ATTR_RB_FRICTION,
+ EXPP_MAT_ATTR_RB_RESTITUTION,
+ EXPP_MAT_ATTR_SSS_SCALE,
+ EXPP_MAT_ATTR_SSS_RADIUS_RED,
+ EXPP_MAT_ATTR_SSS_RADIUS_GREEN,
+ EXPP_MAT_ATTR_SSS_RADIUS_BLUE,
+ EXPP_MAT_ATTR_SSS_IOR,
+ EXPP_MAT_ATTR_SSS_ERROR,
+ EXPP_MAT_ATTR_SSS_COLBLEND,
+ EXPP_MAT_ATTR_SSS_TEXSCATTER,
+ EXPP_MAT_ATTR_SSS_FRONT,
+ EXPP_MAT_ATTR_SSS_BACK,
+};
+
+/* int/short/char */
+enum mat_int_consts {
+ EXPP_MAT_ATTR_TRANSDEPTH = 0,
+ EXPP_MAT_ATTR_MIRRDEPTH,
+ EXPP_MAT_ATTR_HARD,
+ EXPP_MAT_ATTR_HALOSEED,
+ EXPP_MAT_ATTR_NFLARES,
+ EXPP_MAT_ATTR_FLARESEED,
+ EXPP_MAT_ATTR_NSTARS,
+ EXPP_MAT_ATTR_NLINES,
+ EXPP_MAT_ATTR_NRINGS,
+ EXPP_MAT_ATTR_SPEC_SHADER,
+ EXPP_MAT_ATTR_DIFF_SHADER,
+};
+
/*****************************************************************************/
/* Python API function prototypes for the Material module. */
/*****************************************************************************/
@@ -318,73 +270,15 @@
/*** The Material PyType ***/
/***************************/
static int Material_setIpo( BPy_Material * self, PyObject * value );
+static int Material_setLightGroup( BPy_Material * self, PyObject * value );
+static int Material_setSssEnable( BPy_Material * self, PyObject * value );
static int Material_setMode( BPy_Material * self, PyObject * value );
static int Material_setRGBCol( BPy_Material * self, PyObject * value );
static int Material_setSpecCol( BPy_Material * self, PyObject * value );
static int Material_setMirCol( BPy_Material * self, PyObject * value );
static int Material_setSssCol( BPy_Material * self, PyObject * value );
-static int Material_setColorComponent( BPy_Material * self, PyObject * value,
- void * closure );
-static int Material_setAmb( BPy_Material * self, PyObject * value );
-static int Material_setEmit( BPy_Material * self, PyObject * value );
-static int Material_setSpecTransp( BPy_Material * self, PyObject * value );
-static int Material_setAlpha( BPy_Material * self, PyObject * value );
-static int Material_setShadAlpha( BPy_Material * self, PyObject * value );
-static int Material_setRef( BPy_Material * self, PyObject * value );
-static int Material_setSpec( BPy_Material * self, PyObject * value );
-static int Material_setZOffset( BPy_Material * self, PyObject * value );
-static int Material_setLightGroup( BPy_Material * self, PyObject * value );
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list