Page MenuHome
Files F2953

patch-Material.c.txt3
Public
Actions

Authored By
Ken Hughes (khughes)
Nov 13 2013, 1:07 PM
Size
12 KB
Subscribers
None

patch-Material.c.txt3
View Options

--- source/blender/python/api2_2x/Material.c 2005-08-28 18:11:59.000000000 -0700
+++ source/blender/python/api2_2x/Material.c.new 2005-08-28 18:11:25.000000000 -0700
@@ -55,34 +55,6 @@
/*****************************************************************************/
/* Python BPy_Material defaults: */
/*****************************************************************************/
-#define EXPP_MAT_MODE_TRACEABLE MA_TRACEBLE
-#define EXPP_MAT_MODE_SHADOW MA_SHADOW
-#define EXPP_MAT_MODE_SHADELESS MA_SHLESS
-#define EXPP_MAT_MODE_WIRE MA_WIRE
-#define EXPP_MAT_MODE_VCOL_LIGHT MA_VERTEXCOL
-#define EXPP_MAT_MODE_HALO MA_HALO
-#define EXPP_MAT_MODE_ZTRANSP MA_ZTRA
-#define EXPP_MAT_MODE_VCOL_PAINT MA_VERTEXCOLP
-#define EXPP_MAT_MODE_ZINVERT MA_ZINV
-#define EXPP_MAT_MODE_HALORINGS MA_HALO_RINGS
-#define EXPP_MAT_MODE_ENV MA_ENV
-#define EXPP_MAT_MODE_HALOLINES MA_HALO_LINES
-#define EXPP_MAT_MODE_ONLYSHADOW MA_ONLYSHADOW
-#define EXPP_MAT_MODE_HALOXALPHA MA_HALO_XALPHA
-#define EXPP_MAT_MODE_HALOSTAR MA_STAR
-#define EXPP_MAT_MODE_TEXFACE MA_FACETEXTURE
-#define EXPP_MAT_MODE_HALOTEX MA_HALOTEX
-#define EXPP_MAT_MODE_HALOPUNO MA_HALOPUNO
-#define EXPP_MAT_MODE_NOMIST MA_NOMIST
-#define EXPP_MAT_MODE_HALOSHADE MA_HALO_SHADE
-#define EXPP_MAT_MODE_HALOFLARE MA_HALO_FLARE
-#define EXPP_MAT_MODE_RADIO MA_RADIO
-#define EXPP_MAT_MODE_RAYMIRROR MA_RAYMIRROR
-#define EXPP_MAT_MODE_ZTRA MA_ZTRA
-#define EXPP_MAT_MODE_RAYTRANSP MA_RAYTRANSP
-#define EXPP_MAT_MODE_ONLYSHADOW MA_ONLYSHADOW
-#define EXPP_MAT_MODE_NOMIST MA_NOMIST
-#define EXPP_MAT_MODE_ENV MA_ENV
/* Material MIN, MAX values */
#define EXPP_MAT_ADD_MIN 0.0f
#define EXPP_MAT_ADD_MAX 1.0f
@@ -102,10 +74,6 @@
#define EXPP_MAT_SPECTRA_MAX 1.0f
/* Shader specific settings */
-#define EXPP_MAT_SPEC_SHADER_MIN MA_SPEC_COOKTORR
-#define EXPP_MAT_SPEC_SHADER_MAX MA_SPEC_WARDISO
-#define EXPP_MAT_DIFFUSE_SHADER_MIN MA_DIFF_LAMBERT
-#define EXPP_MAT_DIFFUSE_SHADER_MAX MA_DIFF_MINNAERT
#define EXPP_MAT_ROUGHNESS_MIN 0.0f
#define EXPP_MAT_ROUGHNESS_MAX 3.140f
@@ -125,18 +93,6 @@
#define EXPP_MAT_RMS_MAX 0.4f
/* End shader settings */
-/* shader dicts - Diffuse */
-#define EXPP_MAT_SHADER_DIFFUSE_LAMBERT MA_DIFF_LAMBERT
-#define EXPP_MAT_SHADER_DIFFUSE_ORENNAYAR MA_DIFF_ORENNAYAR
-#define EXPP_MAT_SHADER_DIFFUSE_TOON MA_DIFF_TOON
-#define EXPP_MAT_SHADER_DIFFUSE_MINNAERT MA_DIFF_MINNAERT
-/* shader dicts - Specular */
-#define EXPP_MAT_SHADER_SPEC_COOKTORR MA_SPEC_COOKTORR
-#define EXPP_MAT_SHADER_SPEC_PHONG MA_SPEC_PHONG
-#define EXPP_MAT_SHADER_SPEC_BLINN MA_SPEC_BLINN
-#define EXPP_MAT_SHADER_SPEC_TOON MA_SPEC_TOON
-#define EXPP_MAT_SHADER_SPEC_WARDISO MA_SPEC_WARDISO
-
#define EXPP_MAT_ZOFFS_MIN 0.0
#define EXPP_MAT_ZOFFS_MAX 10.0
#define EXPP_MAT_HALOSIZE_MIN 0.0
@@ -363,44 +319,34 @@
{
PyObject *Modes = PyConstant_New( );
-#undef EXPP_ADDCONST
-#define EXPP_ADDCONST(name) \
- PyConstant_Insert(c, #name, PyInt_FromLong(EXPP_MAT_MODE_##name))
-
-/* So that:
- * EXPP_ADDCONST(TRACEABLE) becomes:
- * PyConstant_Insert(c, "TRACEABLE", PyInt_FromLong(EXPP_MAT_MODE_TRACEABLE))
- */
-
if( Modes ) {
BPy_constant *c = ( BPy_constant * ) Modes;
- EXPP_ADDCONST( TRACEABLE );
- EXPP_ADDCONST( SHADOW );
- EXPP_ADDCONST( SHADELESS );
- EXPP_ADDCONST( WIRE );
- EXPP_ADDCONST( VCOL_LIGHT );
- EXPP_ADDCONST( HALO );
- EXPP_ADDCONST( ZTRANSP );
- EXPP_ADDCONST( VCOL_PAINT );
- EXPP_ADDCONST( ZINVERT );
- EXPP_ADDCONST( HALORINGS );
- EXPP_ADDCONST( ENV );
- EXPP_ADDCONST( HALOLINES );
- EXPP_ADDCONST( ONLYSHADOW );
- EXPP_ADDCONST( HALOXALPHA );
- EXPP_ADDCONST( HALOSTAR );
- EXPP_ADDCONST( TEXFACE );
- EXPP_ADDCONST( HALOTEX );
- EXPP_ADDCONST( HALOPUNO );
- EXPP_ADDCONST( NOMIST );
- EXPP_ADDCONST( HALOSHADE );
- EXPP_ADDCONST( HALOFLARE );
- EXPP_ADDCONST( RADIO );
- EXPP_ADDCONST( RAYMIRROR );
- EXPP_ADDCONST( ZTRA );
- EXPP_ADDCONST( RAYTRANSP );
-
+ PyConstant_Insert(c, "TRACEABLE", PyInt_FromLong(MA_TRACEBLE));
+ PyConstant_Insert(c, "SHADOW", PyInt_FromLong(MA_SHADOW));
+ PyConstant_Insert(c, "SHADELESS", PyInt_FromLong(MA_SHLESS));
+ PyConstant_Insert(c, "WIRE", PyInt_FromLong(MA_WIRE));
+ PyConstant_Insert(c, "VCOL_LIGHT", PyInt_FromLong(MA_VERTEXCOL));
+ PyConstant_Insert(c, "HALO", PyInt_FromLong(MA_HALO));
+ PyConstant_Insert(c, "ZTRANSP", PyInt_FromLong(MA_ZTRA));
+ PyConstant_Insert(c, "VCOL_PAINT", PyInt_FromLong(MA_VERTEXCOLP));
+ PyConstant_Insert(c, "ZINVERT", PyInt_FromLong(MA_ZINV));
+ PyConstant_Insert(c, "HALORINGS", PyInt_FromLong(MA_HALO_RINGS));
+ PyConstant_Insert(c, "ENV", PyInt_FromLong(MA_ENV));
+ PyConstant_Insert(c, "HALOLINES", PyInt_FromLong(MA_HALO_LINES));
+ PyConstant_Insert(c, "ONLYSHADOW", PyInt_FromLong(MA_ONLYSHADOW));
+ PyConstant_Insert(c, "HALOXALPHA", PyInt_FromLong(MA_HALO_XALPHA));
+ PyConstant_Insert(c, "HALOSTAR", PyInt_FromLong(MA_STAR));
+ PyConstant_Insert(c, "TEXFACE", PyInt_FromLong(MA_FACETEXTURE));
+ PyConstant_Insert(c, "HALOTEX", PyInt_FromLong(MA_HALOTEX));
+ PyConstant_Insert(c, "HALOPUNO", PyInt_FromLong(MA_HALOPUNO));
+ PyConstant_Insert(c, "NOMIST", PyInt_FromLong(MA_NOMIST));
+ PyConstant_Insert(c, "HALOSHADE", PyInt_FromLong(MA_HALO_SHADE));
+ PyConstant_Insert(c, "HALOFLARE", PyInt_FromLong(MA_HALO_FLARE));
+ PyConstant_Insert(c, "RADIO", PyInt_FromLong(MA_RADIO));
+ PyConstant_Insert(c, "RAYMIRROR", PyInt_FromLong(MA_RAYMIRROR));
+ PyConstant_Insert(c, "ZTRA", PyInt_FromLong(MA_ZTRA));
+ PyConstant_Insert(c, "RAYTRANSP", PyInt_FromLong(MA_RAYTRANSP));
}
return Modes;
@@ -411,28 +357,19 @@
{
PyObject *Shaders = PyConstant_New( );
-#undef EXPP_ADDCONST
-#define EXPP_ADDCONST(name) \
- PyConstant_Insert(c, #name, PyInt_FromLong(EXPP_MAT_SHADER_##name))
-
-/* So that:
- * EXPP_ADDCONST(DIFFUSE_LAMBERT) becomes:
- * PyConstant_Insert(c, "TRACEABLE", PyInt_FromLong(EXPP_MAT_SHADER_DIFFUSE_LAMBERT))
- */
-
if( Shaders ) {
BPy_constant *c = ( BPy_constant * ) Shaders;
- EXPP_ADDCONST( DIFFUSE_LAMBERT );
- EXPP_ADDCONST( DIFFUSE_ORENNAYAR );
- EXPP_ADDCONST( DIFFUSE_TOON );
- EXPP_ADDCONST( DIFFUSE_MINNAERT );
-
- EXPP_ADDCONST( SPEC_COOKTORR );
- EXPP_ADDCONST( SPEC_PHONG );
- EXPP_ADDCONST( SPEC_BLINN );
- EXPP_ADDCONST( SPEC_TOON );
- EXPP_ADDCONST( SPEC_WARDISO );
+ PyConstant_Insert(c, "DIFFUSE_LAMBERT", PyInt_FromLong(MA_DIFF_LAMBERT));
+ PyConstant_Insert(c, "DIFFUSE_ORENNAYAR", PyInt_FromLong(MA_DIFF_ORENNAYAR));
+ PyConstant_Insert(c, "DIFFUSE_TOON", PyInt_FromLong(MA_DIFF_TOON));
+ PyConstant_Insert(c, "DIFFUSE_MINNAERT", PyInt_FromLong(MA_DIFF_MINNAERT));
+ PyConstant_Insert(c, "SPEC_COOKTORR", PyInt_FromLong(MA_SPEC_COOKTORR));
+ PyConstant_Insert(c, "SPEC_PHONG", PyInt_FromLong(MA_SPEC_PHONG));
+ PyConstant_Insert(c, "SPEC_BLINN", PyInt_FromLong(MA_SPEC_BLINN));
+ PyConstant_Insert(c, "SPEC_TOON", PyInt_FromLong(MA_SPEC_TOON));
+ PyConstant_Insert(c, "SPEC_WARDISO", PyInt_FromLong(MA_SPEC_WARDISO));
+
}
return Shaders;
@@ -1975,33 +1912,33 @@
static int Material_setMode( BPy_Material * self, PyObject * value )
{
int param;
- int bitmask = EXPP_MAT_MODE_TRACEABLE
- | EXPP_MAT_MODE_SHADOW
- | EXPP_MAT_MODE_SHADELESS
- | EXPP_MAT_MODE_WIRE
- | EXPP_MAT_MODE_VCOL_LIGHT
- | EXPP_MAT_MODE_VCOL_PAINT
- | EXPP_MAT_MODE_HALO
- | EXPP_MAT_MODE_ZTRANSP
- | EXPP_MAT_MODE_ZINVERT
- | EXPP_MAT_MODE_HALORINGS
- | EXPP_MAT_MODE_HALOLINES
- | EXPP_MAT_MODE_ONLYSHADOW
- | EXPP_MAT_MODE_HALOXALPHA
- | EXPP_MAT_MODE_HALOSTAR
- | EXPP_MAT_MODE_TEXFACE
- | EXPP_MAT_MODE_HALOTEX
- | EXPP_MAT_MODE_HALOPUNO
- | EXPP_MAT_MODE_NOMIST
- | EXPP_MAT_MODE_HALOSHADE
- | EXPP_MAT_MODE_HALOFLARE
- | EXPP_MAT_MODE_RADIO
- | EXPP_MAT_MODE_RAYMIRROR
- | EXPP_MAT_MODE_ZTRA
- | EXPP_MAT_MODE_RAYTRANSP
- | EXPP_MAT_MODE_ONLYSHADOW
- | EXPP_MAT_MODE_NOMIST
- | EXPP_MAT_MODE_ENV;
+ int bitmask = MA_TRACEBLE
+ | MA_SHADOW
+ | MA_SHLESS
+ | MA_WIRE
+ | MA_VERTEXCOL
+ | MA_VERTEXCOLP
+ | MA_HALO
+ | MA_ZTRA
+ | MA_ZINV
+ | MA_HALO_RINGS
+ | MA_HALO_LINES
+ | MA_ONLYSHADOW
+ | MA_HALO_XALPHA
+ | MA_STAR
+ | MA_FACETEXTURE
+ | MA_HALOTEX
+ | MA_HALOPUNO
+ | MA_NOMIST
+ | MA_HALO_SHADE
+ | MA_HALO_FLARE
+ | MA_RADIO
+ | MA_RAYMIRROR
+ | MA_ZTRA
+ | MA_RAYTRANSP
+ | MA_ONLYSHADOW
+ | MA_NOMIST
+ | MA_ENV;
if( !PyInt_CheckExact ( value ) ) {
char errstr[128];
@@ -2278,15 +2215,15 @@
static int Material_setSpecShader( BPy_Material * self, PyObject * value )
{
return EXPP_setShortRange( value, &self->material->spec_shader,
- EXPP_MAT_SPEC_SHADER_MIN,
- EXPP_MAT_SPEC_SHADER_MAX );
+ MA_SPEC_COOKTORR,
+ MA_SPEC_WARDISO );
}
static int Material_setDiffuseShader( BPy_Material * self, PyObject * value )
{
return EXPP_setShortRange( value, &self->material->diff_shader,
- EXPP_MAT_DIFFUSE_SHADER_MIN,
- EXPP_MAT_DIFFUSE_SHADER_MAX );
+ MA_DIFF_LAMBERT,
+ MA_DIFF_MINNAERT );
}
static int Material_setRoughness( BPy_Material * self, PyObject * value )
@@ -3010,7 +2947,7 @@
if ( (PySequence_Size( args ) == 1)
&& PyInt_Check ( PySequence_Fast_GET_ITEM ( args , 0 ) )
&& PyArg_ParseTuple( args, "i", &flag )
- && flag < (EXPP_MAT_MODE_RAYMIRROR >> 1) ) {
+ && flag < (MA_RAYMIRROR >> 1) ) {
ok = 1;
/*
@@ -3027,60 +2964,60 @@
if( m[i] == NULL )
break;
if( strcmp( m[i], "Traceable" ) == 0 )
- flag |= EXPP_MAT_MODE_TRACEABLE;
+ flag |= MA_TRACEBLE;
else if( strcmp( m[i], "Shadow" ) == 0 )
- flag |= EXPP_MAT_MODE_SHADOW;
+ flag |= MA_SHADOW;
else if( strcmp( m[i], "Shadeless" ) == 0 )
- flag |= EXPP_MAT_MODE_SHADELESS;
+ flag |= MA_SHLESS;
else if( strcmp( m[i], "Wire" ) == 0 )
- flag |= EXPP_MAT_MODE_WIRE;
+ flag |= MA_WIRE;
else if( strcmp( m[i], "VColLight" ) == 0 )
- flag |= EXPP_MAT_MODE_VCOL_LIGHT;
+ flag |= MA_VERTEXCOL;
else if( strcmp( m[i], "VColPaint" ) == 0 )
- flag |= EXPP_MAT_MODE_VCOL_PAINT;
+ flag |= MA_VERTEXCOLP;
else if( strcmp( m[i], "Halo" ) == 0 )
- flag |= EXPP_MAT_MODE_HALO;
+ flag |= MA_HALO;
else if( strcmp( m[i], "ZTransp" ) == 0 )
- flag |= EXPP_MAT_MODE_ZTRANSP;
+ flag |= MA_ZTRA;
else if( strcmp( m[i], "ZInvert" ) == 0 )
- flag |= EXPP_MAT_MODE_ZINVERT;
+ flag |= MA_ZINV;
else if( strcmp( m[i], "HaloRings" ) == 0 )
- flag |= EXPP_MAT_MODE_HALORINGS;
+ flag |= MA_HALO_RINGS;
else if( strcmp( m[i], "HaloLines" ) == 0 )
- flag |= EXPP_MAT_MODE_HALOLINES;
+ flag |= MA_HALO_LINES;
else if( strcmp( m[i], "OnlyShadow" ) == 0 )
- flag |= EXPP_MAT_MODE_ONLYSHADOW;
+ flag |= MA_ONLYSHADOW;
else if( strcmp( m[i], "HaloXAlpha" ) == 0 )
- flag |= EXPP_MAT_MODE_HALOXALPHA;
+ flag |= MA_HALO_XALPHA;
else if( strcmp( m[i], "HaloStar" ) == 0 )
- flag |= EXPP_MAT_MODE_HALOSTAR;
+ flag |= MA_STAR;
else if( strcmp( m[i], "TexFace" ) == 0 )
- flag |= EXPP_MAT_MODE_TEXFACE;
+ flag |= MA_FACETEXTURE;
else if( strcmp( m[i], "HaloTex" ) == 0 )
- flag |= EXPP_MAT_MODE_HALOTEX;
+ flag |= MA_HALOTEX;
else if( strcmp( m[i], "HaloPuno" ) == 0 )
- flag |= EXPP_MAT_MODE_HALOPUNO;
+ flag |= MA_HALOPUNO;
else if( strcmp( m[i], "NoMist" ) == 0 )
- flag |= EXPP_MAT_MODE_NOMIST;
+ flag |= MA_NOMIST;
else if( strcmp( m[i], "HaloShaded" ) == 0 )
- flag |= EXPP_MAT_MODE_HALOSHADE;
+ flag |= MA_HALO_SHADE;
else if( strcmp( m[i], "HaloFlare" ) == 0 )
- flag |= EXPP_MAT_MODE_HALOFLARE;
+ flag |= MA_HALO_FLARE;
else if( strcmp( m[i], "Radio" ) == 0 )
- flag |= EXPP_MAT_MODE_RADIO;
+ flag |= MA_RADIO;
/* ** Mirror ** */
else if( strcmp( m[i], "RayMirr" ) == 0 )
- flag |= EXPP_MAT_MODE_RAYMIRROR;
+ flag |= MA_RAYMIRROR;
else if( strcmp( m[i], "ZTransp" ) == 0 )
- flag |= EXPP_MAT_MODE_ZTRA;
+ flag |= MA_ZTRA;
else if( strcmp( m[i], "RayTransp" ) == 0 )
- flag |= EXPP_MAT_MODE_RAYTRANSP;
+ flag |= MA_RAYTRANSP;
else if( strcmp( m[i], "OnlyShadow" ) == 0 )
- flag |= EXPP_MAT_MODE_ONLYSHADOW;
+ flag |= MA_ONLYSHADOW;
else if( strcmp( m[i], "NoMist" ) == 0 )
- flag |= EXPP_MAT_MODE_NOMIST;
+ flag |= MA_NOMIST;
else if( strcmp( m[i], "Env" ) == 0 )
- flag |= EXPP_MAT_MODE_ENV;
+ flag |= MA_ENV;
else
return ( EXPP_ReturnPyObjError( PyExc_AttributeError,
"unknown Material mode argument" ) );

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
05/98/21a1216db70f3de6d95b23ff96d9

Event Timeline