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: select primitive volume by volume hit index

Browse Source 
As of commit 2a2b05c42ada643eb3a535b497d0da7e16ebef41, the primitive volume index is sent to the click handler. Use this instead of relying on a point being inside a shape which is unreliable.
This commit is contained in:
Kawe Mazidjatari 2024-09-22 14:13:39 +02:00
parent 2a2b05c42a
commit 5f3abdb656
2 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/naveditor/ShapeVolumeTool.cpp
View File

@ -115,49 +115,6 @@ ShapeVolumeTool::ShapeVolumeTool() :
{
}
int ShapeVolumeTool::getVolumeAtPos(const float* p)
{
InputGeom* geom = m_editor->getInputGeom();
rdAssert(geom);
// Delete
int nearestIndex = -1;
const ShapeVolume* vols = geom->getConvexVolumes();
for (int i = 0; i < geom->getConvexVolumeCount(); ++i)
{
const ShapeVolume& vol = vols[i];
if (vol.type == VOLUME_BOX)
{
if (rdPointInAABB(p, &vol.verts[0], &vol.verts[3]))
{
nearestIndex = i;
}
}
else if (vol.type == VOLUME_CYLINDER)
{
if (rdPointInCylinder(p, &vol.verts[0], vol.verts[3], vol.verts[4]))
{
nearestIndex = i;
}
}
else if (vol.type == VOLUME_CONVEX)
{
if (rdPointInPolygon(p, vol.verts, vol.nverts) &&
p[2] >= vol.hmin && p[2] <= vol.hmax)
{
nearestIndex = i;
}
}
if (nearestIndex != -1)
break;
}
return nearestIndex;
}
void ShapeVolumeTool::init(Editor* editor)
{
m_editor = editor;
@ -351,7 +308,7 @@ void ShapeVolumeTool::handleMenu()
ImGui::PopItemWidth();
}
void ShapeVolumeTool::handleClick(const float* /*s*/, const float* p, const int /*v*/, bool shift)
void ShapeVolumeTool::handleClick(const float* /*s*/, const float* p, const int v, bool shift)
{
if (!m_editor) return;
InputGeom* geom = m_editor->getInputGeom();
@ -359,7 +316,7 @@ void ShapeVolumeTool::handleClick(const float* /*s*/, const float* p, const int
if (shift)
{
m_selectedVolumeIndex = getVolumeAtPos(p);
m_selectedVolumeIndex = v;
}
else // Create
{

3
src/naveditor/include/ShapeVolumeTool.h
View File

@ -54,8 +54,7 @@ class ShapeVolumeTool : public EditorTool
public:
ShapeVolumeTool();
int getVolumeAtPos(const float* p);
inline int getSelectedVolumeIndex() const { return m_selectedVolumeIndex; };
virtual int type() { return TOOL_SHAPE_VOLUME; }