Recast: sent intersected primitive volume index to click handler

Click handler should be notified about the primitive volume that the ray collided with, which will make selecting objects in the world a lot more reliable and easier.

src/naveditor/CrowdTool.cpp

@@ -998,7 +998,7 @@ void CrowdTool::handleMenu()
 	}
 }
 
-void CrowdTool::handleClick(const float* s, const float* p, bool shift)
+void CrowdTool::handleClick(const float* s, const float* p, const int /*v*/, bool shift)
 {
 	if (!m_editor) return;
 	if (!m_state) return;

src/naveditor/Editor.cpp

@@ -430,10 +430,10 @@ void Editor::handleCommonSettings()
 	ImGui::Separator();
 }
 
-void Editor::handleClick(const float* s, const float* p, bool shift)
+void Editor::handleClick(const float* s, const float* p, const int v, bool shift)
 {
 	if (m_tool)
-		m_tool->handleClick(s, p, shift);
+		m_tool->handleClick(s, p, v, shift);
 }
 
 void Editor::handleToggle()

src/naveditor/Editor_Debug.cpp

@@ -339,10 +339,10 @@ const float* Editor_Debug::getBoundsMax()
 	return 0;
 }
 
-void Editor_Debug::handleClick(const float* s, const float* p, bool shift)
+void Editor_Debug::handleClick(const float* s, const float* p, const int v, bool shift)
 {
 	if (m_tool)
-		m_tool->handleClick(s, p, shift);
+		m_tool->handleClick(s, p, v, shift);
 }
 
 void Editor_Debug::handleToggle()

src/naveditor/Editor_TempObstacles.cpp

@@ -641,7 +641,7 @@ public:
 			m_drawType = DRAWDETAIL_MESH;
 	}
 
-	virtual void handleClick(const float* /*s*/, const float* p, bool /*shift*/)
+	virtual void handleClick(const float* /*s*/, const float* p, const int /*v*/, bool /*shift*/)
 	{
 		m_hitPosSet = true;
 		rdVcopy(m_hitPos,p);
@@ -727,7 +727,7 @@ public:
 		ImGui::Text("Shift+LMB to remove an obstacle.");
 	}
 	
-	virtual void handleClick(const float* s, const float* p, bool shift)
+	virtual void handleClick(const float* s, const float* p, const int /*v*/, bool shift)
 	{
 		if (m_editor)
 		{

src/naveditor/Editor_TileMesh.cpp

@@ -236,7 +236,7 @@ public:
 		}
 	}
 
-	virtual void handleClick(const float* /*s*/, const float* p, bool shift)
+	virtual void handleClick(const float* /*s*/, const float* p, const int /*v*/, bool shift)
 	{
 		m_hitPosSet = true;
 		rdVcopy(m_hitPos,p);

src/naveditor/InputGeom.cpp

@@ -514,8 +514,11 @@ bool InputGeom::saveGeomSet(const BuildSettings* settings)
 	return true;
 }
 
-bool InputGeom::raycastMesh(const float* src, const float* dst, const unsigned int mask, float* tmin) const
+bool InputGeom::raycastMesh(const float* src, const float* dst, const unsigned int mask, int* vidx, float* tmin) const
 {
+	if (vidx)
+		*vidx = -1;
+
 	// Prune hit ray.
 	float btmin = 0, btmax = 1;
 	if (!rdIntersectSegmentAABB(src, dst, m_meshBMin, m_meshBMax, btmin, btmax))
@@ -528,6 +531,7 @@ bool InputGeom::raycastMesh(const float* src, const float* dst, const unsigned i
 	const bool traceTrigger = mask & TRACE_TRIGGER;
 
 	float isectTmin = 1.0f;
+	int isectVolIdx = -1;
 
 	for (int i = 0; i < nvol; i++)
 	{
@@ -561,17 +565,25 @@ bool InputGeom::raycastMesh(const float* src, const float* dst, const unsigned i
 		{
 			hit = true;
 
-			// Caller isn't interested in finding the closest intersection; return out.
+			// Caller isn't interested in finding the closest intersection; break out.
 			if (!tmin)
-				return true;
+			{
-
+				isectVolIdx = i;
-			if (tsmin < isectTmin)
+				break;
+			}
+			else if (tsmin < isectTmin)
+			{
 				isectTmin = tsmin;
+				isectVolIdx = i;
+			}
 		}
 	}
 
 	if (hit)
 	{
+		if (vidx)
+			*vidx = isectVolIdx;
+
 		if (tmin)
 			*tmin = isectTmin;
 

src/naveditor/NavMeshPruneTool.cpp

@@ -272,7 +272,7 @@ void NavMeshPruneTool::handleMenu()
 	}
 }
 
-void NavMeshPruneTool::handleClick(const float* s, const float* p, bool shift)
+void NavMeshPruneTool::handleClick(const float* s, const float* p, const int /*v*/, bool shift)
 {
 	rdIgnoreUnused(s);
 	rdIgnoreUnused(shift);

src/naveditor/NavMeshTesterTool.cpp

@@ -459,7 +459,7 @@ void NavMeshTesterTool::handleMenu()
 	ImGui::Separator();
 }
 
-void NavMeshTesterTool::handleClick(const float* /*s*/, const float* p, bool shift)
+void NavMeshTesterTool::handleClick(const float* /*s*/, const float* p, const int /*v*/, bool shift)
 {
 	if (!shift)
 	{

src/naveditor/OffMeshConnectionTool.cpp

@@ -88,7 +88,7 @@ void OffMeshConnectionTool::handleMenu()
 	ImGui::PopItemWidth();
 }
 
-void OffMeshConnectionTool::handleClick(const float* /*s*/, const float* p, bool shift)
+void OffMeshConnectionTool::handleClick(const float* /*s*/, const float* p, const int /*v*/, bool shift)
 {
 	if (!m_editor) return;
 	InputGeom* geom = m_editor->getInputGeom();

src/naveditor/ShapeVolumeTool.cpp

@@ -351,7 +351,7 @@ void ShapeVolumeTool::handleMenu()
 	ImGui::PopItemWidth();
 }
 
-void ShapeVolumeTool::handleClick(const float* /*s*/, const float* p, 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();

src/naveditor/include/CrowdTool.h

@@ -138,7 +138,7 @@ public:
 	virtual void init(Editor* editor);
 	virtual void reset();
 	virtual void handleMenu();
-	virtual void handleClick(const float* s, const float* p, bool shift);
+	virtual void handleClick(const float* s, const float* p, const int v, bool shift);
 	virtual void handleToggle();
 	virtual void handleStep();
 	virtual void handleUpdate(const float dt);

src/naveditor/include/Editor.h

@@ -210,7 +210,7 @@ struct EditorTool
 	virtual void init(class Editor* editor) = 0;
 	virtual void reset() = 0;
 	virtual void handleMenu() = 0;
-	virtual void handleClick(const float* s, const float* p, bool shift) = 0;
+	virtual void handleClick(const float* s, const float* p, const int v, bool shift) = 0;
 	virtual void handleRender() = 0;
 	virtual void handleRenderOverlay(double* proj, double* model, int* view) = 0;
 	virtual void handleToggle() = 0;
@@ -306,7 +306,7 @@ public:
 	virtual void handleSettings();
 	virtual void handleTools();
 	virtual void handleDebugMode();
-	virtual void handleClick(const float* s, const float* p, bool shift);
+	virtual void handleClick(const float* s, const float* p, const int v, bool shift);
 	virtual void handleToggle();
 	virtual void handleStep();
 	virtual void handleRender();

src/naveditor/include/Editor_Debug.h

@@ -43,7 +43,7 @@ public:
 	virtual void handleSettings();
 	virtual void handleTools();
 	virtual void handleDebugMode();
-	virtual void handleClick(const float* s, const float* p, bool shift);
+	virtual void handleClick(const float* s, const float* p, const int v, bool shift);
 	virtual void handleToggle();
 	virtual void handleRender();
 	virtual void handleRenderOverlay(double* proj, double* model, int* view);

src/naveditor/include/InputGeom.h

@@ -165,7 +165,7 @@ public:
 
 	const rcChunkyTriMesh* getChunkyMesh() const { return m_chunkyMesh; }
 	const BuildSettings* getBuildSettings() const { return m_hasBuildSettings ? &m_buildSettings : 0; }
-	bool raycastMesh(const float* src, const float* dst, const unsigned int mask, float* tmin = nullptr) const;
+	bool raycastMesh(const float* src, const float* dst, const unsigned int mask, int* vol = nullptr, float* tmin = nullptr) const;
 
 	/// @name Off-Mesh connections.
 	///@{

src/naveditor/include/NavMeshPruneTool.h

@@ -41,7 +41,7 @@ public:
 	virtual void init(Editor* editor);
 	virtual void reset();
 	virtual void handleMenu();
-	virtual void handleClick(const float* s, const float* p, bool shift);
+	virtual void handleClick(const float* s, const float* p, const int v, bool shift);
 	virtual void handleToggle();
 	virtual void handleStep();
 	virtual void handleUpdate(const float dt);

src/naveditor/include/NavMeshTesterTool.h

@@ -104,7 +104,7 @@ public:
 	virtual void init(Editor* editor);
 	virtual void reset();
 	virtual void handleMenu();
-	virtual void handleClick(const float* s, const float* p, bool shift);
+	virtual void handleClick(const float* s, const float* p, const int v, bool shift);
 	virtual void handleToggle();
 	virtual void handleStep();
 	virtual void handleUpdate(const float dt);

src/naveditor/include/OffMeshConnectionTool.h

@@ -43,7 +43,7 @@ public:
 	virtual void init(Editor* editor);
 	virtual void reset();
 	virtual void handleMenu();
-	virtual void handleClick(const float* s, const float* p, bool shift);
+	virtual void handleClick(const float* s, const float* p, const int v, bool shift);
 	virtual void handleToggle();
 	virtual void handleStep();
 	virtual void handleUpdate(const float dt);

src/naveditor/include/ShapeVolumeTool.h

@@ -62,7 +62,7 @@ public:
 	virtual void init(Editor* editor);
 	virtual void reset();
 	virtual void handleMenu();
-	virtual void handleClick(const float* s, const float* p, bool shift);
+	virtual void handleClick(const float* s, const float* p, const int v, bool shift);
 	virtual void handleToggle();
 	virtual void handleStep();
 	virtual void handleUpdate(const float dt);

src/naveditor/main.cpp

@@ -771,7 +771,9 @@ int not_main(int argc, char** argv)
 		if (processHitTest && geom && editor)
 		{
 			float hitTime;
-			bool hit = geom->raycastMesh(rayStart, rayEnd, TRACE_ALL, &hitTime);
+			int volumeIndex;
+
+			bool hit = geom->raycastMesh(rayStart, rayEnd, TRACE_ALL, &volumeIndex, &hitTime);
 			
 			if (hit)
 			{
@@ -789,7 +791,7 @@ int not_main(int argc, char** argv)
 					pos[0] = rayStart[0] + (rayEnd[0] - rayStart[0]) * hitTime;
 					pos[1] = rayStart[1] + (rayEnd[1] - rayStart[1]) * hitTime;
 					pos[2] = rayStart[2] + (rayEnd[2] - rayStart[2]) * hitTime;
-					editor->handleClick(rayStart, pos, processHitTestShift);
+					editor->handleClick(rayStart, pos, volumeIndex, processHitTestShift);
 				}
 			}
 			else