Revision: 40127
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40127
Author: ben2610
Date: 2011-09-11 14:13:04 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
Recast: fix bad level calls, Recast compiled out if BGE not enabled. SCons
updated but not tested.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/editors/util/CMakeLists.txt
trunk/blender/source/blender/editors/util/SConscript
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/modifiers/SConscript
trunk/blender/source/blender/modifiers/intern/MOD_navmesh.cpp
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
trunk/blender/source/gameengine/Ketsji/SConscript
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-09-11
13:46:58 UTC (rev 40126)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-09-11
14:13:04 UTC (rev 40127)
@@ -353,6 +353,16 @@
add_definitions(-DWITH_LZMA)
endif()
+if(WITH_GAMEENGINE)
+ list(APPEND INC_SYS
+ ../../../extern/recastnavigation/Recast/Include
+ )
+ list(APPEND SRC
+ intern/navmesh_conversion.cpp
+ BKE_navmesh_conversion.h
+ )
+endif()
+
if(MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
endif()
Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript 2011-09-11 13:46:58 UTC
(rev 40126)
+++ trunk/blender/source/blender/blenkernel/SConscript 2011-09-11 14:13:04 UTC
(rev 40127)
@@ -1,7 +1,7 @@
#!/usr/bin/python
Import ('env')
-sources = env.Glob('intern/*.c')
+sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
incs = '. #/intern/guardedalloc #/intern/memutil ../editors/include'
incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager'
@@ -90,6 +90,12 @@
incs += ' #/extern/lzma'
defs.append('WITH_LZMA')
+if env['WITH_BF_GAMEENGINE']:
+ incs += ' #/extern/recastnavigation/Recast/Include'
+ defs.append('WITH_GAMEENGINE')
+else:
+ sources.remove('intern/navmesh_conversion.cpp')
+
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']
Modified: trunk/blender/source/blender/editors/util/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/util/CMakeLists.txt 2011-09-11
13:46:58 UTC (rev 40126)
+++ trunk/blender/source/blender/editors/util/CMakeLists.txt 2011-09-11
14:13:04 UTC (rev 40127)
@@ -87,16 +87,4 @@
../include/UI_view2d.h
)
-if(WITH_GAMEENGINE)
- list(APPEND INC
- ../../../../extern/recastnavigation/Recast/Include
- )
-
- list(APPEND SRC
- navmesh_conversion.cpp
-
- ../include/ED_navmesh_conversion.h
- )
-endif()
-
blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/util/SConscript
===================================================================
--- trunk/blender/source/blender/editors/util/SConscript 2011-09-11
13:46:58 UTC (rev 40126)
+++ trunk/blender/source/blender/editors/util/SConscript 2011-09-11
14:13:04 UTC (rev 40127)
@@ -1,15 +1,11 @@
#!/usr/bin/python
Import ('env')
-sources = env.Glob('*.c') + env.Glob('*.cpp')
+sources = env.Glob('*.c')
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
incs += ' ../../makesrna'
-incs += ' #extern/recastnavigation/Recast/Include'
incs += ' ../../blenloader'
-if not env['WITH_BF_GAMEENGINE']:
- sources.remove('navmesh_conversion.cpp')
-
env.BlenderLib ( 'bf_editors_util', sources, Split(incs), [],
libtype=['core','player'], priority=[330,210] )
Modified: trunk/blender/source/blender/modifiers/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/modifiers/CMakeLists.txt 2011-09-11
13:46:58 UTC (rev 40126)
+++ trunk/blender/source/blender/modifiers/CMakeLists.txt 2011-09-11
14:13:04 UTC (rev 40127)
@@ -122,7 +122,6 @@
list(APPEND INC
../gpu
../../../extern/recastnavigation/Recast/Include
- ../editors/include # XXX - BAD LEVEL CALL, REMOVE BEFORE
RELEASE
)
endif()
Modified: trunk/blender/source/blender/modifiers/SConscript
===================================================================
--- trunk/blender/source/blender/modifiers/SConscript 2011-09-11 13:46:58 UTC
(rev 40126)
+++ trunk/blender/source/blender/modifiers/SConscript 2011-09-11 14:13:04 UTC
(rev 40127)
@@ -7,8 +7,7 @@
incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern
#/intern/elbeem/extern #/extern/glew/include'
incs += ' ../render/extern/include ../blenloader'
incs += ' ../include ../blenlib ../makesdna ../makesrna ../blenkernel
../blenkernel/intern'
-incs += ' ../editors/include ../gpu'
-incs += ' #extern/recastnavigation/Recast/Include'
+incs += ' ../gpu'
incs += ' ' + env['BF_ZLIB_INC']
@@ -21,6 +20,10 @@
if env['BF_NO_ELBEEM']:
defs.append('DISABLE_ELBEEM')
+if env['WITH_BF_GAMEENGINE']:
+ incs += ' #/extern/recastnavigation/Recast/Include'
+ defs.append('WITH_GAMEENGINE')
+
env.BlenderLib ( libname = 'bf_modifiers', sources = sources,
includes = Split(incs), defines=defs,
libtype=['core','player'], priority = [80, 40] )
Modified: trunk/blender/source/blender/modifiers/intern/MOD_navmesh.cpp
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_navmesh.cpp
2011-09-11 13:46:58 UTC (rev 40126)
+++ trunk/blender/source/blender/modifiers/intern/MOD_navmesh.cpp
2011-09-11 14:13:04 UTC (rev 40127)
@@ -34,11 +34,10 @@
extern "C"{
#ifdef WITH_GAMEENGINE
-# include "ED_navmesh_conversion.h"
-# include "BIF_gl.h"
+# include "BKE_navmesh_conversion.h"
+# include "GL/glew.h"
# include "GPU_buffers.h"
# include "GPU_draw.h"
-# include "UI_resources.h"
#endif
#include "DNA_mesh_types.h"
@@ -54,6 +53,22 @@
#include "BKE_customdata.h"
#include "MEM_guardedalloc.h"
+inline int bit(int a, int b)
+{
+ return (a & (1 << b)) >> b;
+}
+
+inline void intToCol(int i, float* col)
+{
+ int r = bit(i, 0) + bit(i, 3) * 2 + 1;
+ int g = bit(i, 1) + bit(i, 4) * 2 + 1;
+ int b = bit(i, 2) + bit(i, 5) * 2 + 1;
+ col[0] = 1 - r*63.0f/255.0f;
+ col[1] = 1 - g*63.0f/255.0f;
+ col[2] = 1 - b*63.0f/255.0f;
+}
+
+
static void initData(ModifierData *md)
{
/* NavMeshModifierData *nmmd = (NavMeshModifierData*) md; */ /* UNUSED
*/
Modified: trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Ketsji/CMakeLists.txt 2011-09-11
13:46:58 UTC (rev 40126)
+++ trunk/blender/source/gameengine/Ketsji/CMakeLists.txt 2011-09-11
14:13:04 UTC (rev 40127)
@@ -59,7 +59,6 @@
${GLEW_INCLUDE_PATH}
../../../extern/recastnavigation/Recast/Include
../../../extern/recastnavigation/Detour/Include
- ../../blender/editors/include
)
set(SRC
Modified: trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp 2011-09-11
13:46:58 UTC (rev 40126)
+++ trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp 2011-09-11
14:13:04 UTC (rev 40127)
@@ -38,9 +38,7 @@
#include "BKE_customdata.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_DerivedMesh.h"
-
-
-#include "ED_navmesh_conversion.h"
+#include "BKE_navmesh_conversion.h"
}
#include "KX_PythonInit.h"
Modified: trunk/blender/source/gameengine/Ketsji/SConscript
===================================================================
--- trunk/blender/source/gameengine/Ketsji/SConscript 2011-09-11 13:46:58 UTC
(rev 40126)
+++ trunk/blender/source/gameengine/Ketsji/SConscript 2011-09-11 14:13:04 UTC
(rev 40127)
@@ -21,7 +21,6 @@
incs += ' #source/gameengine/Physics/Dummy'
incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include
#source/blender/gpu'
incs += ' #extern/recastnavigation/Recast/Include
#extern/recastnavigation/Detour/Include'
-incs += ' #source/blender/editors/include'
incs += ' ' + env['BF_BULLET_INC']
incs += ' ' + env['BF_OPENGL_INC']
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
