diff --git a/.gitignore b/.gitignore index 0fccf3e..f72b2d3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .project .settings/ .lib/ +target diff --git a/interfacesdk-0.0.5-jar-with-dependencies.jar b/interfacesdk-0.0.5-jar-with-dependencies.jar deleted file mode 100644 index a8312e9..0000000 Binary files a/interfacesdk-0.0.5-jar-with-dependencies.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index 5a05d2a..da7a4b7 100644 --- a/pom.xml +++ b/pom.xml @@ -31,18 +31,26 @@ junit 3.8.1 test - - - processing - core - 1.5.1 - compile - - - org.OpenNI - OpenNI - 1.5.4.0 - compile - - + + + edu.mines.acmX.exhibit + interfacesdk + 0.1.1 + compile + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.5 + 1.5 + + + + diff --git a/src/main/java/edu/mines/aashah/modules/SimpleModule/SimpleModule.java b/src/main/java/edu/mines/aashah/modules/SimpleModule/SimpleModule.java index 314523b..c586213 100644 --- a/src/main/java/edu/mines/aashah/modules/SimpleModule/SimpleModule.java +++ b/src/main/java/edu/mines/aashah/modules/SimpleModule/SimpleModule.java @@ -6,20 +6,20 @@ import java.util.Map; import java.util.Set; -import processing.core.PApplet; import processing.core.PConstants; import processing.core.PImage; -import edu.mines.acmX.exhibit.input_services.events.HandReceiver; import edu.mines.acmX.exhibit.input_services.hardware.BadFunctionalityRequestException; -import edu.mines.acmX.exhibit.input_services.hardware.DeviceConnectionException; import edu.mines.acmX.exhibit.input_services.hardware.HardwareManager; import edu.mines.acmX.exhibit.input_services.hardware.HardwareManagerManifestException; +import edu.mines.acmX.exhibit.input_services.hardware.UnknownDriverRequest; import edu.mines.acmX.exhibit.input_services.hardware.devicedata.HandTrackerInterface; import edu.mines.acmX.exhibit.input_services.hardware.devicedata.RGBImageInterface; +import edu.mines.acmX.exhibit.input_services.hardware.drivers.InvalidConfigurationFileException; import edu.mines.acmX.exhibit.module_management.modules.ProcessingModule; import edu.mines.acmX.exhibit.stdlib.graphics.Coordinate3D; import edu.mines.acmX.exhibit.stdlib.graphics.HandPosition; import edu.mines.acmX.exhibit.stdlib.input_processing.imaging.RGBImageUtilities; +import edu.mines.acmX.exhibit.stdlib.input_processing.receivers.HandReceiver; /** * A simple module example to demonstrate communicating with the @@ -59,11 +59,7 @@ public void setup() { } catch (HardwareManagerManifestException e) { System.out.println("Error in the HardwareManager manifest file."); e.printStackTrace(); - } catch (DeviceConnectionException e) { - System.out.println( "No devices are currently connected to " + - "retrieve data from."); - e.printStackTrace(); - } + } /* * To actually retrieve the driver, such that we can receive @@ -80,6 +76,12 @@ public void setup() { } catch (BadFunctionalityRequestException e) { System.out.println("Functionality unknown (may not be supported)"); e.printStackTrace(); + } catch (UnknownDriverRequest e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (InvalidConfigurationFileException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } /* @@ -183,11 +185,11 @@ public MyHandReceiver() { } public void handCreated(HandPosition handPos) { - handPositions.put(handPos.id, handPos.position); + handPositions.put(handPos.getId(), handPos.getPosition()); } public void handUpdated(HandPosition handPos) { - handPositions.put(handPos.id, handPos.position); + handPositions.put(handPos.getId(), handPos.getPosition()); } public void handDestroyed(int id) { diff --git a/src/main/resources/images/icon.jpg b/src/main/resources/images/icon.jpg new file mode 100644 index 0000000..f76b54b Binary files /dev/null and b/src/main/resources/images/icon.jpg differ diff --git a/src/main/resources/manifest.xml b/src/main/resources/manifest.xml new file mode 100644 index 0000000..7429c5c --- /dev/null +++ b/src/main/resources/manifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + +