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

Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics

This commit is contained in:
Dander7BD 2013-12-04 10:05:02 +01:00
parent 87e9d137ea f2548c43ce
commit f10f3b0bef
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ void Octree::AddObject(UniquePointer< ICustomBody > customBodyRef)
data.next = NULL; data.next = NULL;
data.prev = NULL; data.prev = NULL;
data.customBodyRef = customBodyRef; data.customBodyRef = customBodyRef;
this->mapReferences.insert(std::pair <ICustomBody*, unsigned int> (customBodyRef, this->leafData.size())); this->mapReferences.insert(std::pair <ICustomBody*, unsigned int> (data.customBodyRef, this->leafData.size()));
this->leafData.push_back(data); this->leafData.push_back(data);
/*if(tempPtr != NULL) /*if(tempPtr != NULL)

2
Code/GamePhysics/Implementation/PhysicsAPI_Impl.cpp
View File

@ -20,7 +20,7 @@ namespace
float deltaWhen; float deltaWhen;
Float3 worldWhere; Float3 worldWhere;
if( deuter->Intersects(*deuter, 1.0f, deltaWhen, worldWhere) ) if( proto->Intersects(*deuter, 1.0f, deltaWhen, worldWhere) )
{ {
proto->CallSubscription( proto, deuter ); proto->CallSubscription( proto, deuter );
} }