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

Recast: fix more missed XZY -> XYZ conversions

Browse Source 
Most/all of these functions weren't used for the game, but they should still be converted to XYZ.
This commit is contained in:
Kawe Mazidjatari 2024-07-16 00:57:21 +02:00
parent 166ecabae8
commit 9e37300c41
3 changed files with 14 additions and 14 deletions
src/thirdparty/recast
DebugUtils/Source
RecastDebugDraw.cpp
DetourTileCache/Source
DetourTileCacheBuilder.cpp
Recast/Source
RecastArea.cpp

4
src/thirdparty/recast/DebugUtils/Source/RecastDebugDraw.cpp vendored

@ -405,8 +405,8 @@ void duDebugDrawHeightfieldLayer(duDebugDraw* dd, const struct rcHeightfieldLaye
col = duLerpCol(color, dd->areaToCol(area), 32);
const float fx = layer.bmin[0] + x*cs;
const float fz = layer.bmin[1] + y*cs;
const float fy = layer.bmin[2] +(lh+1)*ch;
const float fy = layer.bmin[1] + y*cs;
const float fz = layer.bmin[2] +(lh+1)*ch;
dd->vertex(fx, fy, fz, col);
dd->vertex(fx+cs, fy, fz, col);

16
src/thirdparty/recast/DetourTileCache/Source/DetourTileCacheBuilder.cpp vendored

@ -2021,11 +2021,11 @@ dtStatus dtMarkCylinderArea(dtTileCacheLayer& layer, const float* orig, const fl
const float py = (pos[1]-orig[1])*ics;
int minx = (int)rdMathFloorf((bmin[0]-orig[0])*ics);
int miny = (int)rdMathFloorf((bmin[1]-orig[1])*ich);
int minz = (int)rdMathFloorf((bmin[2]-orig[2])*ics);
int miny = (int)rdMathFloorf((bmin[1]-orig[1])*ics);
int minz = (int)rdMathFloorf((bmin[2]-orig[2])*ich);
int maxx = (int)rdMathFloorf((bmax[0]-orig[0])*ics);
int maxy = (int)rdMathFloorf((bmax[1]-orig[1])*ich);
int maxz = (int)rdMathFloorf((bmax[2]-orig[2])*ics);
int maxy = (int)rdMathFloorf((bmax[1]-orig[1])*ics);
int maxz = (int)rdMathFloorf((bmax[2]-orig[2])*ich);
if (maxx < 0) return DT_SUCCESS;
if (minx >= w) return DT_SUCCESS;
@ -2064,11 +2064,11 @@ dtStatus dtMarkBoxArea(dtTileCacheLayer& layer, const float* orig, const float c
const float ich = 1.0f/ch;
int minx = (int)floorf((bmin[0]-orig[0])*ics);
int miny = (int)floorf((bmin[1]-orig[1])*ich);
int minz = (int)floorf((bmin[2]-orig[2])*ics);
int miny = (int)floorf((bmin[1]-orig[1])*ics);
int minz = (int)floorf((bmin[2]-orig[2])*ich);
int maxx = (int)floorf((bmax[0]-orig[0])*ics);
int maxy = (int)floorf((bmax[1]-orig[1])*ich);
int maxz = (int)floorf((bmax[2]-orig[2])*ics);
int maxy = (int)floorf((bmax[1]-orig[1])*ics);
int maxz = (int)floorf((bmax[2]-orig[2])*ich);
if (maxx < 0) return DT_SUCCESS;
if (minx >= w) return DT_SUCCESS;

8
src/thirdparty/recast/Recast/Source/RecastArea.cpp vendored

@ -538,11 +538,11 @@ void rcMarkCylinderArea(rcContext* ctx, const float* pos,
const float r2 = r*r;
int minx = (int)((bmin[0]-chf.bmin[0])/chf.cs);
int miny = (int)((bmin[1]-chf.bmin[1])/chf.ch);
int minz = (int)((bmin[2]-chf.bmin[2])/chf.cs);
int miny = (int)((bmin[1]-chf.bmin[1])/chf.cs);
int minz = (int)((bmin[2]-chf.bmin[2])/chf.ch);
int maxx = (int)((bmax[0]-chf.bmin[0])/chf.cs);
int maxy = (int)((bmax[1]-chf.bmin[1])/chf.ch);
int maxz = (int)((bmax[2]-chf.bmin[2])/chf.cs);
int maxy = (int)((bmax[1]-chf.bmin[1])/chf.cs);
int maxz = (int)((bmax[2]-chf.bmin[2])/chf.ch);
if (maxx < 0) return;
if (minx >= chf.width) return;