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

new stuff for 0.12. Need to be tested !!!!

Browse Source 
git-svn-id: http://wiiusej.googlecode.com/svn/trunk@129 ae48ae66-6a45-0410-b38e-211266189506
This commit is contained in:
guilhem.duche
2008-05-05 22:52:07 +00:00
parent 784707cd3b
commit eaeed82fda
3 changed files with 89 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
WiiUseJC/wiiusej_WiiUseApi.c
View File

@@ -15,7 +15,7 @@
* along with WiiuseJ. If not, see <http://www.gnu.org/licenses/>. * along with WiiuseJ. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef WIN32 #ifndef WIN32
#include <unistd.h> #include <unistd.h>
#else #else
#endif #endif
@@ -31,6 +31,15 @@
#define WIIMOTE_STATE_CONNECTED 0x04 #define WIIMOTE_STATE_CONNECTED 0x04
#define WIIMOTE_IS_SET(wm, s) ((wm->state & (s)) == (s)) #define WIIMOTE_IS_SET(wm, s) ((wm->state & (s)) == (s))
#define WIIMOTE_IS_FLAG_SET(wm, s) ((wm->flags & (s)) == (s)) #define WIIMOTE_IS_FLAG_SET(wm, s) ((wm->flags & (s)) == (s))
#define WIIUSE_GET_IR_SENSITIVITY_CORRECTED(wm, lvl) \
do { \
if ((wm->state & 0x0200) == 0x0200) *lvl = 1; \
else if ((wm->state & 0x0400) == 0x0400) *lvl = 2; \
else if ((wm->state & 0x0800) == 0x0800) *lvl = 3; \
else if ((wm->state & 0x1000) == 0x1000) *lvl = 4; \
else if ((wm->state & 0x2000) == 0x2000) *lvl = 5; \
else *lvl = 0; \
} while (0)
/********************* VARIABLES DECLARATIONS *****************************/ /********************* VARIABLES DECLARATIONS *****************************/
@@ -41,8 +50,7 @@
* will get one of these ids. * will get one of these ids.
*/ */
static wiimote** wiimotes; static wiimote** wiimotes;
static int nbMaxWiimotes;
static int nbMaxWiiMotes=0;
/****************** GENERAL FUNCTIONS DEFINITIONS *************************/ /****************** GENERAL FUNCTIONS DEFINITIONS *************************/
@@ -52,7 +60,7 @@ static int nbMaxWiiMotes=0;
* @return The number of wiimotes that successfully connected. * @return The number of wiimotes that successfully connected.
*/ */
JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_connect JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_connect
(JNIEnv *env, jobject obj, jint nbWiimotes){ (JNIEnv *env, jobject obj, jint nbWiimotes) {
return wiiuse_connect(wiimotes, nbWiimotes); return wiiuse_connect(wiimotes, nbWiimotes);
} }
@@ -63,7 +71,7 @@ JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_connect
* @return The number of wiimotes found. * @return The number of wiimotes found.
*/ */
JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_find JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_find
(JNIEnv *env, jobject obj, jint nbMaxWiimotes, jint timeout){ (JNIEnv *env, jobject obj, jint nbMaxWiimotes, jint timeout) {
return wiiuse_find(wiimotes, nbMaxWiimotes, timeout); return wiiuse_find(wiimotes, nbMaxWiimotes, timeout);
} }
@@ -72,79 +80,9 @@ JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_find
* @param nbPossibleWiimotes size of the array. * @param nbPossibleWiimotes size of the array.
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_init JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_init
(JNIEnv *env, jobject obj, jint nbPossibleWiimotes){ (JNIEnv *env, jobject obj, jint nbPossibleWiimotes) {
wiimotes = wiiuse_init(nbPossibleWiimotes); wiimotes = wiiuse_init(nbPossibleWiimotes);
} nbMaxWiimotes = nbPossibleWiimotes;
/**
* Try to connect to 2 wiimotes.
* Make them rumble to show they are connected.
* @param nbConnects number of connections maximum.
* @param rumble
* make the connected wiimotes rumble.
* @return 0 if there is an error otherwise it returns
* the number of wiimotes connected..
*/
JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_doConnections
(JNIEnv *env, jobject obj, jint nbConnects, jboolean rumble) {
/* variables declarations */
int found, connected, i;
short leds;
nbMaxWiiMotes = nbConnects;
/* initialize wiimotes array with the maximum number of wiimotes */
wiimotes = wiiuse_init(nbMaxWiiMotes);
/*
* Find wiimote devices
* Now we need to find some wiimotes.
* Give the function the wiimote array we created, and tell it there
* are 2 wiimotes we are interested in.
* Set the timeout to be 5 seconds.
* This will return the number of actual wiimotes that are in discovery mode.
*/
found = wiiuse_find(wiimotes, nbMaxWiiMotes, 5);
if (!found) return 0;
/*
* Connect to the wiimotes
* Now that we found some wiimotes, connect to them.
* Give the function the wiimote array and the number of wiimote devices we found.
* This will return the number of established connections to the found wiimotes.
*/
connected = wiiuse_connect(wiimotes, nbMaxWiiMotes);
if (!connected) return 0;
//no problems during connection show that wiimotes are connected
/*
* Now set the LEDs and rumble for a second so it's easy
* to tell which wiimotes are connected (just like the wii does).
*/
for (i=0;i<nbMaxWiiMotes;i++) {
leds = 0;
if (i%4==0) leds |= WIIMOTE_LED_1;
else if (i%4==1) leds |= WIIMOTE_LED_2;
else if (i%4==2) leds |= WIIMOTE_LED_3;
else if (i%4==3) leds |= WIIMOTE_LED_4;
wiiuse_set_leds(wiimotes[i], leds);
if (rumble) wiiuse_rumble(wiimotes[i], 1);
}
if (rumble) {
#ifndef WIN32
usleep(200000);
#else
Sleep(200);
#endif
for (i=0;i<nbMaxWiiMotes;i++) {
wiiuse_rumble(wiimotes[i], 0);
}
}
//no pb connecting leave
return connected;
} }
/** /**
@@ -154,16 +92,27 @@ JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_doConnections
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_closeConnection JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_closeConnection
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_disconnect(wiimotes[id-1]); wiiuse_disconnect(wiimotes[id]);
}
/**
* Get unique id of a wiimote in the wiimotes array.
* Please make sure you call an existing index with a
* wiimote initialized at this index,
* other wise you'll get a wrong value.
* @param index index of the wiimote in the wiimotes array.
*/
JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_getUnId
(JNIEnv *env, jobject obj, jint index) {
return wiimotes[index]->unid;
} }
/** /**
* Shutdown api. * Shutdown api.
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_shutdownApi JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_cleanUp
(JNIEnv *env, jobject obj) { (JNIEnv *env, jobject obj) {
//wiiuse_shutdown(); wiiuse_cleanup(wiimotes, nbMaxWiimotes);
wiiuse_cleanup(wiimotes, nbMaxWiiMotes);
} }
/** /**
@@ -172,7 +121,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_shutdownApi
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateRumble JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateRumble
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_rumble(wiimotes[id-1], 1); wiiuse_rumble(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), 1);
} }
/** /**
@@ -181,7 +130,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateRumble
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateRumble JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateRumble
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_rumble(wiimotes[id-1], 0); wiiuse_rumble(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), 0);
} }
/** /**
@@ -190,7 +139,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateRumble
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateIRTracking JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateIRTracking
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_set_ir(wiimotes[id-1], 1); wiiuse_set_ir(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), 1);
} }
/** /**
@@ -199,7 +148,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateIRTracking
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateIRTracking JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateIRTracking
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_set_ir(wiimotes[id-1], 0); wiiuse_set_ir(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), 0);
} }
/** /**
@@ -208,7 +157,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateIRTracking
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateMotionSensing JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateMotionSensing
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_motion_sensing(wiimotes[id-1], 1); wiiuse_motion_sensing(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), 1);
} }
/** /**
@@ -217,7 +166,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateMotionSensing
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateMotionSensing JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateMotionSensing
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_motion_sensing(wiimotes[id-1], 0); wiiuse_motion_sensing(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), 0);
} }
/** /**
@@ -237,7 +186,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setLeds
if (led3) leds |= WIIMOTE_LED_3; if (led3) leds |= WIIMOTE_LED_3;
if (led4) leds |= WIIMOTE_LED_4; if (led4) leds |= WIIMOTE_LED_4;
wiiuse_set_leds(wiimotes[id-1], leds); wiiuse_set_leds(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), leds);
} }
/** /**
@@ -247,7 +196,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setLeds
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setOrientThreshold JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setOrientThreshold
(JNIEnv *env, jobject obj, jint id, jfloat thresh) { (JNIEnv *env, jobject obj, jint id, jfloat thresh) {
wiiuse_set_orient_threshold(wiimotes[id-1], thresh); wiiuse_set_orient_threshold(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), thresh);
} }
/** /**
@@ -257,7 +206,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setOrientThreshold
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setAccelThreshold JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setAccelThreshold
(JNIEnv *env, jobject obj, jint id, jint val) { (JNIEnv *env, jobject obj, jint id, jint val) {
wiiuse_set_accel_threshold(wiimotes[id-1], val); wiiuse_set_accel_threshold(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), val);
} }
/** /**
@@ -267,7 +216,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setAccelThreshold
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setAlphaSmoothing JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setAlphaSmoothing
(JNIEnv *env, jobject obj, jint id, jfloat val) { (JNIEnv *env, jobject obj, jint id, jfloat val) {
wiiuse_set_smooth_alpha(wiimotes[id-1], val); wiiuse_set_smooth_alpha(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), val);
} }
/** /**
@@ -276,7 +225,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setAlphaSmoothing
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_reSync JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_reSync
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_resync(wiimotes[id-1]); wiiuse_resync(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id));
} }
/** /**
@@ -286,7 +235,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_reSync
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateSmoothing JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateSmoothing
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_set_flags(wiimotes[id-1], WIIUSE_SMOOTHING, 0); wiiuse_set_flags(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), WIIUSE_SMOOTHING, 0);
} }
/** /**
@@ -295,7 +244,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateSmoothing
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateSmoothing JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateSmoothing
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_set_flags(wiimotes[id-1], 0, WIIUSE_SMOOTHING); wiiuse_set_flags(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), 0, WIIUSE_SMOOTHING);
} }
/** /**
@@ -305,7 +254,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateSmoothing
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateContinuous JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateContinuous
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_set_flags(wiimotes[id-1], WIIUSE_CONTINUOUS, 0); wiiuse_set_flags(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), WIIUSE_CONTINUOUS, 0);
} }
/** /**
@@ -315,7 +264,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateContinuous
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateContinuous JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateContinuous
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_set_flags(wiimotes[id-1], 0, WIIUSE_CONTINUOUS); wiiuse_set_flags(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), 0, WIIUSE_CONTINUOUS);
} }
/** /**
@@ -324,7 +273,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateContinuous
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setScreenRatio43 JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setScreenRatio43
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_set_aspect_ratio(wiimotes[id-1], WIIUSE_ASPECT_4_3); wiiuse_set_aspect_ratio(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), WIIUSE_ASPECT_4_3);
} }
/** /**
@@ -333,7 +282,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setScreenRatio43
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setScreenRatio169 JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setScreenRatio169
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_set_aspect_ratio(wiimotes[id-1], WIIUSE_ASPECT_4_3); wiiuse_set_aspect_ratio(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), WIIUSE_ASPECT_4_3);
} }
/** /**
@@ -342,7 +291,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setScreenRatio169
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSensorBarAboveScreen JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSensorBarAboveScreen
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_set_ir_position(wiimotes[id-1], WIIUSE_IR_ABOVE); wiiuse_set_ir_position(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), WIIUSE_IR_ABOVE);
} }
/** /**
@@ -351,7 +300,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSensorBarAboveScreen
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSensorBarBelowScreen JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSensorBarBelowScreen
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_set_ir_position(wiimotes[id-1], WIIUSE_IR_BELOW); wiiuse_set_ir_position(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), WIIUSE_IR_BELOW);
} }
/** /**
@@ -364,7 +313,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSensorBarBelowScreen
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setVirtualScreenResolution JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setVirtualScreenResolution
(JNIEnv *env, jobject obj, jint id, jint x, jint y) { (JNIEnv *env, jobject obj, jint id, jint x, jint y) {
wiiuse_set_ir_vres(wiimotes[id-1], x, y); wiiuse_set_ir_vres(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), x, y);
} }
/** /**
@@ -374,7 +323,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setVirtualScreenResolution
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_getStatus JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_getStatus
(JNIEnv *env, jobject obj, jint id) { (JNIEnv *env, jobject obj, jint id) {
wiiuse_status(wiimotes[id-1]); wiiuse_status(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id));
} }
/** /**
@@ -382,8 +331,6 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_getStatus
* *
* @param id * @param id
* the id of the wiimote concerned. * the id of the wiimote concerned.
* @param nbWiimote
* Number of wiimotes connected.
* @param normalTimeout * @param normalTimeout
* The timeout in milliseconds for a normal read. * The timeout in milliseconds for a normal read.
* @param expansionTimeout * @param expansionTimeout
@@ -391,8 +338,8 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_getStatus
* handshake. * handshake.
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setTimeout JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setTimeout
(JNIEnv *env, jobject obj, jint id, jint nbWiimote, jshort normalTimeout, jshort expansionTimeout){ (JNIEnv *env, jobject obj, jint id, jshort normalTimeout, jshort expansionTimeout) {
wiiuse_set_timeout(wiimotes, nbWiimote, normalTimeout, expansionTimeout); wiiuse_set_timeout(wiimotes, nbMaxWiimotes, normalTimeout, expansionTimeout);
} }
/** /**
@@ -406,11 +353,10 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setTimeout
* level will be set to 5. * level will be set to 5.
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setIrSensitivity JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setIrSensitivity
(JNIEnv *env, jobject obj, jint id, jint level){ (JNIEnv *env, jobject obj, jint id, jint level) {
wiiuse_set_ir_sensitivity(wiimotes[id-1], level); wiiuse_set_ir_sensitivity(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), level);
} }
/** /**
* Get status and values from the wiimotes and send it through callbacks. * Get status and values from the wiimotes and send it through callbacks.
* @param wim the wiimote object to fill with the datas. * @param wim the wiimote object to fill with the datas.
@@ -424,12 +370,12 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll
jclass cls = (*env)->GetObjectClass(env, gath); jclass cls = (*env)->GetObjectClass(env, gath);
jmethodID mid; jmethodID mid;
if (wiiuse_poll(wiimotes, nbMaxWiiMotes)) { if (wiiuse_poll(wiimotes, nbMaxWiimotes)) {
/* /*
* This happens if something happened on any wiimote. * This happens if something happened on any wiimote.
* So go through each one and check if anything happened. * So go through each one and check if anything happened.
*/ */
for (i=0; i < nbMaxWiiMotes; ++i) { for (i=0; i < nbMaxWiimotes; ++i) {
switch (wiimotes[i]->event) { switch (wiimotes[i]->event) {
case WIIUSE_EVENT: case WIIUSE_EVENT:
/* a generic event occured */ /* a generic event occured */
@@ -446,10 +392,11 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll
* Also make sure that we see at least 1 dot. * Also make sure that we see at least 1 dot.
*/ */
if (WIIUSE_USING_IR(wiimotes[i])) { if (WIIUSE_USING_IR(wiimotes[i])) {
int a = 0; int a;
WIIUSE_GET_IR_SENSITIVITY_CORRECTED(wiimotes[i], &a);
mid = (*env)->GetMethodID(env, cls, "prepareIRevent", mid = (*env)->GetMethodID(env, cls, "prepareIRevent",
"(IIIIIIIIISS)V"); "(IIIIIIIIISSSF)V");
if (mid == 0) { if (mid == 0) {
return; return;
} }
@@ -458,7 +405,8 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll
wiimotes[i]->ir.ax, wiimotes[i]->ir.ay, wiimotes[i]->ir.ax, wiimotes[i]->ir.ay,
wiimotes[i]->ir.vres[0], wiimotes[i]->ir.vres[1], wiimotes[i]->ir.vres[0], wiimotes[i]->ir.vres[1],
wiimotes[i]->ir.offset[0], wiimotes[i]->ir.offset[1], wiimotes[i]->ir.offset[0], wiimotes[i]->ir.offset[1],
wiimotes[i]->ir.pos, wiimotes[i]->ir.aspect); wiimotes[i]->ir.pos, wiimotes[i]->ir.aspect,
a , wiimotes[i]->ir.distance);
mid = (*env)->GetMethodID(env, cls, "addIRPointToPreparedWiiMoteEvent", mid = (*env)->GetMethodID(env, cls, "addIRPointToPreparedWiiMoteEvent",
"(IISSS)V"); "(IISSS)V");
@@ -466,7 +414,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll
return; return;
} }
/* go through each of the 4 possible IR sources */ /* go through each of the 4 possible IR sources */
for (; a < 4; a++) { for (a=0; a < 4; a++) {
/* check if the source is visible */ /* check if the source is visible */
if (wiimotes[i]->ir.dot[a].visible) { if (wiimotes[i]->ir.dot[a].visible) {
(*env)->CallVoidMethod(env, gath, mid, (*env)->CallVoidMethod(env, gath, mid,
@@ -481,7 +429,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll
if (WIIUSE_USING_ACC(wiimotes[i])) { if (WIIUSE_USING_ACC(wiimotes[i])) {
/* set orientation and gravity force */ /* set orientation and gravity force */
mid = (*env)->GetMethodID(env, cls, mid = (*env)->GetMethodID(env, cls,
"addMotionSensingValues", "(FIZFFFFFFFSSS)V"); "addMotionSensingValues", "(FIZFFFFFFFFFSSS)V");
if (mid == 0) { if (mid == 0) {
return; return;
} }
@@ -532,6 +480,15 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll
(*env)->CallVoidMethod(env, gath, mid, wiimotes[i]->unid); (*env)->CallVoidMethod(env, gath, mid, wiimotes[i]->unid);
break; break;
case WIIUSE_UNEXPECTED_DISCONNECT:
/* the wiimote disconnected */
mid = (*env)->GetMethodID(env, cls, "addDisconnectionEvent", "(I)V");
if (mid == 0) {
return;
}
(*env)->CallVoidMethod(env, gath, mid, wiimotes[i]->unid);
break;
default: default:
break; break;
} }

4
WiiUseJC/wiiusej_WiiUseApi.def
View File

@@ -2,9 +2,9 @@ EXPORTS
Java_wiiusej_WiiUseApi_connect Java_wiiusej_WiiUseApi_connect
Java_wiiusej_WiiUseApi_find Java_wiiusej_WiiUseApi_find
Java_wiiusej_WiiUseApi_init Java_wiiusej_WiiUseApi_init
Java_wiiusej_WiiUseApi_doConnections
Java_wiiusej_WiiUseApi_closeConnection Java_wiiusej_WiiUseApi_closeConnection
Java_wiiusej_WiiUseApi_shutdownApi Java_wiiusej_WiiUseApi_getUnId
Java_wiiusej_WiiUseApi_cleanUp
Java_wiiusej_WiiUseApi_activateRumble Java_wiiusej_WiiUseApi_activateRumble
Java_wiiusej_WiiUseApi_deactivateRumble Java_wiiusej_WiiUseApi_deactivateRumble
Java_wiiusej_WiiUseApi_activateIRTracking Java_wiiusej_WiiUseApi_activateIRTracking

22
WiiUseJC/wiiusej_WiiUseApi.h
View File

@@ -31,14 +31,6 @@ JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_find
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_init JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_init
(JNIEnv *, jobject, jint); (JNIEnv *, jobject, jint);
/*
* Class: wiiusej_WiiUseApi
* Method: doConnections
* Signature: (IZ)I
*/
JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_doConnections
(JNIEnv *, jobject, jint, jboolean);
/* /*
* Class: wiiusej_WiiUseApi * Class: wiiusej_WiiUseApi
* Method: closeConnection * Method: closeConnection
@@ -49,10 +41,18 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_closeConnection
/* /*
* Class: wiiusej_WiiUseApi * Class: wiiusej_WiiUseApi
* Method: shutdownApi * Method: getUnId
* Signature: (I)I
*/
JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_getUnId
(JNIEnv *, jobject, jint);
/*
* Class: wiiusej_WiiUseApi
* Method: cleanUp
* Signature: ()V * Signature: ()V
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_shutdownApi JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_cleanUp
(JNIEnv *, jobject); (JNIEnv *, jobject);
/* /*
@@ -229,7 +229,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_getStatus
* Signature: (IISS)V * Signature: (IISS)V
*/ */
JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setTimeout JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setTimeout
(JNIEnv *, jobject, jint, jint, jshort, jshort); (JNIEnv *, jobject, jint, jshort, jshort);
/* /*
* Class: wiiusej_WiiUseApi * Class: wiiusej_WiiUseApi