ChromaGaming/Regions
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

continued work on BitRegion methods

Browse source
This commit is contained in:
BuildTools 2017-01-16 21:00:18 -05:00
parent 35fa13229a
commit 68b965590b
3 changed files with 235 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

352
src/regions/BitRegion.java
View file

@ -4,6 +4,12 @@ import java.util.BitSet;
public class BitRegion implements UtilBitSet
{
/*----------------------------------------------------------------------------
------------------------------------------------------------------------------
CONSTRUCTORS
------------------------------------------------------------------------------
----------------------------------------------------------------------------*/
private int[] min; public int[] getMin() { return min; }
private int[] max; public int[] getMax() { return max; }
private int[] minTrue; public int[] getMinTrue() { return minTrue; }
@ -16,7 +22,8 @@ public class BitRegion implements UtilBitSet
/**
*
*
* @param min
* @param minX
* @param minZ
*/
public BitRegion(int minX, int minZ)
{
@ -29,7 +36,9 @@ public class BitRegion implements UtilBitSet
/**
*
*
* @param min
* @param minX
* @param minZ
* @param minY
*/
public BitRegion(int minX, int minZ, int minY)
{
@ -40,26 +49,30 @@ public class BitRegion implements UtilBitSet
/*
╔══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╗
║ ╔══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╗ ║
║ ║ ║ ║
║ ║ CALCULATIONS ║ ║
║ ║ ║ ║
║ ╚══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝ ║
╚══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝ */
/*----------------------------------------------------------------------------
------------------------------------------------------------------------------
GETTERS
GET VALUE
------------------------------------------------------------------------------
----------------------------------------------------------------------------*/
/**
*
*
* @return
*/
public int getBoxVolume()
public int getVolume()
{
return blocks.cardinality();
}
/**
*
*
* @return
*/
public int getBoundsVolume()
{
if (max == null) return 0;
@ -69,20 +82,6 @@ public class BitRegion implements UtilBitSet
}
/**
*
* @return
*/
public int getVolume()
{
return blocks.cardinality();
}
/*-------------------------------------
OVERLOADS : getIndex()
-------------------------------------*/
/**
*
* @param coordinate
@ -90,9 +89,10 @@ public class BitRegion implements UtilBitSet
*/
public int getIndex(int x, int z)
{
return getIndex(x, z, min[0], min[1]);
return (x - min[0]) + (z - min[1]);
}
/**
*
* @param coordinate
@ -100,148 +100,158 @@ public class BitRegion implements UtilBitSet
*/
public int getIndex(int x, int z, int y)
{
return getIndex(x, z, y, min[0], min[1], min[2]);
}
/**
*
* @param coordinate
* @param blocks
* @param minX
* @param maxX
* @param minZ
* @param maxZ
* @return
*/
public static int getIndex(int x, int z, int minX, int minZ)
{
return (x - minX) + (z - minZ);
}
/**
*
* @param coordinate
* @param blocks
* @param minX
* @param maxX
* @param minZ
* @param maxZ
* @param minY
* @param maxY
* @return
*/
public static int getIndex(int x, int z, int y, int minX, int minZ, int minY)
{
return (x - minX) + (z - minZ) + (y - minY);
return (x - min[0]) + (z - min[1]) + (y - min[2]);
}
/*-------------------------------------
OVERLOADS : getCoords()
-------------------------------------*/
/**
*
* @param coordinate
* @param index
* @return
*/
public int getCoords(int index)
{
return is3D ?
getIndex(index, min[0], min[1], min[2]) :
getIndex(index, min[0], min[1]);
}
/**
*
* @param coordinate
* @param blocks
* @param minX
* @param maxX
* @param minZ
* @param maxZ
* @return
*/
public static int getCoords(int index, int minX, int minZ)
{
return (x - minX) + (z - minZ);
}
/**
*
* @param coordinate
* @param blocks
* @param minX
* @param maxX
* @param minZ
* @param maxZ
* @param minY
* @param maxY
* @return
*/
public static int getCoords(int index, int minX, int minZ, int minY)
{
return (x - minX) + (z - minZ) + (y - minY);
:
;
}
/*----------------------------------------------------------------------------
------------------------------------------------------------------------------
fill() and clear()
OVERLOADS : fill()
------------------------------------------------------------------------------
----------------------------------------------------------------------------*/
/*-------------------------------------
OVERLOADS : fill()
-------------------------------------*/
/**
*
*/
public void fill()
{
blocks.set(0, getBoxVolume() - 1);
blocks.set(0, getBoundsVolume() - 1);
}
/**
*
*
* @param min
* @param max
* @param minX
* @param minZ
* @param maxX
* @param maxZ
*/
public void fill(int[] min, int[] max)
public void fill(int minX, int minZ, int maxX, int maxZ)//TODO adjust bounds if necessary
{
int z;
int x;
int index;
for (z = minZ; z <= maxZ; z++)
{
index = getIndex(minX, z);
for (x = minX; x <= maxX; x++)
{
blocks.set(index++);
}
}
}
/**
*
*
* @param min
* @param max
* @param blocks
* @param minX
* @param minZ
* @param maxX
* @param maxZ
*/
public void fill(int minX, int minZ, int maxX, int maxZ, BitSet blocksToFill)
public void fill(int minX, int minZ, int minY, int maxX, int maxZ, int maxY)//TODO adjust bounds if necessary
{
BitSet row;
int y;
int z;
int x;
int index;
for (y = minY; y <= maxY; y++)
{
for (z = minZ; z <= maxZ; z++)
{
index = getIndex(minX, z, y);
for (x = minX; x <= maxX; x++)
{
blocks.set(index++);
}
}
}
}
/**
*
*
* @param min
* @param max
* @param blocks
* @param minX
* @param minZ
* @param maxX
* @param maxZ
* @param blocksToFill
*/
public void fill(int minX, int minZ, int minY, int maxX, int maxZ, int maxY, BitSet blocksToFill)
public void fill(int minX, int minZ, int maxX, int maxZ, BitSet blocksToFill)//TODO adjust bounds if necessary
{
BitSet row;
int z;
int x;
int index1;
int index2 = 0;
for (z = minZ; z <= maxZ; z++)
{
index1 = getIndex(minX, z);
for (x = minX; x <= maxX; x++)
{
if (blocksToFill.get(index2++)) blocks.set(index1++);
}
}
}
/**
*
*
* @param minX
* @param minZ
* @param minY
* @param maxX
* @param maxZ
* @param maxY
* @param blocksToFill
*/
public void fill(int minX, int minZ, int minY, int maxX, int maxZ, int maxY, BitSet blocksToFill)//TODO adjust bounds if necessary
{
int y;
int z;
int x;
int index1;
int index2 = 0;
for (y = minY; y <= maxY; y++)
{
for (z = minZ; z <= maxZ; z++)
{
index1 = getIndex(minX, z, y);
for (x = minX; x <= maxX; x++)
{
if (blocksToFill.get(index2++)) blocks.set(index1++);
}
}
}
}
/*-------------------------------------
/*----------------------------------------------------------------------------
------------------------------------------------------------------------------
OVERLOADS : clear()
-------------------------------------*/
------------------------------------------------------------------------------
----------------------------------------------------------------------------*/
/**
*
*/
@ -253,46 +263,112 @@ public class BitRegion implements UtilBitSet
/**
*
*
* @param min
* @param max
* @param minX
* @param minZ
* @param maxX
* @param maxZ
*/
public void clear(int[] min, int[] max)
public void clear(int minX, int minZ, int maxX, int maxZ)
{
int z;
int x;
int index;
for (z = minZ; z <= maxZ; z++)
{
index = getIndex(minX, z);
for (x = minX; x <= maxX; x++)
{
blocks.clear(index++);
}
}
}
/**
*
*
* @param min
* @param max
* @param blocks
* @param minX
* @param minZ
* @param maxX
* @param maxZ
*/
public void clear(int minX, int minZ, int minY, int maxX, int maxZ, int maxY)
{
int y;
int z;
int x;
int index;
for (y = minY; y <= maxY; y++)
{
for (z = minZ; z <= maxZ; z++)
{
index = getIndex(minX, z, y);
for (x = minX; x <= maxX; x++)
{
blocks.clear(index++);
}
}
}
}
/**
*
*
* @param minX
* @param minZ
* @param maxX
* @param maxZ
* @param blocksToClear
*/
public void clear(int minX, int minZ, int maxX, int maxZ, BitSet blocksToClear)
{
BitSet row;
int z;
int x;
int index1;
int index2 = 0;
for (z = minZ; z <= maxZ; z++)
{
index1 = getIndex(minX, z);
for (x = minX; x <= maxX; x++)
{
if (blocksToClear.get(index2++)) blocks.clear(index1++);
}
}
}
/**
*
*
* @param min
* @param max
* @param blocks
* @param minX
* @param minZ
* @param minY
* @param maxX
* @param maxZ
* @param maxY
* @param blocksToClear
*/
public void clear(int minX, int minZ, int minY, int maxX, int maxZ, int maxY, BitSet blocksToClear)
{
BitSet row;
int index = 0;
int y;
int z;
int x;
for (int y = minY; y <= maxY; y++)
int index1;
int index2 = 0;
for (y = minY; y <= maxY; y++)
{
for (int z = minZ; z <= maxZ; z++)
for (z = minZ; z <= maxZ; z++)
{
for (int x = minX; x <= maxX; x++)
{
index1 = getIndex(minX, z, y);
for (x = minX; x <= maxX; x++)
{
if (blocksToClear.get(index2++)) blocks.clear(index1++);
}
}
}

2
src/regions/Octree.java
View file

@ -97,7 +97,7 @@ public class Octree extends Tree
----------------------------------------------------------------------------*/
@Override
OctreeEditor newEditor()
protected final OctreeEditor newEditor()
{
return new OctreeEditor(this);
}

38
src/regions/Tree.java
View file

@ -115,22 +115,24 @@ public abstract class Tree
*/
public Node parseBytes(File file)
{
if (file.length() == 0)
{
return new Node(false);
}
if (file.length() == 0) { return new Node(false); }
else { return parseBytes(file, 1); }
}
private Node parseBytes(File file, int attempt)
{
try
{
DataInputStream input = new DataInputStream(new BufferedInputStream(new FileInputStream(file)));
Node node = parseBytes(input);
input.close();
return node;
}
catch (IOException e)
catch (IOException e)
{
return new Node(false);
e.printStackTrace();
return attempt < 4 ? parseBytes(file, ++attempt) : new Node(false);
}
}
@ -395,7 +397,7 @@ public abstract class Tree
*
* @return a new TreeEditor
*/
abstract TreeEditor<? extends TreeEditor.Edit> newEditor();
protected abstract TreeEditor<? extends TreeEditor.Edit> newEditor();
@ -412,15 +414,6 @@ public abstract class Tree
╚══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝ */
/**
*
* @param parentNode
* @param regionBounds
* @return
*/
public abstract Node[] getNodes(Node parentNode, int[][] regionBounds);
/**
*
* @param regionBounds
@ -430,4 +423,13 @@ public abstract class Tree
{
return getNodes(root, regionBounds);
}
/**
*
* @param parentNode
* @param regionBounds
* @return
*/
public abstract Node[] getNodes(Node parentNode, int[][] regionBounds);
}