From d7a701c2c5ffbe9313431c6367a264e54136accb Mon Sep 17 00:00:00 2001 From: Nick Samarin Date: Thu, 27 May 2010 20:18:56 +0000 Subject: - added new game object type for navigation mesh - added py api for path finding and ray casting - set svn properties for KX_Pathfinder --- source/blender/makesdna/DNA_object_types.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/makesdna/DNA_object_types.h') diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index f50909e641b..6132cb2174b 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -463,6 +463,7 @@ extern Object workob; #define OB_SOFT_BODY 0x20000 #define OB_OCCLUDER 0x40000 #define OB_SENSOR 0x80000 +#define OB_NAVMESH 0x100000 /* ob->gameflag2 */ #define OB_NEVER_DO_ACTIVITY_CULLING 1 @@ -483,6 +484,7 @@ extern Object workob; #define OB_BODY_TYPE_SOFT 4 #define OB_BODY_TYPE_OCCLUDER 5 #define OB_BODY_TYPE_SENSOR 6 +#define OB_BODY_TYPE_NAVMESH 7 /* ob->scavisflag */ #define OB_VIS_SENS 1 -- cgit v1.2.3 From d3d2e92fccc7ed65d753dbf8872b720ffe0fd6ad Mon Sep 17 00:00:00 2001 From: Nick Samarin Date: Mon, 31 May 2010 23:44:43 +0000 Subject: synched branch with trunk at revision 29109 --- source/blender/makesdna/DNA_object_types.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/makesdna/DNA_object_types.h') diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 6132cb2174b..f780552715c 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -412,14 +412,15 @@ extern Object workob; #define BA_HAS_RECALC_OB 4 #define BA_HAS_RECALC_DATA 8 - // XXX DEPRECEATED SETTING... -#define BA_DO_IPO 32 + /* NOTE: this was used as a proper setting in past, so nullify before using */ +#define BA_TEMP_TAG 32 #define BA_FROMSET 128 #define BA_TRANSFORM_CHILD 256 /* child of a transformed object */ #define BA_TRANSFORM_PARENT 8192 /* parent of a transformed object */ + /* an initial attempt as making selection more specific! */ #define BA_DESELECT 0 #define BA_SELECT 1 -- cgit v1.2.3 From 0183d551089c727724db13a67537156f157ae262 Mon Sep 17 00:00:00 2001 From: Nick Samarin Date: Thu, 10 Jun 2010 00:19:06 +0000 Subject: Added parameters for obstacle avoidance simulation: for object - flag for creation representation in simulation(OB_HASOBSTACLE) and obstacle radius (obstacleRad), for scene - obstacle simulation type (obstacleSimulation); added ui for new parameters --- source/blender/makesdna/DNA_object_types.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/makesdna/DNA_object_types.h') diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index f780552715c..1d6cc6981fc 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -182,6 +182,8 @@ typedef struct Object { float max_vel; /* clamp the maximum velocity 0.0 is disabled */ float min_vel; /* clamp the maximum velocity 0.0 is disabled */ float m_contactProcessingThreshold; + float obstacleRad; + char pad0[4]; short rotmode; /* rotation mode - uses defines set out in DNA_action_types.h for PoseChannel rotations... */ @@ -465,6 +467,7 @@ extern Object workob; #define OB_OCCLUDER 0x40000 #define OB_SENSOR 0x80000 #define OB_NAVMESH 0x100000 +#define OB_HASOBSTACLE 0x200000 /* ob->gameflag2 */ #define OB_NEVER_DO_ACTIVITY_CULLING 1 -- cgit v1.2.3