From 00cd8573da47d89958c2999dd8db125e67b408fd Mon Sep 17 00:00:00 2001 From: xmikecampx7 Date: Mon, 15 Dec 2014 21:54:51 +0000 Subject: [PATCH] Added Draft PSX Schema --- .../BizHawk.Client.EmuHawk.csproj | 5 + .../Properties/Resources.Designer.cs | 40 ++++ .../Properties/Resources.resx | 12 ++ BizHawk.Client.EmuHawk/images/Circle.png | Bin 0 -> 801 bytes BizHawk.Client.EmuHawk/images/Cross.png | Bin 0 -> 897 bytes BizHawk.Client.EmuHawk/images/Square.png | Bin 0 -> 575 bytes BizHawk.Client.EmuHawk/images/Triangle.png | Bin 0 -> 716 bytes .../tools/VirtualPads/schema/PSXSchema.cs | 200 ++++++++++++++++++ .../Consoles/Sony/PSX/Octoshock.cs | 15 +- 9 files changed, 265 insertions(+), 7 deletions(-) create mode 100644 BizHawk.Client.EmuHawk/images/Circle.png create mode 100644 BizHawk.Client.EmuHawk/images/Cross.png create mode 100644 BizHawk.Client.EmuHawk/images/Square.png create mode 100644 BizHawk.Client.EmuHawk/images/Triangle.png create mode 100644 BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index e9b30fc4dc..af8c19b0bc 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1002,6 +1002,7 @@ + @@ -1526,6 +1527,10 @@ + + + + diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs index c0857685cd..bdb927c541 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs @@ -300,6 +300,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Circle { + get { + object obj = ResourceManager.GetObject("Circle", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -380,6 +390,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Cross { + get { + object obj = ResourceManager.GetObject("Cross", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1219,6 +1239,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Square { + get { + object obj = ResourceManager.GetObject("Square", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1299,6 +1329,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Triangle { + get { + object obj = ResourceManager.GetObject("Triangle", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx index 5489361bdf..5c8b9dd3f6 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.resx +++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx @@ -1473,4 +1473,16 @@ ..\images\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\Circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\Cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\Square.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\Triangle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/images/Circle.png b/BizHawk.Client.EmuHawk/images/Circle.png new file mode 100644 index 0000000000000000000000000000000000000000..282b708f902f907d0076dc30f5abad801f715853 GIT binary patch literal 801 zcmV++1K#|JP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;r%6OXRCwBqQ(H(>Q50SKoVoMRJ5F|ONT-MCP|~{?$T2F0=mA5KPESHX`jF}; zf})@3qpzT!Aj15J{0S>E=^=y^QACguWmEJNQp%X9(QzKm+{f<297Zc>eI3p|Yp-<{ zdlLY{1Q-Cq<@NCnUj>FBHIHWFN%z^T+#BC*LN_3;-ek@H&L(sB^akXW9;!42&B5>E5t@=Y7)X zWx({Saz)6igl9X&G67&9W!;TDN$hzyW~KlD?Q7g8GZBpw4H{n!y3ejIwW-t9=N3t& zHK3k|*K4_SMB|rG6V296MGg7Z5lMNbo1l_0QRPR*yO#nE%qWEAkqH#K+@nOF+ zBwGXOu?m+6ea~7iTl!MXv8<&R5V@cc0N`2N=-V>eUh8!Vzvhq*QB^EAN&>ov^&4*z zMtYiJp#uUyBRNL*aPB$-@T+2#a7g%=f#|658vlvtsQJpU00O*%e=B4ynE%@#Y4F4- z5J*@|F(SfJkM#fLEf?gFM@@-bq!58XaWR-SpIFQYm)o~hsgnLhn!I;OLb%+%T@Wyo zv7+L_$IK-VnZ6>i;nb3%Lo}7}$N9)YXG2|?vJV7Y8_ZsYB;fYClJn`EWjs=^>1_e` zVV_IfshuVQtX8GkxwfR!ugXmf#)mQM(fwGiz2}?$ z++eo0RX7%}pQSWbt75YxvW@B7zx!!o>*MeGaDHGGx~2PKKs{HhDb3bz!#Xp-fK3n> zfI`5VgmLTWi&V?QnEq{Yneyvgq7WMAJ3@QsIh!g~xmqE32_Td4<7>w3@A{JKXd4*6 f6&ttmnfw|6nokH9u}kj*00000NkvXXu0mjfMbC3$ literal 0 HcmV?d00001 diff --git a/BizHawk.Client.EmuHawk/images/Cross.png b/BizHawk.Client.EmuHawk/images/Cross.png new file mode 100644 index 0000000000000000000000000000000000000000..28a9c09f8d3bae0b5c365c20836571dedbe209e9 GIT binary patch literal 897 zcmV-{1AhF8P)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ<2T4RhRCwBSQ(H(BQ5gQt9Cv5d)-AdcrM?tJIWLD-@5?M|eQbAWQo86?# zOJQPB5EVp8WtJK~S%GTma zHwRBNnM8DUJUB=DUUu}G;><5(`$AOIv?OZQ!E3I+^ND?Ir+FNhz zt*fcHXc#(Zq)qRu&H*BjUO8>iXeZ&&$csr+rVAyzPPPa{NHU8Op0qUWt-o^gl40lo zK%&*<08qGTzq4@DfjgnluW_8SA`KtthP9Ovcl+uxw=0;atO~p0Nd9=6?qN_*Z=Z~*n0E7U5a{z>}@83RsjwJ&i zH1?A$%iSou_MCboP?{_dL8p}dVvLPROJ7NH38I)K~e$P3mQS~w64^adgYX#}iZTPklUs(1(>*=&|r+v6K$4Oc3! zzkBoQ@vOb|rt9j(!*z@q z0DytFeS?(7b<6gw{BU^0Cfl=A#*9F~*At+*tF|oIUQ%_JF(b)j64|r1+pdPIRrR{A z{j*fQ*WH5vx|Os=`I;88r7BsfCEog$mhC%paN@+ND=DR{tHWJ->HNWlzvS3OB7U!D zkj9z1Qsm5h0Jdp~GZHXq@^s7T^Ud|U%FpgJo26(sNemu!YyF1urL~PcchWPQiN6N` XsB}T8h}oR)00000NkvXXu0mjf`dXx? literal 0 HcmV?d00001 diff --git a/BizHawk.Client.EmuHawk/images/Square.png b/BizHawk.Client.EmuHawk/images/Square.png new file mode 100644 index 0000000000000000000000000000000000000000..00c3ade7b3c7e0f43f2d5df32291b3e0ced050df GIT binary patch literal 575 zcmV-F0>J%=P)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ-#Ysd#RCwBqQcG)7Q4s#-oVh1A#uS^45=3gC4=gA~1Z&pr)U{m}T)J@S(wz(a z4Q~7w(!ZfXV(Y>OlqyIFxi{xEE_(0HZPQ9VILtXSXCB|o(EAtfUJthJ?_{$~00JOb z1l8^*c2=5>#=j5PaPp9qe$;F<(O`4RO&}mpA?Lwda0nrQ6^~ex&RA=F`aazM{A08) zB3hAx3l5jlmP}_E3>yGKT4}M~%FU}cHtw!%?*WprK*+Gcm!DrhzWVUyEtbHu!PCKm zjs6}$P?LNLMFdScC89cEs-5~9F1S{yREh{7f=GmjoY%DlG)=Smt4gJh;eS3<9|0>} z%}SM4k!9Ey6r!&psu&{(gqfdVSs3Pd1)cU4@i8Dx(xn58rxU1?hC`)E15qLj^XXMv zloeJkwGj)>-0fV04*^q~IR8c>E_TDR8H~ip=I% z@AmGzeEj?gAlioj7aXDpR$D7@As}}-ViXuo!tJ%Kd)8S903QB2G&`Gp+`7KL+wX1f zR(XpI<-!oCC|lsXhYcP865j0gzFF@^QKC$8KWBgL3d~ut(f~00Hvj(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;Qb|NXRCwBSl5I#+Q5eUc=iGbFUSxN7>Ke71<`%&~f}&UOg$f&{l_ab;KlCN) z!=QZ_v+L9c4jdl- z&%^Kh{|5j7O{Z8003fwC?2u13H<^2;I|2ZTu)K;QP8?;#84BJMTvAPLY%-w5;tM59 z004j#2TVN<03aQzJ50Un>WIzibsjr#ehnQLR>23VcvxlRbQG!RguJ1$8t-mB79Y^R z|45m%SR~-3SaRrKm?@rZ+0l>P3s2u(AdWJ(GZgGWD#B`dvnfCokGyH<*3as}8?$tM zrH$BaP!;X{;2*uu9Zh?8mg-39}RUIsZ364ZM@8UifaXd)Lg$$4h64ivG_#t?m#Ek^krrl z$#j}-aHD-!Z9B19S@zAui~pa&ZY3KZUK#VhdcdWYhDKPUgmNdV>hJyH8@{JnYd8Cs zo**6F-^P62J&RK_k253hUjregDFKjCKv4iAnbuN+!x3bZm7i_Djur+;6;Flt&c)Bj zsG`p$UK)w{X|yoH_58oQ7zHE*IOo7M9gq-UKIN3)D6{|S>u*DMq~n~UrM{<-UDQz| yR-n`Zob#n{xXB7c1kMXw*E1*xkpG<;|2qJF2+T9DA`p`R0000 GetPadSchemas() + { + yield return DualShockController(1); + yield return ConsoleButtons(); + } + + public static PadSchema DualShockController(int controller) + { + return new PadSchema + { + IsConsole = false, + DefaultSize = new Size(420, 260), + Buttons = new[] + { + new PadSchema.ButtonScema + { + Name = "P" + controller + " Up", + DisplayName = "", + Icon = Properties.Resources.BlueUp, + Location = new Point(32, 50), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " Down", + DisplayName = "", + Icon = Properties.Resources.BlueDown, + Location = new Point(32, 71), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " Left", + DisplayName = "", + Icon = Properties.Resources.Back, + Location = new Point(11, 62), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " Right", + DisplayName = "", + Icon = Properties.Resources.Forward, + Location = new Point(53, 62), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " L1", + DisplayName = "L1", + Location = new Point(3, 32), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " R1", + DisplayName = "R1", + Location = new Point(191, 32), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " L2", + DisplayName = "L2", + Location = new Point(3, 10), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " R2", + DisplayName = "R2", + Location = new Point(191, 10), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " L3", + DisplayName = "L3", + Location = new Point(72, 90), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " R3", + DisplayName = "R3", + Location = new Point(130, 90), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " Square", + DisplayName = "", + Icon = Properties.Resources.Square, + Location = new Point(148, 62), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " Triangle", + DisplayName = "", + Icon = Properties.Resources.Triangle, + Location = new Point(169, 50), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " Circle", + DisplayName = "", + Icon = Properties.Resources.Circle, + Location = new Point(190, 62), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " Cross", + DisplayName = "", + Icon = Properties.Resources.Cross, + Location = new Point(169, 71), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " Start", + DisplayName = "S", + Location = new Point(112, 62), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " Select", + DisplayName = "s", + Location = new Point(90, 62), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " LStick X", + MaxValue = 127, + DisplayName = "", + Location = new Point(3, 120), + Type = PadSchema.PadInputType.AnalogStick + }, + new PadSchema.ButtonScema + { + Name = "P" + controller + " RStick X", + MaxValue = 127, + DisplayName = "", + Location = new Point(210, 120), + Type = PadSchema.PadInputType.AnalogStick + } + } + }; + } + private static PadSchema ConsoleButtons() + { + return new PadSchema + { + DisplayName = "Console", + IsConsole = true, + DefaultSize = new Size(360, 250), + Buttons = new[] + { + new PadSchema.ButtonScema + { + Name = "Eject", + DisplayName = "Eject", + Location = new Point(10, 15), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "Reset", + DisplayName = "Reset", + Location = new Point(60, 15), + Type = PadSchema.PadInputType.Boolean + }, + new PadSchema.ButtonScema + { + Name = "Disc Switch", + MaxValue = 50, + DisplayName = "", + Location = new Point(10, 40), + Type = PadSchema.PadInputType.AnalogStick + } + } + }; + } + } +} diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs index 3d9d4ec6b0..b8b58aea6c 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs @@ -32,16 +32,17 @@ namespace BizHawk.Emulation.Cores.Sony.PSX Name = "DualShock Controller", BoolButtons = { - "Up", "Down", "Left", "Right", - "Select", "Start", - "Square", "Triangle", "Circle", "Cross", - "L1", "R1", "L2", "R2", "L3", "R3", - "MODE", + "P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Select", "P1 Start", "P1 Square", "P1 Triangle", "P1 Circle", "P1 Cross", "P1 L1", + "P1 R1", "P1 L2", "P1 R2", "P1 L3", "P1 R3", "P1 MODE", + //"P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Select", "P2 Start", "P2 Square", "P2 Triangle", "P2 Circle", "P2 Cross", "P2 L1", + //"P2 R1", "P2 L2", "P2 R2", "P2 L3", "P2 R3", "P2 MODE", + "Eject", "Reset", }, FloatControls = { - "LStick X", "LStick Y", - "RStick X", "RStick Y", + "P1 LStick X", "P1 LStick Y", "P1 RStick X", "P1 RStick Y", + //"P2 LStick X", "P2 LStick Y", "P2 RStick X", "P2 RStick Y", + //TODO: Fix "Disc Switch", }, FloatRanges = {