Revision: 56178
http://sourceforge.net/p/brlcad/code/56178
Author: mendesr
Date: 2013-07-22 16:39:38 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
Fixed UTests, BoundingBox improvements, Updated version number to 1.6.
Modified Paths:
--------------
jbrlcad/trunk/pom.xml
jbrlcad/trunk/src/main/java/org/brlcad/numerics/BoundingBox.java
jbrlcad/trunk/src/test/java/org/brlcad/geometry/PartitionTest.java
jbrlcad/trunk/src/test/java/org/brlcad/numerics/BoundingBoxTest.java
Modified: jbrlcad/trunk/pom.xml
===================================================================
--- jbrlcad/trunk/pom.xml 2013-07-22 13:40:31 UTC (rev 56177)
+++ jbrlcad/trunk/pom.xml 2013-07-22 16:39:38 UTC (rev 56178)
@@ -4,7 +4,7 @@
<groupId>org.brlcad</groupId>
<artifactId>jbrlcad</artifactId>
<packaging>jar</packaging>
- <version>1.5</version>
+ <version>1.6</version>
<name>jbrlcad</name>
<description>A partial implementation of BRL-CAD in java</description>
<url>http://brlcad.org</url>
Modified: jbrlcad/trunk/src/main/java/org/brlcad/numerics/BoundingBox.java
===================================================================
--- jbrlcad/trunk/src/main/java/org/brlcad/numerics/BoundingBox.java
2013-07-22 13:40:31 UTC (rev 56177)
+++ jbrlcad/trunk/src/main/java/org/brlcad/numerics/BoundingBox.java
2013-07-22 16:39:38 UTC (rev 56178)
@@ -291,9 +291,9 @@
throw new IllegalArgumentException(
"bound() called with Point that is either null or not
valid");
}
- if (p.getX() < max.getX() && p.getX() > min.getX()
- && p.getY() < max.getY() && p.getY() > min.getY()
- && p.getZ() < max.getZ() && p.getZ() > min.getZ()) {
+ if (p.getX() <= max.getX() && p.getX() >= min.getX()
+ && p.getY() <= max.getY() && p.getY() >= min.getY()
+ && p.getZ() <= max.getZ() && p.getZ() >= min.getZ()) {
return true;
}
return false;
Modified: jbrlcad/trunk/src/test/java/org/brlcad/geometry/PartitionTest.java
===================================================================
--- jbrlcad/trunk/src/test/java/org/brlcad/geometry/PartitionTest.java
2013-07-22 13:40:31 UTC (rev 56177)
+++ jbrlcad/trunk/src/test/java/org/brlcad/geometry/PartitionTest.java
2013-07-22 16:39:38 UTC (rev 56178)
@@ -426,6 +426,9 @@
}
private class MockPreppedCombination extends PreppedCombination {
-
+ @Override
+ public String getName(){
+ return "Name";
+ }
}
}
Modified: jbrlcad/trunk/src/test/java/org/brlcad/numerics/BoundingBoxTest.java
===================================================================
--- jbrlcad/trunk/src/test/java/org/brlcad/numerics/BoundingBoxTest.java
2013-07-22 13:40:31 UTC (rev 56177)
+++ jbrlcad/trunk/src/test/java/org/brlcad/numerics/BoundingBoxTest.java
2013-07-22 16:39:38 UTC (rev 56178)
@@ -4,6 +4,7 @@
import static org.junit.Assert.*;
import java.util.List;
+import org.junit.Assert;
/**
* Test framework for the BoundingBox class
@@ -176,6 +177,15 @@
assertEquals( "first hit", 5.0, hits[0], 0.00000001 );
assertEquals( "second hit", 19.142135623730947, hits[1], 0.00000001 );
}
+
+ @Test
+ public void testFlatBoxIntersect() {
+ BoundingBox bb = new BoundingBox( new Point( 0, 0, 0 ), new Point( 6,
6, 0 ) );
+ // a Ray that intersects
+ Ray r = new Ray(new Point(3, 3, -10), new Vector3(0, 0, 1));
+ //Should intersect the Flatbox
+ Assert.assertTrue(bb.doesIntersect(r));
+ }
@Test
public void testConeIntersect() {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
