[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30341] branches/soc-2010-nicks/source: - set default value for level height params

[Nick Samarin]

Revision: 30341
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30341
Author:   nicks
Date:     2010-07-14 22:09:04 +0200 (Wed, 14 Jul 2010)

Log Message:
-----------
- set default value for level height params
- added flag OPTYPE_UNDO for navmesh operator to enable undo operation

Modified Paths:
--------------
    branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-nicks/source/blender/editors/object/object_navmesh.cpp
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_navmesh.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_NavMeshObject.cpp

Modified: branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.c	2010-07-14 20:08:30 UTC (rev 30340)
+++ branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.c	2010-07-14 20:09:04 UTC (rev 30341)
@@ -10958,13 +10958,15 @@
 				tex->saturation= 1.0f;
 		}
 
-		//set defaults for recast data
+		//set defaults for obstacle avoidance, recast data
 		{
 			Scene *sce;
 			for(sce = main->scene.first; sce; sce = sce->id.next)
 			{
-				if(sce->unit.scale_length == 0.0f)
-					sce->unit.scale_length= 1.0f;
+				
+				if (sce->gm.levelHeight == 0.f)
+					sce->gm.levelHeight = 2.f;
+				
 				if(sce->gm.recastData.cellsize == 0.0f)
 					sce->gm.recastData.cellsize = 0.3f;
 				if(sce->gm.recastData.cellheight == 0.0f)

Modified: branches/soc-2010-nicks/source/blender/editors/object/object_navmesh.cpp
===================================================================
--- branches/soc-2010-nicks/source/blender/editors/object/object_navmesh.cpp	2010-07-14 20:08:30 UTC (rev 30340)
+++ branches/soc-2010-nicks/source/blender/editors/object/object_navmesh.cpp	2010-07-14 20:09:04 UTC (rev 30341)
@@ -426,5 +426,8 @@
 
 	/* api callbacks */
 	ot->exec= create_navmesh_exec;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 }

Modified: branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_navmesh.cpp
===================================================================
--- branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_navmesh.cpp	2010-07-14 20:08:30 UTC (rev 30340)
+++ branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_navmesh.cpp	2010-07-14 20:09:04 UTC (rev 30341)
@@ -426,8 +426,9 @@
 
 	NavMeshModifierData *nmmd = (NavMeshModifierData*) md;
 
+
 	//for test
-	result = testCreateNavMesh(nmmd, derivedData);
+	//result = testCreateNavMesh(nmmd, derivedData);
 	//result = buildNavMesh(nmmd, derivedData);
 
 	return result;

Modified: branches/soc-2010-nicks/source/gameengine/Ketsji/KX_NavMeshObject.cpp
===================================================================
--- branches/soc-2010-nicks/source/gameengine/Ketsji/KX_NavMeshObject.cpp	2010-07-14 20:08:30 UTC (rev 30340)
+++ branches/soc-2010-nicks/source/gameengine/Ketsji/KX_NavMeshObject.cpp	2010-07-14 20:09:04 UTC (rev 30341)
@@ -646,7 +646,7 @@
 
 			for (int i = 0, j = (int)poly->nv-1; i < (int)poly->nv; j = i++)
 			{	
-				if (poly->n[j] && renderMode==DETAILED_TRIS) 
+				if (poly->n[j] && renderMode==WALLS) 
 					continue;
 				const float* vif = m_navMesh->getVertex(poly->v[i]);
 				const float* vjf = m_navMesh->getVertex(poly->v[j]);