diff --git a/src/main/java/fr/openmc/core/registry/regions/CustomRegion.java b/src/main/java/fr/openmc/core/registry/regions/CustomRegion.java index ce85d7a4a..b5866b083 100644 --- a/src/main/java/fr/openmc/core/registry/regions/CustomRegion.java +++ b/src/main/java/fr/openmc/core/registry/regions/CustomRegion.java @@ -10,8 +10,8 @@ public abstract class CustomRegion { public abstract World getWorld(); public abstract boolean contains(BlockVector3 pos); - public abstract BlockVector3 getMin(); - public abstract BlockVector3 getMax(); + public abstract BlockVector3 getPos1(); + public abstract BlockVector3 getPos2(); public final boolean contains(Location loc) { if (loc == null || loc.getWorld() == null) return false; diff --git a/src/main/java/fr/openmc/core/registry/regions/content/ExampleRegion.java b/src/main/java/fr/openmc/core/registry/regions/content/ExampleRegion.java index 83db314d4..5d2322faf 100644 --- a/src/main/java/fr/openmc/core/registry/regions/content/ExampleRegion.java +++ b/src/main/java/fr/openmc/core/registry/regions/content/ExampleRegion.java @@ -17,12 +17,12 @@ public World getWorld() { } @Override - public BlockVector3 getMin() { + public BlockVector3 getPos1() { return null; } @Override - public BlockVector3 getMax() { + public BlockVector3 getPos2() { return null; } } diff --git a/src/main/java/fr/openmc/core/registry/regions/types/Region.java b/src/main/java/fr/openmc/core/registry/regions/types/Region.java index c9ff4d047..4fbb82d44 100644 --- a/src/main/java/fr/openmc/core/registry/regions/types/Region.java +++ b/src/main/java/fr/openmc/core/registry/regions/types/Region.java @@ -4,11 +4,18 @@ import fr.openmc.core.registry.regions.CustomRegion; public abstract class Region extends CustomRegion { + private final BlockVector3 min; + private final BlockVector3 max; + + public Region() { + this.max = getPos1().getMaximum(getPos2()); + this.min = getPos1().getMinimum(getPos2()); + } @Override public boolean contains(BlockVector3 pos) { - return pos.containedWithin( - getMin(), - getMax() + return pos.containedWithin( + min, + max ); } } \ No newline at end of file diff --git a/src/main/java/fr/openmc/core/registry/regions/types/SphericalRegion.java b/src/main/java/fr/openmc/core/registry/regions/types/SphericalRegion.java index 2a9a6a97c..cab10eea8 100644 --- a/src/main/java/fr/openmc/core/registry/regions/types/SphericalRegion.java +++ b/src/main/java/fr/openmc/core/registry/regions/types/SphericalRegion.java @@ -19,12 +19,12 @@ public boolean contains(BlockVector3 pos) { } @Override - public BlockVector3 getMin() { + public BlockVector3 getPos1() { return null; } @Override - public BlockVector3 getMax() { + public BlockVector3 getPos2() { return null; } }