archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup & re-use DNA pad var with new collision group object settings.

Browse Source
This commit is contained in:
Campbell Barton
2012-10-30 16:33:40 +00:00
parent 3bf9bb3b13
commit ec1f69ffce
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/makesdna/DNA_object_types.h
View File

@@ -209,7 +209,9 @@ typedef struct Object {
float step_height; float step_height;
float jump_speed; float jump_speed;
float fall_speed; float fall_speed;
char pad1[4];
/** Collision mask settings */
unsigned short col_group, col_mask;
short rotmode; /* rotation mode - uses defines set out in DNA_action_types.h for PoseChannel rotations... */ short rotmode; /* rotation mode - uses defines set out in DNA_action_types.h for PoseChannel rotations... */
@@ -243,9 +245,6 @@ typedef struct Object {
short recalc; /* dependency flag */ short recalc; /* dependency flag */
float anisotropicFriction[3]; float anisotropicFriction[3];
/** Collision mask settings */
unsigned short col_group, col_mask, col_pad[2];
ListBase constraints; /* object constraints */ ListBase constraints; /* object constraints */
ListBase nlastrips DNA_DEPRECATED; // XXX deprecated... old animation system ListBase nlastrips DNA_DEPRECATED; // XXX deprecated... old animation system
ListBase hooks DNA_DEPRECATED; // XXX deprecated... old animation system ListBase hooks DNA_DEPRECATED; // XXX deprecated... old animation system

39
source/blender/makesrna/intern/rna_object.c
View File

@@ -851,11 +851,11 @@ static void rna_MaterialSlot_link_set(PointerRNA *ptr, int value)
if (value) { if (value) {
ob->matbits[index] = 1; ob->matbits[index] = 1;
/* ob->colbits |= (1<<index); */ /* DEPRECATED */ /* ob->colbits |= (1 << index); */ /* DEPRECATED */
} }
else { else {
ob->matbits[index] = 0; ob->matbits[index] = 0;
/* ob->colbits &= ~(1<<index); */ /* DEPRECATED */ /* ob->colbits &= ~(1 << index); */ /* DEPRECATED */
} }
} }
@@ -1036,8 +1036,8 @@ static unsigned int rna_Object_layer_validate__internal(const int *values, unsig
return 0; return 0;
for (i = 0; i < 20; i++) { for (i = 0; i < 20; i++) {
if (values[i]) lay |= (1 << i); if (values[i]) lay |= (1 << i);
else lay &= ~(1 << i); else lay &= ~(1 << i);
} }
return lay; return lay;
@@ -1072,8 +1072,9 @@ static void rna_GameObjectSettings_state_get(PointerRNA *ptr, int *values)
int all_states = (ob->scaflag & OB_ALLSTATE ? 1 : 0); int all_states = (ob->scaflag & OB_ALLSTATE ? 1 : 0);
memset(values, 0, sizeof(int) * OB_MAX_STATES); memset(values, 0, sizeof(int) * OB_MAX_STATES);
for (i = 0; i < OB_MAX_STATES; i++) for (i = 0; i < OB_MAX_STATES; i++) {
values[i] = (ob->state & (1 << i)) | all_states; values[i] = (ob->state & (1 << i)) | all_states;
}
} }
static void rna_GameObjectSettings_state_set(PointerRNA *ptr, const int *values) static void rna_GameObjectSettings_state_set(PointerRNA *ptr, const int *values)
@@ -1116,8 +1117,9 @@ static void rna_GameObjectSettings_col_group_get(PointerRNA *ptr, int *values)
Object *ob = (Object*)ptr->data; Object *ob = (Object*)ptr->data;
int i; int i;
for (i = 0; i < OB_MAX_COL_MASKS; i++) for (i = 0; i < OB_MAX_COL_MASKS; i++) {
values[i] = (ob->col_group & (1<<i)); values[i] = (ob->col_group & (1 << i));
}
} }
static void rna_GameObjectSettings_col_group_set(PointerRNA *ptr, const int *values) static void rna_GameObjectSettings_col_group_set(PointerRNA *ptr, const int *values)
@@ -1127,15 +1129,15 @@ static void rna_GameObjectSettings_col_group_set(PointerRNA *ptr, const int *val
/* ensure we always have some group selected */ /* ensure we always have some group selected */
for (i = 0; i < OB_MAX_COL_MASKS; i++) for (i = 0; i < OB_MAX_COL_MASKS; i++)
if(values[i]) if (values[i])
tot++; tot++;
if (tot==0) if (tot == 0)
return; return;
for (i = 0; i < OB_MAX_COL_MASKS; i++) { for (i = 0; i < OB_MAX_COL_MASKS; i++) {
if (values[i]) ob->col_group |= (1<<i); if (values[i]) ob->col_group |= (1 << i);
else ob->col_group &= ~(1<<i); else ob->col_group &= ~(1 << i);
} }
} }
@@ -1144,8 +1146,9 @@ static void rna_GameObjectSettings_col_mask_get(PointerRNA *ptr, int *values)
Object *ob = (Object*)ptr->data; Object *ob = (Object*)ptr->data;
int i; int i;
for (i = 0; i < OB_MAX_COL_MASKS; i++) for (i = 0; i < OB_MAX_COL_MASKS; i++) {
values[i] = (ob->col_mask & (1<<i)); values[i] = (ob->col_mask & (1 << i));
}
} }
static void rna_GameObjectSettings_col_mask_set(PointerRNA *ptr, const int *values) static void rna_GameObjectSettings_col_mask_set(PointerRNA *ptr, const int *values)
@@ -1155,15 +1158,15 @@ static void rna_GameObjectSettings_col_mask_set(PointerRNA *ptr, const int *valu
/* ensure we always have some mask selected */ /* ensure we always have some mask selected */
for (i = 0; i < OB_MAX_COL_MASKS; i++) for (i = 0; i < OB_MAX_COL_MASKS; i++)
if(values[i]) if (values[i])
tot++; tot++;
if (tot==0) if (tot == 0)
return; return;
for (i = 0; i < OB_MAX_COL_MASKS; i++) { for (i = 0; i < OB_MAX_COL_MASKS; i++) {
if (values[i]) ob->col_mask |= (1<<i); if (values[i]) ob->col_mask |= (1 << i);
else ob->col_mask &= ~(1<<i); else ob->col_mask &= ~(1 << i);
} }
} }
@@ -1513,8 +1516,6 @@ static void rna_def_object_game_settings(BlenderRNA *brna)
StructRNA *srna; StructRNA *srna;
PropertyRNA *prop; PropertyRNA *prop;
int default_col_mask[8] = {1,0,0,0, 0,0,0,0};
static EnumPropertyItem body_type_items[] = { static EnumPropertyItem body_type_items[] = {
{OB_BODY_TYPE_NO_COLLISION, "NO_COLLISION", 0, "No Collision", "Disable collision for this object"}, {OB_BODY_TYPE_NO_COLLISION, "NO_COLLISION", 0, "No Collision", "Disable collision for this object"},
{OB_BODY_TYPE_STATIC, "STATIC", 0, "Static", "Stationary object"}, {OB_BODY_TYPE_STATIC, "STATIC", 0, "Static", "Stationary object"},