Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-14 13:13:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor vector system to be cleaner

Browse Source 
- Move Vector, etc. into `.math` package
- Drop many methods that will be auto-promoted anyways, eg. with
`divide(int)` and `divide(double)` the first is now gone.
- Take Block vectors into their own class hierarchy
- Make it clear throughout the API what takes blockvectors
- many more improvements
This commit is contained in:
Kenzie Togami
2018-10-14 03:40:53 -07:00
parent d7c528247b
commit 399e0ad5fa
230 changed files with 4216 additions and 3913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
worldedit-core/src/test/java/com/sk89q/worldedit/VectorTest.java
View File

@ -1,152 +0,0 @@
/*
* WorldEdit, a Minecraft world manipulation toolkit
* Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit team and contributors
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
public class VectorTest {
@Test
public void collinearityTest() {
assertCollinear(0,0,0, 0,0,0);
assertCollinear(0,0,0, 1,0,0);
assertCollinear(0,0,0, 0,1,0);
assertCollinear(0,0,0, 0,0,1);
assertCollinear(1,0,0, 0,0,0);
assertCollinear(0,1,0, 0,0,0);
assertCollinear(0,0,1, 0,0,0);
assertCollinear(1,0,0, 2,0,0);
assertNotCollinear(1,0,0, 0,1,0);
assertNotCollinear(2,2,2, 8,4,4);
assertCollinear(8,2,2, 8,2,2);
assertNotCollinear(4,2,4, 4,4,4);
assertNotCollinear(1,1,2, 4,8,2);
assertNotCollinear(4,1,8, 1,4,4);
assertCollinear(2,4,2, 1,2,1);
assertNotCollinear(2,2,4, 1,2,1);
assertNotCollinear(4,4,1, 4,4,4);
assertNotCollinear(4,1,4, 1,8,2);
assertCollinear(8,8,4, 4,4,2);
assertNotCollinear(2,1,8, 1,1,2);
assertNotCollinear(8,1,2, 2,1,2);
assertNotCollinear(4,4,8, 2,2,8);
assertNotCollinear(8,4,8, 1,4,8);
assertNotCollinear(2,2,2, 1,4,2);
assertNotCollinear(1,1,2, 8,8,2);
assertNotCollinear(4,4,8, 8,4,4);
assertNotCollinear(1,8,2, 4,4,4);
assertNotCollinear(8,4,2, 1,2,2);
assertNotCollinear(1,8,2, 8,1,4);
assertNotCollinear(4,8,1, 4,8,8);
assertNotCollinear(8,1,8, 8,8,8);
assertNotCollinear(8,4,1, 4,2,2);
assertNotCollinear(4,8,1, 4,2,1);
assertNotCollinear(8,8,1, 2,4,2);
assertCollinear(8,1,4, 8,1,4);
assertNotCollinear(4,1,1, 2,4,8);
assertNotCollinear(4,2,8, 1,4,1);
assertNotCollinear(1,8,2, 1,8,1);
assertNotCollinear(1,1,2, 4,2,2);
assertCollinear(0,0, 0,0);
assertCollinear(0,0, 1,0);
assertCollinear(0,0, 0,1);
assertCollinear(0,0, 0,0);
assertCollinear(1,0, 0,0);
assertCollinear(0,1, 0,0);
assertCollinear(0,0, 0,0);
assertCollinear(1,0, 2,0);
assertNotCollinear(1,0, 0,1);
assertNotCollinear(2,2, 8,4);
assertCollinear(8,2, 8,2);
assertNotCollinear(4,2, 4,4);
assertNotCollinear(1,1, 4,8);
assertNotCollinear(4,1, 1,4);
assertCollinear(2,4, 1,2);
assertNotCollinear(2,2, 1,2);
assertCollinear(4,4, 4,4);
assertNotCollinear(4,1, 1,8);
assertCollinear(8,8, 4,4);
assertNotCollinear(2,1, 1,1);
assertNotCollinear(8,1, 2,1);
assertCollinear(4,4, 2,2);
assertNotCollinear(8,4, 1,4);
assertNotCollinear(2,2, 1,4);
assertCollinear(1,1, 8,8);
assertNotCollinear(4,4, 8,4);
assertNotCollinear(1,8, 4,4);
assertNotCollinear(8,4, 1,2);
assertNotCollinear(1,8, 8,1);
assertCollinear(4,8, 4,8);
assertNotCollinear(8,1, 8,8);
assertCollinear(8,4, 4,2);
assertNotCollinear(4,8, 4,2);
assertNotCollinear(8,8, 2,4);
assertCollinear(8,1, 8,1);
assertNotCollinear(4,1, 2,4);
assertNotCollinear(4,2, 1,4);
assertCollinear(1,8, 1,8);
assertNotCollinear(1,1, 4,2);
}
private void assertCollinear(double ax, double ay, double az, double bx, double by, double bz) {
final Vector a = new Vector(ax,ay,az);
final Vector b = new Vector(bx,by,bz);
assertTrue(a.isCollinearWith(b));
assertTrue(b.isCollinearWith(a));
assertTrue(a.multiply(-1.0).isCollinearWith(b));
assertTrue(a.isCollinearWith(b.multiply(-1.0)));
}
private void assertNotCollinear(double ax, double ay, double az, double bx, double by, double bz) {
final Vector a = new Vector(ax,ay,az);
final Vector b = new Vector(bx,by,bz);
assertFalse(a.isCollinearWith(b));
assertFalse(b.isCollinearWith(a));
assertFalse(a.multiply(-1.0).isCollinearWith(b));
assertFalse(a.isCollinearWith(b.multiply(-1.0)));
}
private void assertCollinear(double ax, double az, double bx, double bz) {
final Vector2D a = new Vector2D(ax,az);
final Vector2D b = new Vector2D(bx,bz);
assertTrue(a.isCollinearWith(b));
assertTrue(b.isCollinearWith(a));
assertTrue(a.multiply(-1.0).isCollinearWith(b));
assertTrue(a.isCollinearWith(b.multiply(-1.0)));
}
private void assertNotCollinear(double ax, double az, double bx, double bz) {
final Vector2D a = new Vector2D(ax,az);
final Vector2D b = new Vector2D(bx,bz);
assertFalse(a.isCollinearWith(b));
assertFalse(b.isCollinearWith(a));
assertFalse(a.multiply(-1.0).isCollinearWith(b));
assertFalse(a.isCollinearWith(b.multiply(-1.0)));
}
}

22
worldedit-core/src/test/java/com/sk89q/worldedit/util/LocationTest.java
View File

@ -22,7 +22,7 @@ package com.sk89q.worldedit.util;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.world.World;
import org.junit.Test;
@ -54,7 +54,7 @@ public class LocationTest {
@Test
public void testToVector() throws Exception {
World world = mock(World.class);
Vector position = new Vector(1, 1, 1);
Vector3 position = new Vector3(1, 1, 1);
Location location = new Location(world, position);
assertEquals(position, location.toVector());
}
@ -62,21 +62,21 @@ public class LocationTest {
@Test
public void testGetX() throws Exception {
World world = mock(World.class);
Location location = new Location(world, new Vector(TEST_VALUE, 0, 0));
Location location = new Location(world, new Vector3(TEST_VALUE, 0, 0));
assertEquals(TEST_VALUE, location.getX(), EPSILON);
}
@Test
public void testGetBlockX() throws Exception {
World world = mock(World.class);
Location location = new Location(world, new Vector(TEST_VALUE, 0, 0));
Location location = new Location(world, new Vector3(TEST_VALUE, 0, 0));
assertEquals(TEST_VALUE, location.getBlockX());
}
@Test
public void testSetX() throws Exception {
World world = mock(World.class);
Location location1 = new Location(world, new Vector());
Location location1 = new Location(world, Vector3.ZERO);
Location location2 = location1.setX(TEST_VALUE);
assertEquals(0, location1.getX(), EPSILON);
assertEquals(TEST_VALUE, location2.getX(), EPSILON);
@ -87,21 +87,21 @@ public class LocationTest {
@Test
public void testGetY() throws Exception {
World world = mock(World.class);
Location location = new Location(world, new Vector(0, TEST_VALUE, 0));
Location location = new Location(world, new Vector3(0, TEST_VALUE, 0));
assertEquals(TEST_VALUE, location.getY(), EPSILON);
}
@Test
public void testGetBlockY() throws Exception {
World world = mock(World.class);
Location location = new Location(world, new Vector(0, TEST_VALUE, 0));
Location location = new Location(world, new Vector3(0, TEST_VALUE, 0));
assertEquals(TEST_VALUE, location.getBlockY());
}
@Test
public void testSetY() throws Exception {
World world = mock(World.class);
Location location1 = new Location(world, new Vector());
Location location1 = new Location(world, Vector3.ZERO);
Location location2 = location1.setY(TEST_VALUE);
assertEquals(0, location1.getY(), EPSILON);
assertEquals(0, location2.getX(), EPSILON);
@ -112,21 +112,21 @@ public class LocationTest {
@Test
public void testGetZ() throws Exception {
World world = mock(World.class);
Location location = new Location(world, new Vector(0, 0, TEST_VALUE));
Location location = new Location(world, new Vector3(0, 0, TEST_VALUE));
assertEquals(TEST_VALUE, location.getZ(), EPSILON);
}
@Test
public void testGetBlockZ() throws Exception {
World world = mock(World.class);
Location location = new Location(world, new Vector(0, 0, TEST_VALUE));
Location location = new Location(world, new Vector3(0, 0, TEST_VALUE));
assertEquals(TEST_VALUE, location.getBlockZ());
}
@Test
public void testSetZ() throws Exception {
World world = mock(World.class);
Location location1 = new Location(world, new Vector());
Location location1 = new Location(world, Vector3.ZERO);
Location location2 = location1.setZ(TEST_VALUE);
assertEquals(0, location1.getZ(), EPSILON);
assertEquals(0, location2.getX(), EPSILON);