[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16057] trunk/blender/source/blender/ python/api2_2x: Python API
Ken Hughes
khughes at pacific.edu
Mon Aug 11 21:06:30 CEST 2008
Revision: 16057
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16057
Author: khughes
Date: 2008-08-11 21:06:30 +0200 (Mon, 11 Aug 2008)
Log Message:
-----------
Python API
----------
Added texture.offset and textute.gain attributes, to access parameters for Musgrove textures.
Modified Paths:
--------------
trunk/blender/source/blender/python/api2_2x/Texture.c
trunk/blender/source/blender/python/api2_2x/doc/Texture.py
Modified: trunk/blender/source/blender/python/api2_2x/Texture.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Texture.c 2008-08-11 13:29:38 UTC (rev 16056)
+++ trunk/blender/source/blender/python/api2_2x/Texture.c 2008-08-11 19:06:30 UTC (rev 16057)
@@ -105,6 +105,10 @@
#define EXPP_TEX_LACUNARITY_MAX 6.0f
#define EXPP_TEX_OCTS_MIN 0.0f
#define EXPP_TEX_OCTS_MAX 8.0f
+#define EXPP_TEX_OFST_MIN 0.0f
+#define EXPP_TEX_OFST_MAX 6.0f
+#define EXPP_TEX_GAIN_MIN 0.0f
+#define EXPP_TEX_GAIN_MAX 6.0f
#define EXPP_TEX_ISCALE_MIN 0.0f
#define EXPP_TEX_ISCALE_MAX 10.0f
#define EXPP_TEX_EXP_MIN 0.010f
@@ -430,6 +434,8 @@
GETFUNC( getNoiseSize );
GETFUNC( getNoiseType );
GETFUNC( getOcts );
+GETFUNC( getOffset );
+GETFUNC( getGain );
GETFUNC( getRepeat );
GETFUNC( getRGBCol );
GETFUNC( getSType );
@@ -478,6 +484,8 @@
SETFUNC( setNoiseSize );
SETFUNC( setNoiseType );
SETFUNC( setOcts );
+SETFUNC( setOffset );
+SETFUNC( setGain );
SETFUNC( setRepeat );
SETFUNC( setRGBCol );
SETFUNC( setSType );
@@ -646,6 +654,14 @@
(getter)Texture_getLacunarity, (setter)Texture_setLacunarity,
"Gap between succesive frequencies (for Musgrave textures)",
NULL},
+ {"offset",
+ (getter)Texture_getOffset, (setter)Texture_setOffset,
+ "Fractal offset (for Musgrave textures)",
+ NULL},
+ {"gain",
+ (getter)Texture_getGain, (setter)Texture_setGain,
+ "Gain multiplier (for Musgrave textures)",
+ NULL},
{"noiseBasis",
(getter)Texture_getNoiseBasis, (setter)Texture_setNoiseBasis,
"Noise basis type (wood, stucci, marble, clouds, Musgrave, distorted noise)",
@@ -1837,6 +1853,20 @@
EXPP_TEX_LACUNARITY_MAX );
}
+static int Texture_setOffset( BPy_Texture * self, PyObject * value )
+{
+ return EXPP_setFloatClamped ( value, &self->texture->mg_offset,
+ EXPP_TEX_OFST_MIN,
+ EXPP_TEX_OFST_MAX );
+}
+
+static int Texture_setGain( BPy_Texture * self, PyObject * value )
+{
+ return EXPP_setFloatClamped ( value, &self->texture->mg_gain,
+ EXPP_TEX_GAIN_MIN,
+ EXPP_TEX_GAIN_MAX );
+}
+
static int Texture_setOcts( BPy_Texture * self, PyObject * value )
{
return EXPP_setFloatClamped ( value, &self->texture->mg_octaves,
@@ -2168,6 +2198,16 @@
return PyFloat_FromDouble( self->texture->mg_octaves );
}
+static PyObject *Texture_getOffset( BPy_Texture *self )
+{
+ return PyFloat_FromDouble( self->texture->mg_offset );
+}
+
+static PyObject *Texture_getGain( BPy_Texture *self )
+{
+ return PyFloat_FromDouble( self->texture->mg_gain );
+}
+
static PyObject *Texture_getRepeat( BPy_Texture *self )
{
return Py_BuildValue( "(i,i)", self->texture->xrepeat,
Modified: trunk/blender/source/blender/python/api2_2x/doc/Texture.py
===================================================================
--- trunk/blender/source/blender/python/api2_2x/doc/Texture.py 2008-08-11 13:29:38 UTC (rev 16056)
+++ trunk/blender/source/blender/python/api2_2x/doc/Texture.py 2008-08-11 19:06:30 UTC (rev 16057)
@@ -344,6 +344,12 @@
@ivar octs: Number of frequencies (for Musgrave textures).
Value is clamped to the range [0.0,8.0].
@type octs: float
+ @ivar offset: Fractal offset (for hetero terrain and multifractal Musgrave textures).
+ Value is clamped to the range [0.0,6.0].
+ @type offset: float
+ @ivar gain: Gain multiplier (for multifractal Musgrave textures).
+ Value is clamped to the range [0.0,6.0].
+ @type gain: float
@ivar repeat: Repetition multiplier (for image textures).
@type repeat: tuple of 2 ints
@ivar rgbCol: RGB color tuple.
More information about the Bf-blender-cvs
mailing list