rik/mimis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gefixt met ApplicationButton

Browse Source
This commit is contained in:
Rik Veenboer
2011-05-11 19:16:17 +00:00
parent bf6af992e3
commit e1188b43cc
10 changed files with 58 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/wiiusej/WiiUseApi.java
View File

@@ -347,6 +347,4 @@ public class WiiUseApi {
* the object where we store all the new events.
*/
native void specialPoll(EventsGatherer gath);
native short[] getCalibration(int id);
}

8
java/src/wiiusej/WiiUseApiManager.java
View File

@@ -662,12 +662,4 @@ public class WiiUseApiManager extends Thread {
protected void finalize() throws Throwable {
shutdown();
}
public Calibration getCalibration(int id) {
short[] data = wiiuse.getCalibration(id);
return new Calibration(
new RawAcceleration(data[0], data[1], data[2]),
new RawAcceleration(data[3], data[4], data[5]));
}
}

14
java/src/wiiusej/values/Calibration.java
View File

@@ -4,14 +4,14 @@ public class Calibration {
protected RawAcceleration zeroAcceleration;
protected RawAcceleration gAcceleration;
protected RawAcceleration differenceAcceleration;
public Calibration(RawAcceleration zeroAcceleration, RawAcceleration gAcceleration) {
this.zeroAcceleration = zeroAcceleration;
this.gAcceleration = gAcceleration;
differenceAcceleration = new RawAcceleration(
(short) (zeroAcceleration.getX() - gAcceleration.getX()),
(short) (zeroAcceleration.getY() - gAcceleration.getY()),
(short) (zeroAcceleration.getZ() - gAcceleration.getZ()));
(short) (gAcceleration.getX() - zeroAcceleration.getX()),
(short) (gAcceleration.getY() - zeroAcceleration.getY()),
(short) (gAcceleration.getZ() - zeroAcceleration.getZ()));
System.out.println(zeroAcceleration);
System.out.println(gAcceleration);
System.out.println(differenceAcceleration);
@@ -29,8 +29,8 @@ public class Calibration {
public Acceleration getAcceleration(RawAcceleration rawAcceleration) {
return new Acceleration(
(rawAcceleration.getX() - zeroAcceleration.getX()),// / (double) gAcceleration.getX(),
(rawAcceleration.getY() - zeroAcceleration.getY()),// / (double) gAcceleration.getY(),
(rawAcceleration.getZ() - zeroAcceleration.getZ()));// / (double) gAcceleration.getZ());
(rawAcceleration.getX() - zeroAcceleration.getX()) / (double) differenceAcceleration.getX(),
(rawAcceleration.getY() - zeroAcceleration.getY()) / (double) differenceAcceleration.getY(),
(rawAcceleration.getZ() - zeroAcceleration.getZ()) / (double) differenceAcceleration.getZ());
}
}