Skip to content
Snippets Groups Projects
Commit ca78105e authored by Vojtech Moravec's avatar Vojtech Moravec
Browse files

Add Chunk2D::index() overload, which takes only X dim.

parent e02537bc
No related branches found
No related tags found
No related merge requests found
...@@ -35,7 +35,7 @@ public class Chunk2D { ...@@ -35,7 +35,7 @@ public class Chunk2D {
* @return Index inside data array. * @return Index inside data array.
*/ */
private int index(final int x, final int y) { private int index(final int x, final int y) {
return index(x, y, dims); return index(x, y, dims.getX());
} }
/** /**
...@@ -46,10 +46,23 @@ public class Chunk2D { ...@@ -46,10 +46,23 @@ public class Chunk2D {
* @param chunkDims Chunk dimensions. * @param chunkDims Chunk dimensions.
* @return Index inside chunk dimension data array. * @return Index inside chunk dimension data array.
*/ */
private int index(final int x, final int y, final V2i chunkDims) { public static int index(final int x, final int y, final V2i chunkDims) {
assert (x >= 0 && x < chunkDims.getX()) : "Index X out of bounds."; // TODO(Moravec): Remove this overload, which remove the need to pass chunkDims.
assert (y >= 0 && y < chunkDims.getY()) : "Index Y out of bounds."; return index(x, y, chunkDims.getX());
return (y * chunkDims.getX()) + x; }
/**
* Calculate the index inside `2D` array
*
* @param x Zero based x coordinate.
* @param y Zero based y coordinate.
* @param chunkWidth Data width.
* @return Index inside chunk dimension data array.
*/
public static int index(final int x, final int y, final int chunkWidth) {
// assert (x >= 0 && x < chunkDims.getX()) : "Index X out of bounds.";
// assert (y >= 0 && y < chunkDims.getY()) : "Index Y out of bounds.";
return (y * chunkWidth) + x;
} }
......
package azgracompress.data;public class Voxel {
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment