Extended Wii Motion Plus Support: There now exists a OrientationEvent to obtain the Wiimotes relative orientation to the starting point. During error aggregation it's getting unprecise and needs continuous resets. The demo-gui now has a panel to orientate a 3D cube. If no WM+ is attached, the panel is there, too. This would be addressed if the Wii Motion Plus detection works well and if I've integrated support for other extensions, like Nunchuck (I finally got one for testing!). Feel free to donate me some money, that I can get some more extensions integrated to become wiigee the ultimate Wii library with integrated gesture recognition for Java. There also is an improvement for the Hidden Markov Model in the works. Thanks Marc for providing this helpful information! :)

git-svn-id: svn://svn.code.sf.net/p/wiigee/code/trunk@94 c7eff9ee-dd40-0410-8832-91a4d88773cf

src/org/wiigee/control/Wiigee.java

@@ -3,7 +3,7 @@
  * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  *
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *
@@ -32,8 +32,8 @@ import org.wiigee.util.Log;
  */
 public class Wiigee {
 
-    protected static String version = "1.5 alpha";
-    protected static String releasedate = "20090617";
+    protected static String version = "1.5.1 alpha";
+    protected static String releasedate = "20090619";
 
     protected Wiigee() {
         Log.write("This is wiigee version "+version+" ("+releasedate+")");

src/org/wiigee/device/Device.java

@@ -3,7 +3,7 @@
  * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *
@@ -52,10 +52,12 @@ public class Device {
     protected Vector<ButtonListener> buttonlistener = new Vector<ButtonListener>();
 	protected ProcessingUnit processingunit = new TriggeredProcessingUnit();
 	
-	public Device() {
-		this.addFilter(new IdleStateFilter());
-		this.addFilter(new MotionDetectFilter(this));
-		this.addFilter(new DirectionalEquivalenceFilter());
+	public Device(boolean autofiltering) {
+        if(autofiltering) {
+            this.addAccelerationFilter(new IdleStateFilter());
+            this.addAccelerationFilter(new MotionDetectFilter(this));
+            this.addAccelerationFilter(new DirectionalEquivalenceFilter());
+        }
 		this.addAccelerationListener(this.processingunit);
         this.addButtonListener(this.processingunit);
 	}
@@ -64,7 +66,7 @@ public class Device {
 	 * Adds a Filter for processing the acceleration values.
 	 * @param filter The Filter instance.
 	 */
-	public void addFilter(Filter filter) {
+	public void addAccelerationFilter(Filter filter) {
 		this.accfilters.add(filter);
 	}
 	
@@ -72,7 +74,7 @@ public class Device {
 	 * Resets all the accfilters, which are resetable.
 	 * Sometimes they have to be resettet if a new gesture starts.
 	 */
-	public void resetFilters() {
+	public void resetAccelerationFilters() {
 		for(int i=0; i<this.accfilters.size(); i++) {
 			this.accfilters.elementAt(i).reset();
 		}
@@ -82,12 +84,20 @@ public class Device {
 	 * Adds an AccelerationListener to the Device. Everytime an acceleration
 	 * on the Device is performed the AccelerationListener would receive
 	 * an event of this action.
-	 * 
+	 *
+     * @param listener The Listener.
 	 */
 	public void addAccelerationListener(AccelerationListener listener) {
 		this.accelerationlistener.add(listener);
 	}
 
+    /**
+     * Adds a ButtonListener to the Device. Everytime a Button has been
+     * pressed or released, the Listener would be notified about this via
+     * the corresponding Events.
+     *
+     * @param listener The Listener.
+     */
     public void addButtonListener(ButtonListener listener) {
         this.buttonlistener.add(listener);
     }
@@ -96,6 +106,8 @@ public class Device {
 	 * Adds a GestureListener to the Device. Everytime a gesture
 	 * is performed the GestureListener would receive an event of
 	 * this gesture.
+     *
+     * @param listener The Listener.
 	 */
 	public void addGestureListener(GestureListener listener) {
 		this.processingunit.addGestureListener(listener);
@@ -187,7 +199,7 @@ public class Device {
 		}
 		
 		if(w.isRecognitionInitEvent() || w.isTrainInitEvent()) {
-			this.resetFilters();
+			this.resetAccelerationFilters();
 		}
 	}
 	

src/org/wiigee/event/AccelerationEvent.java

@@ -3,7 +3,7 @@
  * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/event/AccelerationListener.java

@@ -3,7 +3,7 @@
  * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/event/ActionStartEvent.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *
@@ -30,18 +30,12 @@ import org.wiigee.device.Device;
 
 public class ActionStartEvent extends EventObject {
 
-	protected Device source;
 	protected boolean trainbutton;
 	protected boolean recognitionbutton;
 	protected boolean closegesturebutton;
 	
 	public ActionStartEvent(Device source) {
 		super(source);
-		this.source=source;
-	}
-	
-	public Device getSource() {
-		return this.source;
 	}
 	
 	/**

src/org/wiigee/event/ActionStopEvent.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *
@@ -29,15 +29,8 @@ import org.wiigee.device.Device;
 
 public class ActionStopEvent extends EventObject {
 	
-	protected Device source;
-	
 	public ActionStopEvent(Device source) {
 		super(source);
-		this.source=source;
-	}
-	
-	public Device getSource() {
-		return this.source;
 	}
 
 }

src/org/wiigee/event/ButtonListener.java

@@ -3,7 +3,7 @@
  * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  *
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/event/ButtonPressedEvent.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/event/ButtonReleasedEvent.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *
@@ -24,8 +24,6 @@
 
 package org.wiigee.event;
 
-import java.util.EventObject;
-
 import org.wiigee.device.*;
 
 /**

src/org/wiigee/event/GestureEvent.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/event/GestureListener.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *
@@ -44,14 +44,4 @@ public interface GestureListener extends EventListener {
 	 */
 	public abstract void gestureReceived(GestureEvent event);
 	
-	/**
-	 * This method would be called if the gesture-recognizing system
-	 * switched the state from recognition to training or otherwise.
-	 * 
-	 * @param event The StateEvent containing information about the
-	 * state-change.
-	 */
-	public abstract void stateReceived(StateEvent event);
-	
-	
 }

src/org/wiigee/event/MotionStartEvent.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/event/MotionStopEvent.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/event/StateEvent.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/event/StateListener.java

@@ -0,0 +1,49 @@
+/*
+ * wiigee - accelerometerbased gesture recognition
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
+ * 
+ * Developed at University of Oldenburg
+ * Contact: wiigee@benjaminpoppinga.de
+ *
+ * This file is part of wiigee.
+ *
+ * wiigee 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 2 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package org.wiigee.event;
+
+import java.util.EventListener;
+
+/**
+ * 
+ * This is the StateListener interface which has to be implemented
+ * by any application which should receive recognized statechanges.
+ * 
+ * @author Benjamin 'BePo' Poppinga
+ * 
+ */
+public interface StateListener extends EventListener {
+	
+	/**
+	 * This method would be called if the gesture-recognizing system
+	 * switched the state from recognition to training or otherwise.
+	 * 
+	 * @param event The StateEvent containing information about the
+	 * state-change.
+	 */
+	public abstract void stateReceived(StateEvent event);
+	
+	
+}

src/org/wiigee/filter/DirectionalEquivalenceFilter.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/filter/Filter.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/filter/HighPassFilter.java

@@ -3,7 +3,7 @@
  * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  *
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/filter/IdleStateFilter.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/filter/LowPassFilter.java

@@ -3,7 +3,7 @@
  * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  *
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/filter/MotionDetectFilter.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/logic/Classifier.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/logic/Gesture.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/logic/GestureModel.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/logic/HMM.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/logic/PreciseHMM.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/logic/ProcessingUnit.java

@@ -12,6 +12,7 @@ import org.wiigee.event.GestureListener;
 import org.wiigee.event.MotionStartEvent;
 import org.wiigee.event.MotionStopEvent;
 import org.wiigee.event.StateEvent;
+import org.wiigee.event.StateListener;
 import org.wiigee.util.Log;
 
 public abstract class ProcessingUnit implements AccelerationListener, ButtonListener {
@@ -20,7 +21,8 @@ public abstract class ProcessingUnit implements AccelerationListener, ButtonList
 	protected Classifier classifier;
 	
 	// Listener
-	private Vector<GestureListener> listen = new Vector<GestureListener>();
+	private Vector<GestureListener> gesturelistener = new Vector<GestureListener>();
+    private Vector<StateListener> statelistener = new Vector<StateListener>();
 	
 	
 	public ProcessingUnit() {
@@ -28,26 +30,35 @@ public abstract class ProcessingUnit implements AccelerationListener, ButtonList
 	}
 	
 	/** 
-	 * Add an GestureListener to receive Gesture/StateEvents.
+	 * Add an GestureListener to receive GestureEvents.
 	 * 
 	 * @param g
-	 * 	Class which implements GestureListener interface
+	 * 	Class which implements GestureListener interface.
 	 */
 	public void addGestureListener(GestureListener g) {
-		this.listen.add(g);
+		this.gesturelistener.add(g);
 	}
+
+    /**
+     * Adds a StateListener to receive StateEvents.
+     *
+     * @param s Class which implements the StateListener interface.
+     */
+    public void addStateListener(StateListener s) {
+        this.statelistener.add(s);
+    }
 	
 	protected void fireGestureEvent(int id, double probability) {
 		GestureEvent w = new GestureEvent(this, id, probability);
-		for(int i=0; i<this.listen.size(); i++) {
-			this.listen.get(i).gestureReceived(w);
+		for(int i=0; i<this.gesturelistener.size(); i++) {
+			this.gesturelistener.get(i).gestureReceived(w);
 		}
 	}
 	
 	protected void fireStateEvent(int state) {
 		StateEvent w = new StateEvent(this, state);
-		for(int i=0; i<this.listen.size(); i++) {
-			this.listen.get(i).stateReceived(w);
+		for(int i=0; i<this.statelistener.size(); i++) {
+			this.statelistener.get(i).stateReceived(w);
 		}
 	}
 	

src/org/wiigee/logic/Quantizer.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/logic/TriggeredProcessingUnit.java

@@ -3,7 +3,7 @@
  * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *

src/org/wiigee/util/FileIO.java

@@ -1,9 +1,9 @@
 /*
  * wiigee - accelerometerbased gesture recognition
- * Copyright (C) 2007, 2008 Benjamin Poppinga
+ * Copyright (C) 2007, 2008, 2009 Benjamin Poppinga
  * 
  * Developed at University of Oldenburg
- * Contact: benjamin.poppinga@informatik.uni-oldenburg.de
+ * Contact: wiigee@benjaminpoppinga.de
  *
  * This file is part of wiigee.
  *