diff options
Diffstat (limited to 'source/blender/makesdna/DNA_world_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index f599364ed66..608a4ca982e 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -34,6 +34,7 @@ #include "DNA_ID.h" #include "DNA_scriptlink_types.h" +struct AnimData; struct Ipo; struct MTex; @@ -48,6 +49,7 @@ struct MTex; * data and modeling data. */ typedef struct World { ID id; + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ short colormodel, totex; short texact, mistype; @@ -90,6 +92,7 @@ typedef struct World { short mode; short occlusionRes; /* resolution of occlusion Z buffer in pixel */ short physicsEngine; /* here it's aligned */ + short ticrate, maxlogicstep, physubstep, maxphystep; float misi, miststa, mistdist, misthi; @@ -105,12 +108,16 @@ typedef struct World { short aomode, aosamp, aomix, aocolor; float ao_adapt_thresh, ao_adapt_speed_fac; float ao_approx_error, ao_approx_correction; - short ao_samp_method, ao_gather_method, ao_approx_passes, pad1; + short ao_samp_method, ao_gather_method, ao_approx_passes; + /* assorted settings (in the middle of ambient occlusion settings for padding reasons) */ + short flag; + + /* ambient occlusion (contd...) */ float *aosphere, *aotables; - struct Ipo *ipo; + struct Ipo *ipo; // XXX depreceated... old animation system struct MTex *mtex[18]; /* MAX_MTEX */ /* previews */ @@ -182,5 +189,8 @@ typedef struct World { #define WOPHY_ODE 4 #define WOPHY_BULLET 5 +/* flag */ +#define WO_DS_EXPAND (1<<0) + #endif |