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

Even More XZY->XYZ changes

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-07-28 15:45:02 +02:00
parent cbaf10478a
commit 9eeaebaf6a
8 changed files with 33 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
r5dev/naveditor/CrowdTool.cpp
View File

@ -535,7 +535,7 @@ void CrowdToolState::handleRenderOverlay(double* proj, double* model, int* view)
const dtNode* node = pool->getNodeAtIdx(j+1); const dtNode* node = pool->getNodeAtIdx(j+1);
if (!node) continue; if (!node) continue;
if (gluProject((GLdouble)node->pos[0],(GLdouble)node->pos[1]+off,(GLdouble)node->pos[2], if (gluProject((GLdouble)node->pos[0],(GLdouble)node->pos[1],(GLdouble)node->pos[2]+off,
model, proj, view, &x, &y, &z)) model, proj, view, &x, &y, &z))
{ {
const float heuristic = node->total;// - node->cost; const float heuristic = node->total;// - node->cost;
@ -588,7 +588,7 @@ void CrowdToolState::handleRenderOverlay(double* proj, double* model, int* view)
const dtCrowdAgent* nei = crowd->getAgent(ag->neis[j].idx); const dtCrowdAgent* nei = crowd->getAgent(ag->neis[j].idx);
if (!nei->active) continue; if (!nei->active) continue;
if (gluProject((GLdouble)nei->npos[0], (GLdouble)nei->npos[1]+radius, (GLdouble)nei->npos[2], if (gluProject((GLdouble)nei->npos[0], (GLdouble)nei->npos[1], (GLdouble)nei->npos[2]+radius,
model, proj, view, &x, &y, &z)) model, proj, view, &x, &y, &z))
{ {
snprintf(label, 32, "%.3f", ag->neis[j].dist); snprintf(label, 32, "%.3f", ag->neis[j].dist);

11
r5dev/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp vendored
View File

@ -381,7 +381,6 @@ static void drawMeshTilePortal(duDebugDraw* dd, const dtMeshTile* tile)
dd->vertex(vb[0], y, vb[2] - padz, col); dd->vertex(vb[0], y, vb[2] - padz, col);
dd->vertex(va[0], y, va[2] - padz, col); dd->vertex(va[0], y, va[2] - padz, col);
} }
} }
} }
} }
@ -497,11 +496,11 @@ static void debugDrawTileCachePortals(struct duDebugDraw* dd, const dtTileCacheL
{ {
const int* seg = &segs[dir*4]; const int* seg = &segs[dir*4];
const float ax = bmin[0] + (x+seg[0])*cs; const float ax = bmin[0] + (x+seg[0])*cs;
const float ay = bmin[1] + (lh+1)*ch; const float ay = bmin[1] + (y+seg[1])*cs;
const float az = bmin[2] + (y+seg[2])*cs; const float az = bmin[2] + (lh+1)*ch;
const float bx = bmin[0] + (x+seg[2])*cs; const float bx = bmin[0] + (x+seg[1])*cs;
const float by = bmin[1] + (lh+3)*ch; const float by = bmin[1] + (y+seg[1])*cs;
const float bz = bmin[2] + (y+seg[2])*cs; const float bz = bmin[2] + (lh+3)*ch;
dd->vertex(ax, ay, az, pcol); dd->vertex(ax, ay, az, pcol);
dd->vertex(bx, by, bz, pcol); dd->vertex(bx, by, bz, pcol);
} }

2
r5dev/thirdparty/recast/DetourCrowd/Source/DetourCrowdInternal.cpp vendored
View File

@ -184,7 +184,7 @@ int getNeighbours(const float* pos, const float height, const float range,
dtVsub(diff, pos, ag->npos); dtVsub(diff, pos, ag->npos);
if (dtMathFabsf(diff[2]) >= (height+ag->params.height)/2.0f) if (dtMathFabsf(diff[2]) >= (height+ag->params.height)/2.0f)
continue; continue;
diff[1] = 0; diff[2] = 0;
const float distSqr = dtVlenSqr(diff); const float distSqr = dtVlenSqr(diff);
if (distSqr > dtSqr(range)) if (distSqr > dtSqr(range))
continue; continue;

8
r5dev/thirdparty/recast/DetourCrowd/Source/DetourObstacleAvoidance.cpp vendored
View File

@ -293,13 +293,13 @@ void dtObstacleAvoidanceQuery::prepare(const float* pos, const float* dvel)
const float a = dtTriArea2D(orig, cir->dp,dv); const float a = dtTriArea2D(orig, cir->dp,dv);
if (a < 0.01f) if (a < 0.01f)
{ {
cir->np[0] = -cir->dp[2]; cir->np[0] = -cir->dp[1];
cir->np[2] = cir->dp[0]; cir->np[1] = cir->dp[0];
} }
else else
{ {
cir->np[0] = cir->dp[2]; cir->np[0] = cir->dp[1];
cir->np[2] = -cir->dp[0]; cir->np[1] = -cir->dp[0];
} }
} }

4
r5dev/thirdparty/recast/DetourTileCache/Source/DetourTileCache.cpp vendored
View File

@ -486,8 +486,8 @@ dtStatus dtTileCache::queryTiles(const float* bmin, const float* bmax,
const float th = m_params.height * m_params.cs; const float th = m_params.height * m_params.cs;
const int tx0 = (int)dtMathFloorf((bmin[0]-m_params.orig[0]) / tw); const int tx0 = (int)dtMathFloorf((bmin[0]-m_params.orig[0]) / tw);
const int tx1 = (int)dtMathFloorf((bmax[0]-m_params.orig[0]) / tw); const int tx1 = (int)dtMathFloorf((bmax[0]-m_params.orig[0]) / tw);
const int ty0 = (int)dtMathFloorf((bmin[2]-m_params.orig[2]) / th); const int ty0 = (int)dtMathFloorf((bmin[1]-m_params.orig[1]) / th);
const int ty1 = (int)dtMathFloorf((bmax[2]-m_params.orig[2]) / th); const int ty1 = (int)dtMathFloorf((bmax[1]-m_params.orig[1]) / th);
for (int ty = ty0; ty <= ty1; ++ty) for (int ty = ty0; ty <= ty1; ++ty)
{ {

4
r5dev/thirdparty/recast/DetourTileCache/Source/DetourTileCacheBuilder.cpp vendored
View File

@ -398,7 +398,7 @@ static bool appendVertex(dtTempContour& cont, const int x, const int y, const in
pb[0] = (unsigned char)x; pb[0] = (unsigned char)x;
return true; return true;
} }
else if (pa[2] == pb[2] && (int)pb[2] == y) else if (pa[1] == pb[1] && (int)pb[1] == y)
{ {
// The verts are aligned aling y-axis, update x. // The verts are aligned aling y-axis, update x.
pb[0] = (unsigned char)x; pb[0] = (unsigned char)x;
@ -523,7 +523,7 @@ static bool walkContour(dtTileCacheLayer& layer, int x, int y, dtTempContour& co
// Remove last vertex if it is duplicate of the first one. // Remove last vertex if it is duplicate of the first one.
unsigned char* pa = &cont.verts[(cont.nverts-1)*4]; unsigned char* pa = &cont.verts[(cont.nverts-1)*4];
unsigned char* pb = &cont.verts[0]; unsigned char* pb = &cont.verts[0];
if (pa[0] == pb[0] && pa[2] == pb[2]) if (pa[0] == pb[0] && pa[1] == pb[1])
cont.nverts--; cont.nverts--;
return true; return true;

22
r5dev/thirdparty/recast/Recast/Source/RecastContour.cpp vendored
View File

@ -650,7 +650,7 @@ static bool mergeContours(rcContour& ca, rcContour& cb, int ia, int ib)
struct rcContourHole struct rcContourHole
{ {
rcContour* contour; rcContour* contour;
int minx, minz, leftmost; int minx, miny, leftmost;
}; };
struct rcContourRegion struct rcContourRegion
@ -667,19 +667,19 @@ struct rcPotentialDiagonal
}; };
// Finds the lowest leftmost vertex of a contour. // Finds the lowest leftmost vertex of a contour.
static void findLeftMostVertex(rcContour* contour, int* minx, int* minz, int* leftmost) static void findLeftMostVertex(rcContour* contour, int* minx, int* miny, int* leftmost)
{ {
*minx = contour->verts[0]; *minx = contour->verts[0];
*minz = contour->verts[2]; *miny = contour->verts[1];
*leftmost = 0; *leftmost = 0;
for (int i = 1; i < contour->nverts; i++) for (int i = 1; i < contour->nverts; i++)
{ {
const int x = contour->verts[i*4+0]; const int x = contour->verts[i*4+0];
const int z = contour->verts[i*4+2]; const int y = contour->verts[i*4+1];
if (x < *minx || (x == *minx && z < *minz)) if (x < *minx || (x == *minx && y < *miny))
{ {
*minx = x; *minx = x;
*minz = z; *miny = y;
*leftmost = i; *leftmost = i;
} }
} }
@ -691,9 +691,9 @@ static int compareHoles(const void* va, const void* vb)
const rcContourHole* b = (const rcContourHole*)vb; const rcContourHole* b = (const rcContourHole*)vb;
if (a->minx == b->minx) if (a->minx == b->minx)
{ {
if (a->minz < b->minz) if (a->miny < b->miny)
return -1; return -1;
if (a->minz > b->minz) if (a->miny > b->miny)
return 1; return 1;
} }
else else
@ -723,7 +723,7 @@ static void mergeRegionHoles(rcContext* ctx, rcContourRegion& region)
{ {
// Sort holes from left to right. // Sort holes from left to right.
for (int i = 0; i < region.nholes; i++) for (int i = 0; i < region.nholes; i++)
findLeftMostVertex(region.holes[i].contour, &region.holes[i].minx, &region.holes[i].minz, &region.holes[i].leftmost); findLeftMostVertex(region.holes[i].contour, &region.holes[i].minx, &region.holes[i].miny, &region.holes[i].leftmost);
qsort(region.holes, region.nholes, sizeof(rcContourHole), compareHoles); qsort(region.holes, region.nholes, sizeof(rcContourHole), compareHoles);
@ -764,9 +764,9 @@ static void mergeRegionHoles(rcContext* ctx, rcContourRegion& region)
if (inCone(j, outline->nverts, outline->verts, corner)) if (inCone(j, outline->nverts, outline->verts, corner))
{ {
int dx = outline->verts[j*4+0] - corner[0]; int dx = outline->verts[j*4+0] - corner[0];
int dz = outline->verts[j*4+2] - corner[2]; int dy = outline->verts[j*4+1] - corner[1];
diags[ndiags].vert = j; diags[ndiags].vert = j;
diags[ndiags].dist = dx*dx + dz*dz; diags[ndiags].dist = dx*dx + dy*dy;
ndiags++; ndiags++;
} }
} }

9
r5dev/thirdparty/recast/Recast/Source/RecastMeshDetail.cpp vendored
View File

@ -1470,18 +1470,11 @@ bool rcBuildPolyMeshDetail(rcContext* ctx, const rcPolyMesh& mesh, const rcCompa
for (int j = 0; j < ntris; ++j) for (int j = 0; j < ntris; ++j)
{ {
const int* t = &tris[j*4]; const int* t = &tris[j*4];
#if 1
dmesh.tris[dmesh.ntris*4+0] = (unsigned char)t[0]; dmesh.tris[dmesh.ntris*4+0] = (unsigned char)t[0];
dmesh.tris[dmesh.ntris*4+1] = (unsigned char)t[2]; dmesh.tris[dmesh.ntris*4+1] = (unsigned char)t[2];
dmesh.tris[dmesh.ntris*4+2] = (unsigned char)t[1]; dmesh.tris[dmesh.ntris*4+2] = (unsigned char)t[1];
dmesh.tris[dmesh.ntris*4+3] = getTriFlags(&verts[t[0]*3], &verts[t[2]*3], &verts[t[1]*3], poly, npoly); dmesh.tris[dmesh.ntris*4+3] = getTriFlags(&verts[t[0]*3], &verts[t[2]*3], &verts[t[1]*3], poly, npoly);
#else
dmesh.tris[dmesh.ntris * 4 + 0] = (unsigned char)t[0];
dmesh.tris[dmesh.ntris * 4 + 1] = (unsigned char)t[1];
dmesh.tris[dmesh.ntris * 4 + 2] = (unsigned char)t[2];
dmesh.tris[dmesh.ntris * 4 + 3] = getTriFlags(&verts[t[0] * 3], &verts[t[1] * 3], &verts[t[2] * 3], poly, npoly);
#endif
dmesh.ntris++; dmesh.ntris++;
} }
} }