diff options
| author | Nick Samarin <nicks1987@bigmir.net> | 2010-08-11 00:48:28 +0400 |
|---|---|---|
| committer | Nick Samarin <nicks1987@bigmir.net> | 2010-08-11 00:48:28 +0400 |
| commit | 3a8f3dd3f5e843ef8abad41996ebe5f7041e3807 (patch) | |
| tree | 41390eb56e14df0beb83285f0f7cf71ce49e6ee5 /source/blender | |
| parent | 7ec16a7c6e44cc5cb5dd52a2d49dec5dbe712efc (diff) | |
reworked obstacle simulation in order to have two realizations: with "cell" and "ray" sampling
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/util/navmesh_conversion.cpp | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/util/navmesh_conversion.cpp b/source/blender/editors/util/navmesh_conversion.cpp index 62e26e2cd55..873660baa13 100644 --- a/source/blender/editors/util/navmesh_conversion.cpp +++ b/source/blender/editors/util/navmesh_conversion.cpp @@ -341,7 +341,7 @@ bool buildNavMeshData(const int nverts, const float* verts, { memcpy(dtris+3*2*i, tris+3*dtrisToTrisMap[i], sizeof(unsigned short)*3); } - //create new recast data corresponded to dtris and renumber for continious indices + //create new recast data corresponded to dtris and renumber for continuous indices int prevPolyIdx=-1, curPolyIdx, newPolyIdx=0; dtrisToPolysMap = new int[ndtris]; for (int i=0; i<ndtris; i++) diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 0bd530bbd43..8909d96b03a 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -500,7 +500,8 @@ typedef struct GameData { /* obstacleSimulation */ #define OBSTSIMULATION_NONE 0 -#define OBSTSIMULATION_TOI 1 +#define OBSTSIMULATION_TOI_rays 1 +#define OBSTSIMULATION_TOI_cells 2 /* GameData.flag */ #define GAME_ENABLE_ALL_FRAMES (1 << 1) diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 607b6363cb6..28af92eb745 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1637,7 +1637,8 @@ static void rna_def_scene_game_data(BlenderRNA *brna) static EnumPropertyItem obstacle_simulation_items[] = { {OBSTSIMULATION_NONE, "NONE", 0, "None", ""}, - {OBSTSIMULATION_TOI, "RVO", 0, "RVO", ""}, + {OBSTSIMULATION_TOI_rays, "RVO (rays)", 0, "RVO (rays)", ""}, + {OBSTSIMULATION_TOI_cells, "RVO (cells)", 0, "RVO (cells)", ""}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "SceneGameData", NULL); |