[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16132] trunk/blender/source/blender: Animateable (ipos) power and fall-off for particle effectors.
Janne Karhu
jhkarh at utu.fi
Sat Aug 16 18:21:05 CEST 2008
Revision: 16132
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16132
Author: jhk
Date: 2008-08-16 18:21:01 +0200 (Sat, 16 Aug 2008)
Log Message:
-----------
Animateable (ipos) power and fall-off for particle effectors.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/makesdna/DNA_ipo_types.h
trunk/blender/source/blender/src/editipo_lib.c
Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c 2008-08-16 14:38:08 UTC (rev 16131)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c 2008-08-16 16:21:01 UTC (rev 16132)
@@ -182,7 +182,7 @@
PART_EMIT_FREQ, PART_EMIT_LIFE, PART_EMIT_VEL, PART_EMIT_AVE, PART_EMIT_SIZE,
PART_AVE, PART_SIZE, PART_DRAG, PART_BROWN, PART_DAMP, PART_LENGTH, PART_CLUMP,
PART_GRAV_X, PART_GRAV_Y, PART_GRAV_Z, PART_KINK_AMP, PART_KINK_FREQ, PART_KINK_SHAPE,
- PART_BB_TILT
+ PART_BB_TILT, PART_PD_FSTR, PART_PD_FFALL, PART_PD_FMAXD
};
@@ -1608,6 +1608,12 @@
poin= &(part->kink_shape); break;
case PART_BB_TILT:
poin= &(part->bb_tilt); break;
+ case PART_PD_FSTR:
+ poin= (part->pd?(&(part->pd->f_strength)):NULL); break;
+ case PART_PD_FFALL:
+ poin= (part->pd?(&(part->pd->f_power)):NULL); break;
+ case PART_PD_FMAXD:
+ poin= (part->pd?(&(part->pd->maxdist)):NULL); break;
}
}
Modified: trunk/blender/source/blender/makesdna/DNA_ipo_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_ipo_types.h 2008-08-16 14:38:08 UTC (rev 16131)
+++ trunk/blender/source/blender/makesdna/DNA_ipo_types.h 2008-08-16 16:21:01 UTC (rev 16132)
@@ -354,8 +354,8 @@
/* ******************** */
/* particle ipos */
-#define PART_TOTIPO 19
-#define PART_TOTNAM 19
+#define PART_TOTIPO 22
+#define PART_TOTNAM 22
#define PART_EMIT_FREQ 1
#define PART_EMIT_LIFE 2
@@ -381,7 +381,11 @@
#define PART_BB_TILT 19
+#define PART_PD_FSTR 20
+#define PART_PD_FFALL 21
+#define PART_PD_FMAXD 22
+
/* these are IpoCurve specific */
/* **************** IPO ********************* */
Modified: trunk/blender/source/blender/src/editipo_lib.c
===================================================================
--- trunk/blender/source/blender/src/editipo_lib.c 2008-08-16 14:38:08 UTC (rev 16131)
+++ trunk/blender/source/blender/src/editipo_lib.c 2008-08-16 16:21:01 UTC (rev 16132)
@@ -103,7 +103,7 @@
char *fluidsim_ic_names[FLUIDSIM_TOTNAM] = { "Fac-Visc", "Fac-Time", "GravX","GravY","GravZ", "VelX","VelY","VelZ", "Active" };
char *part_ic_names[PART_TOTNAM] = { "E_Freq", "E_Life", "E_Speed", "E_Angular", "E_Size",
"Angular", "Size", "Drag", "Brown", "Damp", "Length", "Clump",
-"GravX", "GravY", "GravZ", "KinkAmp", "KinkFreq", "KinkShape", "BBTilt"};
+"GravX", "GravY", "GravZ", "KinkAmp", "KinkFreq", "KinkShape", "BBTilt", "FStreng", "FFall", "FMaxD"};
/* gets the appropriate icon for the given blocktype */
int geticon_ipo_blocktype(short blocktype)
More information about the Bf-blender-cvs
mailing list