flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Added one more direction into collision checks 

* Added direction XM_XP
* Improved performance, thanks STR and xoft
This commit is contained in:
Tiger Wang 2014-01-19 18:42:05 +00:00
parent 9a580146e4
commit 3700ad8546
1 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/Entities/Minecart.cpp
View File

@ -720,56 +720,81 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
{
cMinecartCollisionCallback MinecartCollisionCallback(GetPosition(), GetHeight(), GetWidth(), GetUniqueID(), ((m_Attachee == NULL) ? -1 : m_Attachee->GetUniqueID()));
int ChunkX, ChunkZ;
cChunkDef::BlockToChunk((int)floor(GetPosX()), (int)floor(GetPosZ()), ChunkX, ChunkZ);
m_World->ForEachEntityInChunk(ChunkX, ChunkZ, MinecartCollisionCallback);
if (!MinecartCollisionCallback.FoundIntersection())
{
return false;
}
switch (a_RailMeta)
{
case E_META_RAIL_ZM_ZP:
{
cMinecartCollisionCallback MinecartCollisionCallback(GetPosition(), GetHeight(), GetWidth(), GetUniqueID(), ((m_Attachee == NULL) ? -1 : m_Attachee->GetUniqueID()));
m_World->ForEachEntity(MinecartCollisionCallback);
if (MinecartCollisionCallback.FoundIntersection())
if (MinecartCollisionCallback.GetCollidedEntityPosition().z >= GetPosZ())
{
if (MinecartCollisionCallback.GetCollidedEntityPosition().z >= GetPosZ())
if ((-GetSpeedZ() * 0.4) < 0.01)
{
if (((-GetSpeedZ()) * 0.4) < 0.01)
{
AddSpeedZ(-4);
}
else
{
SetSpeedZ((-GetSpeedZ()) * 0.4);
}
AddSpeedZ(-4);
}
else
{
if ((GetSpeedZ() * 0.4) < 0.01)
{
AddSpeedZ(4);
}
else
{
SetSpeedZ(GetSpeedZ() * 0.4);
}
SetSpeedZ(-GetSpeedZ() * 0.4);
}
return true;
}
break;
else
{
if ((GetSpeedZ() * 0.4) < 0.01)
{
AddSpeedZ(4);
}
else
{
SetSpeedZ(GetSpeedZ() * 0.4);
}
}
return true;
}
case E_META_RAIL_XM_XP:
{
break;
if (MinecartCollisionCallback.GetCollidedEntityPosition().x >= GetPosX())
{
if ((-GetSpeedX() * 0.4) < 0.01)
{
AddSpeedX(-4);
}
else
{
SetSpeedX(-GetSpeedX() * 0.4);
}
}
else
{
if ((GetSpeedX() * 0.4) < 0.01)
{
AddSpeedX(4);
}
else
{
SetSpeedX(GetSpeedX() * 0.4);
}
}
return true;
}
case E_META_RAIL_CURVED_ZM_XM:
case E_META_RAIL_CURVED_ZM_XP:
case E_META_RAIL_CURVED_ZP_XM:
case E_META_RAIL_CURVED_ZP_XP:
{
// TODO - simply can't be bothered right now
break;
}
default: break;
}
return false;
}