bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

disable navmesh feature when building without the game engine.

Browse Source
This commit is contained in:
Campbell Barton 2011-09-10 04:21:58 +00:00
parent fb4abf2e41
commit 01dca44a84
6 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extern/CMakeLists.txt vendored
View File

@ -43,10 +43,9 @@ if(WITH_BUILTIN_GLEW)
add_subdirectory(glew)
endif()
## TODO MAKE GAME ENGINE ONLY
# if(WITH_GAMEENGINE)
if(WITH_GAMEENGINE)
add_subdirectory(recastnavigation)
# endif()
endif()
if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
add_subdirectory(libopenjpeg)

11
source/blender/editors/object/CMakeLists.txt
View File

@ -49,7 +49,6 @@ set(SRC
object_hook.c
object_lattice.c
object_modifier.c
object_navmesh.cpp
object_ops.c
object_relations.c
object_select.c
@ -60,8 +59,18 @@ set(SRC
object_intern.h
)
if(WITH_GAMEENGINE)
list(APPEND SRC
object_navmesh.cpp
)
endif()
if(WITH_PYTHON)
add_definitions(-DWITH_PYTHON)
endif()
if(WITH_GAMEENGINE)
add_definitions(-DWITH_GAMEENGINE)
endif()
blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}")

3
source/blender/editors/object/object_ops.c
View File

@ -213,11 +213,14 @@ void ED_operatortypes_object(void)
WM_operatortype_append(OBJECT_OT_bake_image);
WM_operatortype_append(OBJECT_OT_drop_named_material);
#ifdef WITH_GAMEENGINE
WM_operatortype_append(OBJECT_OT_create_navmesh);
WM_operatortype_append(OBJECT_OT_assign_navpolygon);
WM_operatortype_append(OBJECT_OT_assign_new_navpolygon);
#endif
}
void ED_operatormacros_object(void)
{
wmOperatorType *ot;

7
source/blender/editors/util/CMakeLists.txt
View File

@ -40,7 +40,6 @@ set(SRC
editmode_undo.c
numinput.c
undo.c
navmesh_conversion.cpp
crazyspace.c
util_intern.h
@ -90,4 +89,10 @@ set(SRC
../include/UI_view2d.h
)
if(WITH_GAMEENGINE)
list(APPEND SRC
navmesh_conversion.cpp
)
endif()
blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}")

4
source/blender/modifiers/CMakeLists.txt
View File

@ -119,4 +119,8 @@ if(NOT WITH_MOD_FLUID)
add_definitions(-DDISABLE_ELBEEM)
endif()
if(WITH_GAMEENGINE)
add_definitions(-DWITH_GAMEENGINE)
endif()
blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}")

16
source/blender/modifiers/intern/MOD_navmesh.cpp
View File

@ -33,7 +33,10 @@ extern "C"{
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "BLI_math.h"
#include "BLI_utildefines.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
@ -47,13 +50,13 @@ extern "C"{
static void initData(ModifierData *md)
{
NavMeshModifierData *nmmd = (NavMeshModifierData*) md;
/* NavMeshModifierData *nmmd = (NavMeshModifierData*) md; */ /* UNUSED */
}
static void copyData(ModifierData *md, ModifierData *target)
{
NavMeshModifierData *nmmd = (NavMeshModifierData*) md;
NavMeshModifierData *tnmmd = (NavMeshModifierData*) target;
/* NavMeshModifierData *nmmd = (NavMeshModifierData*) md; */
/* NavMeshModifierData *tnmmd = (NavMeshModifierData*) target; */
//.todo - deep copy
}
@ -62,6 +65,8 @@ static void copyData(ModifierData *md, ModifierData *target)
static void (*drawFacesSolid_original)(DerivedMesh *dm, float (*partial_redraw_planes)[4],
int fast, int (*setMaterial)(int, void *attribs)) = NULL;*/
#ifdef WITH_GAMEENGINE
static void drawNavMeshColored(DerivedMesh *dm)
{
int a, glmode;
@ -122,9 +127,11 @@ static void navDM_drawFacesSolid(DerivedMesh *dm,
//drawFacesSolid_original(dm, partial_redraw_planes, fast, setMaterial);
drawNavMeshColored(dm);
}
#endif /* WITH_GAMEENGINE */
static DerivedMesh *createNavMeshForVisualization(NavMeshModifierData *mmd,DerivedMesh *dm)
{
#ifdef WITH_GAMEENGINE
DerivedMesh *result;
int maxFaces = dm->getNumFaces(dm);
@ -194,6 +201,9 @@ static DerivedMesh *createNavMeshForVisualization(NavMeshModifierData *mmd,Deriv
delete trisToFacesMap;
return result;
#else // WITH_GAMEENGINE
return dm;
#endif // WITH_GAMEENGINE
}
/*