[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28845] branches/soc-2010-nicks: added converting mesh of game object to Detour StatNavMesh ( game object is defined by property "navmesh")

Nick Samarin nicks1987 at bigmir.net
Wed May 19 03:42:18 CEST 2010


Revision: 28845
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28845
Author:   nicks
Date:     2010-05-19 03:42:17 +0200 (Wed, 19 May 2010)

Log Message:
-----------
added converting  mesh of game object to Detour StatNavMesh (game object is defined by property "navmesh")

Modified Paths:
--------------
    branches/soc-2010-nicks/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h
    branches/soc-2010-nicks/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp
    branches/soc-2010-nicks/extern/recastnavigation/Recast/Include/Recast.h
    branches/soc-2010-nicks/extern/recastnavigation/Recast/Source/RecastMesh.cpp
    branches/soc-2010-nicks/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
    branches/soc-2010-nicks/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
    branches/soc-2010-nicks/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_Scene.h

Added Paths:
-----------
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_Pathfinder.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_Pathfinder.h

Modified: branches/soc-2010-nicks/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h
===================================================================
--- branches/soc-2010-nicks/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h	2010-05-19 01:01:21 UTC (rev 28844)
+++ branches/soc-2010-nicks/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h	2010-05-19 01:42:17 UTC (rev 28845)
@@ -26,4 +26,8 @@
 						 const unsigned char* dtris, const int ndtris, 
 						 unsigned char** outData, int* outDataSize);
 
+int createBVTree(const unsigned short* verts, const int nverts,
+						const unsigned short* polys, const int npolys, const int nvp,
+						float cs, float ch, int nnodes, dtStatBVNode* nodes);
+
 #endif // DETOURSTATNAVMESHBUILDER_H
\ No newline at end of file

Modified: branches/soc-2010-nicks/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp
===================================================================
--- branches/soc-2010-nicks/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp	2010-05-19 01:01:21 UTC (rev 28844)
+++ branches/soc-2010-nicks/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp	2010-05-19 01:42:17 UTC (rev 28845)
@@ -160,7 +160,7 @@
 	}
 }
 
-static int createBVTree(const unsigned short* verts, const int nverts,
+/*static*/ int createBVTree(const unsigned short* verts, const int nverts,
 						const unsigned short* polys, const int npolys, const int nvp,
 						float cs, float ch,
 						int nnodes, dtStatBVNode* nodes)

Modified: branches/soc-2010-nicks/extern/recastnavigation/Recast/Include/Recast.h
===================================================================
--- branches/soc-2010-nicks/extern/recastnavigation/Recast/Include/Recast.h	2010-05-19 01:01:21 UTC (rev 28844)
+++ branches/soc-2010-nicks/extern/recastnavigation/Recast/Include/Recast.h	2010-05-19 01:42:17 UTC (rev 28845)
@@ -496,5 +496,6 @@
 
 bool rcMergePolyMeshDetails(rcPolyMeshDetail** meshes, const int nmeshes, rcPolyMeshDetail& mesh);
 
+bool buildMeshAdjacency(unsigned short* polys, const int npolys, const int nverts, const int vertsPerPoly);
 
 #endif // RECAST_H

Modified: branches/soc-2010-nicks/extern/recastnavigation/Recast/Source/RecastMesh.cpp
===================================================================
--- branches/soc-2010-nicks/extern/recastnavigation/Recast/Source/RecastMesh.cpp	2010-05-19 01:01:21 UTC (rev 28844)
+++ branches/soc-2010-nicks/extern/recastnavigation/Recast/Source/RecastMesh.cpp	2010-05-19 01:42:17 UTC (rev 28845)
@@ -32,7 +32,7 @@
 	unsigned short poly[2];
 };
 
-static bool buildMeshAdjacency(unsigned short* polys, const int npolys,
+/*static */bool buildMeshAdjacency(unsigned short* polys, const int npolys,
 							   const int nverts, const int vertsPerPoly)
 {
 	// Based on code by Eric Lengyel from:

Modified: branches/soc-2010-nicks/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
===================================================================
--- branches/soc-2010-nicks/projectfiles_vc9/gameengine/converter/KX_converter.vcproj	2010-05-19 01:01:21 UTC (rev 28844)
+++ branches/soc-2010-nicks/projectfiles_vc9/gameengine/converter/KX_converter.vcproj	2010-05-19 01:42:17 UTC (rev 28845)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="KX_converter"
 	ProjectGUID="{F90BD995-FFA4-4B18-81E8-FA4322C939E8}"
 	RootNamespace="KX_converter"
@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesrna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\intern\audaspace\intern;..\..\..\source\blender\ikplugin"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\extern\recastnavigation\Detour\Include;..\..\..\..\build\msvc_9\extern\recastnavigation\Recast\Include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesrna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\intern\audaspace\intern;..\..\..\source\blender\ikplugin"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,USE_SUMO_SOLID"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -195,7 +195,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\lib\windows\python\include\python3.1;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesrna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\intern\audaspace\intern;..\..\..\source\blender\ikplugin"

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list