Skip to content

Commit

Permalink
Fix missing dependency and add idea project file
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreiBarsan committed Feb 7, 2019
1 parent b108426 commit 7214e45
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 17 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -84,4 +84,5 @@ local.properties
.Trashes
Icon?
ehthumbs.db
Thumbs.db
Thumbs.db.idea/
.idea/
38 changes: 38 additions & 0 deletions Yeti.iml
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.jogamp.gluegen:gluegen-rt-main:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.gluegen:gluegen-rt:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.gluegen:gluegen-rt:natives-android-armv6:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.gluegen:gluegen-rt:natives-linux-amd64:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.gluegen:gluegen-rt:natives-linux-armv6:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.gluegen:gluegen-rt:natives-linux-armv6hf:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.gluegen:gluegen-rt:natives-linux-i586:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.gluegen:gluegen-rt:natives-macosx-universal:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.gluegen:gluegen-rt:natives-solaris-amd64:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.gluegen:gluegen-rt:natives-solaris-i586:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.gluegen:gluegen-rt:natives-windows-amd64:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.gluegen:gluegen-rt:natives-windows-i586:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all-main:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:natives-android-armv6:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:natives-linux-amd64:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:natives-linux-armv6:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:natives-linux-armv6hf:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:natives-linux-i586:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:natives-macosx-universal:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:natives-solaris-amd64:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:natives-solaris-i586:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:natives-windows-amd64:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:natives-windows-i586:2.1.4" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.8.1" level="project" />
</component>
</module>
7 changes: 6 additions & 1 deletion pom.xml
Expand Up @@ -28,5 +28,10 @@
<artifactId>jogl-all-main</artifactId>
<version>2.1.4</version>
</dependency>
</dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
</dependency>
</dependencies>
</project>
30 changes: 15 additions & 15 deletions src/barsan/opengl/tests/math/RectangleTest.java
Expand Up @@ -10,17 +10,17 @@

public class RectangleTest {

final static float EPSILON = 0.0001f;
final static float EPSILON = 0.0001f;

@Test
public void testContainsFloatFloat() {
Rectangle toTest = new Rectangle(-4, -4, 8, 8);
assertTrue(toTest.contains(0, 0));

assertFalse(toTest.contains(-4, -4));
assertFalse(toTest.contains(-4, -2));
assertFalse(toTest.contains(8, 8));

assertTrue(toTest.contains(0, 0));

assertFalse(toTest.contains(-4.00f, -4.05f));
Expand All @@ -34,7 +34,7 @@ public void testOverlaps() {
Rectangle r2 = new Rectangle(4, 7, 1, 2);
Rectangle r3 = new Rectangle(4, 7, 9, 240);
Rectangle r4 = new Rectangle(24, 10, 3, 4);

assertTrue(r1.overlaps(r2));
assertTrue(r1.overlaps(r3));
assertFalse(r1.overlaps(r4));
Expand All @@ -44,28 +44,28 @@ public void testOverlaps() {
public void testIntersect() {
Rectangle faller = new Rectangle(0.77f, 0.68f, 2.0f, 4.0f);
Rectangle ground = new Rectangle(0.0f, 0.0f, 20.0f, 1.0f);

Rectangle intersection = faller.intersect(ground);

assertEquals("The whole width of the faller must be in the intersection.",
faller.width, intersection.width, EPSILON);

intersection = ground.intersect(faller);

assertEquals("The whole width of the faller must be in the intersection.",
faller.width, intersection.width, EPSILON);

Rectangle sideMoved = new Rectangle(0.29f, -3.0f, 2.0f, 4.0f);
Rectangle wall = new Rectangle(2.0f, -9.0f, 2.0f, 16.0f);

intersection = sideMoved.intersect(wall);
assertEquals("",
assertEquals("",
sideMoved.height, intersection.height, EPSILON);

intersection = wall.intersect(sideMoved);
assertEquals("",
assertEquals("",
sideMoved.height, intersection.height, EPSILON);

Rectangle positiveWall = new Rectangle(2.0f, 0.0f, 2.0f, 16.0f);
intersection = sideMoved.intersect(positiveWall);
assertEquals(0.29f, intersection.width, EPSILON);
Expand Down

0 comments on commit 7214e45

Please sign in to comment.