Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Expose new Recast partitioning methods for navmesh generation

Browse Source 
This patch depends on D1747, which upgrades the Recast version.  It exposes the new Recast partitioning methods in the navmesh generation.

Reviewers: campbellbarton, moguri

Reviewed By: moguri

Projects: #bf_blender

Differential Revision: https://developer.blender.org/D1748
This commit is contained in:
Reinier de Blois
2016-04-05 20:38:42 +02:00
committed by Porteries Tristan
parent 176538f613
commit c084520b03
4 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/startup/bl_ui/properties_game.py
View File

@@ -510,7 +510,11 @@ class SCENE_PT_game_navmesh(SceneButtonsPanel, Panel):
col.label(text="Region:") col.label(text="Region:")
row = col.row() row = col.row()
row.prop(rd, "region_min_size") row.prop(rd, "region_min_size")
row.prop(rd, "region_merge_size") if rd.partitioning != 'LAYERS':
row.prop(rd, "region_merge_size")
col = layout.column()
col.prop(rd, "partitioning")
col = layout.column() col = layout.column()
col.label(text="Polygonization:") col.label(text="Polygonization:")

41
source/blender/editors/mesh/mesh_navmesh.c
View File

@@ -245,20 +245,41 @@ static bool buildNavMesh(const RecastData *recastParams, int nverts, float *vert
return false; return false;
} }
/* Prepare for region partitioning, by calculating distance field along the walkable surface */ if (recastParams->partitioning == RC_PARTITION_WATERSHED) {
if (!recast_buildDistanceField(chf)) { /* Prepare for region partitioning, by calculating distance field along the walkable surface */
recast_destroyCompactHeightfield(chf); if (!recast_buildDistanceField(chf)) {
recast_destroyCompactHeightfield(chf);
BKE_report(reports, RPT_ERROR, "Failed to build distance field"); BKE_report(reports, RPT_ERROR, "Failed to build distance field");
return false; return false;
}
/* Partition the walkable surface into simple regions without holes */
if (!recast_buildRegions(chf, 0, minRegionArea, mergeRegionArea)) {
recast_destroyCompactHeightfield(chf);
BKE_report(reports, RPT_ERROR, "Failed to build watershed regions");
return false;
}
} }
else if (recastParams->partitioning == RC_PARTITION_MONOTONE) {
/* Partition the walkable surface into simple regions without holes */
/* Monotone partitioning does not need distancefield. */
if (!recast_buildRegionsMonotone(chf, 0, minRegionArea, mergeRegionArea)) {
recast_destroyCompactHeightfield(chf);
/* Partition the walkable surface into simple regions without holes */ BKE_report(reports, RPT_ERROR, "Failed to build monotone regions");
if (!recast_buildRegions(chf, 0, minRegionArea, mergeRegionArea)) { return false;
recast_destroyCompactHeightfield(chf); }
}
else { /* RC_PARTITION_LAYERS */
/* Partition the walkable surface into simple regions without holes */
if (!recast_buildLayerRegions(chf, 0, minRegionArea)) {
recast_destroyCompactHeightfield(chf);
BKE_report(reports, RPT_ERROR, "Failed to build regions"); BKE_report(reports, RPT_ERROR, "Failed to build layer regions");
return false; return false;
}
} }
/* ** Step 5: Trace and simplify region contours ** */ /* ** Step 5: Trace and simplify region contours ** */

8
source/blender/makesdna/DNA_scene_types.h
View File

@@ -795,9 +795,15 @@ typedef struct RecastData {
int vertsperpoly; int vertsperpoly;
float detailsampledist; float detailsampledist;
float detailsamplemaxerror; float detailsamplemaxerror;
short pad1, pad2; char partitioning;
char pad1;
short pad2;
} RecastData; } RecastData;
#define RC_PARTITION_WATERSHED 0
#define RC_PARTITION_MONOTONE 1
#define RC_PARTITION_LAYERS 2
typedef struct GameData { typedef struct GameData {
/* standalone player */ /* standalone player */

14
source/blender/makesrna/intern/rna_scene.c
View File

@@ -3565,6 +3565,13 @@ static void rna_def_scene_game_recast_data(BlenderRNA *brna)
StructRNA *srna; StructRNA *srna;
PropertyRNA *prop; PropertyRNA *prop;
static EnumPropertyItem rna_enum_partitioning_items[] = {
{RC_PARTITION_WATERSHED, "WATERSHED", 0, "Watershed", "Classic Recast partitioning method generating the nicest tessellation"},
{RC_PARTITION_MONOTONE, "MONOTONE", 0, "Monotone", "Fastest navmesh generation method, may create long thin polygons"},
{RC_PARTITION_LAYERS, "LAYERS", 0, "Layers", "Reasonably fast method that produces better triangles than monotone partitioning"},
{0, NULL, 0, NULL, NULL}
};
srna = RNA_def_struct(brna, "SceneGameRecastData", NULL); srna = RNA_def_struct(brna, "SceneGameRecastData", NULL);
RNA_def_struct_sdna(srna, "RecastData"); RNA_def_struct_sdna(srna, "RecastData");
RNA_def_struct_nested(brna, srna, "Scene"); RNA_def_struct_nested(brna, srna, "Scene");
@@ -3627,6 +3634,13 @@ static void rna_def_scene_game_recast_data(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Merged Region Size", "Minimum regions size (smaller regions will be merged)"); RNA_def_property_ui_text(prop, "Merged Region Size", "Minimum regions size (smaller regions will be merged)");
RNA_def_property_update(prop, NC_SCENE, NULL); RNA_def_property_update(prop, NC_SCENE, NULL);
prop = RNA_def_property(srna, "partitioning", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "partitioning");
RNA_def_property_enum_items(prop, rna_enum_partitioning_items);
RNA_def_property_enum_default(prop, RC_PARTITION_WATERSHED);
RNA_def_property_ui_text(prop, "Partitioning", "Choose partitioning method");
RNA_def_property_update(prop, NC_SCENE, NULL);
prop = RNA_def_property(srna, "edge_max_len", PROP_FLOAT, PROP_NONE); prop = RNA_def_property(srna, "edge_max_len", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "edgemaxlen"); RNA_def_property_float_sdna(prop, NULL, "edgemaxlen");
RNA_def_property_ui_range(prop, 0, 50, 1, 2); RNA_def_property_ui_range(prop, 0, 50, 1, 2);