Skip to content

Fix. Made min and max immutable. Fixed related tests. #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Fix. Made min and max immutable. Fixed related tests. #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions src/main/java/mesh/modifier/RandomHolesModifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,19 +212,6 @@ public float getMinAmount() {
return minAmount;
}

/**
* Sets the minimum hole percentage.
*
* @param minAmount the minimum hole percentage. Must be in the range [0, 1].
* @throws IllegalArgumentException if {@code minAmount} is out of range or
* greater than the current
* {@code maxAmount}.
*/
public void setMinAmount(float minAmount) {
validateAmountRange(minAmount, maxAmount);
this.minAmount = minAmount;
}

/**
* Gets the maximum hole percentage.
*
Expand All @@ -234,18 +221,6 @@ public float getMaxAmount() {
return maxAmount;
}

/**
* Sets the maximum hole percentage.
*
* @param maxAmount the maximum hole percentage. Must be in the range [0, 1].
* @throws IllegalArgumentException if {@code maxAmount} is out of range or
* less than the current {@code minAmount}.
*/
public void setMaxAmount(float maxAmount) {
validateAmountRange(minAmount, maxAmount);
this.maxAmount = maxAmount;
}

/**
* Validates that the given range of amounts is within acceptable bounds.
* <p>
Expand Down
244 changes: 93 additions & 151 deletions src/test/java/mesh/modifier/test/RandomHolesModifierFaceCollectionOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,30 +34,30 @@ public void returnsNonNullMesh() {
Mesh3D mesh = new CubeCreator().create();
assertNotNull(modifier.modify(mesh, new ArrayList<Face3D>()));
}

@Test
public void nullMeshThrowsException() {
assertThrows(IllegalArgumentException.class, () -> {
modifier.modify(null, new ArrayList<Face3D>());
});
}

@Test
public void nullCollcetionThrowsException() {
ArrayList<Face3D> faces = null;
assertThrows(IllegalArgumentException.class, () -> {
modifier.modify(new Mesh3D(), faces);
});
}

@Test
public void testFaceCountModifyAllCubeFaces() {
Mesh3D cube = new CubeCreator().create();
ArrayList<Face3D> faces = new ArrayList<Face3D>(cube.getFaces());
modifier.modify(cube, faces);
assertEquals(24, cube.getFaceCount());
}

@Test
public void testFaceCountModifyTwoCubeFaces() {
Mesh3D cube = new CubeCreator().create();
Expand All @@ -67,15 +67,15 @@ public void testFaceCountModifyTwoCubeFaces() {
modifier.modify(cube, faces);
assertEquals(12, cube.getFaceCount());
}

@Test
public void testVertexCountModifyAllCubeFaces() {
Mesh3D cube = new CubeCreator().create();
ArrayList<Face3D> faces = new ArrayList<Face3D>(cube.getFaces());
modifier.modify(cube, faces);
assertEquals(32, cube.getVertexCount());
}

@Test
public void testVertexCountModifyTwoCubeFaces() {
Mesh3D cube = new CubeCreator().create();
Expand All @@ -85,207 +85,149 @@ public void testVertexCountModifyTwoCubeFaces() {
modifier.modify(cube, faces);
assertEquals(16, cube.getVertexCount());
}

@ParameterizedTest
@ValueSource(longs = {
0,
4432,
245,
-14332,
-13423293,
4324243,
Long.MAX_VALUE,
Long.MIN_VALUE
})
public void testFacesWithDifferentSeeds(long seed) {
int[][] expected = new int[][] {
{3,0,9,8},
{0,1,10,9},
{1,2,11,10},
{2,3,8,11},
{6,5,13,12},
{5,4,14,13},
{4,7,15,14},
{7,6,12,15},
{1,0,17,16},
{0,4,18,17},
{4,5,19,18},
{5,1,16,19},
{1,5,21,20},
{5,6,22,21},
{6,2,23,22},
{2,1,20,23},
{6,7,25,24},
{7,3,26,25},
{3,2,27,26},
{2,6,24,27},
{3,7,29,28},
{7,4,30,29},
{4,0,31,30},
{0,3,28,31}
};

@ParameterizedTest
@ValueSource(longs = { 0, 4432, 245, -14332, -13423293, 4324243,
Long.MAX_VALUE, Long.MIN_VALUE })
public void testFacesWithDifferentSeeds(long seed) {
int[][] expected = new int[][] { { 3, 0, 9, 8 }, { 0, 1, 10, 9 },
{ 1, 2, 11, 10 }, { 2, 3, 8, 11 }, { 6, 5, 13, 12 }, { 5, 4, 14, 13 },
{ 4, 7, 15, 14 }, { 7, 6, 12, 15 }, { 1, 0, 17, 16 }, { 0, 4, 18, 17 },
{ 4, 5, 19, 18 }, { 5, 1, 16, 19 }, { 1, 5, 21, 20 }, { 5, 6, 22, 21 },
{ 6, 2, 23, 22 }, { 2, 1, 20, 23 }, { 6, 7, 25, 24 }, { 7, 3, 26, 25 },
{ 3, 2, 27, 26 }, { 2, 6, 24, 27 }, { 3, 7, 29, 28 }, { 7, 4, 30, 29 },
{ 4, 0, 31, 30 }, { 0, 3, 28, 31 } };
Mesh3D mesh = new CubeCreator().create();
modifier.setSeed(seed);
modifier.modify(mesh, mesh.getFaces());
for (int i = 0; i < expected.length; i++) {
int[] actual = mesh.getFaceAt(i).indices;
assertArrayEquals(expected[i], actual);
}
}
}

@Test
public void testPlaneVerticesWithZeroSeeed() {
Vector3f[] expected = {
new Vector3f(1.0f, 0.0f, -1.0f),
new Vector3f(1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, -1.0f),
new Vector3f(0.6847742f, 0.0f, -0.6847742f),
new Vector3f(0.6847742f, 0.0f, 0.6847742f),
new Vector3f(-0.6847742f, 0.0f, 0.6847742f),
new Vector3f(-0.6847742f, 0.0f, -0.6847742f)
};
Vector3f[] expected = { new Vector3f(1.0f, 0.0f, -1.0f),
new Vector3f(1.0f, 0.0f, 1.0f), new Vector3f(-1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, -1.0f),
new Vector3f(0.6847742f, 0.0f, -0.6847742f),
new Vector3f(0.6847742f, 0.0f, 0.6847742f),
new Vector3f(-0.6847742f, 0.0f, 0.6847742f),
new Vector3f(-0.6847742f, 0.0f, -0.6847742f) };
ArrayList<Face3D> faces = new ArrayList<Face3D>();
Mesh3D plane = new PlaneCreator().create();
faces.add(plane.getFaceAt(0));
modifier.modify(plane, faces);
assertArrayEquals(expected, plane.vertices.toArray());
}

@Test
public void testPlaneVerticesWithPositiveSeeed() {
Vector3f[] expected = {
new Vector3f(1.0f, 0.0f, -1.0f),
new Vector3f(1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, -1.0f),
new Vector3f(0.31211585f, 0.0f, -0.31211585f),
new Vector3f(0.31211585f, 0.0f, 0.31211585f),
new Vector3f(-0.31211585f, 0.0f, 0.31211585f),
new Vector3f(-0.31211585f, 0.0f, -0.31211585f),
};
Vector3f[] expected = { new Vector3f(1.0f, 0.0f, -1.0f),
new Vector3f(1.0f, 0.0f, 1.0f), new Vector3f(-1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, -1.0f),
new Vector3f(0.31211585f, 0.0f, -0.31211585f),
new Vector3f(0.31211585f, 0.0f, 0.31211585f),
new Vector3f(-0.31211585f, 0.0f, 0.31211585f),
new Vector3f(-0.31211585f, 0.0f, -0.31211585f), };
ArrayList<Face3D> faces = new ArrayList<Face3D>();
Mesh3D plane = new PlaneCreator().create();
faces.add(plane.getFaceAt(0));
modifier.setSeed(13424);
modifier.modify(plane, faces);
assertArrayEquals(expected, plane.vertices.toArray());
}

@Test
public void testPlaneVerticesWithNegativeSeeed() {
Vector3f[] expected = {
new Vector3f(1.0f, 0.0f, -1.0f),
new Vector3f(1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, -1.0f),
new Vector3f(0.2969781f, 0.0f, -0.2969781f),
new Vector3f(0.2969781f, 0.0f, 0.2969781f),
new Vector3f(-0.2969781f, 0.0f, 0.2969781f),
new Vector3f(-0.2969781f, 0.0f, -0.2969781f),
};
Vector3f[] expected = { new Vector3f(1.0f, 0.0f, -1.0f),
new Vector3f(1.0f, 0.0f, 1.0f), new Vector3f(-1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, -1.0f),
new Vector3f(0.2969781f, 0.0f, -0.2969781f),
new Vector3f(0.2969781f, 0.0f, 0.2969781f),
new Vector3f(-0.2969781f, 0.0f, 0.2969781f),
new Vector3f(-0.2969781f, 0.0f, -0.2969781f), };
ArrayList<Face3D> faces = new ArrayList<Face3D>();
Mesh3D plane = new PlaneCreator().create();
faces.add(plane.getFaceAt(0));
modifier.setSeed(-3244324);
modifier.modify(plane, faces);
assertArrayEquals(expected, plane.vertices.toArray());
}

@Test
public void testPlaneVerticesWithSeedMaxLong() {
Vector3f[] expected = {
new Vector3f(1.0f, 0.0f, -1.0f),
new Vector3f(1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, -1.0f),
new Vector3f(0.31515408f, 0.0f, -0.31515408f),
new Vector3f(0.31515408f, 0.0f, 0.31515408f),
new Vector3f(-0.31515408f, 0.0f, 0.31515408f),
new Vector3f(-0.31515408f, 0.0f, -0.31515408f),
};
Vector3f[] expected = { new Vector3f(1.0f, 0.0f, -1.0f),
new Vector3f(1.0f, 0.0f, 1.0f), new Vector3f(-1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, -1.0f),
new Vector3f(0.31515408f, 0.0f, -0.31515408f),
new Vector3f(0.31515408f, 0.0f, 0.31515408f),
new Vector3f(-0.31515408f, 0.0f, 0.31515408f),
new Vector3f(-0.31515408f, 0.0f, -0.31515408f), };
ArrayList<Face3D> faces = new ArrayList<Face3D>();
Mesh3D plane = new PlaneCreator().create();
faces.add(plane.getFaceAt(0));
modifier.setSeed(Long.MAX_VALUE);
modifier.modify(plane, faces);
assertArrayEquals(expected, plane.vertices.toArray());
}

@Test
public void testPlaneVerticesWithSeedMinLong() {
Vector3f[] expected = {
new Vector3f(1.0f, 0.0f, -1.0f),
new Vector3f(1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, -1.0f),
new Vector3f(0.6847742f, 0.0f, -0.6847742f),
new Vector3f(0.6847742f, 0.0f, 0.6847742f),
new Vector3f(-0.6847742f, 0.0f, 0.6847742f),
new Vector3f(-0.6847742f, 0.0f, -0.6847742f),
};
Vector3f[] expected = { new Vector3f(1.0f, 0.0f, -1.0f),
new Vector3f(1.0f, 0.0f, 1.0f), new Vector3f(-1.0f, 0.0f, 1.0f),
new Vector3f(-1.0f, 0.0f, -1.0f),
new Vector3f(0.6847742f, 0.0f, -0.6847742f),
new Vector3f(0.6847742f, 0.0f, 0.6847742f),
new Vector3f(-0.6847742f, 0.0f, 0.6847742f),
new Vector3f(-0.6847742f, 0.0f, -0.6847742f), };
ArrayList<Face3D> faces = new ArrayList<Face3D>();
Mesh3D plane = new PlaneCreator().create();
faces.add(plane.getFaceAt(0));
modifier.setSeed(Long.MIN_VALUE);
modifier.modify(plane, faces);
assertArrayEquals(expected, plane.vertices.toArray());
}

@Test
public void tesCubeVerticesWithPositiveSeed() {
Vector3f[] expected = new Vector3f[] {
new Vector3f(1.0f, -1.0f, -1.0f),
new Vector3f(1.0f, -1.0f, 1.0f),
new Vector3f(-1.0f, -1.0f, 1.0f),
new Vector3f(-1.0f, -1.0f, -1.0f),
new Vector3f(1.0f, 1.0f, -1.0f),
new Vector3f(1.0f, 1.0f, 1.0f),
new Vector3f(-1.0f, 1.0f, 1.0f),
new Vector3f(-1.0f, 1.0f, -1.0f),
new Vector3f(-1.0f, 0.2517369f, 0.2517369f),
new Vector3f(-1.0f, 0.2517369f, -0.2517369f),
new Vector3f(-1.0f, -0.2517369f, -0.2517369f),
new Vector3f(-1.0f, -0.2517369f, 0.2517369f),
};

@Test
public void tesCubeVerticesWithPositiveSeed() {
Vector3f[] expected = new Vector3f[] { new Vector3f(1.0f, -1.0f, -1.0f),
new Vector3f(1.0f, -1.0f, 1.0f), new Vector3f(-1.0f, -1.0f, 1.0f),
new Vector3f(-1.0f, -1.0f, -1.0f), new Vector3f(1.0f, 1.0f, -1.0f),
new Vector3f(1.0f, 1.0f, 1.0f), new Vector3f(-1.0f, 1.0f, 1.0f),
new Vector3f(-1.0f, 1.0f, -1.0f),
new Vector3f(-1.0f, 0.2517369f, 0.2517369f),
new Vector3f(-1.0f, 0.2517369f, -0.2517369f),
new Vector3f(-1.0f, -0.2517369f, -0.2517369f),
new Vector3f(-1.0f, -0.2517369f, 0.2517369f), };
Mesh3D mesh = new CubeCreator().create();
ArrayList<Face3D> faces = new ArrayList<Face3D>();
faces.add(mesh.getFaceAt(4));
modifier = new RandomHolesModifier(0.1f, 0.3f);
modifier.setSeed(234453);
modifier.setMinAmount(0.1f);
modifier.setMaxAmount(0.3f);
modifier.modify(mesh, faces);
assertArrayEquals(expected, mesh.vertices.toArray());
}

@ParameterizedTest
@ValueSource(floats = {
0.1f,
0.322f,
0.123f,
0.022f,
0.245f,
0.751f,
0.965f,
Float.MIN_VALUE,
Float.MAX_VALUE,
})
public void testMinMaxAmountPositiveValuesAndSeed(float amount) {
Mesh3D expected = new PlaneCreator().create();
ExtrudeModifier extrudeModifier = new ExtrudeModifier();
extrudeModifier.setRemoveFaces(true);
extrudeModifier.setScale(amount);
extrudeModifier.setAmount(0);
expected.apply(extrudeModifier);

Mesh3D actual = new PlaneCreator().create();
ArrayList<Face3D> faces = new ArrayList<Face3D>();
faces.add(actual.getFaceAt(0));
modifier.setMinAmount(amount);
modifier.setMaxAmount(amount);
modifier.setSeed(234);
modifier.modify(actual, faces);
}

@ParameterizedTest
@ValueSource(floats = { 0.1f, 0.322f, 0.123f, 0.022f, 0.245f, 0.751f,
0.965f })
public void testMinMaxAmountPositiveValuesAndSeed(float amount) {
Mesh3D expected = new PlaneCreator().create();
ExtrudeModifier extrudeModifier = new ExtrudeModifier();
extrudeModifier.setRemoveFaces(true);
extrudeModifier.setScale(amount);
extrudeModifier.setAmount(0);
expected.apply(extrudeModifier);

Mesh3D actual = new PlaneCreator().create();
ArrayList<Face3D> faces = new ArrayList<Face3D>();
faces.add(actual.getFaceAt(0));
modifier = new RandomHolesModifier(amount, amount);
modifier.setSeed(234);
modifier.modify(actual, faces);
assertArrayEquals(expected.vertices.toArray(), actual.vertices.toArray());
}
}

}
Loading
Loading