NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed from pointer to reference 

Did it in sample and visit functions
This commit is contained in:
Robin Engman 2013-11-29 09:07:52 +01:00 committed by Dander7BD
parent c31ea9730b
commit 1a06c7c7e6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Code/GamePhysics/Implementation/Octree.cpp
View File

@ -94,11 +94,11 @@ std::vector<ICustomBody*>& Octree::Sample(ICustomBody* customBodyRef, std::vecto
return updateList; return updateList;
} }
std::vector<ICustomBody*>& Octree::Sample(::Collision3D::ICollideable* collideable, std::vector<ICustomBody*>& updateList) std::vector<ICustomBody*>& Octree::Sample(const Oyster::Collision3D::ICollideable& collideable, std::vector<ICustomBody*>& updateList)
{ {
for(unsigned int i = 0; i<this->leafData.size(); i++) for(unsigned int i = 0; i<this->leafData.size(); i++)
{ {
if(this->leafData[i].container.Intersects(*collideable)) if(this->leafData[i].container.Intersects(collideable))
{ {
updateList.push_back(this->leafData[i].customBodyRef); updateList.push_back(this->leafData[i].customBodyRef);
} }
@ -127,11 +127,11 @@ void Octree::Visit(ICustomBody* customBodyRef, VistorAction hitAction )
} }
} }
void Octree::Visit(::Collision3D::ICollideable* collideable, VistorAction hitAction) void Octree::Visit(const Oyster::Collision3D::ICollideable& collideable, VistorAction hitAction)
{ {
for(unsigned int i = 0; i<this->leafData.size(); i++) for(unsigned int i = 0; i<this->leafData.size(); i++)
{ {
if(this->leafData[i].container.Intersects(*collideable)) if(this->leafData[i].container.Intersects(collideable))
{ {
//hitAction(*this, tempRef, i); // @todo TODO: Add typedef to handle function calls with ICollideable //hitAction(*this, tempRef, i); // @todo TODO: Add typedef to handle function calls with ICollideable
} }

4
Code/GamePhysics/Implementation/Octree.h
View File

@ -50,9 +50,9 @@ namespace Oyster
void DestroyObject(::Utility::DynamicMemory::UniquePointer< ICustomBody > customBodyRef); void DestroyObject(::Utility::DynamicMemory::UniquePointer< ICustomBody > customBodyRef);
std::vector<ICustomBody*>& Sample(ICustomBody* customBodyRef, std::vector<ICustomBody*>& updateList); std::vector<ICustomBody*>& Sample(ICustomBody* customBodyRef, std::vector<ICustomBody*>& updateList);
std::vector<ICustomBody*>& Sample(Oyster::Collision3D::ICollideable* collideable, std::vector<ICustomBody*>& updateList); std::vector<ICustomBody*>& Sample(const Oyster::Collision3D::ICollideable& collideable, std::vector<ICustomBody*>& updateList);
void Visit(ICustomBody* customBodyRef, VistorAction hitAction ); void Visit(ICustomBody* customBodyRef, VistorAction hitAction );
void Visit(Oyster::Collision3D::ICollideable* collideable, VistorAction hitAction ); void Visit(const Oyster::Collision3D::ICollideable& collideable, VistorAction hitAction );
ICustomBody* GetCustomBody(const unsigned int tempRef); ICustomBody* GetCustomBody(const unsigned int tempRef);