Fixed octree and API
Rewrote AddObject function in octree and OnPossibleCollision in PhysocsAPI_Impl
This commit is contained in:
parent
0a0e327d71
commit
b03e9af027
|
@ -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)
|
||||||
|
|
|
@ -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 );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue