AstralTransRocketries/LucidCube
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Adjust comment formatting

Browse Source
This commit is contained in:
Christophe Piveteau 2014-08-18 01:57:44 +02:00
parent 72c02ceb17
commit c70886a712
1 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/Entities/Minecart.cpp
View File

@ -889,25 +889,35 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
((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))
) )
{ // Moving -X + Z // Moving -X +Z
if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01) // ~ speedX >= 0 {
{ // Immobile or not moving in the "right" direction. Give it a bump! if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
// ~ speedX >= 0
{
// Immobile or not moving in the "right" direction. Give it a bump!
AddSpeedX(-4 / sqrt(2)); AddSpeedX(-4 / sqrt(2));
AddSpeedZ(4 / sqrt(2)); AddSpeedZ(4 / sqrt(2));
} }
else // ~ SpeedX < 0 else
{ // Moving in the "right" direction. Only accelerate it a bit. // ~ SpeedX < 0
{
// Moving in the "right" direction. Only accelerate it a bit.
SetSpeedX(GetSpeedX() * 0.4 / sqrt(2)); SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2)); SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
} }
} // Moving +X -Z }
else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01) // ~ SpeedX <= 0 else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
{ // Immobile or not moving in the "right" direction // Moving +X -Z
// ~ SpeedX <= 0
{
// Immobile or not moving in the "right" direction
AddSpeedX(4 / sqrt(2)); AddSpeedX(4 / sqrt(2));
AddSpeedZ(-4 / sqrt(2)); AddSpeedZ(-4 / sqrt(2));
} }
else // ~ SpeedX > 0 else
{ // Moving in the "right" direction // ~ SpeedX > 0
{
// Moving in the "right" direction
SetSpeedX(GetSpeedX() * 0.4 / sqrt(2)); SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2)); SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
} }
@ -928,29 +938,39 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
Let's consider a z-x-coordinate system where the minecart is the center (0/0). Let's consider a z-x-coordinate system where the minecart is the center (0/0).
The minecart moves along the line x = z, the perpendicular line to this is x = -z. The minecart moves along the line x = z, the perpendicular line to this is x = -z.
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. */ 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 ( // Moving +X +Z 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))
) )
// Moving +X +Z
{ {
if ((GetSpeedX() * 0.4) < 0.01) // ~ SpeedX <= 0 if ((GetSpeedX() * 0.4) < 0.01)
{ // Immobile or not moving in the "right" direction // ~ SpeedX <= 0
{
// Immobile or not moving in the "right" direction
AddSpeedX(4 / sqrt(2)); AddSpeedX(4 / sqrt(2));
AddSpeedZ(4 / sqrt(2)); AddSpeedZ(4 / sqrt(2));
} }
else // SpeedX > 0 else
{ // Moving in the "right" direction // SpeedX > 0
{
// Moving in the "right" direction
SetSpeedX(GetSpeedX() * 0.4 / sqrt(2)); SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2)); SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
} }
} // Moving -X -Z }
else if ((-GetSpeedX() * 0.4) < 0.01) // ~ SpeedX >= 0 else if ((-GetSpeedX() * 0.4) < 0.01)
{ // Immobile or not moving in the "right" direction // Moving -X -Z
// ~ SpeedX >= 0
{
// Immobile or not moving in the "right" direction
AddSpeedX(-4 / sqrt(2)); AddSpeedX(-4 / sqrt(2));
AddSpeedZ(-4 / sqrt(2)); AddSpeedZ(-4 / sqrt(2));
} }
else // ~ SpeedX < 0 else
{ // Moving in the "right" direction // ~ SpeedX < 0
{
// Moving in the "right" direction
SetSpeedX(GetSpeedX() * 0.4 / sqrt(2)); SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2)); SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
} }