diff options
Diffstat (limited to 'source/blender/makesdna/DNA_actuator_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_actuator_types.h | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 43dada97d0e..278da27faf9 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -37,6 +37,9 @@ struct Scene; struct Group; struct Text; +// for Sound3D +#include "DNA_sound_types.h" + /* ****************** ACTUATORS ********************* */ /* unused now, moved to editobjectactuator in 2.02. Still needed for dna */ @@ -62,18 +65,13 @@ typedef struct bSoundActuator { short flag, sndnr; int sta, end; short pad1[2]; + float volume, pitch; struct bSound *sound; + struct Sound3D sound3D; short type, makecopy; short copymade, pad2[1]; } bSoundActuator; -typedef struct bCDActuator { - short flag, sndnr; - int sta, end; - short type, track; - float volume; -} bCDActuator; - typedef struct bEditObjectActuator { int time; short type, flag; @@ -82,7 +80,7 @@ typedef struct bEditObjectActuator { char name[32]; float linVelocity[3]; /* initial lin. velocity on creation */ float angVelocity[3]; /* initial ang. velocity on creation */ - float pad; + float mass; short localflag; /* flag for the lin & ang. vel: apply locally */ short dyn_operation; } bEditObjectActuator; @@ -107,6 +105,7 @@ typedef struct bObjectActuator { float loc[3], rot[3]; float dloc[3], drot[3]; float linearvelocity[3], angularvelocity[3]; + struct Object *reference; } bObjectActuator; typedef struct bIpoActuator { @@ -195,7 +194,8 @@ typedef struct bGameActuator { typedef struct bVisibilityActuator { /** bit 0: Is this object visible? - ** bit 1: Apply recursively */ + ** bit 1: Apply recursively + ** bit 2: Is this object an occluder? */ int flag; } bVisibilityActuator; @@ -213,7 +213,8 @@ typedef struct bTwoDFilterActuator{ }bTwoDFilterActuator; typedef struct bParentActuator { - char pad[4]; + char pad[2]; + short flag; int type; struct Object *ob; } bParentActuator; @@ -288,7 +289,6 @@ typedef struct FreeCamera { #define ACT_RANDOM 13 #define ACT_MESSAGE 14 #define ACT_ACTION 15 /* __ NLA */ -#define ACT_CD 16 #define ACT_GAME 17 #define ACT_VISIBILITY 18 #define ACT_2DFILTER 19 @@ -357,6 +357,7 @@ typedef struct FreeCamera { #define ACT_PROP_ASSIGN 0 #define ACT_PROP_ADD 1 #define ACT_PROP_COPY 2 +#define ACT_PROP_TOGGLE 3 /* constraint flag */ #define ACT_CONST_LOCX 1 @@ -401,6 +402,10 @@ typedef struct FreeCamera { /* editObjectActuator->flag */ #define ACT_TRACK_3D 1 +/* editObjectActuator->flag for replace mesh actuator */ +#define ACT_EDOB_REPLACE_MESH_NOGFX 2 /* use for replace mesh actuator */ +#define ACT_EDOB_REPLACE_MESH_PHYS 4 + /* SceneActuator->type */ #define ACT_SCENE_RESTART 0 #define ACT_SCENE_SET 1 @@ -424,6 +429,9 @@ typedef struct FreeCamera { #define ACT_RANDOM_FLOAT_NORMAL 8 #define ACT_RANDOM_FLOAT_NEGATIVE_EXPONENTIAL 9 +/* SoundActuator->flag */ +#define ACT_SND_3D_SOUND 1 + /* SoundActuator->type */ #define ACT_SND_PLAY_STOP_SOUND 0 #define ACT_SND_PLAY_END_SOUND 1 @@ -436,15 +444,6 @@ typedef struct FreeCamera { #define ACT_MESG_MESG 0 #define ACT_MESG_PROP 1 -/* cdactuator->type */ -#define ACT_CD_PLAY_ALL 0 -#define ACT_CD_PLAY_TRACK 1 -#define ACT_CD_LOOP_TRACK 2 -#define ACT_CD_VOLUME 3 -#define ACT_CD_STOP 4 -#define ACT_CD_PAUSE 5 -#define ACT_CD_RESUME 6 - /* gameactuator->type */ #define ACT_GAME_LOAD 0 #define ACT_GAME_START 1 @@ -457,6 +456,7 @@ typedef struct FreeCamera { /* Set means the object will become invisible */ #define ACT_VISIBILITY_INVISIBLE (1 << 0) #define ACT_VISIBILITY_RECURSIVE (1 << 1) +#define ACT_VISIBILITY_OCCLUSION (1 << 2) /* twodfilter->type */ #define ACT_2DFILTER_ENABLED -2 @@ -479,6 +479,11 @@ typedef struct FreeCamera { /* parentactuator->type */ #define ACT_PARENT_SET 0 #define ACT_PARENT_REMOVE 1 + +/* parentactuator->flag */ +#define ACT_PARENT_COMPOUND 1 +#define ACT_PARENT_GHOST 2 + #endif |