[giimote commit] r198 - Made the build process much easier by including tar, gzip, and subversion in the tools dir...
0 views
Skip to first unread message
codesite...@google.com
May 9, 2009, 10:43:19 PM5/9/09
to gii...@googlegroups.com
Author: leif902
Date: Sat May 9 19:41:31 2009
New Revision: 198
Added:
trunk/Tools/gzip.exe (contents, props changed)
trunk/Tools/svn/
trunk/Tools/svn/intl3_svn.dll (contents, props changed)
trunk/Tools/svn/libapr-1.dll (contents, props changed)
trunk/Tools/svn/libapriconv-1.dll (contents, props changed)
trunk/Tools/svn/libapriconv.dll (contents, props changed)
trunk/Tools/svn/libaprutil-1.dll (contents, props changed)
trunk/Tools/svn/libdb44.dll (contents, props changed)
trunk/Tools/svn/libeay32.dll (contents, props changed)
trunk/Tools/svn/libsvn_client-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_delta-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_diff-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_fs-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_ra-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_repos-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_subr-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_wc-1.dll (contents, props changed)
trunk/Tools/svn/ssleay32.dll (contents, props changed)
trunk/Tools/svn/svn.exe (contents, props changed)
trunk/Tools/tar.exe (contents, props changed)
trunk/WiimoteLib/ (props changed)
trunk/WiimoteLib/WiimoteLib.dll (contents, props changed)
trunk/WiimoteLib/copyright.txt
trunk/WiimoteLib/license.txt
Modified:
trunk/ (props changed)
trunk/GiiMote.ged
trunk/GiiMote/AssemblyInfo.cpp
trunk/GiiMote/GiiMote.h
trunk/GiiMote/GiiMote.vcproj
trunk/GiiMote/Orientation.h
trunk/GiiMote/Wiimote.h
trunk/Help/GiiMote Documentation/ (props changed)
trunk/Help/GiiMote Help/ (props changed)
trunk/MATLAB/ (props changed)
trunk/Tools/buildPrototype.m
wiki/BuildDocumentation.wiki
wiki/GML.wiki
wiki/Gzip.wiki
wiki/Tar.wiki
wiki/TlbExp.wiki
wiki/WiimoteLib.wiki
Log:
Made the build process much easier by including tar, gzip, and subversion
in the tools directory
Put WiimoteLib back
Updated wiki info on build dependencies
BUG: wm_get_moving now properly detects motion
Modified: trunk/GiiMote.ged
==============================================================================
Binary files. No diff available.
Modified: trunk/GiiMote/AssemblyInfo.cpp
==============================================================================
--- trunk/GiiMote/AssemblyInfo.cpp (original)
+++ trunk/GiiMote/AssemblyInfo.cpp Sat May 9 19:41:31 2009
@@ -50,7 +50,11 @@
[assembly:AssemblyVersionAttribute("3.0.*")];
-[assembly:ComVisible(false)];
+[assembly:ComVisible(true)];
+
+[assembly:AssemblyDelaySign(false)]
+
+[assembly:AssemblyKeyFile("")]
[assembly:CLSCompliantAttribute(true)];
Modified: trunk/GiiMote/GiiMote.h
==============================================================================
--- trunk/GiiMote/GiiMote.h (original)
+++ trunk/GiiMote/GiiMote.h Sat May 9 19:41:31 2009
@@ -17,6 +17,9 @@
// along with GiiMote. If not, see <http://www.gnu.org/licenses/>.
#pragma once
+
+using namespace System::Runtime::InteropServices;
+
///////////////////////
// Define Constants //
/////////////////////
@@ -110,277 +113,280 @@
////////////////////////////////////////////
// Wii Remote Functions
////////////////////////////////////////////
- // Connection Functions
- exp double gm_init();
- exp double gm_cleanup();
- exp double wm_find_all();
- exp double wm_found();
- exp double wm_exists();
- exp double wm_num_exists();
- exp double wm_set_using_val(double wm);
- exp double wm_set_using_guid(char* wm);
- exp double wm_connect();
- exp double wm_connect_all();
- exp double wm_connected();
- exp double wm_disconnect();
- exp double wm_disconnect_all();
- exp double wm_set_report_type(double report_type, double continuous);
- exp double wm_get_report_type();
- exp double wm_get_report_continuous();
- exp double wm_get_id_current();
- exp double wm_get_id_guid(char* guid);
- exp char* wm_get_guid_id(double val);
- exp char* wm_get_guid_current();
- exp double wm_get_index_id(double guid);
- exp double wm_get_index_current();
- exp double wm_get_index_guid(char* guid);
- exp char* wm_get_hid_device_path();
-
- // LED Functions
- exp double wm_get_led(double led_num);
- exp double wm_set_leds(double led1, double led2, double led3, double
led4);
- exp double wm_set_leds_int(double val);
-
- // Status
- exp double wm_get_battery();
- exp double wm_get_battery_raw();
- exp double wm_get_status();
- exp double wm_check_extension();
- exp double wm_set_rumble(double rumbling);
- exp double wm_get_rumble();
-
- // Orientation
- exp double wm_get_moving();
- exp double wm_get_roll();
- exp double wm_get_pitch();
- exp double wm_get_yaw();
- exp double wm_get_altitude();
-
- // Reading/Writing
- exp double wm_bin_read_byte(double address);
- exp double wm_bin_write_byte(double address, double value);
+// Connection Functions
+exp double gm_init();
+exp double gm_cleanup();
+exp double wm_find_all();
+exp double wm_found();
+exp double wm_exists();
+exp double wm_num_exists();
+exp double wm_set_using_val(double wm);
+exp double wm_set_using_guid(char* wm);
+exp double wm_connect();
+exp double wm_connect_all();
+exp double wm_connected();
+exp double wm_disconnect();
+exp double wm_disconnect_all();
+exp double wm_set_report_type(double report_type, double continuous);
+exp double wm_get_report_type();
+exp double wm_get_report_continuous();
+exp double wm_get_id_current();
+exp double wm_get_id_guid(char* guid);
+exp char* wm_get_guid_id(double val);
+exp char* wm_get_guid_current();
+exp double wm_get_index_id(double guid);
+exp double wm_get_index_current();
+exp double wm_get_index_guid(char* guid);
+exp char* wm_get_hid_device_path();
+
+// LED Functions
+exp double wm_get_led(double led_num);
+exp double wm_set_leds(double led1, double led2, double led3, double led4);
+exp double wm_set_leds_int(double val);
+
+// Status
+exp double wm_get_battery();
+exp double wm_get_battery_raw();
+exp double wm_get_status();
+exp double wm_check_extension();
+exp double wm_set_rumble(double rumbling);
+exp double wm_get_rumble();
+
+// Orientation
+exp double wm_get_moving();
+exp double wm_get_roll();
+exp double wm_get_pitch();
+exp double wm_get_yaw();
+exp double wm_get_altitude();
+
+// Reading/Writing
+exp double wm_bin_read_byte(double address);
+exp double wm_bin_write_byte(double address, double value);
////////////////////////////////////////////
// Mathematical Functions
////////////////////////////////////////////
- exp double in_domain(double x, double d1, double d2);
- exp double domain_rescale(double val, double minin, double maxin, double
minout, double maxout);
+exp double in_domain(double x, double d1, double d2);
+exp double domain_rescale(double val, double minin, double maxin, double
minout, double maxout);
///////////////////////////////////////////////
// Buttons, Joysticks, Triggers, and Sensors
///////////////////////////////////////////////
- // Misc. Guitar
- exp double wm_guitar_get_type();
+// Misc. Guitar
+exp double wm_guitar_get_type();
- // Buttons
- exp double wm_guitar_check_button(double key_code);
- exp double wm_drum_check_button(double key_code);
- exp double wm_nunchuck_check_button(double key_code);
- exp double wm_classic_check_button(double key_code);
- exp double wm_check_button(double key_code);
-
- // Sensors (Balance Board)
- exp double wm_bb_get_weight_lbs();
- exp double wm_bb_get_weight_kgs();
- exp double wm_bb_get_sensor_raw(double sensor);
- exp double wm_bb_get_sensor_kgs(double sensor);
- exp double wm_bb_get_sensor_lbs(double sensor);
- exp double wm_bb_get_center_of_gravity_x();
- exp double wm_bb_get_center_of_gravity_y();
-
- // Joysticks (General)
- exp double joystick_direction(double xx, double yy);
- exp double joystick_pressure(double xx, double yy);
- exp double wm_set_joystick_dead_zone(double val);
- exp double wm_get_joystick_dead_zone();
-
- // Joysticks (Nunchuck)
- exp double wm_nunchuck_xpos();
- exp double wm_nunchuck_ypos();
- exp double wm_nunchuck_direction();
- exp double wm_nunchuck_pressure();
- exp double wm_nunchuck_rawx();
- exp double wm_nunchuck_rawy();
-
- // Joysticks (Classic Controller)
- exp double wm_classic_xpos(double stick);
- exp double wm_classic_ypos(double stick);
- exp double wm_classic_rawx(double stick);
- exp double wm_classic_rawy(double stick);
- exp double wm_classic_direction(double stick);
- exp double wm_classic_pressure(double stick);
-
- // Joysticks (Guitar)
- exp double wm_guitar_xpos();
- exp double wm_guitar_ypos();
- exp double wm_guitar_direction();
- exp double wm_guitar_pressure();
- exp double wm_guitar_rawx();
- exp double wm_guitar_rawy();
-
- // Joysticks (Drum)
- exp double wm_drum_xpos();
- exp double wm_drum_ypos();
- exp double wm_drum_direction();
- exp double wm_drum_pressure();
- exp double wm_drum_rawx();
- exp double wm_drum_rawy();
-
- // Triggers (General)
- exp double wm_set_trigger_dead_zone(double val);
- exp double wm_get_trigger_dead_zone();
-
- // Triggers (Classic Controller)
- exp double wm_classic_trigger_pressure(double trigger);
- exp double wm_classic_trigger_raw(double trigger);
-
- // Whammy Bar (Guitar)
- exp double wm_guitar_whammybar_pos();
- exp double wm_guitar_whammybar_rawpos();
+// Buttons
+exp double wm_guitar_check_button(double key_code);
+exp double wm_drum_check_button(double key_code);
+exp double wm_nunchuck_check_button(double key_code);
+exp double wm_classic_check_button(double key_code);
+exp double wm_check_button(double key_code);
+
+// Sensors (Balance Board)
+exp double wm_bb_get_weight_lbs();
+exp double wm_bb_get_weight_kgs();
+exp double wm_bb_get_sensor_raw(double sensor);
+exp double wm_bb_get_sensor_kgs(double sensor);
+exp double wm_bb_get_sensor_lbs(double sensor);
+exp double wm_bb_get_center_of_gravity_x();
+exp double wm_bb_get_center_of_gravity_y();
+
+// Joysticks (General)
+exp double joystick_direction(double xx, double yy);
+exp double joystick_pressure(double xx, double yy);
+exp double wm_set_joystick_dead_zone(double val);
+exp double wm_get_joystick_dead_zone();
+
+// Joysticks (Nunchuck)
+exp double wm_nunchuck_xpos();
+exp double wm_nunchuck_ypos();
+exp double wm_nunchuck_direction();
+exp double wm_nunchuck_pressure();
+exp double wm_nunchuck_rawx();
+exp double wm_nunchuck_rawy();
+
+// Joysticks (Classic Controller)
+exp double wm_classic_xpos(double stick);
+exp double wm_classic_ypos(double stick);
+exp double wm_classic_rawx(double stick);
+exp double wm_classic_rawy(double stick);
+exp double wm_classic_direction(double stick);
+exp double wm_classic_pressure(double stick);
+
+// Joysticks (Guitar)
+exp double wm_guitar_xpos();
+exp double wm_guitar_ypos();
+exp double wm_guitar_direction();
+exp double wm_guitar_pressure();
+exp double wm_guitar_rawx();
+exp double wm_guitar_rawy();
+
+// Joysticks (Drum)
+exp double wm_drum_xpos();
+exp double wm_drum_ypos();
+exp double wm_drum_direction();
+exp double wm_drum_pressure();
+exp double wm_drum_rawx();
+exp double wm_drum_rawy();
+
+// Triggers (General)
+exp double wm_set_trigger_dead_zone(double val);
+exp double wm_get_trigger_dead_zone();
+
+// Triggers (Classic Controller)
+exp double wm_classic_trigger_pressure(double trigger);
+exp double wm_classic_trigger_raw(double trigger);
+
+// Whammy Bar (Guitar)
+exp double wm_guitar_whammybar_pos();
+exp double wm_guitar_whammybar_rawpos();
- // Drum
- exp double wm_drum_get_velocity(double key_code);
+// Drum
+exp double wm_drum_get_velocity(double key_code);
////////////////////////////////////////////
// Accelerometers and IR
////////////////////////////////////////////
- // Accelerometer (General)
- exp double wm_calc_accel(float accel, int dz_index);
+// Accelerometer (General)
+exp double wm_calc_accel(float accel, int dz_index);
- // Accelerometer (Wii Remote)
- exp double wm_get_accel_x();
- exp double wm_get_accel_y();
- exp double wm_get_accel_z();
- exp double wm_get_accel_rawx();
- exp double wm_get_accel_rawy();
- exp double wm_get_accel_rawz();
- exp double wm_set_accel_dead_zone_x(double val);
- exp double wm_set_accel_dead_zone_y(double val);
- exp double wm_set_accel_dead_zone_z(double val);
- exp double wm_get_accel_dead_zone_x();
- exp double wm_get_accel_dead_zone_y();
- exp double wm_get_accel_dead_zone_z();
-
- // Accelerometer (Nunchuck)
- exp double wm_nunchuck_get_accel_x();
- exp double wm_nunchuck_get_accel_y();
- exp double wm_nunchuck_get_accel_z();
- exp double wm_nunchuck_get_accel_rawx();
- exp double wm_nunchuck_get_accel_rawy();
- exp double wm_nunchuck_get_accel_rawz();
- exp double wm_nunchuck_set_accel_dead_zone_x(double val);
- exp double wm_nunchuck_set_accel_dead_zone_y(double val);
- exp double wm_nunchuck_set_accel_dead_zone_z(double val);
- exp double wm_nunchuck_get_accel_dead_zone_x();
- exp double wm_nunchuck_get_accel_dead_zone_y();
- exp double wm_nunchuck_get_accel_dead_zone_z();
-
- // Infrared
- exp double wm_ir_set_sensitivity(double sensitivity);
- exp double wm_ir_get_sensitivity();
- exp double wm_ir_found_dot(double dot_number);
- exp double wm_ir_dot_size(double dot_number);
- exp double wm_ir_dot_get_x(double dot_number);
- exp double wm_ir_dot_get_y(double dot_number);
- exp double wm_ir_dot_get_rawx(double dot_number);
- exp double wm_ir_dot_get_rawy(double dot_number);
- exp double wm_ir_dot_get_midx();
- exp double wm_ir_dot_get_midy();
- exp double wm_ir_dot_get_rawmidx();
- exp double wm_ir_dot_get_rawmidy();
- exp double wm_ir_dot_get_delta_x(double dot_number);
- exp double wm_ir_dot_get_delta_y(double dot_number);
- exp double wm_ir_dot_get_delta_rawx(double dot_number);
- exp double wm_ir_dot_get_delta_rawy(double dot_number);
- exp double wm_ir_dot_get_delta_midx();
- exp double wm_ir_dot_get_delta_midy();
- exp double wm_ir_dot_get_delta_rawmidx();
- exp double wm_ir_dot_get_delta_rawmidy();
- exp double wm_ir_display_get_x();
- exp double wm_ir_display_get_y();
+// Accelerometer (Wii Remote)
+exp double wm_get_accel_x();
+exp double wm_get_accel_y();
+exp double wm_get_accel_z();
+exp double wm_get_accel_rawx();
+exp double wm_get_accel_rawy();
+exp double wm_get_accel_rawz();
+exp double wm_set_accel_dead_zone_x(double val);
+exp double wm_set_accel_dead_zone_y(double val);
+exp double wm_set_accel_dead_zone_z(double val);
+exp double wm_get_accel_dead_zone_x();
+exp double wm_get_accel_dead_zone_y();
+exp double wm_get_accel_dead_zone_z();
+
+// Accelerometer (Nunchuck)
+exp double wm_nunchuck_get_accel_x();
+exp double wm_nunchuck_get_accel_y();
+exp double wm_nunchuck_get_accel_z();
+exp double wm_nunchuck_get_accel_rawx();
+exp double wm_nunchuck_get_accel_rawy();
+exp double wm_nunchuck_get_accel_rawz();
+exp double wm_nunchuck_set_accel_dead_zone_x(double val);
+exp double wm_nunchuck_set_accel_dead_zone_y(double val);
+exp double wm_nunchuck_set_accel_dead_zone_z(double val);
+exp double wm_nunchuck_get_accel_dead_zone_x();
+exp double wm_nunchuck_get_accel_dead_zone_y();
+exp double wm_nunchuck_get_accel_dead_zone_z();
+
+// Infrared
+exp double wm_ir_set_sensitivity(double sensitivity);
+exp double wm_ir_get_sensitivity();
+exp double wm_ir_found_dot(double dot_number);
+exp double wm_ir_dot_size(double dot_number);
+exp double wm_ir_dot_get_x(double dot_number);
+exp double wm_ir_dot_get_y(double dot_number);
+exp double wm_ir_dot_get_rawx(double dot_number);
+exp double wm_ir_dot_get_rawy(double dot_number);
+exp double wm_ir_dot_get_midx();
+exp double wm_ir_dot_get_midy();
+exp double wm_ir_dot_get_rawmidx();
+exp double wm_ir_dot_get_rawmidy();
+exp double wm_ir_dot_get_delta_x(double dot_number);
+exp double wm_ir_dot_get_delta_y(double dot_number);
+exp double wm_ir_dot_get_delta_rawx(double dot_number);
+exp double wm_ir_dot_get_delta_rawy(double dot_number);
+exp double wm_ir_dot_get_delta_midx();
+exp double wm_ir_dot_get_delta_midy();
+exp double wm_ir_dot_get_delta_rawmidx();
+exp double wm_ir_dot_get_delta_rawmidy();
+exp double wm_ir_display_get_x();
+exp double wm_ir_display_get_y();
////////////////////////////////////////////
// Calibration
////////////////////////////////////////////
- // Nunchuck Get
- exp double wm_nunchuck_get_calibration_x0();
- exp double wm_nunchuck_get_calibration_xg();
- exp double wm_nunchuck_get_calibration_y0();
- exp double wm_nunchuck_get_calibration_yg();
- exp double wm_nunchuck_get_calibration_z0();
- exp double wm_nunchuck_get_calibration_zg();
- exp double wm_nunchuck_get_calibration_maxx();
- exp double wm_nunchuck_get_calibration_maxy();
- exp double wm_nunchuck_get_calibration_midx();
- exp double wm_nunchuck_get_calibration_midy();
- exp double wm_nunchuck_get_calibration_minx();
- exp double wm_nunchuck_get_calibration_miny();
- // Nunchuck Set
- exp double wm_nunchuck_set_calibration_x0(double val);
- exp double wm_nunchuck_set_calibration_xg(double val);
- exp double wm_nunchuck_set_calibration_y0(double val);
- exp double wm_nunchuck_set_calibration_yg(double val);
- exp double wm_nunchuck_set_calibration_z0(double val);
- exp double wm_nunchuck_set_calibration_zg(double val);
- exp double wm_nunchuck_set_calibration_maxx(double val);
- exp double wm_nunchuck_set_calibration_maxy(double val);
- exp double wm_nunchuck_set_calibration_midx(double val);
- exp double wm_nunchuck_set_calibration_midy(double val);
- exp double wm_nunchuck_set_calibration_minx(double val);
- exp double wm_nunchuck_set_calibration_miny(double val);
- // Classic Controller Get
- exp double wm_classic_get_calibration_maxtrigger(double trigger);
- exp double wm_classic_get_calibration_mintrigger(double trigger);
- exp double wm_classic_get_calibration_maxx(double joystick);
- exp double wm_classic_get_calibration_minx(double joystick);
- exp double wm_classic_get_calibration_midx(double joystick);
- exp double wm_classic_get_calibration_midy(double joystick);
- exp double wm_classic_get_calibration_maxy(double joystick);
- exp double wm_classic_get_calibration_miny(double joystick);
- // Classic Controller Set
- exp double wm_classic_set_calibration_maxtrigger(double trigger, double
val);
- exp double wm_classic_set_calibration_mintrigger(double trigger, double
val);
- exp double wm_classic_set_calibration_maxx(double joystick, double val);
- exp double wm_classic_set_calibration_minx(double joystick, double val);
- exp double wm_classic_set_calibration_midx(double joystick, double val);
- exp double wm_classic_set_calibration_midy(double joystick, double val);
- exp double wm_classic_set_calibration_maxy(double joystick, double val);
- exp double wm_classic_set_calibration_miny(double joystick, double val);
- // Wii Remote Get
- exp double wm_get_calibration_x0();
- exp double wm_get_calibration_xg();
- exp double wm_get_calibration_y0();
- exp double wm_get_calibration_yg();
- exp double wm_get_calibration_z0();
- exp double wm_get_calibration_zg();
- // Wii Remote Set
- exp double wm_set_calibration_x0(double val);
- exp double wm_set_calibration_xg(double val);
- exp double wm_set_calibration_y0(double val);
- exp double wm_set_calibration_yg(double val);
- exp double wm_set_calibration_z0(double val);
- exp double wm_set_calibration_zg(double val);
- // Balance Board Get
- exp double wm_bb_get_calibration_kg0(double sensor);
- exp double wm_bb_get_calibration_kg17(double sensor);
- exp double wm_bb_get_calibration_kg34(double sensor);
- // Balance Board Set
- exp double wm_bb_set_calibration_kg0(double sensor, double val);
- exp double wm_bb_set_calibration_kg17(double sensor, double val);
- exp double wm_bb_set_calibration_kg34(double sensor, double val);
+// Nunchuck Get
+exp double wm_nunchuck_get_calibration_x0();
+exp double wm_nunchuck_get_calibration_xg();
+exp double wm_nunchuck_get_calibration_y0();
+exp double wm_nunchuck_get_calibration_yg();
+exp double wm_nunchuck_get_calibration_z0();
+exp double wm_nunchuck_get_calibration_zg();
+exp double wm_nunchuck_get_calibration_maxx();
+exp double wm_nunchuck_get_calibration_maxy();
+exp double wm_nunchuck_get_calibration_midx();
+exp double wm_nunchuck_get_calibration_midy();
+exp double wm_nunchuck_get_calibration_minx();
+exp double wm_nunchuck_get_calibration_miny();
+// Nunchuck Set
+exp double wm_nunchuck_set_calibration_x0(double val);
+exp double wm_nunchuck_set_calibration_xg(double val);
+exp double wm_nunchuck_set_calibration_y0(double val);
+exp double wm_nunchuck_set_calibration_yg(double val);
+exp double wm_nunchuck_set_calibration_z0(double val);
+exp double wm_nunchuck_set_calibration_zg(double val);
+exp double wm_nunchuck_set_calibration_maxx(double val);
+exp double wm_nunchuck_set_calibration_maxy(double val);
+exp double wm_nunchuck_set_calibration_midx(double val);
+exp double wm_nunchuck_set_calibration_midy(double val);
+exp double wm_nunchuck_set_calibration_minx(double val);
+exp double wm_nunchuck_set_calibration_miny(double val);
+// Classic Controller Get
+exp double wm_classic_get_calibration_maxtrigger(double trigger);
+exp double wm_classic_get_calibration_mintrigger(double trigger);
+exp double wm_classic_get_calibration_maxx(double joystick);
+exp double wm_classic_get_calibration_minx(double joystick);
+exp double wm_classic_get_calibration_midx(double joystick);
+exp double wm_classic_get_calibration_midy(double joystick);
+exp double wm_classic_get_calibration_maxy(double joystick);
+exp double wm_classic_get_calibration_miny(double joystick);
+// Classic Controller Set
+exp double wm_classic_set_calibration_maxtrigger(double trigger, double
val);
+exp double wm_classic_set_calibration_mintrigger(double trigger, double
val);
+exp double wm_classic_set_calibration_maxx(double joystick, double val);
+exp double wm_classic_set_calibration_minx(double joystick, double val);
+exp double wm_classic_set_calibration_midx(double joystick, double val);
+exp double wm_classic_set_calibration_midy(double joystick, double val);
+exp double wm_classic_set_calibration_maxy(double joystick, double val);
+exp double wm_classic_set_calibration_miny(double joystick, double val);
+// Wii Remote Get
+exp double wm_get_calibration_x0();
+exp double wm_get_calibration_xg();
+exp double wm_get_calibration_y0();
+exp double wm_get_calibration_yg();
+exp double wm_get_calibration_z0();
+exp double wm_get_calibration_zg();
+// Wii Remote Set
+exp double wm_set_calibration_x0(double val);
+exp double wm_set_calibration_xg(double val);
+exp double wm_set_calibration_y0(double val);
+exp double wm_set_calibration_yg(double val);
+exp double wm_set_calibration_z0(double val);
+exp double wm_set_calibration_zg(double val);
+// Balance Board Get
+exp double wm_bb_get_calibration_kg0(double sensor);
+exp double wm_bb_get_calibration_kg17(double sensor);
+exp double wm_bb_get_calibration_kg34(double sensor);
+// Balance Board Set
+exp double wm_bb_set_calibration_kg0(double sensor, double val);
+exp double wm_bb_set_calibration_kg17(double sensor, double val);
+exp double wm_bb_set_calibration_kg34(double sensor, double val);
////////////////////////////////////////////
// Mii Functions
////////////////////////////////////////////
- exp double wm_mii_data_dump(char* fName, double miiBlock, double
miiNumber);
- exp double wm_mii_data_inject(char* fName,double miiBlock, double
miiNumber);
- exp double wm_mii_update_crc(char* fName);
-
-/// <summary>Functionality to communicate with a Nintendo Wii Remote from
Game Maker</summary>
-namespace GiiMoteLib {
+exp double wm_mii_data_dump(char* fName, double miiBlock, double
miiNumber);
+exp double wm_mii_data_inject(char* fName,double miiBlock, double
miiNumber);
+exp double wm_mii_update_crc(char* fName);
+/// <summary>Functionality to communicate with a Wii Remote from programs
with generic library binding methods</summary>
+namespace GiiMoteLib
+{
/// <summary>The class embodying GiiMote</summary>
- public ref class GiiMote
+ [GuidAttribute(L"873767D4-F03A-4DC5-8A6B-E6824b180D63")]
+ [ClassInterfaceAttribute(ClassInterfaceType::None)]
+ [ProgId("GiiMoteLib::GiiMote")]
+ public ref class __declspec(uuid("873767D4-F03A-4DC5-8A6B-E6824b180D63"))
GiiMote
{
public:
/// <summary>A collection of all the Wii Remotes attatched to the
system</summary>
@@ -493,13 +499,8 @@
GiiMote::initialized = true;
}
/// <summary>Default destructor</summary>
- /// <remarks>
- /// The GiiMote destructor (~GiiMote) is not bound late.
- /// If you introduce a class into this library which inherits from
GiiMote
- /// you will need to make the destructor bind late using the
keyword "virtual."
- /// </remarks>
/// <returns>Nothing</returns>
- ~GiiMote()
+ virtual ~GiiMote()
{
wm_disconnect_all();
delete ir_screen_pos;
@@ -520,7 +521,7 @@
/// <summary>Wii Remote extension state change event</summary>
/// <param name="sender">Object sending the event</param>
/// <param name="args">Current extension status</param>
- void wm_OnWiimoteExtensionChanged(System::Object^ sender,
WiimoteExtensionChangedEventArgs^ args)
+ virtual void wm_OnWiimoteExtensionChanged(System::Object^ sender,
WiimoteExtensionChangedEventArgs^ args)
{
// Since I'm not sure how to identify which Wii Remote is triggering
the event
// and this one doesn't happen often, update all of them.
@@ -538,7 +539,7 @@
/// <summary>Wii Remote state change event</summary>
/// <param name="sender">Object sending the event</param>
/// <param name="args">Current Wii Remote state</param>
- void wm_OnWiimoteChanged(System::Object^ sender,
WiimoteChangedEventArgs^ args)
+ virtual void wm_OnWiimoteChanged(System::Object^ sender,
WiimoteChangedEventArgs^ args)
{
// Update only the calling Wii Remote
int Index = -1;
@@ -652,4 +653,3 @@
}
return ( double(!GiiMote::initialized) );
}
-
Modified: trunk/GiiMote/GiiMote.vcproj
==============================================================================
--- trunk/GiiMote/GiiMote.vcproj (original)
+++ trunk/GiiMote/GiiMote.vcproj Sat May 9 19:41:31 2009
@@ -87,6 +87,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ Description="Generating type library..."
+ CommandLine="Tlbexp "$(TargetPath)"
/out:"$(TargetDir)$(TargetName).tlb""
/>
</Configuration>
<Configuration
@@ -103,9 +105,9 @@
/>
<Tool
Name="VCCustomBuildTool"
- Description="Generating Release Packages"
- CommandLine="set TARGET=$(TargetDir)$(TargetName)
set
TRUNKDIR=$(TargetDir)trunk
svn.exe export --quiet --force
"$(SolutionDir)\" "%TRUNKDIR%"
cd
$(TargetDir)
tar -cz --file="$(TargetName).tar.gz"
"trunk"
RMDIR /S /Q "%TRUNKDIR%"
"
- Outputs="$(TargetDir)$(TargetName).tar.gz"
+ Description=""
+ CommandLine=""
+ Outputs=""
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -165,7 +167,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine=""
+ Description="Generating type library and exporting source archive..."
+ CommandLine="Tlbexp "$(TargetPath)"
/out:"$(TargetDir)$(TargetName).tlb"

set
TOOLSDIR=$(SolutionDir)Tools
PATH %PATH%;%TOOLSDIR%;%TOOLSDIR%\svn
set
TRUNKDIR=$(TargetDir)trunk
svn export --quiet --force
"$(SolutionDir)\" "%TRUNKDIR%"
cd
$(TargetDir)
DEL /F /S
"$(TargetName).tar.gz"
tar -czf
"$(TargetName).tar.gz" "trunk"
RMDIR /S /Q
"%TRUNKDIR%"
"
ExcludedFromBuild="false"
/>
</Configuration>
@@ -245,7 +248,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine=""
+ Description="Generating type library..."
+ CommandLine="Tlbexp "$(TargetPath)"
/out:"$(TargetDir)$(TargetName).tlb""
ExcludedFromBuild="false"
/>
</Configuration>
@@ -279,6 +283,11 @@
<AssemblyReference
RelativePath="System.Drawing.dll"
AssemblyName="System.Drawing, Version=2.0.0.0,
PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+ MinFrameworkVersion="131072"
+ />
+ <AssemblyReference
+ RelativePath="mscorlib.dll"
+ AssemblyName="mscorlib, Version=2.0.0.0,
PublicKeyToken=b77a5c561934e089, processorArchitecture=IA64"
MinFrameworkVersion="131072"
/>
</References>
Modified: trunk/GiiMote/Orientation.h
==============================================================================
--- trunk/GiiMote/Orientation.h (original)
+++ trunk/GiiMote/Orientation.h Sat May 9 19:41:31 2009
@@ -30,8 +30,8 @@
{
try
{
- float csf = Math::Abs(
GiiMote::gm->wc[GiiMote::gm->wmIndex]->WiimoteState->AccelState.Values.X +
GiiMote::gm->wc[GiiMote::gm->wmIndex]->WiimoteState->AccelState.Values.Y +
GiiMote::gm->wc[GiiMote::gm->wmIndex]->WiimoteState->AccelState.Values.Z );
- if ( csf > 1.5 || csf < 0.5 )
+ float csf = Math::Abs(
GiiMote::gm->wc[GiiMote::gm->wmIndex]->WiimoteState->AccelState.Values.X )
+ Math::Abs(
GiiMote::gm->wc[GiiMote::gm->wmIndex]->WiimoteState->AccelState.Values.Y )
+ Math::Abs(
GiiMote::gm->wc[GiiMote::gm->wmIndex]->WiimoteState->AccelState.Values.Z );
+ if ( csf >= 1.5 )
{
return ( 1 );
}
Modified: trunk/GiiMote/Wiimote.h
==============================================================================
--- trunk/GiiMote/Wiimote.h (original)
+++ trunk/GiiMote/Wiimote.h Sat May 9 19:41:31 2009
@@ -189,6 +189,7 @@
{
try
{
+ // Try a dummy read from the calibration data for the accelerometer
GiiMote::gm->wc[GiiMote::gm->wmIndex]->ReadData(0x0016,1);
}
catch(...)
Modified: trunk/Tools/buildPrototype.m
==============================================================================
--- trunk/Tools/buildPrototype.m (original)
+++ trunk/Tools/buildPrototype.m Sat May 9 19:41:31 2009
@@ -21,7 +21,6 @@
% You should have received a copy of the GNU Lesser General Public
License
% along with GiiMote. If not, see <http://www.gnu.org/licenses/>.
function retcode = buildPrototype(fname)
- cd ../MATLAB
loadlibrary('GiiMote.dll', '../GiiMote/GiiMote.h', 'mfilename', fname);
if (libisloaded('GiiMote.dll'))
retcode = 0;
Added: trunk/Tools/gzip.exe
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/intl3_svn.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libapr-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libapriconv-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libapriconv.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libaprutil-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libdb44.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libeay32.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_client-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_delta-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_diff-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_fs-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_ra-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_repos-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_subr-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_wc-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/ssleay32.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/svn.exe
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/tar.exe
==============================================================================
Binary file. No diff available.
Added: trunk/WiimoteLib/WiimoteLib.dll
==============================================================================
Binary file. No diff available.
Added: trunk/WiimoteLib/copyright.txt
==============================================================================
--- (empty file)
+++ trunk/WiimoteLib/copyright.txt Sat May 9 19:41:31 2009
@@ -0,0 +1,7 @@
+Copyright 2007-2009 Brian Peek
+http://www.brianpeek.com/
+http://www.codeplex.com/WiimoteLib
+http://www.wiimotelib.org/
+
+Licensed under the terms of the Microsoft Permissive License (Ms-PL).
+See license.txt for details.
\ No newline at end of file
Added: trunk/WiimoteLib/license.txt
==============================================================================
--- (empty file)
+++ trunk/WiimoteLib/license.txt Sat May 9 19:41:31 2009
@@ -0,0 +1,60 @@
+Microsoft Permissive License (Ms-PL)
+
+This license governs use of the accompanying software. If you use the
software,
+you accept this license. If you do not accept the license, do not use the
+software.
+
+1. Definitions
+
+The terms "reproduce," "reproduction," "derivative works,"
and "distribution"
+have the same meaning here as under U.S. copyright law.
+
+A "contribution" is the original software, or any additions or changes to
the
+software.
+
+A "contributor" is any person that distributes its contribution under this
+license.
+
+"Licensed patents" are a contributor's patent claims that read directly on
its
+contribution.
+
+2. Grant of Rights
+
+(A) Copyright Grant- Subject to the terms of this license, including the
license
+conditions and limitations in section 3, each contributor grants you a
+non-exclusive, worldwide, royalty-free copyright license to reproduce its
+contribution, prepare derivative works of its contribution, and distribute
its
+contribution or any derivative works that you create.
+
+(B) Patent Grant- Subject to the terms of this license, including the
license
+conditions and limitations in section 3, each contributor grants you a
+non-exclusive, worldwide, royalty-free license under its licensed patents
to
+make, have made, use, sell, offer for sale, import, and/or otherwise
dispose of
+its contribution in the software or derivative works of the contribution
in the
+software.
+
+3. Conditions and Limitations
+
+(A) No Trademark License- This license does not grant you rights to use any
+contributors' name, logo, or trademarks.
+
+(B) If you bring a patent claim against any contributor over patents that
you
+claim are infringed by the software, your patent license from such
contributor
+to the software ends automatically.
+
+(C) If you distribute any portion of the software, you must retain all
+copyright, patent, trademark, and attribution notices that are present in
the
+software.
+
+(D) If you distribute any portion of the software in source code form, you
may
+do so only under this license by including a complete copy of this license
with
+your distribution. If you distribute any portion of the software in
compiled or
+object code form, you may only do so under a license that complies with
this
+license.
+
+(E) The software is licensed "as-is." You bear the risk of using it. The
+contributors give no express warranties, guarantees or conditions. You may
have
+additional consumer rights under your local laws which this license cannot
+change. To the extent permitted under your local laws, the contributors
exclude
+the implied warranties of merchantability, fitness for a particular
purpose and
+non-infringement.
\ No newline at end of file
Modified: wiki/BuildDocumentation.wiki
==============================================================================
--- wiki/BuildDocumentation.wiki (original)
+++ wiki/BuildDocumentation.wiki Sat May 9 19:41:31 2009
@@ -3,20 +3,21 @@
= Introduction =
-Unfortunately, building GiiMote from source is not as simple as
downloading the source and running a few scripts. The build process relies
on many different tools, many of which must be downloaded, installed, and
configured separately from GiiMote. The recommended (and only supported)
environment for building GiiMote is
[http://msdn.microsoft.com/en-us/vstudio/default.aspx Visual Studio] or
[http://www.microsoft.com/express/vc/ Visual C++ Express].
+Building GiiMote from source is fairly pain free. The build process relies
on many different tools, some of which must be installed and configured
separately from GiiMote. The only recommended (and only supported)
environments for building GiiMote are
[http://msdn.microsoft.com/en-us/vstudio/default.aspx Visual Studio] and
[http://www.microsoft.com/express/vc/ Visual C++ Express].
+
= Getting the source =
There are several different ways to get the source.
== Tarball ==
-A source tarball is available over HTTP and can be found by searching the
[http://code.google.com/p/giimote/downloads/list?can=1&q=.tar.gz downloads
page].
+A source tarball is available over HTTP and can be found by searching on
the [http://code.google.com/p/giimote/downloads/list?can=1&q=.tar.gz
downloads page].
== Subversion ==
You can also checkout a working copy of GiiMote from the
[http://giimote.googlecode.com/svn/ SVN repository]. To get a working copy
from subversion please follow the instructions on
[http://code.google.com/p/giimote/source/checkout this page].
-If you obtain the source from SVN it will not always build properly. To
get a copy of a stable release look in the
[http://giimote.googlecode.com/svn/tags/ tags directory].
+If you obtain the source from SVN GiiMote may not be stable, or even
compile at all. To get a copy of a stable release look in the
[http://giimote.googlecode.com/svn/tags/ tags directory].
== Browse source on the Web ==
@@ -28,7 +29,7 @@
Before you attempt to build GiiMote make sure you have the proper tools
and that they are configured correctly and visible to your build
environment.
== Release ==
-These dependencies are only used when you build GiiMote with the
[ReleaseConfiguration release configuration]. This configuration does not
embed debugging symbols and exports a source tarball and typelibrary after
the build.
+These dependencies are only used when you build GiiMote with the
[ReleaseConfiguration release configuration]. This configuration does not
embed debugging symbols and exports a source tarball after the build.
* [Subversion]
* [Tar]
@@ -38,7 +39,7 @@
The [DebugConfiguration debug configuration] does not have any
configuration-specific dependencies.
== MATLAB ==
-To build GiiMote for [MATLAB] you must have a licensed copy of MATLAB. To
find out more visit [http://www.mathworks.com/ The MathWorks].
+To build GiiMote for [MATLAB] you must own a licensed copy of MATLAB. To
find out more visit [http://www.mathworks.com/ The MathWorks].
== All Configurations ==
@@ -51,8 +52,9 @@
After you have all of your tools configured and the source downloaded you
can finally build GiiMote. A solution for Visual Studio or Visual C++
Express is provided with the source. This is the recommended and only
supported method for building GiiMote. Building in Visual Studio or Visual
C++ Express is as easy as opening
[http://code.google.com/p/giimote/source/browse/trunk/GiiMote.sln
GiiMote.sln] in the IDE, selecting a configuration ("[ReleaseConfiguration
Release]", "[DebugConfiguration Debug]", or "[MatlabConfiguration
MATLAB]"), and pressing build.
+
= Links =
- * [http://code.google.com/p/giimote/source/browse/ code browser]
+ * [http://code.google.com/p/giimote/source/browse/ Code browser]
* [http://giimote.googlecode.com/svn/ SVN repo]
* [http://giimote.googlecode.com/svn/tags/ Stable releases]
Modified: wiki/GML.wiki
==============================================================================
--- wiki/GML.wiki (original)
+++ wiki/GML.wiki Sat May 9 19:41:31 2009
@@ -1,5 +1,5 @@
-#summary Game Maker Language, the scripting language of Game Maker
-#labels Phase-Implementation,Type-Article,Featured
+#summary Game Maker Language, the scripting language of Game Maker
+#labels Phase-Implementation,Type-Article
= Introduction =
Modified: wiki/Gzip.wiki
==============================================================================
--- wiki/Gzip.wiki (original)
+++ wiki/Gzip.wiki Sat May 9 19:41:31 2009
@@ -3,10 +3,10 @@
= Introduction =
-Gzip.exe is used in the [ReleaseConfiguration "Release" configuration] by
[Tar Tar.exe] to compress the source tarball which is generated after
compiling GiiMote. To use gzip you must:
- * Download GNU's gzip tool [http://www.gnu.org/software/gzip/ here]
- * Place gzip.exe in a location where it is visible from the command line
+Gzip.exe is used in the [ReleaseConfiguration "Release" configuration] by
[Tar tar.exe] to compress the source tarball which is generated after
compiling GiiMote.
+
= Links =
+ * [http://www.gzip.org/ The gzip home page]
* [http://www.gnu.org/software/gzip/ GNU's Gzip tool]
Modified: wiki/Tar.wiki
==============================================================================
--- wiki/Tar.wiki (original)
+++ wiki/Tar.wiki Sat May 9 19:41:31 2009
@@ -1,11 +1,9 @@
-#summary Description of Tar.exe and is place in the build process
+#summary Description of tar and is place in the build process
#labels Phase-Requirements
= Introduction =
-Tar.exe is used in the [ReleaseConfiguration "Release" configuration] to
create a source tarball after compiling GiiMote. To use tar you must:
- * Download GNU's tar tool [http://www.gnu.org/software/tar/ here]
- * Place Tar.exe in a location where it is visible to the command line
+Tar is used in the [ReleaseConfiguration "Release" configuration] to
create a source tarball after compiling GiiMote.
= Dependencies =
@@ -13,4 +11,4 @@
= Links =
- * [http://www.gnu.org/software/tar/ GNU's implementation of Tar]
+ * [http://www.gnu.org/software/tar/ GNU's implementation of Tar]
\ No newline at end of file
Modified: wiki/TlbExp.wiki
==============================================================================
--- wiki/TlbExp.wiki (original)
+++ wiki/TlbExp.wiki Sat May 9 19:41:31 2009
@@ -3,7 +3,7 @@
= Introduction =
-TlbExp is a tool which is included with the .NET Framework. It is used to
export a [TypeLibrary type library] after the build process has been
completed.
+TlbExp is a tool which is included with the .NET Framework. It is used in
the GiiMote build process to export a [TypeLibrary type library] after the
build has been completed.
= Links =
Modified: wiki/WiimoteLib.wiki
==============================================================================
--- wiki/WiimoteLib.wiki (original)
+++ wiki/WiimoteLib.wiki Sat May 9 19:41:31 2009
@@ -11,11 +11,6 @@
WiimoteLib was started by [http://brianpeek.com/ Brian Peek] as an article
for Microsoft's [http://blogs.msdn.com/coding4fun/ Coding4Fun] website. The
original article contains basics on the design and internals of the library
and can be found
[http://blogs.msdn.com/coding4fun/archive/2007/03/14/1879033.aspx here].
WiimoteLib is open source and licensed under the MS-Pl.
-= Implementation =
-
-To compile GiiMote you will need to obtain WiimoteLib from
[http://www.codeplex.com/WiimoteLib CodePlex] and place the library in a
sub-directory of your trunk or root directory called "WiimoteLib"
(ex. "\trunk\WiimoteLib\WiimoteLib.dll").
-
-
= Links =
* [http://www.codeplex.com/WiimoteLib WiimoteLib on CodePlex]
Date: Sat May 9 19:41:31 2009
New Revision: 198
Added:
trunk/Tools/gzip.exe (contents, props changed)
trunk/Tools/svn/
trunk/Tools/svn/intl3_svn.dll (contents, props changed)
trunk/Tools/svn/libapr-1.dll (contents, props changed)
trunk/Tools/svn/libapriconv-1.dll (contents, props changed)
trunk/Tools/svn/libapriconv.dll (contents, props changed)
trunk/Tools/svn/libaprutil-1.dll (contents, props changed)
trunk/Tools/svn/libdb44.dll (contents, props changed)
trunk/Tools/svn/libeay32.dll (contents, props changed)
trunk/Tools/svn/libsvn_client-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_delta-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_diff-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_fs-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_ra-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_repos-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_subr-1.dll (contents, props changed)
trunk/Tools/svn/libsvn_wc-1.dll (contents, props changed)
trunk/Tools/svn/ssleay32.dll (contents, props changed)
trunk/Tools/svn/svn.exe (contents, props changed)
trunk/Tools/tar.exe (contents, props changed)
trunk/WiimoteLib/ (props changed)
trunk/WiimoteLib/WiimoteLib.dll (contents, props changed)
trunk/WiimoteLib/copyright.txt
trunk/WiimoteLib/license.txt
Modified:
trunk/ (props changed)
trunk/GiiMote.ged
trunk/GiiMote/AssemblyInfo.cpp
trunk/GiiMote/GiiMote.h
trunk/GiiMote/GiiMote.vcproj
trunk/GiiMote/Orientation.h
trunk/GiiMote/Wiimote.h
trunk/Help/GiiMote Documentation/ (props changed)
trunk/Help/GiiMote Help/ (props changed)
trunk/MATLAB/ (props changed)
trunk/Tools/buildPrototype.m
wiki/BuildDocumentation.wiki
wiki/GML.wiki
wiki/Gzip.wiki
wiki/Tar.wiki
wiki/TlbExp.wiki
wiki/WiimoteLib.wiki
Log:
Made the build process much easier by including tar, gzip, and subversion
in the tools directory
Put WiimoteLib back
Updated wiki info on build dependencies
BUG: wm_get_moving now properly detects motion
Modified: trunk/GiiMote.ged
==============================================================================
Binary files. No diff available.
Modified: trunk/GiiMote/AssemblyInfo.cpp
==============================================================================
--- trunk/GiiMote/AssemblyInfo.cpp (original)
+++ trunk/GiiMote/AssemblyInfo.cpp Sat May 9 19:41:31 2009
@@ -50,7 +50,11 @@
[assembly:AssemblyVersionAttribute("3.0.*")];
-[assembly:ComVisible(false)];
+[assembly:ComVisible(true)];
+
+[assembly:AssemblyDelaySign(false)]
+
+[assembly:AssemblyKeyFile("")]
[assembly:CLSCompliantAttribute(true)];
Modified: trunk/GiiMote/GiiMote.h
==============================================================================
--- trunk/GiiMote/GiiMote.h (original)
+++ trunk/GiiMote/GiiMote.h Sat May 9 19:41:31 2009
@@ -17,6 +17,9 @@
// along with GiiMote. If not, see <http://www.gnu.org/licenses/>.
#pragma once
+
+using namespace System::Runtime::InteropServices;
+
///////////////////////
// Define Constants //
/////////////////////
@@ -110,277 +113,280 @@
////////////////////////////////////////////
// Wii Remote Functions
////////////////////////////////////////////
- // Connection Functions
- exp double gm_init();
- exp double gm_cleanup();
- exp double wm_find_all();
- exp double wm_found();
- exp double wm_exists();
- exp double wm_num_exists();
- exp double wm_set_using_val(double wm);
- exp double wm_set_using_guid(char* wm);
- exp double wm_connect();
- exp double wm_connect_all();
- exp double wm_connected();
- exp double wm_disconnect();
- exp double wm_disconnect_all();
- exp double wm_set_report_type(double report_type, double continuous);
- exp double wm_get_report_type();
- exp double wm_get_report_continuous();
- exp double wm_get_id_current();
- exp double wm_get_id_guid(char* guid);
- exp char* wm_get_guid_id(double val);
- exp char* wm_get_guid_current();
- exp double wm_get_index_id(double guid);
- exp double wm_get_index_current();
- exp double wm_get_index_guid(char* guid);
- exp char* wm_get_hid_device_path();
-
- // LED Functions
- exp double wm_get_led(double led_num);
- exp double wm_set_leds(double led1, double led2, double led3, double
led4);
- exp double wm_set_leds_int(double val);
-
- // Status
- exp double wm_get_battery();
- exp double wm_get_battery_raw();
- exp double wm_get_status();
- exp double wm_check_extension();
- exp double wm_set_rumble(double rumbling);
- exp double wm_get_rumble();
-
- // Orientation
- exp double wm_get_moving();
- exp double wm_get_roll();
- exp double wm_get_pitch();
- exp double wm_get_yaw();
- exp double wm_get_altitude();
-
- // Reading/Writing
- exp double wm_bin_read_byte(double address);
- exp double wm_bin_write_byte(double address, double value);
+// Connection Functions
+exp double gm_init();
+exp double gm_cleanup();
+exp double wm_find_all();
+exp double wm_found();
+exp double wm_exists();
+exp double wm_num_exists();
+exp double wm_set_using_val(double wm);
+exp double wm_set_using_guid(char* wm);
+exp double wm_connect();
+exp double wm_connect_all();
+exp double wm_connected();
+exp double wm_disconnect();
+exp double wm_disconnect_all();
+exp double wm_set_report_type(double report_type, double continuous);
+exp double wm_get_report_type();
+exp double wm_get_report_continuous();
+exp double wm_get_id_current();
+exp double wm_get_id_guid(char* guid);
+exp char* wm_get_guid_id(double val);
+exp char* wm_get_guid_current();
+exp double wm_get_index_id(double guid);
+exp double wm_get_index_current();
+exp double wm_get_index_guid(char* guid);
+exp char* wm_get_hid_device_path();
+
+// LED Functions
+exp double wm_get_led(double led_num);
+exp double wm_set_leds(double led1, double led2, double led3, double led4);
+exp double wm_set_leds_int(double val);
+
+// Status
+exp double wm_get_battery();
+exp double wm_get_battery_raw();
+exp double wm_get_status();
+exp double wm_check_extension();
+exp double wm_set_rumble(double rumbling);
+exp double wm_get_rumble();
+
+// Orientation
+exp double wm_get_moving();
+exp double wm_get_roll();
+exp double wm_get_pitch();
+exp double wm_get_yaw();
+exp double wm_get_altitude();
+
+// Reading/Writing
+exp double wm_bin_read_byte(double address);
+exp double wm_bin_write_byte(double address, double value);
////////////////////////////////////////////
// Mathematical Functions
////////////////////////////////////////////
- exp double in_domain(double x, double d1, double d2);
- exp double domain_rescale(double val, double minin, double maxin, double
minout, double maxout);
+exp double in_domain(double x, double d1, double d2);
+exp double domain_rescale(double val, double minin, double maxin, double
minout, double maxout);
///////////////////////////////////////////////
// Buttons, Joysticks, Triggers, and Sensors
///////////////////////////////////////////////
- // Misc. Guitar
- exp double wm_guitar_get_type();
+// Misc. Guitar
+exp double wm_guitar_get_type();
- // Buttons
- exp double wm_guitar_check_button(double key_code);
- exp double wm_drum_check_button(double key_code);
- exp double wm_nunchuck_check_button(double key_code);
- exp double wm_classic_check_button(double key_code);
- exp double wm_check_button(double key_code);
-
- // Sensors (Balance Board)
- exp double wm_bb_get_weight_lbs();
- exp double wm_bb_get_weight_kgs();
- exp double wm_bb_get_sensor_raw(double sensor);
- exp double wm_bb_get_sensor_kgs(double sensor);
- exp double wm_bb_get_sensor_lbs(double sensor);
- exp double wm_bb_get_center_of_gravity_x();
- exp double wm_bb_get_center_of_gravity_y();
-
- // Joysticks (General)
- exp double joystick_direction(double xx, double yy);
- exp double joystick_pressure(double xx, double yy);
- exp double wm_set_joystick_dead_zone(double val);
- exp double wm_get_joystick_dead_zone();
-
- // Joysticks (Nunchuck)
- exp double wm_nunchuck_xpos();
- exp double wm_nunchuck_ypos();
- exp double wm_nunchuck_direction();
- exp double wm_nunchuck_pressure();
- exp double wm_nunchuck_rawx();
- exp double wm_nunchuck_rawy();
-
- // Joysticks (Classic Controller)
- exp double wm_classic_xpos(double stick);
- exp double wm_classic_ypos(double stick);
- exp double wm_classic_rawx(double stick);
- exp double wm_classic_rawy(double stick);
- exp double wm_classic_direction(double stick);
- exp double wm_classic_pressure(double stick);
-
- // Joysticks (Guitar)
- exp double wm_guitar_xpos();
- exp double wm_guitar_ypos();
- exp double wm_guitar_direction();
- exp double wm_guitar_pressure();
- exp double wm_guitar_rawx();
- exp double wm_guitar_rawy();
-
- // Joysticks (Drum)
- exp double wm_drum_xpos();
- exp double wm_drum_ypos();
- exp double wm_drum_direction();
- exp double wm_drum_pressure();
- exp double wm_drum_rawx();
- exp double wm_drum_rawy();
-
- // Triggers (General)
- exp double wm_set_trigger_dead_zone(double val);
- exp double wm_get_trigger_dead_zone();
-
- // Triggers (Classic Controller)
- exp double wm_classic_trigger_pressure(double trigger);
- exp double wm_classic_trigger_raw(double trigger);
-
- // Whammy Bar (Guitar)
- exp double wm_guitar_whammybar_pos();
- exp double wm_guitar_whammybar_rawpos();
+// Buttons
+exp double wm_guitar_check_button(double key_code);
+exp double wm_drum_check_button(double key_code);
+exp double wm_nunchuck_check_button(double key_code);
+exp double wm_classic_check_button(double key_code);
+exp double wm_check_button(double key_code);
+
+// Sensors (Balance Board)
+exp double wm_bb_get_weight_lbs();
+exp double wm_bb_get_weight_kgs();
+exp double wm_bb_get_sensor_raw(double sensor);
+exp double wm_bb_get_sensor_kgs(double sensor);
+exp double wm_bb_get_sensor_lbs(double sensor);
+exp double wm_bb_get_center_of_gravity_x();
+exp double wm_bb_get_center_of_gravity_y();
+
+// Joysticks (General)
+exp double joystick_direction(double xx, double yy);
+exp double joystick_pressure(double xx, double yy);
+exp double wm_set_joystick_dead_zone(double val);
+exp double wm_get_joystick_dead_zone();
+
+// Joysticks (Nunchuck)
+exp double wm_nunchuck_xpos();
+exp double wm_nunchuck_ypos();
+exp double wm_nunchuck_direction();
+exp double wm_nunchuck_pressure();
+exp double wm_nunchuck_rawx();
+exp double wm_nunchuck_rawy();
+
+// Joysticks (Classic Controller)
+exp double wm_classic_xpos(double stick);
+exp double wm_classic_ypos(double stick);
+exp double wm_classic_rawx(double stick);
+exp double wm_classic_rawy(double stick);
+exp double wm_classic_direction(double stick);
+exp double wm_classic_pressure(double stick);
+
+// Joysticks (Guitar)
+exp double wm_guitar_xpos();
+exp double wm_guitar_ypos();
+exp double wm_guitar_direction();
+exp double wm_guitar_pressure();
+exp double wm_guitar_rawx();
+exp double wm_guitar_rawy();
+
+// Joysticks (Drum)
+exp double wm_drum_xpos();
+exp double wm_drum_ypos();
+exp double wm_drum_direction();
+exp double wm_drum_pressure();
+exp double wm_drum_rawx();
+exp double wm_drum_rawy();
+
+// Triggers (General)
+exp double wm_set_trigger_dead_zone(double val);
+exp double wm_get_trigger_dead_zone();
+
+// Triggers (Classic Controller)
+exp double wm_classic_trigger_pressure(double trigger);
+exp double wm_classic_trigger_raw(double trigger);
+
+// Whammy Bar (Guitar)
+exp double wm_guitar_whammybar_pos();
+exp double wm_guitar_whammybar_rawpos();
- // Drum
- exp double wm_drum_get_velocity(double key_code);
+// Drum
+exp double wm_drum_get_velocity(double key_code);
////////////////////////////////////////////
// Accelerometers and IR
////////////////////////////////////////////
- // Accelerometer (General)
- exp double wm_calc_accel(float accel, int dz_index);
+// Accelerometer (General)
+exp double wm_calc_accel(float accel, int dz_index);
- // Accelerometer (Wii Remote)
- exp double wm_get_accel_x();
- exp double wm_get_accel_y();
- exp double wm_get_accel_z();
- exp double wm_get_accel_rawx();
- exp double wm_get_accel_rawy();
- exp double wm_get_accel_rawz();
- exp double wm_set_accel_dead_zone_x(double val);
- exp double wm_set_accel_dead_zone_y(double val);
- exp double wm_set_accel_dead_zone_z(double val);
- exp double wm_get_accel_dead_zone_x();
- exp double wm_get_accel_dead_zone_y();
- exp double wm_get_accel_dead_zone_z();
-
- // Accelerometer (Nunchuck)
- exp double wm_nunchuck_get_accel_x();
- exp double wm_nunchuck_get_accel_y();
- exp double wm_nunchuck_get_accel_z();
- exp double wm_nunchuck_get_accel_rawx();
- exp double wm_nunchuck_get_accel_rawy();
- exp double wm_nunchuck_get_accel_rawz();
- exp double wm_nunchuck_set_accel_dead_zone_x(double val);
- exp double wm_nunchuck_set_accel_dead_zone_y(double val);
- exp double wm_nunchuck_set_accel_dead_zone_z(double val);
- exp double wm_nunchuck_get_accel_dead_zone_x();
- exp double wm_nunchuck_get_accel_dead_zone_y();
- exp double wm_nunchuck_get_accel_dead_zone_z();
-
- // Infrared
- exp double wm_ir_set_sensitivity(double sensitivity);
- exp double wm_ir_get_sensitivity();
- exp double wm_ir_found_dot(double dot_number);
- exp double wm_ir_dot_size(double dot_number);
- exp double wm_ir_dot_get_x(double dot_number);
- exp double wm_ir_dot_get_y(double dot_number);
- exp double wm_ir_dot_get_rawx(double dot_number);
- exp double wm_ir_dot_get_rawy(double dot_number);
- exp double wm_ir_dot_get_midx();
- exp double wm_ir_dot_get_midy();
- exp double wm_ir_dot_get_rawmidx();
- exp double wm_ir_dot_get_rawmidy();
- exp double wm_ir_dot_get_delta_x(double dot_number);
- exp double wm_ir_dot_get_delta_y(double dot_number);
- exp double wm_ir_dot_get_delta_rawx(double dot_number);
- exp double wm_ir_dot_get_delta_rawy(double dot_number);
- exp double wm_ir_dot_get_delta_midx();
- exp double wm_ir_dot_get_delta_midy();
- exp double wm_ir_dot_get_delta_rawmidx();
- exp double wm_ir_dot_get_delta_rawmidy();
- exp double wm_ir_display_get_x();
- exp double wm_ir_display_get_y();
+// Accelerometer (Wii Remote)
+exp double wm_get_accel_x();
+exp double wm_get_accel_y();
+exp double wm_get_accel_z();
+exp double wm_get_accel_rawx();
+exp double wm_get_accel_rawy();
+exp double wm_get_accel_rawz();
+exp double wm_set_accel_dead_zone_x(double val);
+exp double wm_set_accel_dead_zone_y(double val);
+exp double wm_set_accel_dead_zone_z(double val);
+exp double wm_get_accel_dead_zone_x();
+exp double wm_get_accel_dead_zone_y();
+exp double wm_get_accel_dead_zone_z();
+
+// Accelerometer (Nunchuck)
+exp double wm_nunchuck_get_accel_x();
+exp double wm_nunchuck_get_accel_y();
+exp double wm_nunchuck_get_accel_z();
+exp double wm_nunchuck_get_accel_rawx();
+exp double wm_nunchuck_get_accel_rawy();
+exp double wm_nunchuck_get_accel_rawz();
+exp double wm_nunchuck_set_accel_dead_zone_x(double val);
+exp double wm_nunchuck_set_accel_dead_zone_y(double val);
+exp double wm_nunchuck_set_accel_dead_zone_z(double val);
+exp double wm_nunchuck_get_accel_dead_zone_x();
+exp double wm_nunchuck_get_accel_dead_zone_y();
+exp double wm_nunchuck_get_accel_dead_zone_z();
+
+// Infrared
+exp double wm_ir_set_sensitivity(double sensitivity);
+exp double wm_ir_get_sensitivity();
+exp double wm_ir_found_dot(double dot_number);
+exp double wm_ir_dot_size(double dot_number);
+exp double wm_ir_dot_get_x(double dot_number);
+exp double wm_ir_dot_get_y(double dot_number);
+exp double wm_ir_dot_get_rawx(double dot_number);
+exp double wm_ir_dot_get_rawy(double dot_number);
+exp double wm_ir_dot_get_midx();
+exp double wm_ir_dot_get_midy();
+exp double wm_ir_dot_get_rawmidx();
+exp double wm_ir_dot_get_rawmidy();
+exp double wm_ir_dot_get_delta_x(double dot_number);
+exp double wm_ir_dot_get_delta_y(double dot_number);
+exp double wm_ir_dot_get_delta_rawx(double dot_number);
+exp double wm_ir_dot_get_delta_rawy(double dot_number);
+exp double wm_ir_dot_get_delta_midx();
+exp double wm_ir_dot_get_delta_midy();
+exp double wm_ir_dot_get_delta_rawmidx();
+exp double wm_ir_dot_get_delta_rawmidy();
+exp double wm_ir_display_get_x();
+exp double wm_ir_display_get_y();
////////////////////////////////////////////
// Calibration
////////////////////////////////////////////
- // Nunchuck Get
- exp double wm_nunchuck_get_calibration_x0();
- exp double wm_nunchuck_get_calibration_xg();
- exp double wm_nunchuck_get_calibration_y0();
- exp double wm_nunchuck_get_calibration_yg();
- exp double wm_nunchuck_get_calibration_z0();
- exp double wm_nunchuck_get_calibration_zg();
- exp double wm_nunchuck_get_calibration_maxx();
- exp double wm_nunchuck_get_calibration_maxy();
- exp double wm_nunchuck_get_calibration_midx();
- exp double wm_nunchuck_get_calibration_midy();
- exp double wm_nunchuck_get_calibration_minx();
- exp double wm_nunchuck_get_calibration_miny();
- // Nunchuck Set
- exp double wm_nunchuck_set_calibration_x0(double val);
- exp double wm_nunchuck_set_calibration_xg(double val);
- exp double wm_nunchuck_set_calibration_y0(double val);
- exp double wm_nunchuck_set_calibration_yg(double val);
- exp double wm_nunchuck_set_calibration_z0(double val);
- exp double wm_nunchuck_set_calibration_zg(double val);
- exp double wm_nunchuck_set_calibration_maxx(double val);
- exp double wm_nunchuck_set_calibration_maxy(double val);
- exp double wm_nunchuck_set_calibration_midx(double val);
- exp double wm_nunchuck_set_calibration_midy(double val);
- exp double wm_nunchuck_set_calibration_minx(double val);
- exp double wm_nunchuck_set_calibration_miny(double val);
- // Classic Controller Get
- exp double wm_classic_get_calibration_maxtrigger(double trigger);
- exp double wm_classic_get_calibration_mintrigger(double trigger);
- exp double wm_classic_get_calibration_maxx(double joystick);
- exp double wm_classic_get_calibration_minx(double joystick);
- exp double wm_classic_get_calibration_midx(double joystick);
- exp double wm_classic_get_calibration_midy(double joystick);
- exp double wm_classic_get_calibration_maxy(double joystick);
- exp double wm_classic_get_calibration_miny(double joystick);
- // Classic Controller Set
- exp double wm_classic_set_calibration_maxtrigger(double trigger, double
val);
- exp double wm_classic_set_calibration_mintrigger(double trigger, double
val);
- exp double wm_classic_set_calibration_maxx(double joystick, double val);
- exp double wm_classic_set_calibration_minx(double joystick, double val);
- exp double wm_classic_set_calibration_midx(double joystick, double val);
- exp double wm_classic_set_calibration_midy(double joystick, double val);
- exp double wm_classic_set_calibration_maxy(double joystick, double val);
- exp double wm_classic_set_calibration_miny(double joystick, double val);
- // Wii Remote Get
- exp double wm_get_calibration_x0();
- exp double wm_get_calibration_xg();
- exp double wm_get_calibration_y0();
- exp double wm_get_calibration_yg();
- exp double wm_get_calibration_z0();
- exp double wm_get_calibration_zg();
- // Wii Remote Set
- exp double wm_set_calibration_x0(double val);
- exp double wm_set_calibration_xg(double val);
- exp double wm_set_calibration_y0(double val);
- exp double wm_set_calibration_yg(double val);
- exp double wm_set_calibration_z0(double val);
- exp double wm_set_calibration_zg(double val);
- // Balance Board Get
- exp double wm_bb_get_calibration_kg0(double sensor);
- exp double wm_bb_get_calibration_kg17(double sensor);
- exp double wm_bb_get_calibration_kg34(double sensor);
- // Balance Board Set
- exp double wm_bb_set_calibration_kg0(double sensor, double val);
- exp double wm_bb_set_calibration_kg17(double sensor, double val);
- exp double wm_bb_set_calibration_kg34(double sensor, double val);
+// Nunchuck Get
+exp double wm_nunchuck_get_calibration_x0();
+exp double wm_nunchuck_get_calibration_xg();
+exp double wm_nunchuck_get_calibration_y0();
+exp double wm_nunchuck_get_calibration_yg();
+exp double wm_nunchuck_get_calibration_z0();
+exp double wm_nunchuck_get_calibration_zg();
+exp double wm_nunchuck_get_calibration_maxx();
+exp double wm_nunchuck_get_calibration_maxy();
+exp double wm_nunchuck_get_calibration_midx();
+exp double wm_nunchuck_get_calibration_midy();
+exp double wm_nunchuck_get_calibration_minx();
+exp double wm_nunchuck_get_calibration_miny();
+// Nunchuck Set
+exp double wm_nunchuck_set_calibration_x0(double val);
+exp double wm_nunchuck_set_calibration_xg(double val);
+exp double wm_nunchuck_set_calibration_y0(double val);
+exp double wm_nunchuck_set_calibration_yg(double val);
+exp double wm_nunchuck_set_calibration_z0(double val);
+exp double wm_nunchuck_set_calibration_zg(double val);
+exp double wm_nunchuck_set_calibration_maxx(double val);
+exp double wm_nunchuck_set_calibration_maxy(double val);
+exp double wm_nunchuck_set_calibration_midx(double val);
+exp double wm_nunchuck_set_calibration_midy(double val);
+exp double wm_nunchuck_set_calibration_minx(double val);
+exp double wm_nunchuck_set_calibration_miny(double val);
+// Classic Controller Get
+exp double wm_classic_get_calibration_maxtrigger(double trigger);
+exp double wm_classic_get_calibration_mintrigger(double trigger);
+exp double wm_classic_get_calibration_maxx(double joystick);
+exp double wm_classic_get_calibration_minx(double joystick);
+exp double wm_classic_get_calibration_midx(double joystick);
+exp double wm_classic_get_calibration_midy(double joystick);
+exp double wm_classic_get_calibration_maxy(double joystick);
+exp double wm_classic_get_calibration_miny(double joystick);
+// Classic Controller Set
+exp double wm_classic_set_calibration_maxtrigger(double trigger, double
val);
+exp double wm_classic_set_calibration_mintrigger(double trigger, double
val);
+exp double wm_classic_set_calibration_maxx(double joystick, double val);
+exp double wm_classic_set_calibration_minx(double joystick, double val);
+exp double wm_classic_set_calibration_midx(double joystick, double val);
+exp double wm_classic_set_calibration_midy(double joystick, double val);
+exp double wm_classic_set_calibration_maxy(double joystick, double val);
+exp double wm_classic_set_calibration_miny(double joystick, double val);
+// Wii Remote Get
+exp double wm_get_calibration_x0();
+exp double wm_get_calibration_xg();
+exp double wm_get_calibration_y0();
+exp double wm_get_calibration_yg();
+exp double wm_get_calibration_z0();
+exp double wm_get_calibration_zg();
+// Wii Remote Set
+exp double wm_set_calibration_x0(double val);
+exp double wm_set_calibration_xg(double val);
+exp double wm_set_calibration_y0(double val);
+exp double wm_set_calibration_yg(double val);
+exp double wm_set_calibration_z0(double val);
+exp double wm_set_calibration_zg(double val);
+// Balance Board Get
+exp double wm_bb_get_calibration_kg0(double sensor);
+exp double wm_bb_get_calibration_kg17(double sensor);
+exp double wm_bb_get_calibration_kg34(double sensor);
+// Balance Board Set
+exp double wm_bb_set_calibration_kg0(double sensor, double val);
+exp double wm_bb_set_calibration_kg17(double sensor, double val);
+exp double wm_bb_set_calibration_kg34(double sensor, double val);
////////////////////////////////////////////
// Mii Functions
////////////////////////////////////////////
- exp double wm_mii_data_dump(char* fName, double miiBlock, double
miiNumber);
- exp double wm_mii_data_inject(char* fName,double miiBlock, double
miiNumber);
- exp double wm_mii_update_crc(char* fName);
-
-/// <summary>Functionality to communicate with a Nintendo Wii Remote from
Game Maker</summary>
-namespace GiiMoteLib {
+exp double wm_mii_data_dump(char* fName, double miiBlock, double
miiNumber);
+exp double wm_mii_data_inject(char* fName,double miiBlock, double
miiNumber);
+exp double wm_mii_update_crc(char* fName);
+/// <summary>Functionality to communicate with a Wii Remote from programs
with generic library binding methods</summary>
+namespace GiiMoteLib
+{
/// <summary>The class embodying GiiMote</summary>
- public ref class GiiMote
+ [GuidAttribute(L"873767D4-F03A-4DC5-8A6B-E6824b180D63")]
+ [ClassInterfaceAttribute(ClassInterfaceType::None)]
+ [ProgId("GiiMoteLib::GiiMote")]
+ public ref class __declspec(uuid("873767D4-F03A-4DC5-8A6B-E6824b180D63"))
GiiMote
{
public:
/// <summary>A collection of all the Wii Remotes attatched to the
system</summary>
@@ -493,13 +499,8 @@
GiiMote::initialized = true;
}
/// <summary>Default destructor</summary>
- /// <remarks>
- /// The GiiMote destructor (~GiiMote) is not bound late.
- /// If you introduce a class into this library which inherits from
GiiMote
- /// you will need to make the destructor bind late using the
keyword "virtual."
- /// </remarks>
/// <returns>Nothing</returns>
- ~GiiMote()
+ virtual ~GiiMote()
{
wm_disconnect_all();
delete ir_screen_pos;
@@ -520,7 +521,7 @@
/// <summary>Wii Remote extension state change event</summary>
/// <param name="sender">Object sending the event</param>
/// <param name="args">Current extension status</param>
- void wm_OnWiimoteExtensionChanged(System::Object^ sender,
WiimoteExtensionChangedEventArgs^ args)
+ virtual void wm_OnWiimoteExtensionChanged(System::Object^ sender,
WiimoteExtensionChangedEventArgs^ args)
{
// Since I'm not sure how to identify which Wii Remote is triggering
the event
// and this one doesn't happen often, update all of them.
@@ -538,7 +539,7 @@
/// <summary>Wii Remote state change event</summary>
/// <param name="sender">Object sending the event</param>
/// <param name="args">Current Wii Remote state</param>
- void wm_OnWiimoteChanged(System::Object^ sender,
WiimoteChangedEventArgs^ args)
+ virtual void wm_OnWiimoteChanged(System::Object^ sender,
WiimoteChangedEventArgs^ args)
{
// Update only the calling Wii Remote
int Index = -1;
@@ -652,4 +653,3 @@
}
return ( double(!GiiMote::initialized) );
}
-
Modified: trunk/GiiMote/GiiMote.vcproj
==============================================================================
--- trunk/GiiMote/GiiMote.vcproj (original)
+++ trunk/GiiMote/GiiMote.vcproj Sat May 9 19:41:31 2009
@@ -87,6 +87,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ Description="Generating type library..."
+ CommandLine="Tlbexp "$(TargetPath)"
/out:"$(TargetDir)$(TargetName).tlb""
/>
</Configuration>
<Configuration
@@ -103,9 +105,9 @@
/>
<Tool
Name="VCCustomBuildTool"
- Description="Generating Release Packages"
- CommandLine="set TARGET=$(TargetDir)$(TargetName)
set
TRUNKDIR=$(TargetDir)trunk
svn.exe export --quiet --force
"$(SolutionDir)\" "%TRUNKDIR%"
cd
$(TargetDir)
tar -cz --file="$(TargetName).tar.gz"
"trunk"
RMDIR /S /Q "%TRUNKDIR%"
"
- Outputs="$(TargetDir)$(TargetName).tar.gz"
+ Description=""
+ CommandLine=""
+ Outputs=""
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -165,7 +167,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine=""
+ Description="Generating type library and exporting source archive..."
+ CommandLine="Tlbexp "$(TargetPath)"
/out:"$(TargetDir)$(TargetName).tlb"

set
TOOLSDIR=$(SolutionDir)Tools
PATH %PATH%;%TOOLSDIR%;%TOOLSDIR%\svn
set
TRUNKDIR=$(TargetDir)trunk
svn export --quiet --force
"$(SolutionDir)\" "%TRUNKDIR%"
cd
$(TargetDir)
DEL /F /S
"$(TargetName).tar.gz"
tar -czf
"$(TargetName).tar.gz" "trunk"
RMDIR /S /Q
"%TRUNKDIR%"
"
ExcludedFromBuild="false"
/>
</Configuration>
@@ -245,7 +248,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine=""
+ Description="Generating type library..."
+ CommandLine="Tlbexp "$(TargetPath)"
/out:"$(TargetDir)$(TargetName).tlb""
ExcludedFromBuild="false"
/>
</Configuration>
@@ -279,6 +283,11 @@
<AssemblyReference
RelativePath="System.Drawing.dll"
AssemblyName="System.Drawing, Version=2.0.0.0,
PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+ MinFrameworkVersion="131072"
+ />
+ <AssemblyReference
+ RelativePath="mscorlib.dll"
+ AssemblyName="mscorlib, Version=2.0.0.0,
PublicKeyToken=b77a5c561934e089, processorArchitecture=IA64"
MinFrameworkVersion="131072"
/>
</References>
Modified: trunk/GiiMote/Orientation.h
==============================================================================
--- trunk/GiiMote/Orientation.h (original)
+++ trunk/GiiMote/Orientation.h Sat May 9 19:41:31 2009
@@ -30,8 +30,8 @@
{
try
{
- float csf = Math::Abs(
GiiMote::gm->wc[GiiMote::gm->wmIndex]->WiimoteState->AccelState.Values.X +
GiiMote::gm->wc[GiiMote::gm->wmIndex]->WiimoteState->AccelState.Values.Y +
GiiMote::gm->wc[GiiMote::gm->wmIndex]->WiimoteState->AccelState.Values.Z );
- if ( csf > 1.5 || csf < 0.5 )
+ float csf = Math::Abs(
GiiMote::gm->wc[GiiMote::gm->wmIndex]->WiimoteState->AccelState.Values.X )
+ Math::Abs(
GiiMote::gm->wc[GiiMote::gm->wmIndex]->WiimoteState->AccelState.Values.Y )
+ Math::Abs(
GiiMote::gm->wc[GiiMote::gm->wmIndex]->WiimoteState->AccelState.Values.Z );
+ if ( csf >= 1.5 )
{
return ( 1 );
}
Modified: trunk/GiiMote/Wiimote.h
==============================================================================
--- trunk/GiiMote/Wiimote.h (original)
+++ trunk/GiiMote/Wiimote.h Sat May 9 19:41:31 2009
@@ -189,6 +189,7 @@
{
try
{
+ // Try a dummy read from the calibration data for the accelerometer
GiiMote::gm->wc[GiiMote::gm->wmIndex]->ReadData(0x0016,1);
}
catch(...)
Modified: trunk/Tools/buildPrototype.m
==============================================================================
--- trunk/Tools/buildPrototype.m (original)
+++ trunk/Tools/buildPrototype.m Sat May 9 19:41:31 2009
@@ -21,7 +21,6 @@
% You should have received a copy of the GNU Lesser General Public
License
% along with GiiMote. If not, see <http://www.gnu.org/licenses/>.
function retcode = buildPrototype(fname)
- cd ../MATLAB
loadlibrary('GiiMote.dll', '../GiiMote/GiiMote.h', 'mfilename', fname);
if (libisloaded('GiiMote.dll'))
retcode = 0;
Added: trunk/Tools/gzip.exe
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/intl3_svn.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libapr-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libapriconv-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libapriconv.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libaprutil-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libdb44.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libeay32.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_client-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_delta-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_diff-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_fs-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_ra-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_repos-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_subr-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/libsvn_wc-1.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/ssleay32.dll
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/svn/svn.exe
==============================================================================
Binary file. No diff available.
Added: trunk/Tools/tar.exe
==============================================================================
Binary file. No diff available.
Added: trunk/WiimoteLib/WiimoteLib.dll
==============================================================================
Binary file. No diff available.
Added: trunk/WiimoteLib/copyright.txt
==============================================================================
--- (empty file)
+++ trunk/WiimoteLib/copyright.txt Sat May 9 19:41:31 2009
@@ -0,0 +1,7 @@
+Copyright 2007-2009 Brian Peek
+http://www.brianpeek.com/
+http://www.codeplex.com/WiimoteLib
+http://www.wiimotelib.org/
+
+Licensed under the terms of the Microsoft Permissive License (Ms-PL).
+See license.txt for details.
\ No newline at end of file
Added: trunk/WiimoteLib/license.txt
==============================================================================
--- (empty file)
+++ trunk/WiimoteLib/license.txt Sat May 9 19:41:31 2009
@@ -0,0 +1,60 @@
+Microsoft Permissive License (Ms-PL)
+
+This license governs use of the accompanying software. If you use the
software,
+you accept this license. If you do not accept the license, do not use the
+software.
+
+1. Definitions
+
+The terms "reproduce," "reproduction," "derivative works,"
and "distribution"
+have the same meaning here as under U.S. copyright law.
+
+A "contribution" is the original software, or any additions or changes to
the
+software.
+
+A "contributor" is any person that distributes its contribution under this
+license.
+
+"Licensed patents" are a contributor's patent claims that read directly on
its
+contribution.
+
+2. Grant of Rights
+
+(A) Copyright Grant- Subject to the terms of this license, including the
license
+conditions and limitations in section 3, each contributor grants you a
+non-exclusive, worldwide, royalty-free copyright license to reproduce its
+contribution, prepare derivative works of its contribution, and distribute
its
+contribution or any derivative works that you create.
+
+(B) Patent Grant- Subject to the terms of this license, including the
license
+conditions and limitations in section 3, each contributor grants you a
+non-exclusive, worldwide, royalty-free license under its licensed patents
to
+make, have made, use, sell, offer for sale, import, and/or otherwise
dispose of
+its contribution in the software or derivative works of the contribution
in the
+software.
+
+3. Conditions and Limitations
+
+(A) No Trademark License- This license does not grant you rights to use any
+contributors' name, logo, or trademarks.
+
+(B) If you bring a patent claim against any contributor over patents that
you
+claim are infringed by the software, your patent license from such
contributor
+to the software ends automatically.
+
+(C) If you distribute any portion of the software, you must retain all
+copyright, patent, trademark, and attribution notices that are present in
the
+software.
+
+(D) If you distribute any portion of the software in source code form, you
may
+do so only under this license by including a complete copy of this license
with
+your distribution. If you distribute any portion of the software in
compiled or
+object code form, you may only do so under a license that complies with
this
+license.
+
+(E) The software is licensed "as-is." You bear the risk of using it. The
+contributors give no express warranties, guarantees or conditions. You may
have
+additional consumer rights under your local laws which this license cannot
+change. To the extent permitted under your local laws, the contributors
exclude
+the implied warranties of merchantability, fitness for a particular
purpose and
+non-infringement.
\ No newline at end of file
Modified: wiki/BuildDocumentation.wiki
==============================================================================
--- wiki/BuildDocumentation.wiki (original)
+++ wiki/BuildDocumentation.wiki Sat May 9 19:41:31 2009
@@ -3,20 +3,21 @@
= Introduction =
-Unfortunately, building GiiMote from source is not as simple as
downloading the source and running a few scripts. The build process relies
on many different tools, many of which must be downloaded, installed, and
configured separately from GiiMote. The recommended (and only supported)
environment for building GiiMote is
[http://msdn.microsoft.com/en-us/vstudio/default.aspx Visual Studio] or
[http://www.microsoft.com/express/vc/ Visual C++ Express].
+Building GiiMote from source is fairly pain free. The build process relies
on many different tools, some of which must be installed and configured
separately from GiiMote. The only recommended (and only supported)
environments for building GiiMote are
[http://msdn.microsoft.com/en-us/vstudio/default.aspx Visual Studio] and
[http://www.microsoft.com/express/vc/ Visual C++ Express].
+
= Getting the source =
There are several different ways to get the source.
== Tarball ==
-A source tarball is available over HTTP and can be found by searching the
[http://code.google.com/p/giimote/downloads/list?can=1&q=.tar.gz downloads
page].
+A source tarball is available over HTTP and can be found by searching on
the [http://code.google.com/p/giimote/downloads/list?can=1&q=.tar.gz
downloads page].
== Subversion ==
You can also checkout a working copy of GiiMote from the
[http://giimote.googlecode.com/svn/ SVN repository]. To get a working copy
from subversion please follow the instructions on
[http://code.google.com/p/giimote/source/checkout this page].
-If you obtain the source from SVN it will not always build properly. To
get a copy of a stable release look in the
[http://giimote.googlecode.com/svn/tags/ tags directory].
+If you obtain the source from SVN GiiMote may not be stable, or even
compile at all. To get a copy of a stable release look in the
[http://giimote.googlecode.com/svn/tags/ tags directory].
== Browse source on the Web ==
@@ -28,7 +29,7 @@
Before you attempt to build GiiMote make sure you have the proper tools
and that they are configured correctly and visible to your build
environment.
== Release ==
-These dependencies are only used when you build GiiMote with the
[ReleaseConfiguration release configuration]. This configuration does not
embed debugging symbols and exports a source tarball and typelibrary after
the build.
+These dependencies are only used when you build GiiMote with the
[ReleaseConfiguration release configuration]. This configuration does not
embed debugging symbols and exports a source tarball after the build.
* [Subversion]
* [Tar]
@@ -38,7 +39,7 @@
The [DebugConfiguration debug configuration] does not have any
configuration-specific dependencies.
== MATLAB ==
-To build GiiMote for [MATLAB] you must have a licensed copy of MATLAB. To
find out more visit [http://www.mathworks.com/ The MathWorks].
+To build GiiMote for [MATLAB] you must own a licensed copy of MATLAB. To
find out more visit [http://www.mathworks.com/ The MathWorks].
== All Configurations ==
@@ -51,8 +52,9 @@
After you have all of your tools configured and the source downloaded you
can finally build GiiMote. A solution for Visual Studio or Visual C++
Express is provided with the source. This is the recommended and only
supported method for building GiiMote. Building in Visual Studio or Visual
C++ Express is as easy as opening
[http://code.google.com/p/giimote/source/browse/trunk/GiiMote.sln
GiiMote.sln] in the IDE, selecting a configuration ("[ReleaseConfiguration
Release]", "[DebugConfiguration Debug]", or "[MatlabConfiguration
MATLAB]"), and pressing build.
+
= Links =
- * [http://code.google.com/p/giimote/source/browse/ code browser]
+ * [http://code.google.com/p/giimote/source/browse/ Code browser]
* [http://giimote.googlecode.com/svn/ SVN repo]
* [http://giimote.googlecode.com/svn/tags/ Stable releases]
Modified: wiki/GML.wiki
==============================================================================
--- wiki/GML.wiki (original)
+++ wiki/GML.wiki Sat May 9 19:41:31 2009
@@ -1,5 +1,5 @@
-#summary Game Maker Language, the scripting language of Game Maker
-#labels Phase-Implementation,Type-Article,Featured
+#summary Game Maker Language, the scripting language of Game Maker
+#labels Phase-Implementation,Type-Article
= Introduction =
Modified: wiki/Gzip.wiki
==============================================================================
--- wiki/Gzip.wiki (original)
+++ wiki/Gzip.wiki Sat May 9 19:41:31 2009
@@ -3,10 +3,10 @@
= Introduction =
-Gzip.exe is used in the [ReleaseConfiguration "Release" configuration] by
[Tar Tar.exe] to compress the source tarball which is generated after
compiling GiiMote. To use gzip you must:
- * Download GNU's gzip tool [http://www.gnu.org/software/gzip/ here]
- * Place gzip.exe in a location where it is visible from the command line
+Gzip.exe is used in the [ReleaseConfiguration "Release" configuration] by
[Tar tar.exe] to compress the source tarball which is generated after
compiling GiiMote.
+
= Links =
+ * [http://www.gzip.org/ The gzip home page]
* [http://www.gnu.org/software/gzip/ GNU's Gzip tool]
Modified: wiki/Tar.wiki
==============================================================================
--- wiki/Tar.wiki (original)
+++ wiki/Tar.wiki Sat May 9 19:41:31 2009
@@ -1,11 +1,9 @@
-#summary Description of Tar.exe and is place in the build process
+#summary Description of tar and is place in the build process
#labels Phase-Requirements
= Introduction =
-Tar.exe is used in the [ReleaseConfiguration "Release" configuration] to
create a source tarball after compiling GiiMote. To use tar you must:
- * Download GNU's tar tool [http://www.gnu.org/software/tar/ here]
- * Place Tar.exe in a location where it is visible to the command line
+Tar is used in the [ReleaseConfiguration "Release" configuration] to
create a source tarball after compiling GiiMote.
= Dependencies =
@@ -13,4 +11,4 @@
= Links =
- * [http://www.gnu.org/software/tar/ GNU's implementation of Tar]
+ * [http://www.gnu.org/software/tar/ GNU's implementation of Tar]
\ No newline at end of file
Modified: wiki/TlbExp.wiki
==============================================================================
--- wiki/TlbExp.wiki (original)
+++ wiki/TlbExp.wiki Sat May 9 19:41:31 2009
@@ -3,7 +3,7 @@
= Introduction =
-TlbExp is a tool which is included with the .NET Framework. It is used to
export a [TypeLibrary type library] after the build process has been
completed.
+TlbExp is a tool which is included with the .NET Framework. It is used in
the GiiMote build process to export a [TypeLibrary type library] after the
build has been completed.
= Links =
Modified: wiki/WiimoteLib.wiki
==============================================================================
--- wiki/WiimoteLib.wiki (original)
+++ wiki/WiimoteLib.wiki Sat May 9 19:41:31 2009
@@ -11,11 +11,6 @@
WiimoteLib was started by [http://brianpeek.com/ Brian Peek] as an article
for Microsoft's [http://blogs.msdn.com/coding4fun/ Coding4Fun] website. The
original article contains basics on the design and internals of the library
and can be found
[http://blogs.msdn.com/coding4fun/archive/2007/03/14/1879033.aspx here].
WiimoteLib is open source and licensed under the MS-Pl.
-= Implementation =
-
-To compile GiiMote you will need to obtain WiimoteLib from
[http://www.codeplex.com/WiimoteLib CodePlex] and place the library in a
sub-directory of your trunk or root directory called "WiimoteLib"
(ex. "\trunk\WiimoteLib\WiimoteLib.dll").
-
-
= Links =
* [http://www.codeplex.com/WiimoteLib WiimoteLib on CodePlex]
Reply all
Reply to author
Forward
0 new messages