cleaned out some code
This commit is contained in:
@@ -398,12 +398,7 @@ public class Box
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* We use this method to set the various width of the column
|
||||
* @param xWidth
|
||||
* @param yWidth
|
||||
* @param zWidth
|
||||
*/
|
||||
/** We use this method to set the various width of the column */
|
||||
public void setWidth(int xWidth, int yWidth, int zWidth)
|
||||
{
|
||||
boxWidth[X] = xWidth;
|
||||
@@ -411,12 +406,7 @@ public class Box
|
||||
boxWidth[Z] = zWidth;
|
||||
}
|
||||
|
||||
/**
|
||||
* We use this method to set the various offset of the column
|
||||
* @param xOffset
|
||||
* @param yOffset
|
||||
* @param zOffset
|
||||
*/
|
||||
/** We use this method to set the various offset of the column */
|
||||
public void setOffset(int xOffset, int yOffset, int zOffset)
|
||||
{
|
||||
boxOffset[X] = xOffset;
|
||||
|
||||
@@ -32,5 +32,5 @@ public enum FogDistance
|
||||
FAR,
|
||||
|
||||
/** only looks good if the fog quality is set to Fancy. */
|
||||
NEAR_AND_FAR;
|
||||
NEAR_AND_FAR
|
||||
}
|
||||
@@ -39,5 +39,5 @@ public enum FogDrawOverride
|
||||
ALWAYS_DRAW_FOG_FAST,
|
||||
|
||||
/** Always draw fog on the LODs */
|
||||
ALWAYS_DRAW_FOG_FANCY;
|
||||
ALWAYS_DRAW_FOG_FANCY
|
||||
}
|
||||
@@ -27,5 +27,5 @@ public enum FogQuality
|
||||
{
|
||||
FAST,
|
||||
FANCY,
|
||||
OFF;
|
||||
OFF
|
||||
}
|
||||
|
||||
@@ -31,5 +31,5 @@ public enum GenerationPriority
|
||||
{
|
||||
NEAR_FIRST,
|
||||
|
||||
FAR_FIRST;
|
||||
FAR_FIRST
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ public enum HorizontalResolution
|
||||
|
||||
|
||||
|
||||
private HorizontalResolution(int newLengthCount, int newDetailLevel)
|
||||
HorizontalResolution(int newLengthCount, int newDetailLevel)
|
||||
{
|
||||
detailLevel = (byte) newDetailLevel;
|
||||
dataPointLengthCount = newLengthCount;
|
||||
|
||||
@@ -46,7 +46,7 @@ public enum LodTemplate
|
||||
|
||||
public final AbstractLodTemplate template;
|
||||
|
||||
private LodTemplate(AbstractLodTemplate newTemplate)
|
||||
LodTemplate(AbstractLodTemplate newTemplate)
|
||||
{
|
||||
template = newTemplate;
|
||||
}
|
||||
|
||||
@@ -18,5 +18,5 @@ public enum ShadingMode
|
||||
* LODs will have darker sides and bottoms to simulate
|
||||
* Minecraft's fast, top down lighting.
|
||||
*/
|
||||
GAME_SHADING;
|
||||
GAME_SHADING
|
||||
}
|
||||
@@ -97,12 +97,7 @@ public class ClientProxy
|
||||
// render event //
|
||||
//==============//
|
||||
|
||||
/**
|
||||
* Do any setup that is required to draw LODs
|
||||
* and then tell the LodRenderer to draw.
|
||||
*
|
||||
* @param mcMatrixStack
|
||||
*/
|
||||
/** Do any setup that is required to draw LODs and then tell the LodRenderer to draw. */
|
||||
public void renderLods(MatrixStack mcMatrixStack, float partialTicks)
|
||||
{
|
||||
// comment out when creating a release
|
||||
|
||||
@@ -202,71 +202,6 @@ public class DataPointUtil
|
||||
isVoid(dataPoint) + " " +
|
||||
doesItExist(dataPoint) + '\n';
|
||||
}
|
||||
|
||||
/**
|
||||
* This method merge column of single data together
|
||||
* @deprecated
|
||||
*/
|
||||
public static long mergeSingleData(long[] dataToMerge)
|
||||
{
|
||||
int numberOfChildren = 0;
|
||||
|
||||
int tempAlpha = 0;
|
||||
int tempRed = 0;
|
||||
int tempGreen = 0;
|
||||
int tempBlue = 0;
|
||||
int tempHeight = Integer.MIN_VALUE;
|
||||
int tempDepth = Integer.MAX_VALUE;
|
||||
int tempLightBlock = 0;
|
||||
int tempLightSky = 0;
|
||||
byte tempGenMode = DistanceGenerationMode.SERVER.complexity;
|
||||
boolean allEmpty = true;
|
||||
boolean allVoid = true;
|
||||
for (long data : dataToMerge)
|
||||
{
|
||||
if (DataPointUtil.doesItExist(data))
|
||||
{
|
||||
allEmpty = false;
|
||||
if (!(DataPointUtil.isVoid(data)))
|
||||
{
|
||||
numberOfChildren++;
|
||||
allVoid = false;
|
||||
tempAlpha += DataPointUtil.getAlpha(data);
|
||||
tempRed += DataPointUtil.getRed(data);
|
||||
tempGreen += DataPointUtil.getGreen(data);
|
||||
tempBlue += DataPointUtil.getBlue(data);
|
||||
tempHeight = Math.max(tempHeight, DataPointUtil.getHeight(data));
|
||||
tempDepth = Math.min(tempDepth, DataPointUtil.getDepth(data));
|
||||
tempLightBlock += DataPointUtil.getLightBlock(data);
|
||||
tempLightSky += DataPointUtil.getLightSky(data);
|
||||
}
|
||||
tempGenMode = (byte) Math.min(tempGenMode, DataPointUtil.getGenerationMode(data));
|
||||
} else
|
||||
{
|
||||
tempGenMode = (byte) Math.min(tempGenMode, DistanceGenerationMode.NONE.complexity);
|
||||
}
|
||||
}
|
||||
|
||||
if (allEmpty)
|
||||
{
|
||||
//no child has been initialized
|
||||
return DataPointUtil.EMPTY_DATA;
|
||||
} else if (allVoid)
|
||||
{
|
||||
//all the children are void
|
||||
return DataPointUtil.createVoidDataPoint(tempGenMode);
|
||||
} else
|
||||
{
|
||||
//we have at least 1 child
|
||||
tempAlpha = tempAlpha / numberOfChildren;
|
||||
tempRed = tempRed / numberOfChildren;
|
||||
tempGreen = tempGreen / numberOfChildren;
|
||||
tempBlue = tempBlue / numberOfChildren;
|
||||
tempLightBlock = tempLightBlock / numberOfChildren;
|
||||
tempLightSky = tempLightSky / numberOfChildren;
|
||||
return DataPointUtil.createDataPoint(tempAlpha, tempRed, tempGreen, tempBlue, tempHeight, tempDepth, tempLightSky, tempLightBlock, tempGenMode);
|
||||
}
|
||||
}
|
||||
|
||||
public static void shrinkArray(short[] array, int packetSize, int start, int length, int arraySize)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user