style cleanup & re-use DNA pad var with new collision group object settings.
This commit is contained in:
@@ -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
|
||||||
|
@@ -1072,9 +1072,10 @@ 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,9 +1117,10 @@ 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)
|
||||||
{
|
{
|
||||||
@@ -1144,9 +1146,10 @@ 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)
|
||||||
{
|
{
|
||||||
@@ -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"},
|
||||||
|
Reference in New Issue
Block a user