diff options
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_armature_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_effect_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_group_types.h | 47 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 49 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_nla_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 10 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 28 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 12 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 3 |
11 files changed, 59 insertions, 106 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index db9926d4653..9191e0b6c48 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -36,6 +36,7 @@ struct SpaceLink; struct ListBase; +struct Object; /* PoseChannel stores the results of Actions (ipos) and transform information with respect to the restposition of Armature bones */ @@ -73,6 +74,7 @@ typedef struct bPoseChannel { float ikstretch; float *path; /* totpath x 3 x float */ + struct Object *custom; /* draws custom object instead of this channel */ } bPoseChannel; @@ -116,6 +118,7 @@ typedef struct SpaceAction { /* Action Channel flags */ #define ACHAN_SELECTED 0x00000001 #define ACHAN_HILIGHTED 0x00000002 +#define ACHAN_HIDDEN 0x00000004 #define ACHAN_MOVED 0x80000000 /* SpaceAction flag */ diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index 77b8ffd2286..809ff15e46d 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -66,7 +66,7 @@ typedef struct Bone { float rad_head, rad_tail; /* radius for head/tail sphere, defining deform as well */ float size[3]; /* patch for upward compat, UNUSED! */ - short boneclass; + short layer; short segments; /* for B-bones */ }Bone; @@ -76,7 +76,7 @@ typedef struct bArmature { ListBase chainbase; int flag; int drawtype; - int deformflag; + short deformflag, layer; short ghostep, ghostsize; }bArmature; diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h index 46ce9b7d017..571f87ae33f 100644 --- a/source/blender/makesdna/DNA_effect_types.h +++ b/source/blender/makesdna/DNA_effect_types.h @@ -104,6 +104,7 @@ typedef struct Particle { short mat_nr, rt; } Particle; +struct Group; typedef struct PartEff { struct PartEff *next, *prev; @@ -125,7 +126,10 @@ typedef struct PartEff { short disp, vertgroup_v; char vgroupname[32], vgroupname_v[32]; + float imat[4][4]; /* inverse matrix of parent Object */ + Particle *keys; + struct Group *group; } PartEff; diff --git a/source/blender/makesdna/DNA_group_types.h b/source/blender/makesdna/DNA_group_types.h index f7139101476..09ecc3a68c1 100644 --- a/source/blender/makesdna/DNA_group_types.h +++ b/source/blender/makesdna/DNA_group_types.h @@ -38,50 +38,13 @@ #include "DNA_ID.h" struct Object; -struct Ipo; - -typedef struct GroupKey { - struct GroupKey *next, *prev; - short sfra, efra; - float cfra; - char name[32]; -} GroupKey; - -typedef struct ObjectKey { - struct ObjectKey *next, *prev; - GroupKey *gkey; /* for reference */ - - /* copy of relevant data */ - short partype, pad; - int par1, par2, par3; - - struct Object *parent, *track; - struct Ipo *ipo; - - /* this block identical to object */ - float loc[3], dloc[3], orig[3]; - float size[3], dsize[3]; - float rot[3], drot[3]; - float quat[4], dquat[4]; - float obmat[4][4]; - float parentinv[4][4]; - float imat[4][4]; /* voor bij render, tijdens simulate, tijdelijk: ipokeys van transform */ - - unsigned int lay; /* kopie van Base */ - - char transflag, ipoflag; - char trackflag, upflag; - - float sf, ctime, padf; - - -} ObjectKey; typedef struct GroupObject { struct GroupObject *next, *prev; struct Object *ob; - ListBase okey; /* ObjectKey */ - + void *lampren; /* used while render */ + int recalc; /* copy of ob->recalc, used to set animated groups OK */ + int pad; } GroupObject; @@ -89,11 +52,9 @@ typedef struct Group { ID id; ListBase gobject; /* GroupObject */ - ListBase gkey; /* GroupKey */ - - GroupKey *active; } Group; + #endif diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 451b8ba692f..79d73ff2b99 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -34,10 +34,9 @@ #ifndef DNA_MATERIAL_TYPES_H #define DNA_MATERIAL_TYPES_H -/* #include "BLI_listBase.h" */ - #include "DNA_ID.h" #include "DNA_scriptlink_types.h" +#include "DNA_listBase.h" #ifndef MAX_MTEX #define MAX_MTEX 10 @@ -47,6 +46,17 @@ struct MTex; struct Ipo; struct Material; struct ColorBand; +struct Group; + +typedef struct MaterialLayer { + struct MaterialLayer *next, *prev; + + struct Material *mat; + float blendfac; + short flag, blendmethod, menunr, pad; + int pad2; + +} MaterialLayer; /* WATCH IT: change type? also make changes in ipo.h */ @@ -54,14 +64,16 @@ typedef struct Material { ID id; short colormodel, lay; /* lay: for dynamics (old engine, until 2.04) */ + /* note, keep this below synced with render_types.h */ float r, g, b; float specr, specg, specb; float mirr, mirg, mirb; float ambr, ambb, ambg; - float amb, emit, ang, spectra, ray_mirror; float alpha, ref, spec, zoffs, add; float translucency; + /* end synced with render_types.h */ + float fresnel_mir, fresnel_mir_i; float fresnel_tra, fresnel_tra_i; float filter; /* filter added, for raytrace transparency */ @@ -69,16 +81,15 @@ typedef struct Material { short har; char seed1, seed2; - int mode; - int mode2; /* even more material settings :) */ + int mode, mode_l; /* mode_l is the or-ed result of all layer modes */ short flarec, starc, linec, ringc; float hasize, flaresize, subsize, flareboost; float strand_sta, strand_end, strand_ease; + float sbias; /* shadow bias */ /* for buttons and render*/ char rgbsel, texact, pr_type, pad; - short pr_back, pr_lamp, septex, pad4; - int pad5; + short pr_back, pr_lamp, septex, ml_flag; /* ml_flag is for disable base material */ /* shaders */ short diff_shader, spec_shader; @@ -97,7 +108,9 @@ typedef struct Material { float rampfac_col, rampfac_spec; struct MTex *mtex[10]; + ListBase layers; struct Ipo *ipo; + struct Group *group; /* dynamic properties */ float friction, fh, reflect; @@ -107,7 +120,7 @@ typedef struct Material { /* yafray: absorption color, dispersion parameters and material preset menu */ float YF_ar, YF_ag, YF_ab, YF_dscale, YF_dpwr; int YF_dsmp, YF_preset, YF_djit; - + ScriptLink scriptlink; } Material; @@ -156,6 +169,8 @@ typedef struct Material { #define MA_FULL_OSA 0x800000 #define MA_TANGENT_STR 0x1000000 #define MA_SHADBUF 0x2000000 + /* note; we drop MA_TANGENT_STR later to become tangent_u */ +#define MA_TANGENT_V 0x4000000 #define MA_MODE_MASK 0x3ffffff /* all valid mode bits */ @@ -163,7 +178,8 @@ typedef struct Material { #define MA_DIFF_LAMBERT 0 #define MA_DIFF_ORENNAYAR 1 #define MA_DIFF_TOON 2 -#define MA_DIFF_MINNAERT 3 +#define MA_DIFF_MINNAERT 3 +#define MA_DIFF_FRESNEL 4 /* spec_shader */ #define MA_SPEC_COOKTORR 0 @@ -205,10 +221,10 @@ typedef struct Material { #define TEXCO_OSA 512 #define TEXCO_WINDOW 1024 #define NEED_UV 2048 - /* optim = use simpler AA */ -#define TEXCO_OPTIM 4096 - /* stored in vertex->accum, 1 D */ +#define TEXCO_TANGENT 4096 + /* still stored in vertex->accum, 1 D */ #define TEXCO_STRAND 8192 +#define TEXCO_STRESS 16384 /* mapto */ #define MAP_COL 1 @@ -226,6 +242,7 @@ typedef struct Material { #define MAP_AMB 2048 #define MAP_DISPLACE 4096 #define MAP_WARP 8192 +#define MAP_LAYER 16384 /* pr_type */ #define MA_FLAT 0 @@ -235,5 +252,13 @@ typedef struct Material { /* pr_back */ #define MA_DARK 1 +/* MaterialLayer flag */ +#define ML_ACTIVE 1 +#define ML_RENDER 2 +#define ML_NEG_NORMAL 4 +#define ML_DIFFUSE 8 +#define ML_SPECULAR 16 +#define ML_ALPHA 32 + #endif diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h index bf3d7820dae..fe01fa91eb2 100644 --- a/source/blender/makesdna/DNA_nla_types.h +++ b/source/blender/makesdna/DNA_nla_types.h @@ -35,6 +35,7 @@ struct bAction; struct Ipo; +struct Object; typedef struct bActionStrip { struct bActionStrip *next, *prev; @@ -43,9 +44,10 @@ typedef struct bActionStrip { struct Ipo *ipo; /* Blending ipo */ struct bAction *act; /* The action referenced by this strip */ - + struct Object *object; /* For groups, the actual object being nla'ed */ float start, end; /* The range of frames covered by this strip */ float actstart, actend; /* The range of frames taken from the action */ + float actoffs, padf; /* Offset within action, for cycles and striding */ float stridelen; /* The stridelength (considered when flag & ACT_USESTRIDE) */ float repeat; /* The number of times to repeat the action range */ diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 1d16015a628..50243c26887 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -188,10 +188,7 @@ typedef struct Object { struct PartDeflect *pd; /* particle deflector/attractor/collision data */ struct SoftBody *soft; /* if exists, saved in file */ - struct Life *life; - - LBuf lbuf; - LBuf port; + struct Group *dup_group; /* object duplicator for group */ short fluidsimFlag; /* NT toggle fluidsim participation on/off */ char shapenr, shapeflag; /* current shape key for menu or pinned, flag for pinning */ @@ -262,13 +259,13 @@ extern Object workob; #define OB_OFFS_LOCAL 1 #define OB_QUAT 2 #define OB_NEG_SCALE 4 -#define OB_DUPLI (8+16) +#define OB_DUPLI (8+16+256) #define OB_DUPLIFRAMES 8 #define OB_DUPLIVERTS 16 #define OB_DUPLIROT 32 #define OB_DUPLINOSPEED 64 - #define OB_POWERTRACK 128 +#define OB_DUPLIGROUP 256 /* (short) ipoflag */ #define OB_DRAWKEY 1 @@ -329,7 +326,6 @@ extern Object workob; #define BA_HAS_RECALC_DATA 8 #define BA_DO_IPO 32 -#define OB_GONNA_MOVE 32 #define BA_FROMSET 128 #define OB_DO_IMAT 256 diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index fe54a631bdd..968aa6abe56 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -289,7 +289,6 @@ typedef struct Scene { ListBase base; struct Base *basact; - struct Group *group; float cursor[3]; float twcent[3]; /* center for transform widget */ @@ -407,33 +406,6 @@ typedef struct Scene { #define R_RADHDR 21 #define R_TIFF 22 -/* **************** RENDER ********************* */ -/* mode flag is same as for renderdata */ -/* flag */ -#define R_ZTRA 1 -#define R_HALO 2 -#define R_SEC_FIELD 4 -#define R_LAMPHALO 8 -#define R_RENDERING 16 -#define R_ANIMRENDER 32 -#define R_REDRAW_PRV 64 - -/* vlakren->flag (vlak = face in dutch) char!!! */ -#define R_SMOOTH 1 -#define R_VISIBLE 2 - /* strand flag, means special handling */ -#define R_STRAND 4 -#define R_NOPUNOFLIP 8 -#define R_FULL_OSA 16 -#define R_FACE_SPLIT 32 - /* Tells render to divide face other way. */ -#define R_DIVIDE_24 64 - /* vertex normals are tangent or view-corrected vector, for hair strands */ -#define R_TANGENT 128 - -/* vertren->texofs (texcoordinate offset relative to vertren->orco */ -#define R_UVOFS3 1 - /* **************** SCENE ********************* */ #define RAD_PHASE_PATCHES 1 #define RAD_PHASE_FACES 2 diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 7007981ff64..5a7e84c62ef 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -483,6 +483,7 @@ typedef struct SpaceImaSel { #define SO_SELECTED 3 #define SO_ACTIVE 4 #define SO_SAME_TYPE 5 +#define SO_GROUPS 6 /* SpaceOops->storeflag */ #define SO_TREESTORE_CLEANUP 1 diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index bf4f44a421d..3e1628a658c 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -63,18 +63,6 @@ typedef struct BGpic { unsigned int *rect; } BGpic; -# -# -typedef struct View3DAfter { - struct View3DAfter *next, *prev; - struct Base *base; - int type; -} View3DAfter; - -/* View3DAfter->type */ -#define V3D_XRAY 1 -#define V3D_TRANSP 2 - typedef struct View3D { struct SpaceLink *next, *prev; int spacetype; diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index e284044a633..edc621ba758 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -152,12 +152,13 @@ typedef struct World { #define WOMAP_HORIZ 2 #define WOMAP_ZENUP 4 #define WOMAP_ZENDOWN 8 +#define WOMAP_MIST 16 /* physicsEngine */ #define WOPHY_NONE 0 #define WOPHY_ENJI 1 #define WOPHY_SUMO 2 -#define WOPHY_DYNAMO 3 +#define WOPHY_DYNAMO 3 #define WOPHY_ODE 4 #define WOPHY_BULLET 5 |