Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-03 19:00:30 +02:00
Code Issues Projects Releases Wiki Activity

Remove unused option, clean up or and clarify some comments.

Browse Source 
The secondaryPassSingular option doesn't seem to make much sense in case
of triple-transitions (6 secondary ones).
This commit is contained in:
asofold 2015-03-09 11:26:53 +01:00
parent e871d205f6
commit 2e4a47f3c1
1 changed files with 21 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/RayTracing.java
View File

@ -18,7 +18,7 @@ public abstract class RayTracing {
/** Distance per axis. */ /** Distance per axis. */
protected double dX, dY, dZ; protected double dX, dY, dZ;
/** Current block. */ /** Current block, step always has been or is called with these. */
protected int blockX, blockY, blockZ; protected int blockX, blockY, blockZ;
/** End block. */ /** End block. */
@ -44,9 +44,6 @@ public abstract class RayTracing {
/** If to call stepSecondary at all (secondary transitions).*/ /** If to call stepSecondary at all (secondary transitions).*/
protected boolean secondaryStep = true; protected boolean secondaryStep = true;
/** If to pass secondary transitions if ANY sub-call succeeds. */
protected boolean secondaryPassSingular = false;
/** Maximum steps that will be done. */ /** Maximum steps that will be done. */
private int maxSteps = Integer.MAX_VALUE; private int maxSteps = Integer.MAX_VALUE;
@ -134,10 +131,13 @@ public abstract class RayTracing {
boolean transX, transY, transZ; boolean transX, transY, transZ;
// Actual loop. // Actual loop.
// TODO: Fix last transition not taken sometimes (with "off by x-th digit" or "t=0 transition"). /*
* TODO: Fix last transition not taken sometimes (with
* "off by x-th digit" or "t=0 transition"). Consider correcting t on
* base of the block coordinates in use.
*/
while (1.0 - t > tol) { while (1.0 - t > tol) {
// Determine smallest time to block edge, per axis. // Determine smallest time to block edge, per axis.
// TODO: if all coords are in the end block: ensure the full distance is taken towards the end coordinate.
tX = tDiff(dX, oX, blockX == endBlockX); tX = tDiff(dX, oX, blockX == endBlockX);
tY = tDiff(dY, oY, blockY == endBlockY); tY = tDiff(dY, oY, blockY == endBlockY);
tZ = tDiff(dZ, oZ, blockZ == endBlockZ); tZ = tDiff(dZ, oZ, blockZ == endBlockZ);
@ -155,6 +155,7 @@ public abstract class RayTracing {
} }
if (t + tMin > 1.0) { if (t + tMin > 1.0) {
// Set to the remaining distance (does trigger). // Set to the remaining distance (does trigger).
// TODO: Inaccurate t can mean iterating too short.
tMin = 1.0 - t; tMin = 1.0 - t;
} }
@ -261,7 +262,7 @@ public abstract class RayTracing {
} }
/** /**
* * Handle all secondary transitions (incomplete transitions).
* @param transitions * @param transitions
* @param transX * @param transX
* @param transY * @param transY
@ -272,49 +273,34 @@ public abstract class RayTracing {
protected boolean handleSecondaryTransitions(final int transitions, final boolean transX, final boolean transY, final boolean transZ, final double tMin) { protected boolean handleSecondaryTransitions(final int transitions, final boolean transX, final boolean transY, final boolean transZ, final double tMin) {
// Handle one transition. // Handle one transition.
if (transX) { if (transX) {
if (step(blockX + (dX > 0 ? 1 : -1), blockY, blockZ, dX > 0 ? 0.0 : 1.0, oY, oZ, 0.0, false)) { if (!step(blockX + (dX > 0 ? 1 : -1), blockY, blockZ, dX > 0 ? 0.0 : 1.0, oY, oZ, 0.0, false)) {
if (secondaryPassSingular) {
return true;
}
}
else if (!secondaryPassSingular) {
return false; return false;
} }
} }
if (transY) { if (transY) {
if (step(blockX, blockY + (dY > 0 ? 1 : -1), blockZ, oX, dY > 0 ? 0.0 : 1.0, oZ, 0.0, false)) { if (!step(blockX, blockY + (dY > 0 ? 1 : -1), blockZ, oX, dY > 0 ? 0.0 : 1.0, oZ, 0.0, false)) {
if (secondaryPassSingular) {
return true;
}
}
else if (!secondaryPassSingular) {
return false; return false;
} }
} }
if (transZ) { if (transZ) {
if (step(blockX, blockY, blockZ + (dZ > 0 ? 1 : -1), oX, oY, dZ > 0 ? 0.0 : 1.0, 0.0, false)) { if (!step(blockX, blockY, blockZ + (dZ > 0 ? 1 : -1), oX, oY, dZ > 0 ? 0.0 : 1.0, 0.0, false)) {
if (secondaryPassSingular) {
return true;
}
}
else if (!secondaryPassSingular) {
return false; return false;
} }
} }
// Handle two transitions. // Handle double-transitions.
if (transitions == 3) { if (transitions == 3) {
if (!handleSecondaryDoubleTransitions(transitions, transX, transY, transZ, tMin)) { if (!handleSecondaryDoubleTransitions(transitions, transX, transY, transZ, tMin)) {
return false; return false;
} }
} }
// If secondaryPassSingular is true, all returned false, otherwise none returned false. // All passed.
return !secondaryPassSingular; return true;
} }
/** /**
* * Handle secondary transitions with 2 axes at once (incomplete transitions).
* @param transitions * @param transitions
* @param transX * @param transX
* @param transY * @param transY
@ -325,34 +311,19 @@ public abstract class RayTracing {
protected boolean handleSecondaryDoubleTransitions(final int transitions, final boolean transX, final boolean transY, final boolean transZ, final double tMin) { protected boolean handleSecondaryDoubleTransitions(final int transitions, final boolean transX, final boolean transY, final boolean transZ, final double tMin) {
// Two transitions at once, thus step directly. // Two transitions at once, thus step directly.
// X and Y. // X and Y.
if (step(blockX + (dX > 0 ? 1 : -1), blockY + (dY > 0 ? 1 : -1), blockZ, dX > 0 ? 0.0 : 1.0, dY > 0 ? 0.0 : 1.0, oZ, 0.0, false)) { if (!step(blockX + (dX > 0 ? 1 : -1), blockY + (dY > 0 ? 1 : -1), blockZ, dX > 0 ? 0.0 : 1.0, dY > 0 ? 0.0 : 1.0, oZ, 0.0, false)) {
if (secondaryPassSingular) {
return true;
}
}
else if (!secondaryPassSingular) {
return false; return false;
} }
// X and Z. // X and Z.
if (step(blockX + (dX > 0 ? 1 : -1), blockY, blockZ + (dZ > 0 ? 1 : -1), dX > 0 ? 0.0 : 1.0, oY, dZ > 0 ? 0.0 : 1.0, 0.0, false)) { if (!step(blockX + (dX > 0 ? 1 : -1), blockY, blockZ + (dZ > 0 ? 1 : -1), dX > 0 ? 0.0 : 1.0, oY, dZ > 0 ? 0.0 : 1.0, 0.0, false)) {
if (secondaryPassSingular) {
return true;
}
}
else if (!secondaryPassSingular) {
return false; return false;
} }
// Y and Z. // Y and Z.
if (step(blockX, blockY + (dY > 0 ? 1 : -1), blockZ + (dZ > 0 ? 1 : -1), oX, dY > 0 ? 0.0 : 1.0, dZ > 0 ? 0.0 : 1.0, 0.0, false)) { if (!step(blockX, blockY + (dY > 0 ? 1 : -1), blockZ + (dZ > 0 ? 1 : -1), oX, dY > 0 ? 0.0 : 1.0, dZ > 0 ? 0.0 : 1.0, 0.0, false)) {
if (secondaryPassSingular) {
return true;
}
}
else if (!secondaryPassSingular) {
return false; return false;
} }
// If secondaryPassSingular is true, all returned false, otherwise none returned false. // All passed.
return !secondaryPassSingular; return true;
} }
/** /**
@ -364,6 +335,7 @@ public abstract class RayTracing {
} }
/** /**
* Test if the primary line reached the end block.<br>
* (Might later get changed to protected visibility.) * (Might later get changed to protected visibility.)
* @return * @return
*/ */