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

Add some comments

Browse Source
This commit is contained in:
Christophe Piveteau 2014-08-15 13:40:56 +02:00
parent e3a74f379f
commit 0f631febfc
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Entities/Minecart.cpp
View File

@ -875,17 +875,23 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
{ {
Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ()); Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
// Prevent division by small numbers
Distance.z = std::max(Distance.z, 0.001); Distance.z = std::max(Distance.z, 0.001);
/* Check to which side the minecart is to be pushed.
Let's consider a z-x-coordinate system where the minecart is the center (0/0).
The minecart moves along the line z = -x, the perpendicular line to this is z = x.
In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located.
*/
if ( if (
((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) || ((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
((Distance.z < 0) && ((Distance.x / Distance.z) <= 1)) ((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
) )
{ {
if ((-GetSpeedX() * 0.4) < 0.01) if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
{ {
AddSpeedX(-4/sqrt(2)); AddSpeedX(-4 / sqrt(2));
AddSpeedZ(4/sqrt(2)); AddSpeedZ(4 / sqrt(2));
} }
else else
{ {
@ -893,10 +899,10 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
SetSpeedZ(GetSpeedZ() * 0.4); SetSpeedZ(GetSpeedZ() * 0.4);
} }
} }
else if ((GetSpeedX() * 0.4) < 0.01) else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
{ {
AddSpeedX(4/sqrt(2)); AddSpeedX(4 / sqrt(2));
AddSpeedZ(-4/sqrt(2)); AddSpeedZ(-4 / sqrt(2));
} }
else else
{ {
@ -910,8 +916,13 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
{ {
Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ()); Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
// Prevent division by small numbers
Distance.z = std::max(Distance.z, 0.001); Distance.z = std::max(Distance.z, 0.001);
/* Check to which side the minecart is to be pushed.
Let's consider a z-x-coordinate system where the minecart is the center (0/0).
The minecart moves along the line z = x, the perpendicular line to this is z = -x.
In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
if ( if (
((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) || ((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
((Distance.z < 0) && ((Distance.x / Distance.z) >= -1)) ((Distance.z < 0) && ((Distance.x / Distance.z) >= -1))
@ -919,8 +930,8 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
{ {
if ((GetSpeedX() * 0.4) < 0.01) if ((GetSpeedX() * 0.4) < 0.01)
{ {
AddSpeedX(4/sqrt(2)); AddSpeedX(4 / sqrt(2));
AddSpeedZ(4/sqrt(2)); AddSpeedZ(4 / sqrt(2));
} }
else else
{ {
@ -930,8 +941,8 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
} }
else if ((-GetSpeedX() * 0.4) < 0.01) else if ((-GetSpeedX() * 0.4) < 0.01)
{ {
AddSpeedX(-4/sqrt(2)); AddSpeedX(-4 / sqrt(2));
AddSpeedZ(-4/sqrt(2)); AddSpeedZ(-4 / sqrt(2));
} }
else else
{ {