From 6148783fe4db6b7f7e3f15c249cfff2c4033983b Mon Sep 17 00:00:00 2001
From: Robin Engman <robinengman@hotmail.com>
Date: Tue, 28 Jan 2014 10:18:26 +0100
Subject: [PATCH] Added args to ApplyEffect

---
 Code/GamePhysics/Implementation/Octree.cpp          | 4 ++--
 Code/GamePhysics/Implementation/Octree.h            | 4 ++--
 Code/GamePhysics/Implementation/PhysicsAPI_Impl.cpp | 4 ++--
 Code/GamePhysics/Implementation/PhysicsAPI_Impl.h   | 2 +-
 Code/GamePhysics/PhysicsAPI.h                       | 6 ++++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Code/GamePhysics/Implementation/Octree.cpp b/Code/GamePhysics/Implementation/Octree.cpp
index 3faff29e..b4395516 100644
--- a/Code/GamePhysics/Implementation/Octree.cpp
+++ b/Code/GamePhysics/Implementation/Octree.cpp
@@ -128,13 +128,13 @@ void Octree::Visit(ICustomBody* customBodyRef, VisitorAction hitAction )
 	}
 }
 
-void Octree::Visit(const Oyster::Collision3D::ICollideable& collideable, VisitorActionCollideable hitAction)
+void Octree::Visit(const Oyster::Collision3D::ICollideable& collideable, void* args, VisitorActionCollideable hitAction)
 {
 	for(unsigned int i = 0; i<this->leafData.size(); i++)
 	{
 		if(collideable.Intersects(this->leafData[i].container))
 		{
-			hitAction( this->GetCustomBody(i) );
+			hitAction( this->GetCustomBody(i), args );
 		}
 	}
 }
diff --git a/Code/GamePhysics/Implementation/Octree.h b/Code/GamePhysics/Implementation/Octree.h
index 7b350795..50b9569a 100644
--- a/Code/GamePhysics/Implementation/Octree.h
+++ b/Code/GamePhysics/Implementation/Octree.h
@@ -18,7 +18,7 @@ namespace Oyster
 			static const unsigned int invalid_ref;
 
 			typedef void(*VisitorAction)(Octree&, unsigned int, unsigned int);
-			typedef void(*VisitorActionCollideable)(ICustomBody*);
+			typedef void(*VisitorActionCollideable)(ICustomBody*, void*);
 
 			struct Data
 			{
@@ -53,7 +53,7 @@ namespace Oyster
 			std::vector<ICustomBody*>& Sample(ICustomBody* customBodyRef, std::vector<ICustomBody*>& updateList);
 			std::vector<ICustomBody*>& Sample(const Oyster::Collision3D::ICollideable& collideable, std::vector<ICustomBody*>& updateList);
 			void Visit(ICustomBody* customBodyRef, VisitorAction hitAction );
-			void Visit(const Oyster::Collision3D::ICollideable& collideable, VisitorActionCollideable hitAction );
+			void Visit(const Oyster::Collision3D::ICollideable& collideable, void* args, VisitorActionCollideable hitAction );
 
 			ICustomBody* GetCustomBody(const unsigned int tempRef);
 
diff --git a/Code/GamePhysics/Implementation/PhysicsAPI_Impl.cpp b/Code/GamePhysics/Implementation/PhysicsAPI_Impl.cpp
index d3650f66..14c4d9e4 100644
--- a/Code/GamePhysics/Implementation/PhysicsAPI_Impl.cpp
+++ b/Code/GamePhysics/Implementation/PhysicsAPI_Impl.cpp
@@ -276,9 +276,9 @@ void API_Impl::RemoveGravity( const API::Gravity &g )
 	}
 }
 
-void API_Impl::ApplyEffect( const Oyster::Collision3D::ICollideable& collideable, void(hitAction)(ICustomBody*) )
+void API_Impl::ApplyEffect( const Oyster::Collision3D::ICollideable& collideable, void* args, void(hitAction)(ICustomBody*, void*) )
 {
-	this->worldScene.Visit(collideable, hitAction);
+	this->worldScene.Visit(collideable, args, hitAction);
 }
 
 //void API_Impl::ApplyForceAt( const ICustomBody* objRef, const Float3 &worldPos, const Float3 &worldF )
diff --git a/Code/GamePhysics/Implementation/PhysicsAPI_Impl.h b/Code/GamePhysics/Implementation/PhysicsAPI_Impl.h
index b9343ae6..63d8ff08 100644
--- a/Code/GamePhysics/Implementation/PhysicsAPI_Impl.h
+++ b/Code/GamePhysics/Implementation/PhysicsAPI_Impl.h
@@ -35,7 +35,7 @@ namespace Oyster
 			void AddGravity( const API::Gravity &g );
 			void RemoveGravity( const API::Gravity &g );
 
-			void ApplyEffect( const Oyster::Collision3D::ICollideable& collideable, void(hitAction)(ICustomBody*) );
+			void ApplyEffect( const Oyster::Collision3D::ICollideable& collideable, void* args, void(hitAction)(ICustomBody*, void*) );
 
 			//void ApplyForceAt( const ICustomBody* objRef, const ::Oyster::Math::Float3 &worldPos, const ::Oyster::Math::Float3 &worldF );
 
diff --git a/Code/GamePhysics/PhysicsAPI.h b/Code/GamePhysics/PhysicsAPI.h
index 7f20fcf7..3ced2a55 100644
--- a/Code/GamePhysics/PhysicsAPI.h
+++ b/Code/GamePhysics/PhysicsAPI.h
@@ -139,9 +139,11 @@ namespace Oyster
 			/********************************************************
 			 * Applies an effect to objects that collide with the set volume.
 			 * @param collideable: An ICollideable that defines the volume of the effect.
-			 * @param hitAction: A function that contains the effect.
+			 * @param args: The arguments needed for the hitAction function.
+			 * @param hitAction: A function that contains the effect. Parameterlist contains the custom body 
+								 the collideable hits, and the arguments sent to the function.
 			 ********************************************************/
-			virtual void ApplyEffect( const Oyster::Collision3D::ICollideable& collideable, void(hitAction)(ICustomBody*) ) = 0;
+			virtual void ApplyEffect( const Oyster::Collision3D::ICollideable& collideable, void* args, void(hitAction)(ICustomBody*, void*) ) = 0;
 
 			///********************************************************
 			// * Apply force on an object.