diff options
author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-26 22:53:26 +0400 |
---|---|---|
committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-26 22:53:26 +0400 |
commit | db90946d82d32bead6252f8bdc86b9daa5f45f07 (patch) | |
tree | d5b3f252d04334554d27aa8094f7669d230fce67 /source/blender/makesdna | |
parent | b542721f329304f2dc582436b3a5de92dc045956 (diff) |
svn merge -r 16608:16749 https://svn.blender.org/svnroot/bf-blender/trunk/blendersoc-2008-jaguarandi
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_actuator_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_ipo_types.h | 13 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_lamp_types.h | 7 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 27 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_fluidsim.h | 18 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 6 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 1 |
11 files changed, 75 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 750bdf2cfff..2487216f764 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -368,6 +368,8 @@ typedef struct FreeCamera { #define ACT_CONST_MATERIAL 128 #define ACT_CONST_PERMANENT 256 #define ACT_CONST_DISTANCE 512 +#define ACT_CONST_LOCAL 1024 + /* constraint mode */ #define ACT_CONST_DIRPX 1 #define ACT_CONST_DIRPY 2 diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 3722c365f39..f809cac037d 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -68,7 +68,7 @@ typedef struct BevList { # # typedef struct BevPoint { - float x, y, z, alfa, sina, cosa, mat[3][3]; + float x, y, z, alfa, radius, sina, cosa, mat[3][3]; short f1, f2; } BevPoint; @@ -115,7 +115,7 @@ typedef struct Nurb { BezTriple *bezt; short tilt_interp; /* KEY_LINEAR, KEY_CARDINAL, KEY_BSPLINE */ - short pad; + short radius_interp; int charidx; } Nurb; diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h index fe75148fb3b..5be6dd727c0 100644 --- a/source/blender/makesdna/DNA_ipo_types.h +++ b/source/blender/makesdna/DNA_ipo_types.h @@ -373,8 +373,8 @@ typedef struct Ipo { /* ****** FluidSim (ID_FLUIDSIM) ****** */ -#define FLUIDSIM_TOTIPO 9 -#define FLUIDSIM_TOTNAM 9 +#define FLUIDSIM_TOTIPO 13 +#define FLUIDSIM_TOTNAM 13 #define FLUIDSIM_VISC 1 #define FLUIDSIM_TIME 2 @@ -389,8 +389,15 @@ typedef struct Ipo { #define FLUIDSIM_ACTIVE 9 -/* ******* Particle (ID_PA) ******** */ +#define FLUIDSIM_ATTR_FORCE_STR 10 +#define FLUIDSIM_ATTR_FORCE_RADIUS 11 +#define FLUIDSIM_VEL_FORCE_STR 12 +#define FLUIDSIM_VEL_FORCE_RADIUS 13 + +/* ******************** */ +/* particle ipos */ +/* ******* Particle (ID_PA) ******** */ #define PART_TOTIPO 25 #define PART_TOTNAM 25 diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h index 2a39580bb5c..217e3ed1463 100644 --- a/source/blender/makesdna/DNA_lamp_types.h +++ b/source/blender/makesdna/DNA_lamp_types.h @@ -50,6 +50,7 @@ typedef struct Lamp { short colormodel, totex; float r, g, b, k; + float shdwr, shdwg, shdwb, shdwpad; float energy, dist, spotsize, spotblend; float haint; @@ -78,7 +79,7 @@ typedef struct Lamp { /* sun/sky */ short sun_effect_type; - short atm_pad[3]; + short skyblendtype; float horizon_brightness; float spread; float sun_brightness; @@ -89,7 +90,7 @@ typedef struct Lamp { float atm_inscattering_factor; float atm_extinction_factor; float atm_distance_factor; - + float skyblendfac; /* yafray: photonlight params */ int YF_numphotons, YF_numsearch; @@ -138,6 +139,7 @@ typedef struct Lamp { /* Since it is used with LOCAL lamp, can't use LA_SHAD */ #define LA_YF_SOFT 16384 #define LA_LAYER_SHADOW 32768 +#define LA_SHAD_TEX (1<<16) /* layer_shadow */ #define LA_LAYER_SHADOW_BOTH 0 @@ -190,6 +192,7 @@ typedef struct Lamp { /* mapto */ #define LAMAP_COL 1 +#define LAMAP_SHAD 2 #endif /* DNA_LAMP_TYPES_H */ diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index c92a33bbcbb..aa847050581 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -320,6 +320,7 @@ typedef struct Material { #define MA_LAMP 6 #define MA_SKY 7 #define MA_HAIR 10 +#define MA_ATMOS 11 /* pr_back */ #define MA_DARK 1 diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 0f820e88541..ae07434a37f 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -36,6 +36,8 @@ typedef enum ModifierType { eModifierType_Collision, eModifierType_Bevel, eModifierType_Shrinkwrap, + eModifierType_Fluidsim, + eModifierType_Mask, eModifierType_SimpleDeform, NUM_MODIFIER_TYPES } ModifierType; @@ -105,6 +107,24 @@ typedef struct BuildModifierData { int randomize, seed; } BuildModifierData; +/* Mask Modifier */ +typedef struct MaskModifierData { + ModifierData modifier; + + struct Object *ob_arm; /* armature to use to in place of hardcoded vgroup */ + char vgroup[32]; /* name of vertex group to use to mask */ + + int mode; /* using armature or hardcoded vgroup */ + int flag; /* flags for various things */ +} MaskModifierData; + +/* Mask Modifier -> mode */ +#define MOD_MASK_MODE_VGROUP 0 +#define MOD_MASK_MODE_ARM 1 + +/* Mask Modifier -> flag */ +#define MOD_MASK_INV (1<<0) + typedef struct ArrayModifierData { ModifierData modifier; @@ -493,6 +513,13 @@ typedef struct ExplodeModifierData { float protect; } ExplodeModifierData; +typedef struct FluidsimModifierData { + ModifierData modifier; + + struct FluidsimSettings *fss; /* definition is is DNA_object_fluidsim.h */ + struct PointCache *point_cache; /* definition is in DNA_object_force.h */ +} FluidsimModifierData; + typedef struct ShrinkwrapModifierData { ModifierData modifier; diff --git a/source/blender/makesdna/DNA_object_fluidsim.h b/source/blender/makesdna/DNA_object_fluidsim.h index 9b1e4fb56cb..fde1ce57875 100644 --- a/source/blender/makesdna/DNA_object_fluidsim.h +++ b/source/blender/makesdna/DNA_object_fluidsim.h @@ -108,7 +108,7 @@ typedef struct FluidsimSettings { float surfaceSmoothing; /* number of surface subdivisions*/ int surfaceSubdivs; - int unusedDNADummy; + int flag; /* GUI flags */ /* particle display - size scaling, and alpha influence */ float particleInfSize, particleInfAlpha; @@ -117,6 +117,18 @@ typedef struct FluidsimSettings { /* save fluidsurface normals in mvert.no, and surface vertex velocities (if available) in mvert.co */ struct MVert *meshSurfNormals; + + /* Fluid control settings */ + float cpsTimeStart; + float cpsTimeEnd; + float cpsQuality; + + float attractforceStrength; + float attractforceRadius; + float velocityforceStrength; + float velocityforceRadius; + + int lastgoodframe; } FluidsimSettings; @@ -128,6 +140,7 @@ typedef struct FluidsimSettings { #define OB_FLUIDSIM_INFLOW 16 #define OB_FLUIDSIM_OUTFLOW 32 #define OB_FLUIDSIM_PARTICLE 64 +#define OB_FLUIDSIM_CONTROL 128 #define OB_TYPEFLAG_START 0 #define OB_FSGEO_THIN (1<<(OB_TYPEFLAG_START+1)) @@ -145,6 +158,9 @@ typedef struct FluidsimSettings { #define OB_FSPART_NEWPART (1<<3) #define OB_FSPART_FLOAT (1<<4) +// new fluid bit flags for fss->flags - dg +#define OB_FLUIDSIM_REVERSE (1 << 0) + #ifdef __cplusplus } #endif diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 66bdaf2c98b..c12da6b0194 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -156,8 +156,8 @@ typedef struct Object { float formfactor; float rdamping, sizefac; - float margin, pad3; - + float margin; + int pad3; char dt, dtx; char totcol; /* copy of mesh or curve or meta */ @@ -411,6 +411,7 @@ extern Object workob; #define OB_RECALC_TIME 4 #define OB_RECALC 7 + /* ob->gameflag */ #define OB_DYNAMIC 1 #define OB_CHILD 2 @@ -459,6 +460,7 @@ extern Object workob; #define OB_SHOWCONT 2048 #define OB_SETSTBIT 4096 #define OB_INITSTBIT 8192 +#define OB_DEBUGSTATE 16384 /* ob->restrictflag */ #define OB_RESTRICT_VIEW 1 diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 8618bee3638..7dd69b2151c 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -66,6 +66,8 @@ typedef struct ParticleData { ParticleKey state; /* normally current global coordinates or */ /* in sticky object space if dead & sticky */ + ParticleKey prev_state; /* previous state */ + HairKey *hair; /* hair vertices */ ParticleKey *keys; /* keyed states */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 32522d1e866..3888cb48520 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -553,6 +553,10 @@ typedef struct Scene { /* Sculptmode data */ struct SculptData sculptdata; + + /* frame step. */ + int frame_step; + int pad; } Scene; diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index c59cafc1ef0..226a3ecd834 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -589,6 +589,7 @@ typedef struct SpaceImaSel { #define SO_LIBRARIES 7 #define SO_VERSE_SESSION 8 #define SO_VERSE_MS 9 +#define SO_SEQUENCE 10 /* SpaceOops->storeflag */ #define SO_TREESTORE_CLEANUP 1 |