kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

move NavMesh draw code out of being a modifier and into DerivedMesh drawing hack (which IMHO is less bad then mis-using a modifier only to override drawing calls).

Browse Source
This commit is contained in:
Campbell Barton 2011-10-09 21:11:51 +00:00
parent 9d70e050a2
commit 7306eb84f0
13 changed files with 215 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@ -379,10 +379,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col.label(text="Mirror Object:")
col.prop(md, "mirror_object", text="")
def NAVMESH(self, layout, ob, md):
layout.operator("mesh.assign_navpolygon")
layout.operator("mesh.assign_new_navpolygon")
def MULTIRES(self, layout, ob, md):
layout.row().prop(md, "subdivision_type", expand=True)

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

@ -166,6 +166,9 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
elif game.physics_type in {'SENSOR', 'INVISIBLE', 'NO_COLLISION', 'OCCLUDE'}:
layout.prop(ob, "hide_render", text="Invisible")
elif game.physics_type == 'NAVMESH':
layout.operator("mesh.assign_navpolygon")
layout.operator("mesh.assign_new_navpolygon")
class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel, Panel):

2
source/blender/blenkernel/BKE_mesh.h
View File

@ -161,6 +161,8 @@ int BKE_mesh_validate_dm(struct DerivedMesh *dm);
void BKE_mesh_calc_edges(struct Mesh *mesh, int update);
void BKE_mesh_ensure_navmesh(struct Mesh *me);
#ifdef __cplusplus
}
#endif

2
source/blender/blenkernel/CMakeLists.txt
View File

@ -359,6 +359,8 @@ if(WITH_GAMEENGINE)
intern/navmesh_conversion.c
BKE_navmesh_conversion.h
)
add_definitions(-DWITH_GAMEENGINE)
endif()
## Warnings as errors, this is too strict!

186
source/blender/blenkernel/intern/DerivedMesh.c
View File

@ -62,6 +62,10 @@
#include "BKE_multires.h"
#include "BKE_armature.h"
#ifdef WITH_GAMEENGINE
#include "BKE_navmesh_conversion.h"
#endif
#include "BLO_sys_types.h" // for intptr_t support
#include "GL/glew.h"
@ -73,6 +77,8 @@
extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm);
///////////////////////////////////
///////////////////////////////////
@ -2105,6 +2111,18 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
add_orco_dm(ob, NULL, *deform_r, NULL, CD_ORCO);
}
#ifdef WITH_GAMEENGINE
/* NavMesh - this is a hack but saves having a NavMesh modifier */
if (ob->body_type == OB_BODY_TYPE_NAVMESH && finaldm->type == DM_TYPE_CDDM) {
DerivedMesh *tdm;
tdm= navmesh_dm_createNavMeshForVisualization(finaldm);
if (finaldm != tdm) {
finaldm->release(finaldm);
finaldm= tdm;
}
}
#endif /* WITH_GAMEENGINE */
*final_r = finaldm;
if(orcodm)
@ -2939,3 +2957,171 @@ void DM_set_object_boundbox(Object *ob, DerivedMesh *dm)
boundbox_set_from_min_max(ob->bb, min, max);
}
/* --- NAVMESH (begin) --- */
#ifdef WITH_GAMEENGINE
BM_INLINE int navmesh_bit(int a, int b)
{
return (a & (1 << b)) >> b;
}
BM_INLINE void navmesh_intToCol(int i, float* col)
{
int r = navmesh_bit(i, 0) + navmesh_bit(i, 3) * 2 + 1;
int g = navmesh_bit(i, 1) + navmesh_bit(i, 4) * 2 + 1;
int b = navmesh_bit(i, 2) + navmesh_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 navmesh_drawColored(DerivedMesh *dm)
{
int a, glmode;
MVert *mvert = (MVert *)CustomData_get_layer(&dm->vertData, CD_MVERT);
MFace *mface = (MFace *)CustomData_get_layer(&dm->faceData, CD_MFACE);
int* polygonIdx = (int*)CustomData_get_layer(&dm->faceData, CD_RECAST);
const float BLACK_COLOR[3] = {0.f, 0.f, 0.f};
float col[3];
if (!polygonIdx)
return;
/*
//UI_ThemeColor(TH_WIRE);
glDisable(GL_LIGHTING);
glLineWidth(2.0);
dm->drawEdges(dm, 0, 1);
glLineWidth(1.0);
glEnable(GL_LIGHTING);*/
glDisable(GL_LIGHTING);
if(GPU_buffer_legacy(dm) ) {
DEBUG_VBO( "Using legacy code. drawNavMeshColored\n" );
//glShadeModel(GL_SMOOTH);
glBegin(glmode = GL_QUADS);
for(a = 0; a < dm->numFaceData; a++, mface++) {
int new_glmode = mface->v4?GL_QUADS:GL_TRIANGLES;
int polygonIdx = *(int*)CustomData_get(&dm->faceData, a, CD_RECAST);
if (polygonIdx<=0)
memcpy(col, BLACK_COLOR, 3*sizeof(float));
else
navmesh_intToCol(polygonIdx, col);
if(new_glmode != glmode) {
glEnd();
glBegin(glmode = new_glmode);
}
glColor3fv(col);
glVertex3fv(mvert[mface->v1].co);
glVertex3fv(mvert[mface->v2].co);
glVertex3fv(mvert[mface->v3].co);
if(mface->v4) {
glVertex3fv(mvert[mface->v4].co);
}
}
glEnd();
}
glEnable(GL_LIGHTING);
}
static void navmesh_DM_drawFacesTex(DerivedMesh *dm, int (*setDrawOptions)(MTFace *tface, int has_mcol, int matnr))
{
(void) setDrawOptions;
navmesh_drawColored(dm);
}
static void navmesh_DM_drawFacesSolid(DerivedMesh *dm,
float (*partial_redraw_planes)[4],
int UNUSED(fast), int (*setMaterial)(int, void *attribs))
{
(void) partial_redraw_planes;
(void) setMaterial;
//drawFacesSolid_original(dm, partial_redraw_planes, fast, setMaterial);
navmesh_drawColored(dm);
}
static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm)
{
DerivedMesh *result;
int maxFaces = dm->getNumFaces(dm);
int *recastData;
int vertsPerPoly=0, nverts=0, ndtris=0, npolys=0;
float* verts=NULL;
unsigned short *dtris=NULL, *dmeshes=NULL, *polys=NULL;
int *dtrisToPolysMap=NULL, *dtrisToTrisMap=NULL, *trisToFacesMap=NULL;
int res;
result = CDDM_copy(dm);
if (!CustomData_has_layer(&result->faceData, CD_RECAST))
{
int *sourceRecastData = (int*)CustomData_get_layer(&dm->faceData, CD_RECAST);
CustomData_add_layer_named(&result->faceData, CD_RECAST, CD_DUPLICATE,
sourceRecastData, maxFaces, "recastData");
}
recastData = (int*)CustomData_get_layer(&result->faceData, CD_RECAST);
result->drawFacesTex = navmesh_DM_drawFacesTex;
result->drawFacesSolid = navmesh_DM_drawFacesSolid;
//process mesh
res = buildNavMeshDataByDerivedMesh(dm, &vertsPerPoly, &nverts, &verts, &ndtris, &dtris,
&npolys, &dmeshes, &polys, &dtrisToPolysMap, &dtrisToTrisMap,
&trisToFacesMap);
if (res)
{
size_t polyIdx;
//invalidate concave polygon
for (polyIdx=0; polyIdx<(size_t)npolys; polyIdx++)
{
unsigned short* poly = &polys[polyIdx*2*vertsPerPoly];
if (!polyIsConvex(poly, vertsPerPoly, verts))
{
//set negative polygon idx to all faces
unsigned short *dmesh = &dmeshes[4*polyIdx];
unsigned short tbase = dmesh[2];
unsigned short tnum = dmesh[3];
unsigned short ti;
for (ti=0; ti<tnum; ti++)
{
unsigned short triidx = dtrisToTrisMap[tbase+ti];
unsigned short faceidx = trisToFacesMap[triidx];
if (recastData[faceidx]>0)
recastData[faceidx] = -recastData[faceidx];
}
}
}
}
else
{
printf("Error during creation polygon infos\n");
}
//clean up
if (verts!=NULL)
MEM_freeN(verts);
if (dtris!=NULL)
MEM_freeN(dtris);
if (dmeshes!=NULL)
MEM_freeN(dmeshes);
if (polys!=NULL)
MEM_freeN(polys);
if (dtrisToPolysMap!=NULL)
MEM_freeN(dtrisToPolysMap);
if (dtrisToTrisMap!=NULL)
MEM_freeN(dtrisToTrisMap);
if (trisToFacesMap!=NULL)
MEM_freeN(trisToFacesMap);
return result;
}
#endif /* WITH_GAMEENGINE */
/* --- NAVMESH (end) --- */

16
source/blender/blenkernel/intern/mesh.c
View File

@ -1606,3 +1606,19 @@ void mesh_translate(Mesh *me, float offset[3], int do_keys)
}
}
}
void BKE_mesh_ensure_navmesh(Mesh *me)
{
if (!CustomData_has_layer(&me->fdata, CD_RECAST)) {
int i;
int numFaces = me->totface;
int* recastData;
CustomData_add_layer_named(&me->fdata, CD_RECAST, CD_CALLOC, NULL, numFaces, "recastData");
recastData = (int*)CustomData_get_layer(&me->fdata, CD_RECAST);
for (i=0; i<numFaces; i++) {
recastData[i] = i+1;
}
CustomData_add_layer_named(&me->fdata, CD_RECAST, CD_REFERENCE, recastData, numFaces, "recastData");
}
}

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

@ -296,7 +296,6 @@ static Object* createRepresentation(bContext *C, struct recast_polyMesh *pmesh,
int i,j, k;
unsigned short* v;
int face[3];
Main *bmain= CTX_data_main(C);
Scene *scene= CTX_data_scene(C);
Object* obedit;
int createob= base==NULL;
@ -305,7 +304,6 @@ static Object* createRepresentation(bContext *C, struct recast_polyMesh *pmesh,
unsigned int *meshes;
float bmin[3], cs, ch, *dverts;
unsigned char *tris;
ModifierData *md;
zero_v3(co);
zero_v3(rot);
@ -419,11 +417,8 @@ static Object* createRepresentation(bContext *C, struct recast_polyMesh *pmesh,
obedit->body_type= OB_BODY_TYPE_NAVMESH;
rename_id((ID *)obedit, "Navmesh");
}
md= modifiers_findByType(obedit, eModifierType_NavMesh);
if(!md) {
ED_object_modifier_add(NULL, bmain, scene, obedit, NULL, eModifierType_NavMesh);
}
BKE_mesh_ensure_navmesh(obedit->data);
return obedit;
}

5
source/blender/makesdna/DNA_modifier_types.h
View File

@ -74,7 +74,6 @@ typedef enum ModifierType {
eModifierType_WeightVGEdit,
eModifierType_WeightVGMix,
eModifierType_WeightVGProximity,
eModifierType_NavMesh,
eModifierType_DynamicPaint, /* reserve slot */
NUM_MODIFIER_TYPES
} ModifierType;
@ -751,10 +750,6 @@ typedef struct ScrewModifierData {
#define MOD_SCREW_OBJECT_OFFSET (1<<2)
// #define MOD_SCREW_OBJECT_ANGLE (1<<4)
typedef struct NavMeshModifierData {
ModifierData modifier;
} NavMeshModifierData;
typedef struct WarpModifierData {
ModifierData modifier;

15
source/blender/makesrna/intern/rna_modifier.c
View File

@ -91,7 +91,6 @@ EnumPropertyItem modifier_type_items[] ={
{eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, "Collision", ""},
{eModifierType_Explode, "EXPLODE", ICON_MOD_EXPLODE, "Explode", ""},
{eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""},
{eModifierType_NavMesh, "NAVMESH", ICON_MOD_PHYSICS, "Navigation mesh", ""},
{eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""},
{eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""},
{eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""},
@ -189,8 +188,6 @@ static StructRNA* rna_Modifier_refine(struct PointerRNA *ptr)
return &RNA_ScrewModifier;
case eModifierType_Warp:
return &RNA_WarpModifier;
case eModifierType_NavMesh:
return &RNA_NavMeshModifier;
case eModifierType_WeightVGEdit:
return &RNA_VertexWeightEditModifier;
case eModifierType_WeightVGMix:
@ -2490,17 +2487,6 @@ static void rna_def_modifier_screw(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
}
static void rna_def_modifier_navmesh(BlenderRNA *brna)
{
StructRNA *srna;
/* PropertyRNA *prop; */ /* UNUSED */
srna= RNA_def_struct(brna, "NavMeshModifier", "Modifier");
RNA_def_struct_ui_text(srna, "NavMesh Modifier", "NavMesh modifier");
RNA_def_struct_sdna(srna, "NavMeshModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_DECIM);
}
static void rna_def_modifier_weightvg_mask(BlenderRNA *brna, StructRNA *srna)
{
static EnumPropertyItem weightvg_mask_tex_map_items[] = {
@ -2893,7 +2879,6 @@ void RNA_def_modifier(BlenderRNA *brna)
rna_def_modifier_smoke(brna);
rna_def_modifier_solidify(brna);
rna_def_modifier_screw(brna);
rna_def_modifier_navmesh(brna);
rna_def_modifier_weightvgedit(brna);
rna_def_modifier_weightvgmix(brna);
rna_def_modifier_weightvgproximity(brna);

4
source/blender/makesrna/intern/rna_object.c
View File

@ -905,6 +905,10 @@ static void rna_GameObjectSettings_physics_type_set(PointerRNA *ptr, int value)
case OB_BODY_TYPE_NAVMESH:
ob->gameflag |= OB_NAVMESH;
ob->gameflag &= ~(OB_SENSOR|OB_COLLISION|OB_DYNAMIC|OB_OCCLUDER);
/* could be moved into mesh UI but for now ensure mesh data layer */
BKE_mesh_ensure_navmesh(ob->data);
break;
case OB_BODY_TYPE_NO_COLLISION:
ob->gameflag &= ~(OB_SENSOR|OB_COLLISION|OB_OCCLUDER|OB_DYNAMIC|OB_NAVMESH);

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

@ -65,7 +65,6 @@ set(SRC
intern/MOD_meshdeform.c
intern/MOD_mirror.c
intern/MOD_multires.c
intern/MOD_navmesh.c
intern/MOD_none.c
intern/MOD_particleinstance.c
intern/MOD_particlesystem.c

313
source/blender/modifiers/intern/MOD_navmesh.c
View File

@ -1,313 +0,0 @@
/*
* $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* The Original Code is Copyright (C) 2005 by the Blender Foundation.
* All rights reserved.
*
* Contributor(s):
*
* ***** END GPL LICENSE BLOCK *****
*
*/
/** \file blender/modifiers/intern/MOD_navmesh.c
* \ingroup modifiers
*/
#include <math.h>
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#ifdef WITH_GAMEENGINE
# include "recast-capi.h"
# include "BKE_navmesh_conversion.h"
# include "GL/glew.h"
# include "GPU_buffers.h"
# include "GPU_draw.h"
#endif
#include "BLI_math.h"
#include "BLI_utildefines.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_particle.h"
#include "BKE_customdata.h"
#include "MEM_guardedalloc.h"
BM_INLINE int bit(int a, int b)
{
return (a & (1 << b)) >> b;
}
BM_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 *UNUSED(md))
{
/* NavMeshModifierData *nmmd = (NavMeshModifierData*) md; */ /* UNUSED */
}
static void copyData(ModifierData *UNUSED(md), ModifierData *UNUSED(target))
{
/* NavMeshModifierData *nmmd = (NavMeshModifierData*) md; */
/* NavMeshModifierData *tnmmd = (NavMeshModifierData*) target; */
//.todo - deep copy
}
/*
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;
MVert *mvert = (MVert *)CustomData_get_layer(&dm->vertData, CD_MVERT);
MFace *mface = (MFace *)CustomData_get_layer(&dm->faceData, CD_MFACE);
int* polygonIdx = (int*)CustomData_get_layer(&dm->faceData, CD_RECAST);
const float BLACK_COLOR[3] = {0.f, 0.f, 0.f};
float col[3];
if (!polygonIdx)
return;
/*
//UI_ThemeColor(TH_WIRE);
glDisable(GL_LIGHTING);
glLineWidth(2.0);
dm->drawEdges(dm, 0, 1);
glLineWidth(1.0);
glEnable(GL_LIGHTING);*/
glDisable(GL_LIGHTING);
if(GPU_buffer_legacy(dm) ) {
DEBUG_VBO( "Using legacy code. drawNavMeshColored\n" );
//glShadeModel(GL_SMOOTH);
glBegin(glmode = GL_QUADS);
for(a = 0; a < dm->numFaceData; a++, mface++) {
int new_glmode = mface->v4?GL_QUADS:GL_TRIANGLES;
int polygonIdx = *(int*)CustomData_get(&dm->faceData, a, CD_RECAST);
if (polygonIdx<=0)
memcpy(col, BLACK_COLOR, 3*sizeof(float));
else
intToCol(polygonIdx, col);
if(new_glmode != glmode) {
glEnd();
glBegin(glmode = new_glmode);
}
glColor3fv(col);
glVertex3fv(mvert[mface->v1].co);
glVertex3fv(mvert[mface->v2].co);
glVertex3fv(mvert[mface->v3].co);
if(mface->v4) {
glVertex3fv(mvert[mface->v4].co);
}
}
glEnd();
}
glEnable(GL_LIGHTING);
}
static void navDM_drawFacesTex(DerivedMesh *dm, int (*setDrawOptions)(MTFace *tface, int has_mcol, int matnr))
{
(void) setDrawOptions;
drawNavMeshColored(dm);
}
static void navDM_drawFacesSolid(DerivedMesh *dm,
float (*partial_redraw_planes)[4],
int UNUSED(fast), int (*setMaterial)(int, void *attribs))
{
(void) partial_redraw_planes;
(void) setMaterial;
//drawFacesSolid_original(dm, partial_redraw_planes, fast, setMaterial);
drawNavMeshColored(dm);
}
#endif /* WITH_GAMEENGINE */
static DerivedMesh *createNavMeshForVisualization(NavMeshModifierData *UNUSED(mmd), DerivedMesh *dm)
{
#ifdef WITH_GAMEENGINE
DerivedMesh *result;
int maxFaces = dm->getNumFaces(dm);
int *recastData;
int vertsPerPoly=0, nverts=0, ndtris=0, npolys=0;
float* verts=NULL;
unsigned short *dtris=NULL, *dmeshes=NULL, *polys=NULL;
int *dtrisToPolysMap=NULL, *dtrisToTrisMap=NULL, *trisToFacesMap=NULL;
int res;
result = CDDM_copy(dm);
if (!CustomData_has_layer(&result->faceData, CD_RECAST))
{
int *sourceRecastData = (int*)CustomData_get_layer(&dm->faceData, CD_RECAST);
CustomData_add_layer_named(&result->faceData, CD_RECAST, CD_DUPLICATE,
sourceRecastData, maxFaces, "recastData");
}
recastData = (int*)CustomData_get_layer(&result->faceData, CD_RECAST);
result->drawFacesTex = navDM_drawFacesTex;
result->drawFacesSolid = navDM_drawFacesSolid;
//process mesh
res = buildNavMeshDataByDerivedMesh(dm, &vertsPerPoly, &nverts, &verts, &ndtris, &dtris,
&npolys, &dmeshes, &polys, &dtrisToPolysMap, &dtrisToTrisMap,
&trisToFacesMap);
if (res)
{
size_t polyIdx;
//invalidate concave polygon
for (polyIdx=0; polyIdx<(size_t)npolys; polyIdx++)
{
unsigned short* poly = &polys[polyIdx*2*vertsPerPoly];
if (!polyIsConvex(poly, vertsPerPoly, verts))
{
//set negative polygon idx to all faces
unsigned short *dmesh = &dmeshes[4*polyIdx];
unsigned short tbase = dmesh[2];
unsigned short tnum = dmesh[3];
unsigned short ti;
for (ti=0; ti<tnum; ti++)
{
unsigned short triidx = dtrisToTrisMap[tbase+ti];
unsigned short faceidx = trisToFacesMap[triidx];
if (recastData[faceidx]>0)
recastData[faceidx] = -recastData[faceidx];
}
}
}
}
else
{
printf("Error during creation polygon infos\n");
}
//clean up
if (verts!=NULL)
MEM_freeN(verts);
if (dtris!=NULL)
MEM_freeN(dtris);
if (dmeshes!=NULL)
MEM_freeN(dmeshes);
if (polys!=NULL)
MEM_freeN(polys);
if (dtrisToPolysMap!=NULL)
MEM_freeN(dtrisToPolysMap);
if (dtrisToTrisMap!=NULL)
MEM_freeN(dtrisToTrisMap);
if (trisToFacesMap!=NULL)
MEM_freeN(trisToFacesMap);
return result;
#else // WITH_GAMEENGINE
return dm;
#endif // WITH_GAMEENGINE
}
/*
static int isDisabled(ModifierData *md, int useRenderParams)
{
NavMeshModifierData *amd = (NavMeshModifierData*) md;
return false;
}*/
static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *derivedData,
int UNUSED(useRenderParams), int UNUSED(isFinalCalc))
{
DerivedMesh *result = NULL;
NavMeshModifierData *nmmd = (NavMeshModifierData*) md;
int hasRecastData = CustomData_has_layer(&derivedData->faceData, CD_RECAST)>0;
if (ob->body_type!=OB_BODY_TYPE_NAVMESH || !hasRecastData )
{
//convert to nav mesh object:
//1)set physics type
ob->gameflag &= ~OB_COLLISION;
ob->gameflag |= OB_NAVMESH;
ob->body_type = OB_BODY_TYPE_NAVMESH;
//2)add and init recast data layer
if (!hasRecastData)
{
Mesh* obmesh = (Mesh *)ob->data;
if (obmesh)
{
int i;
int numFaces = obmesh->totface;
int* recastData;
CustomData_add_layer_named(&obmesh->fdata, CD_RECAST, CD_CALLOC, NULL, numFaces, "recastData");
recastData = (int*)CustomData_get_layer(&obmesh->fdata, CD_RECAST);
for (i=0; i<numFaces; i++)
{
recastData[i] = i+1;
}
CustomData_add_layer_named(&derivedData->faceData, CD_RECAST, CD_REFERENCE, recastData, numFaces, "recastData");
}
}
}
result = createNavMeshForVisualization(nmmd, derivedData);
return result;
}
ModifierTypeInfo modifierType_NavMesh = {
/* name */ "NavMesh",
/* structName */ "NavMeshModifierData",
/* structSize */ sizeof(NavMeshModifierData),
/* type */ eModifierTypeType_Constructive,
/* flags */ (ModifierTypeFlag) (eModifierTypeFlag_AcceptsMesh
| eModifierTypeFlag_Single),
/* copyData */ copyData,
/* deformVerts */ 0,
/* deformMatrices */ 0,
/* deformVertsEM */ 0,
/* deformMatricesEM */ 0,
/* applyModifier */ applyModifier,
/* applyModifierEM */ 0,
/* initData */ initData,
/* requiredDataMask */ 0,
/* freeData */ 0,
/* isDisabled */ 0,
/* updateDepgraph */ 0,
/* dependsOnTime */ 0,
/* foreachObjectLink */ 0,
/* foreachIDLink */ 0,
};

1
source/blender/modifiers/intern/MOD_util.c
View File

@ -295,7 +295,6 @@ void modifier_type_init(ModifierTypeInfo *types[])
INIT_TYPE(Solidify);
INIT_TYPE(Screw);
INIT_TYPE(Warp);
INIT_TYPE(NavMesh);
INIT_TYPE(WeightVGEdit);
INIT_TYPE(WeightVGMix);
INIT_TYPE(WeightVGProximity);