1 files changed, 38 insertions, 95 deletions

diff --git a/src/Physics/Tracers/BlockTracer.h b/src/Physics/Tracers/BlockTracer.h
index 62ae1636e..e32ef3b21 100644
--- a/src/Physics/Tracers/BlockTracer.h
+++ b/src/Physics/Tracers/BlockTracer.h
@@ -1,7 +1,7 @@
 
 // BlockTracer.h
 
-// Declares the classes common for all blocktracers
+// Declares the callback common to all blocktracers
 
 
 
@@ -9,118 +9,61 @@
 
 #pragma once
 
-
-
-
-
 #include "Defines.h"
 #include "ChunkDef.h"
 
 
 
 
-// fwd: World.h
-class cWorld;
-
 
+/** The callback class is used to notify the caller of individual events that are being traced. */
+class BlockTracerCallbacks abstract
+{
+public:
 
+	// Force a virtual destructor in descendants:
+	virtual ~BlockTracerCallbacks() {}
 
+	/** Called on each block encountered along the path, including the first block (path start)
+	When this callback returns true, the tracing is aborted. */
+	virtual bool OnNextBlock(Vector3i a_BlockPos, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, eBlockFace a_EntryFace) = 0;
 
-class cBlockTracer abstract
-{
-public:
-	/** The callback class is used to notify the caller of individual events that are being traced.
-	*/
-	class cCallbacks abstract
-	{
-	public:
-		// Force a virtual destructor in descendants:
-		virtual ~cCallbacks() {}
-
-		/** Called on each block encountered along the path, including the first block (path start)
-		When this callback returns true, the tracing is aborted.
-		*/
-		virtual bool OnNextBlock(Vector3i a_BlockPos, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, eBlockFace a_EntryFace) = 0;
-
-		/** Called on each block encountered along the path, including the first block (path start), if chunk data is not loaded
-		When this callback returns true, the tracing is aborted.
-		*/
-		virtual bool OnNextBlockNoData(Vector3i a_BlockPos, eBlockFace a_EntryFace)
-		{
-			UNUSED(a_BlockPos);
-			UNUSED(a_EntryFace);
-			return false;
-		}
-
-		/** Called when the path goes out of world, either below (a_BlockPos.y < 0) or above (a_BlockPos.y >= cChunkDef::Height)
-		The coords specify the exact point at which the path exited the world.
-		If this callback returns true, the tracing is aborted.
-		Note that some paths can go out of the world and come back again (parabola),
-		in such a case this callback is followed by OnIntoWorld() and further OnNextBlock() calls
-		*/
-		virtual bool OnOutOfWorld(Vector3d a_BlockPos)
-		{
-			UNUSED(a_BlockPos);
-			return false;
-		}
-
-		/** Called when the path goes into the world, from either below (a_BlockPos.y < 0) or above (a_BlockPos.y >= cChunkDef::Height)
-		The coords specify the exact point at which the path entered the world.
-		If this callback returns true, the tracing is aborted.
-		Note that some paths can go out of the world and come back again (parabola),
-		in such a case this callback is followed by further OnNextBlock() calls
-		*/
-		virtual bool OnIntoWorld(Vector3d a_BlockPos)
-		{
-			UNUSED(a_BlockPos);
-			return false;
-		}
-
-		/** Called when the path is sure not to hit any more blocks.
-		Note that for some shapes this might never happen (line with constant Y)
-		*/
-		virtual void OnNoMoreHits(void) {}
-
-		/** Called when the block tracing walks into a chunk that is not allocated.
-		This usually means that the tracing is aborted.
-		*/
-		virtual void OnNoChunk(void) {}
-	} ;
-
-
-	/** Creates the BlockTracer parent with the specified callbacks */
-	cBlockTracer(cWorld & a_World, cCallbacks & a_Callbacks) :
-		m_World(&a_World),
-		m_Callbacks(&a_Callbacks)
+	/** Called on each block encountered along the path, including the first block (path start), if chunk data is not loaded
+	When this callback returns true, the tracing is aborted. */
+	virtual bool OnNextBlockNoData(Vector3i a_BlockPos, eBlockFace a_EntryFace)
 	{
+		UNUSED(a_BlockPos);
+		UNUSED(a_EntryFace);
+		return false;
 	}
 
-
-	/** Sets new world, returns the old one. Note that both need to be valid */
-	cWorld & SetWorld(cWorld & a_World)
+	/** Called when the path goes out of world, either below (a_BlockPos.y < 0) or above (a_BlockPos.y >= cChunkDef::Height)
+	The coords specify the exact point at which the path exited the world.
+	If this callback returns true, the tracing is aborted.
+	Note that some paths can go out of the world and come back again (parabola),
+	in such a case this callback is followed by OnIntoWorld() and further OnNextBlock() calls. */
+	virtual bool OnOutOfWorld(Vector3d a_BlockPos)
 	{
-		cWorld & Old = *m_World;
-		m_World = &a_World;
-		return Old;
+		UNUSED(a_BlockPos);
+		return false;
 	}
 
-
-	/** Sets new callbacks, returns the old ones. Note that both need to be valid */
-	cCallbacks & SetCallbacks(cCallbacks & a_NewCallbacks)
+	/** Called when the path goes into the world, from either below (a_BlockPos.y < 0) or above (a_BlockPos.y >= cChunkDef::Height)
+	The coords specify the exact point at which the path entered the world.
+	If this callback returns true, the tracing is aborted.
+	Note that some paths can go out of the world and come back again (parabola),
+	in such a case this callback is followed by further OnNextBlock() calls. */
+	virtual bool OnIntoWorld(Vector3d a_BlockPos)
 	{
-		cCallbacks & Old = *m_Callbacks;
-		m_Callbacks = &a_NewCallbacks;
-		return Old;
+		UNUSED(a_BlockPos);
+		return false;
 	}
 
-protected:
-	/** The world upon which to operate */
-	cWorld * m_World;
+	/** Called when the path is sure not to hit any more blocks.
+	Note that for some shapes this might never happen (line with constant Y). */
+	virtual void OnNoMoreHits(void) {}
 
-	/** The callback to use for reporting */
-	cCallbacks * m_Callbacks;
+	/** Called when the block tracing walks into a chunk that is not allocated.
+	This usually means that the tracing is aborted. */
+	virtual void OnNoChunk(void) {}
 } ;
-
-
-
-