R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename "Sample" enumerants to "Editor"

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-10-22 22:45:54 +02:00
parent 61ff7e5079
commit 9289356794
6 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
r5dev/naveditor/Editor_SoloMesh.cpp
View File

@ -261,7 +261,7 @@ void Editor_SoloMesh::handleRender()
duDebugDrawNavMeshBVTree(&m_dd, *m_navMesh);
if (m_drawMode == DRAWMODE_NAVMESH_NODES)
duDebugDrawNavMeshNodes(&m_dd, *m_navQuery);
duDebugDrawNavMeshPolysWithFlags(&m_dd, *m_navMesh, SAMPLE_POLYFLAGS_DISABLED, duRGBA(0,0,0,128));
duDebugDrawNavMeshPolysWithFlags(&m_dd, *m_navMesh, EDITOR_POLYFLAGS_DISABLED, duRGBA(0,0,0,128));
}
glDepthMask(GL_TRUE);
@ -535,7 +535,7 @@ bool Editor_SoloMesh::handleBuild()
// if you have large open areas with small obstacles (not a problem if you use tiles)
// * good choice to use for tiled navmesh with medium and small sized tiles
if (m_partitionType == SAMPLE_PARTITION_WATERSHED)
if (m_partitionType == EDITOR_PARTITION_WATERSHED)
{
// Prepare for region partitioning, by calculating distance field along the walkable surface.
if (!rcBuildDistanceField(m_ctx, *m_chf))
@ -551,7 +551,7 @@ bool Editor_SoloMesh::handleBuild()
return false;
}
}
else if (m_partitionType == SAMPLE_PARTITION_MONOTONE)
else if (m_partitionType == EDITOR_PARTITION_MONOTONE)
{
// Partition the walkable surface into simple regions without holes.
// Monotone partitioning does not need distancefield.
@ -561,7 +561,7 @@ bool Editor_SoloMesh::handleBuild()
return false;
}
}
else // SAMPLE_PARTITION_LAYERS
else // EDITOR_PARTITION_LAYERS
{
// Partition the walkable surface into simple regions without holes.
if (!rcBuildLayerRegions(m_ctx, *m_chf, 0, m_cfg.minRegionArea))
@ -648,21 +648,21 @@ bool Editor_SoloMesh::handleBuild()
for (int i = 0; i < m_pmesh->npolys; ++i)
{
if (m_pmesh->areas[i] == RC_WALKABLE_AREA)
m_pmesh->areas[i] = SAMPLE_POLYAREA_GROUND;
m_pmesh->areas[i] = EDITOR_POLYAREA_GROUND;
if (m_pmesh->areas[i] == SAMPLE_POLYAREA_GROUND ||
m_pmesh->areas[i] == SAMPLE_POLYAREA_GRASS ||
m_pmesh->areas[i] == SAMPLE_POLYAREA_ROAD)
if (m_pmesh->areas[i] == EDITOR_POLYAREA_GROUND ||
m_pmesh->areas[i] == EDITOR_POLYAREA_GRASS ||
m_pmesh->areas[i] == EDITOR_POLYAREA_ROAD)
{
m_pmesh->flags[i] = SAMPLE_POLYFLAGS_WALK;
m_pmesh->flags[i] = EDITOR_POLYFLAGS_WALK;
}
else if (m_pmesh->areas[i] == SAMPLE_POLYAREA_WATER)
else if (m_pmesh->areas[i] == EDITOR_POLYAREA_WATER)
{
m_pmesh->flags[i] = SAMPLE_POLYFLAGS_SWIM;
m_pmesh->flags[i] = EDITOR_POLYFLAGS_SWIM;
}
else if (m_pmesh->areas[i] == SAMPLE_POLYAREA_DOOR)
else if (m_pmesh->areas[i] == EDITOR_POLYAREA_DOOR)
{
m_pmesh->flags[i] = SAMPLE_POLYFLAGS_WALK | SAMPLE_POLYFLAGS_DOOR;
m_pmesh->flags[i] = EDITOR_POLYFLAGS_WALK | EDITOR_POLYFLAGS_DOOR;
}
}

20
r5dev/naveditor/Editor_TempObstacles.cpp
View File

@ -178,21 +178,21 @@ struct MeshProcess : public dtTileCacheMeshProcess
for (int i = 0; i < params->polyCount; ++i)
{
if (polyAreas[i] == DT_TILECACHE_WALKABLE_AREA)
polyAreas[i] = SAMPLE_POLYAREA_GROUND;
polyAreas[i] = EDITOR_POLYAREA_GROUND;
if (polyAreas[i] == SAMPLE_POLYAREA_GROUND ||
polyAreas[i] == SAMPLE_POLYAREA_GRASS ||
polyAreas[i] == SAMPLE_POLYAREA_ROAD)
if (polyAreas[i] == EDITOR_POLYAREA_GROUND ||
polyAreas[i] == EDITOR_POLYAREA_GRASS ||
polyAreas[i] == EDITOR_POLYAREA_ROAD)
{
polyFlags[i] = SAMPLE_POLYFLAGS_WALK;
polyFlags[i] = EDITOR_POLYFLAGS_WALK;
}
else if (polyAreas[i] == SAMPLE_POLYAREA_WATER)
else if (polyAreas[i] == EDITOR_POLYAREA_WATER)
{
polyFlags[i] = SAMPLE_POLYFLAGS_SWIM;
polyFlags[i] = EDITOR_POLYFLAGS_SWIM;
}
else if (polyAreas[i] == SAMPLE_POLYAREA_DOOR)
else if (polyAreas[i] == EDITOR_POLYAREA_DOOR)
{
polyFlags[i] = SAMPLE_POLYFLAGS_WALK | SAMPLE_POLYFLAGS_DOOR;
polyFlags[i] = EDITOR_POLYFLAGS_WALK | EDITOR_POLYFLAGS_DOOR;
}
}
@ -1065,7 +1065,7 @@ void Editor_TempObstacles::handleRender()
duDebugDrawNavMeshPortals(&m_dd, *m_navMesh);
if (m_drawMode == DRAWMODE_NAVMESH_NODES)
duDebugDrawNavMeshNodes(&m_dd, *m_navQuery);
duDebugDrawNavMeshPolysWithFlags(&m_dd, *m_navMesh, SAMPLE_POLYFLAGS_DISABLED, duRGBA(0,0,0,128));
duDebugDrawNavMeshPolysWithFlags(&m_dd, *m_navMesh, EDITOR_POLYFLAGS_DISABLED, duRGBA(0,0,0,128));
}

2
r5dev/naveditor/Editor_TileMesh.cpp
View File

@ -1056,7 +1056,7 @@ unsigned char* Editor_TileMesh::buildTileMesh(const int tx, const int ty, const
return 0;
}
}
else // SAMPLE_PARTITION_LAYERS
else // EDITOR_PARTITION_LAYERS
{
// Partition the walkable surface into simple regions without holes.
if (!rcBuildLayerRegions(m_ctx, *m_chf, m_cfg.borderSize, m_cfg.minRegionArea))

20
r5dev/naveditor/Sample_TempObstacles.cpp
View File

@ -178,21 +178,21 @@ struct MeshProcess : public dtTileCacheMeshProcess
for (int i = 0; i < params->polyCount; ++i)
{
if (polyAreas[i] == DT_TILECACHE_WALKABLE_AREA)
polyAreas[i] = SAMPLE_POLYAREA_GROUND;
polyAreas[i] = EDITOR_POLYAREA_GROUND;
if (polyAreas[i] == SAMPLE_POLYAREA_GROUND ||
polyAreas[i] == SAMPLE_POLYAREA_GRASS ||
polyAreas[i] == SAMPLE_POLYAREA_ROAD)
if (polyAreas[i] == EDITOR_POLYAREA_GROUND ||
polyAreas[i] == EDITOR_POLYAREA_GRASS ||
polyAreas[i] == EDITOR_POLYAREA_ROAD)
{
polyFlags[i] = SAMPLE_POLYFLAGS_WALK;
polyFlags[i] = EDITOR_POLYFLAGS_WALK;
}
else if (polyAreas[i] == SAMPLE_POLYAREA_WATER)
else if (polyAreas[i] == EDITOR_POLYAREA_WATER)
{
polyFlags[i] = SAMPLE_POLYFLAGS_SWIM;
polyFlags[i] = EDITOR_POLYFLAGS_SWIM;
}
else if (polyAreas[i] == SAMPLE_POLYAREA_DOOR)
else if (polyAreas[i] == EDITOR_POLYAREA_DOOR)
{
polyFlags[i] = SAMPLE_POLYFLAGS_WALK | SAMPLE_POLYFLAGS_DOOR;
polyFlags[i] = EDITOR_POLYFLAGS_WALK | EDITOR_POLYFLAGS_DOOR;
}
}
@ -1065,7 +1065,7 @@ void Editor_TempObstacles::handleRender()
duDebugDrawNavMeshPortals(&m_dd, *m_navMesh);
if (m_drawMode == DRAWMODE_NAVMESH_NODES)
duDebugDrawNavMeshNodes(&m_dd, *m_navQuery);
duDebugDrawNavMeshPolysWithFlags(&m_dd, *m_navMesh, SAMPLE_POLYFLAGS_DISABLED, duRGBA(0,0,0,128));
duDebugDrawNavMeshPolysWithFlags(&m_dd, *m_navMesh, EDITOR_POLYFLAGS_DISABLED, duRGBA(0,0,0,128));
}

6
r5dev/naveditor/include/Editor.h
View File

@ -16,8 +16,8 @@
// 3. This notice may not be removed or altered from any source distribution.
//
#ifndef RECASTSAMPLE_H
#define RECASTSAMPLE_H
#ifndef RECASTEDITOR_H
#define RECASTEDITOR_H
#include "Recast/Include/Recast.h"
#include "NavEditor/Include/EditorInterfaces.h"
@ -201,4 +201,4 @@ private:
};
#endif // RECASTSAMPLE_H
#endif // RECASTEDITOR_H

2
r5dev/naveditor/include/Editor_Debug.h
View File

@ -60,4 +60,4 @@ private:
};
#endif // RECASTSAMPLE_H
#endif // RECASTEDITOR_H