Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1121] trunk/plugins/IR Server Suite
|
From: <an...@us...> - 2007-12-04 04:22:18
|
Revision: 1121
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1121&view=rev
Author: and-81
Date: 2007-12-03 20:22:16 -0800 (Mon, 03 Dec 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite.nsi
Added Paths:
-----------
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiAll.png
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiAll.xml
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiClassic.png
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiClassic.xml
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiRemote.png
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiRemote.xml
Added: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiAll.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiAll.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiAll.xml
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiAll.xml (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiAll.xml 2007-12-04 04:22:16 UTC (rev 1121)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<skin>
+ <button name="Up" code="Wiimote_Pad:Up" shortcut="Up" top="58" left="57" height="25" width="25" />
+ <button name="Left" code="Wiimote_Pad:Left" shortcut="Left" top="81" left="34" height="25" width="25" />
+ <button name="Right" code="Wiimote_Pad:Right" shortcut="Right" top="81" left="81" height="25" width="25" />
+ <button name="Down" code="Wiimote_Pad:Down" shortcut="Down" top="105" left="57" height="25" width="25" />
+ <button name="A" code="Wiimote_Button:A" shortcut="A" top="156" left="46" height="50" width="50" />
+ <button name="Minus" code="Wiimote_Button:Minus" shortcut="Subtract" top="263" left="20" height="25" width="25" />
+ <button name="Home" code="Wiimote_Button:Home" shortcut="None" top="263" left="58" height="25" width="25" />
+ <button name="Plus" code="Wiimote_Button:Plus" shortcut="Add" top="263" left="97" height="25" width="25" />
+ <button name="One" code="Wiimote_Button:One" shortcut="NumPad1" top="407" left="55" height="32" width="32" />
+ <button name="Two" code="Wiimote_Button:Two" shortcut="NumPad2" top="458" left="55" height="32" width="32" />
+ <button name="B" code="Wiimote_Button:B" shortcut="B" top="90" left="268" height="77" width="57" />
+ <button name="Power" code="Wiimote_Special" shortcut="None" top="16" left="21" height="25" width="25" />
+ <button name="Up" code="WiimoteClassic_Pad:Up" shortcut="Up" top="401" left="496" height="30" width="30" />
+ <button name="Left" code="WiimoteClassic_Pad:Left" shortcut="Left" top="426" left="466" height="30" width="30" />
+ <button name="Right" code="WiimoteClassic_Pad:Right" shortcut="Right" top="429" left="526" height="30" width="30" />
+ <button name="Down" code="WiimoteClassic_Pad:Down" shortcut="Down" top="456" left="496" height="30" width="30" />
+ <button name="Minus" code="WiimoteClassic_Button:Minus" shortcut="Subtract" top="433" left="620" height="23" width="23" />
+ <button name="Home" code="WiimoteClassic_Button:Home" shortcut="None" top="433" left="658" height="23" width="23" />
+ <button name="Plus" code="WiimoteClassic_Button:Plus" shortcut="Add" top="433" left="697" height="23" width="23" />
+ <button name="Y" code="WiimoteClassic_Button:Y" shortcut="Y" top="425" left="758" height="40" width="40" />
+ <button name="X" code="WiimoteClassic_Button:X" shortcut="X" top="390" left="809" height="40" width="40" />
+ <button name="B" code="WiimoteClassic_Button:B" shortcut="B" top="458" left="806" height="40" width="40" />
+ <button name="A" code="WiimoteClassic_Button:A" shortcut="A" top="424" left="857" height="40" width="40" />
+ <button name="L" code="WiimoteClassic_Button:TriggerL" shortcut="L" top="324" left="461" height="36" width="95" />
+ <button name="R" code="WiimoteClassic_Button:TriggerR" shortcut="R" top="324" left="781" height="36" width="95" />
+ <button name="ZL" code="WiimoteClassic_Button:ZL" shortcut="None" top="324" left="586" height="20" width="40" />
+ <button name="ZR" code="WiimoteClassic_Button:ZR" shortcut="None" top="324" left="712" height="20" width="40" />
+</skin>
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiClassic.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiClassic.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiClassic.xml
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiClassic.xml (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiClassic.xml 2007-12-04 04:22:16 UTC (rev 1121)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<skin>
+ <button name="Up" code="WiimoteClassic_Pad:Up" shortcut="Up" top="78" left="86" height="30" width="30" />
+ <button name="Left" code="WiimoteClassic_Pad:Left" shortcut="Left" top="104" left="56" height="30" width="30" />
+ <button name="Right" code="WiimoteClassic_Pad:Right" shortcut="Right" top="104" left="117" height="30" width="30" />
+ <button name="Down" code="WiimoteClassic_Pad:Down" shortcut="Down" top="132" left="86" height="30" width="30" />
+ <button name="Minus" code="WiimoteClassic_Button:Minus" shortcut="Subtract" top="109" left="210" height="23" width="23" />
+ <button name="Home" code="WiimoteClassic_Button:Home" shortcut="None" top="109" left="248" height="23" width="23" />
+ <button name="Plus" code="WiimoteClassic_Button:Plus" shortcut="Add" top="109" left="287" height="23" width="23" />
+ <button name="Y" code="WiimoteClassic_Button:Y" shortcut="Y" top="101" left="347" height="40" width="40" />
+ <button name="X" code="WiimoteClassic_Button:X" shortcut="X" top="66" left="398" height="40" width="40" />
+ <button name="B" code="WiimoteClassic_Button:B" shortcut="B" top="134" left="395" height="40" width="40" />
+ <button name="A" code="WiimoteClassic_Button:A" shortcut="A" top="100" left="446" height="40" width="40" />
+ <button name="L" code="WiimoteClassic_Button:TriggerL" shortcut="L" top="0" left="51" height="36" width="95" />
+ <button name="R" code="WiimoteClassic_Button:TriggerR" shortcut="R" top="0" left="373" height="36" width="95" />
+ <button name="ZL" code="WiimoteClassic_Button:ZL" shortcut="None" top="0" left="178" height="20" width="40" />
+ <button name="ZR" code="WiimoteClassic_Button:ZR" shortcut="None" top="0" left="302" height="20" width="40" />
+</skin>
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiRemote.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiRemote.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiRemote.xml
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiRemote.xml (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/WiiRemote.xml 2007-12-04 04:22:16 UTC (rev 1121)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<skin>
+ <button name="Up" code="Wiimote_Pad:Up" shortcut="Up" top="58" left="57" height="25" width="25" />
+ <button name="Left" code="Wiimote_Pad:Left" shortcut="Left" top="81" left="34" height="25" width="25" />
+ <button name="Right" code="Wiimote_Pad:Right" shortcut="Right" top="81" left="81" height="25" width="25" />
+ <button name="Down" code="Wiimote_Pad:Down" shortcut="Down" top="105" left="57" height="25" width="25" />
+ <button name="A" code="Wiimote_Button:A" shortcut="A" top="156" left="46" height="50" width="50" />
+ <button name="Minus" code="Wiimote_Button:Minus" shortcut="Subtract" top="263" left="20" height="25" width="25" />
+ <button name="Home" code="Wiimote_Button:Home" shortcut="None" top="263" left="58" height="25" width="25" />
+ <button name="Plus" code="Wiimote_Button:Plus" shortcut="Add" top="263" left="97" height="25" width="25" />
+ <button name="One" code="Wiimote_Button:One" shortcut="NumPad1" top="407" left="55" height="32" width="32" />
+ <button name="Two" code="Wiimote_Button:Two" shortcut="NumPad2" top="458" left="55" height="32" width="32" />
+ <button name="B" code="Wiimote_Button:B" shortcut="B" top="90" left="268" height="77" width="57" />
+ <button name="Power" code="Wiimote_Special" shortcut="None" top="16" left="21" height="25" width="25" />
+</skin>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs 2007-12-04 03:33:40 UTC (rev 1120)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs 2007-12-04 04:22:16 UTC (rev 1121)
@@ -13,12 +13,13 @@
/// <summary>
/// IR Server Plugin for the Wii Remote.
/// </summary>
- public class WiiRemoteReceiver : IRServerPluginBase, IRemoteReceiver
+ public class WiiRemoteReceiver : IRServerPluginBase, IRemoteReceiver, IMouseReceiver
{
#region Variables
RemoteHandler _remoteButtonHandler;
+ MouseHandler _mouseHandler;
Wiimote _wiimote;
@@ -118,7 +119,17 @@
set { _remoteButtonHandler = value; }
}
+ /// <summary>
+ /// Callback for mouse events.
+ /// </summary>
+ /// <value>The mouse callback.</value>
+ public MouseHandler MouseCallback
+ {
+ get { return _mouseHandler; }
+ set { _mouseHandler = value; }
+ }
+
void WiimoteChanged(object sender, WiimoteChangedEventArgs args)
{
WiimoteState ws = args.WiimoteState;
@@ -169,16 +180,20 @@
int x = (int)(screenWidth - (ws.IRState.X1 + ws.IRState.X2) / 2 * screenWidth);
int y = (int)((ws.IRState.Y1 + ws.IRState.Y2) / 2 * screenHeight);
- Cursor.Position = new Point(x, y);
+ if (_mouseHandler == null)
+ {
+ Cursor.Position = new Point(x, y);
+ }
+ else
+ {
+ int prevX = (int)(screenWidth - (_previousState.IRState.X1 + _previousState.IRState.X2) / 2 * screenWidth);
+ int prevY = (int)((_previousState.IRState.Y1 + _previousState.IRState.Y2) / 2 * screenHeight);
- int prevX = (int)(screenWidth - (_previousState.IRState.X1 + _previousState.IRState.X2) / 2 * screenWidth);
- int prevY = (int)((_previousState.IRState.Y1 + _previousState.IRState.Y2) / 2 * screenHeight);
+ int deltaX = x - prevX;
+ int deltaY = y - prevY;
- int deltaX = x - prevX;
- int deltaY = y - prevY;
-
- Trace.WriteLine("DeltaX: " + deltaX.ToString() + " DeltaY: " + deltaY.ToString());
-
+ MouseCallback(deltaX, deltaY, 0);
+ }
}
}
else
Modified: trunk/plugins/IR Server Suite/IR Server Suite.nsi
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.nsi 2007-12-04 03:33:40 UTC (rev 1120)
+++ trunk/plugins/IR Server Suite/IR Server Suite.nsi 2007-12-04 04:22:16 UTC (rev 1121)
@@ -43,10 +43,17 @@
Function .onInit
${If} ${RunningX64}
+
+ ${DisableX64FSRedirection}
+ StrCpy '$INSTDIR' '$PROGRAMFILES\IR Server Suite'
+ ${EnableX64FSRedirection}
+
SetRegView 64
- ${DisableX64FSRedirection}
+
${Else}
+
SetRegView 32
+
${Endif}
FunctionEnd
@@ -138,6 +145,8 @@
File "IR Server Plugins\Microsoft MCE Transceiver\bin\Release\*.*"
File "IR Server Plugins\Serial IR Blaster\bin\Release\*.*"
File "IR Server Plugins\USB-UIRT Transceiver\bin\Release\*.*"
+ File "IR Server Plugins\Wii Remote Receiver\bin\Debug\*.*"
+ File "IR Server Plugins\WiimoteLib\bin\Debug\*.*"
File "IR Server Plugins\Windows Message Receiver\bin\Release\*.*"
File "IR Server Plugins\WinLirc Transceiver\bin\Release\*.*"
File "IR Server Plugins\X10 Transceiver\bin\Release\*.*"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
