diff --git a/3rdparty/include/IconsPromptFont.h b/3rdparty/include/IconsPromptFont.h index cd158abb34..17fe5def7e 100644 --- a/3rdparty/include/IconsPromptFont.h +++ b/3rdparty/include/IconsPromptFont.h @@ -329,4 +329,13 @@ #define ICON_PF_SHOPPING_CART "\xF0\x9F\x9B\x92" #define ICON_PF_ACHIEVEMENTS_PROGRESSION "\xE2\x8E\xB2" #define ICON_PF_ACHIEVEMENTS_MISSABLE "\xE2\x8E\xB3" -#define ICON_PF_ACHIEVEMENTS_WIN "\xE2\x8E\xB4" \ No newline at end of file +#define ICON_PF_ACHIEVEMENTS_WIN "\xE2\x8E\xB4" +#define ICON_PF_POPN_BLUE_LEFT "\xE2\x8B\x80" +#define ICON_PF_POPN_BLUE_RIGHT "\xE2\x8B\x81" +#define ICON_PF_POPN_GREEN_LEFT "\xE2\x8B\x82" +#define ICON_PF_POPN_GREEN_RIGHT "\xE2\x8B\x83" +#define ICON_PF_POPN_YELLOW_LEFT "\xE2\x8B\x84" +#define ICON_PF_POPN_YELLOW_RIGHT "\xE2\x8B\x85" +#define ICON_PF_POPN_WHITE_LEFT "\xE2\x8B\x86" +#define ICON_PF_POPN_WHITE_RIGHT "\xE2\x8B\x87" +#define ICON_PF_POPN_RED "\xE2\x8B\x88" \ No newline at end of file diff --git a/bin/resources/fonts/promptfont.otf b/bin/resources/fonts/promptfont.otf index bddd1c2cc3..5bf2041c16 100644 Binary files a/bin/resources/fonts/promptfont.otf and b/bin/resources/fonts/promptfont.otf differ diff --git a/pcsx2-qt/CMakeLists.txt b/pcsx2-qt/CMakeLists.txt index 9287189559..245077a89d 100644 --- a/pcsx2-qt/CMakeLists.txt +++ b/pcsx2-qt/CMakeLists.txt @@ -64,6 +64,7 @@ target_sources(pcsx2-qt PRIVATE Settings/ControllerBindingWidget.ui Settings/ControllerBindingWidget_DualShock2.ui Settings/ControllerBindingWidget_Guitar.ui + Settings/ControllerBindingWidget_Popn.ui Settings/ControllerBindingWidgets.cpp Settings/ControllerBindingWidgets.h Settings/ControllerLEDSettingsDialog.ui diff --git a/pcsx2-qt/Settings/ControllerBindingWidget_Popn.ui b/pcsx2-qt/Settings/ControllerBindingWidget_Popn.ui new file mode 100644 index 0000000000..cfa5ee8f82 --- /dev/null +++ b/pcsx2-qt/Settings/ControllerBindingWidget_Popn.ui @@ -0,0 +1,531 @@ + + + ControllerBindingWidget_Popn + + + + 0 + 0 + 1232 + 644 + + + + + 0 + 0 + + + + + 1100 + 500 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 400 + 266 + + + + + + + :/images/Popn.svg + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + Select + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 100 + 16777215 + + + + PushButton + + + + + + + + + + Yellow (Left) + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 100 + 16777215 + + + + PushButton + + + + + + + + + + Yellow (Right) + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 100 + 16777215 + + + + PushButton + + + + + + + + + + Blue (Right) + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 100 + 16777215 + + + + PushButton + + + + + + + + + + Blue (Left) + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 100 + 16777215 + + + + PushButton + + + + + + + + + + Start + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 100 + 16777215 + + + + PushButton + + + + + + + + + + + + + + Red + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + + 100 + 16777215 + + + + PushButton + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Green (Right) + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 150 + 0 + + + + + 100 + 16777215 + + + + PushButton + + + + + + + + + + White (Left) + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 150 + 0 + + + + + 100 + 16777215 + + + + PushButton + + + + + + + + + + Green (Left) + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 150 + 0 + + + + + 100 + 16777215 + + + + PushButton + + + + + + + + + + White (Right) + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 150 + 0 + + + + + 100 + 16777215 + + + + PushButton + + + + + + + + + + + + + InputBindingWidget + QPushButton +
Settings/InputBindingWidget.h
+ + + + + + + diff --git a/pcsx2-qt/Settings/ControllerBindingWidgets.cpp b/pcsx2-qt/Settings/ControllerBindingWidgets.cpp index 5d356a19e8..6d545b6b9b 100644 --- a/pcsx2-qt/Settings/ControllerBindingWidgets.cpp +++ b/pcsx2-qt/Settings/ControllerBindingWidgets.cpp @@ -108,6 +108,10 @@ void ControllerBindingWidget::onTypeChanged() { m_bindings_widget = ControllerBindingWidget_Guitar::createInstance(this); } + else if (cinfo->type == Pad::ControllerType::Popn) + { + m_bindings_widget = ControllerBindingWidget_Popn::createInstance(this); + } else { m_bindings_widget = new ControllerBindingWidget_Base(this); @@ -897,6 +901,27 @@ ControllerBindingWidget_Base* ControllerBindingWidget_Guitar::createInstance(Con return new ControllerBindingWidget_Guitar(parent); } +ControllerBindingWidget_Popn::ControllerBindingWidget_Popn(ControllerBindingWidget* parent) + : ControllerBindingWidget_Base(parent) +{ + m_ui.setupUi(this); + initBindingWidgets(); +} + +ControllerBindingWidget_Popn::~ControllerBindingWidget_Popn() +{ +} + +QIcon ControllerBindingWidget_Popn::getIcon() const +{ + return QIcon::fromTheme("Popn-line"); +} + +ControllerBindingWidget_Base* ControllerBindingWidget_Popn::createInstance(ControllerBindingWidget* parent) +{ + return new ControllerBindingWidget_Popn(parent); +} + ////////////////////////////////////////////////////////////////////////// USBDeviceWidget::USBDeviceWidget(QWidget* parent, ControllerSettingsWindow* dialog, u32 port) diff --git a/pcsx2-qt/Settings/ControllerBindingWidgets.h b/pcsx2-qt/Settings/ControllerBindingWidgets.h index 84125b1af6..be11c6c7a1 100644 --- a/pcsx2-qt/Settings/ControllerBindingWidgets.h +++ b/pcsx2-qt/Settings/ControllerBindingWidgets.h @@ -12,6 +12,7 @@ #include "ui_ControllerBindingWidget.h" #include "ui_ControllerBindingWidget_DualShock2.h" #include "ui_ControllerBindingWidget_Guitar.h" +#include "ui_ControllerBindingWidget_Popn.h" #include "ui_ControllerMacroWidget.h" #include "ui_ControllerMacroEditWidget.h" #include "ui_USBDeviceWidget.h" @@ -199,6 +200,22 @@ private: Ui::ControllerBindingWidget_Guitar m_ui; }; +class ControllerBindingWidget_Popn final : public ControllerBindingWidget_Base +{ + Q_OBJECT + +public: + ControllerBindingWidget_Popn(ControllerBindingWidget* parent); + ~ControllerBindingWidget_Popn(); + + QIcon getIcon() const override; + + static ControllerBindingWidget_Base* createInstance(ControllerBindingWidget* parent); + +private: + Ui::ControllerBindingWidget_Popn m_ui; +}; + ////////////////////////////////////////////////////////////////////////// class USBDeviceWidget final : public QWidget diff --git a/pcsx2-qt/Translations.cpp b/pcsx2-qt/Translations.cpp index 0bde59d84a..4e06fcaddf 100644 --- a/pcsx2-qt/Translations.cpp +++ b/pcsx2-qt/Translations.cpp @@ -360,22 +360,22 @@ static constexpr const QtHost::GlyphInfo s_glyph_info[] = { { "ja-JP", "msgothic.ttc", nullptr, "ヒラギノ角ゴシック W3.ttc", // auto update by update_glyph_ranges.py with pcsx2-qt_ja-JP.ts - u"​​……□□△△◯◯✕✕、。々々「』〜〜ああいいううええおせそそたちっぬのばびびぶぶへべほぼまやょろわわをんァイウチッツテニネロワワンン・ー一一上下不与世世両両並並中中乗乗了了予予事事互互交交今介他他付付代以仮仮件件任任伸伸似似位低体体何何作作使使例例供供係係保保信信修修個個倍倍借借値値停停側側傍傍備備像像優優元元先光入入全全公公共共具典内内再再冗冗処処出出分切列列初初判別利利制刷則則削削前前副副割割力力加加効効動動勧勧化化区区十十半半南単印印即即去去参参及及反収取受古古可台右右号号各各合合同名向向否否含含告告周周味味命命品品商商問問善善四四回回囲囲固固国国圧在地地均均垂垂型型域域基基報報場場境境増増壊壊声声変変外外多多大大太太央央失失奇奇奨奨好好妙妙妨妨始始子子字存安安完完定定実実容容寄寄密密対対射射尊尊小小少少尾尾展展履履岐岐崩崩左左巨巨己己帰帰常常幅幅平平序序度座延延式式引引弱弱張張強強当当形形彩彩影影役役待待後後得得御御復復微微心心必必応応忠忠念念急急性性悪悪情情想想意意感感態態慣慣成成戻戻所所手手承承投投択択抱抱押押拒拒招招拡拡拳拳持持指指振振挿挿捗捗排排接接推推描提換換揮揮援援揺揺損損撮撮操操支支改改放放敗敗数数整整文文料料断断新新方方既既日日早早明明昨昨時時曲曲更更書書替最有有望望期期未本条条析析果果格格桁桁案案械械検検極極楽楽概概構構標標権権橙橙機機欄欄欠次止正歴歴殊残毎毎比比水水求求汎汎決決況況法法波波注注浪浪浮浮消消深深済済減減渡渡港港湾湾満満源源準準滑滑点点無無照照牲牲特特犠犠状状獲獲率率現現理理璧璧環環生生用用由由申申画画番番異異発登白白的的目目直直相相省省知知短短破破確確示示禁禁秒秒移移程程種種稿稿空空立立端端競競第第算算管管範範精精索索細細終終組組経経結結絞絞統統続続維維緑緒線線編編縦縦縮縮績績繰繰置置義義者者肢肢能能自自致致般般良良色色荷荷落落蔵蔵行行表表衰衰装装補補製製複複要要見見規規視視覚覚覧覧観観角角解解言言計計記記設設許許訳訳証証試試該詳認認語語誤誤説読調調識識警警象象負負責責費貼資資質質赤赤起起超超足足跡跡転転軸軸軽軽辞辞込込近近返返追追送送逆逆途途通通速速連連進進遅遅遊遊過過適適選選避避部部配配重量鉄鉄録録長長閉閉開開間間関関閾閾防防降降限限除除陽陽隅隅際際集集離難電電青青非非面面韓韓音音響響頂頂順順領領頻頼題題類類飾飾香香駄駄高高鮮鮮黄黄！！＞？～～" + u"​​……□□△△◯◯✕✕、。々々「』〜〜ああいいううええおせそそたちっぬのばびびぶぶへべほぼまもややょろわわをんァイウチッツテニネロワワンヴ・ー一一上下不与世世両両並並中中丸丸乗乗了了予予事事互互交交今介他他付付代以仮仮件件任任伸伸似似位低体体何何作作使使例例供供依依価価係係保保信信修修個個倍倍借借値値停停側側傍傍備備像像優優元元先光入入全全公公共共具典内内再再冗冗処処出出分切列列初初判別利利制刷則則削削前前副副割割力力加加効効動動勧勧化化区区十十半半南単印印即即厳厳去去参参及及反反取受古古可台右右号号各各合合同名向向含含告告周周味味命命品品商商問問善善四四回回囲囲固固国国圧在地地均均垂垂型型域域基基報報場場境境増増壊壊声声変変外外多多大大太太央央失失奇奇奨奨好好妙妙妨妨始始子子字存安安完完定定実実容容寄寄密密対対専専射射尊尊小小少少尾尾展展履履岐岐崩崩左左巨巨差差己己帰帰常常幅幅平平序序度座延延式式引引弱弱張張強強当当形形彩彩影影役役待待後後得得御御復復微微心心必必応応忠忠念念思思急急性性悪悪情情想想意意感感態態慣慣成成戦戦戻戻所所手手扱扱承承抜抜択択抱抱押押招招拡拡拳拳持持指指振振挿挿捗捗排排接接推推描提換換援援揺揺損損撮撮操操支支改改放放敗敗数数整整文文料料断断新新方方既既日日早早昇昇明明昨昨時時普普曲曲更更書書替最有有望望期期未本条条析析果果格格桁桁案案械械検検極極楽楽概概構構標標権権橙橙機機欄欄欠次止正歴歴殊残母毎比比水水求求汎汎決決況況法法波波注注浪浪浮浮消消深深済済減減渡渡港港湾湾満満源源準準滑滑演演点点無無照照牲牲特特犠犠状状独独獲獲率率現現理理璧璧環環生生用用由由申申画画留留番番異異発登白白的的目目直直相相省省知知短短破破確確示示禁禁秒秒移移程程種種空空立立端端競競第第策策算算管管節節範範精精索索細細終終組組経経結結絞絞統統続続維維緑緒線線編編縦縦縮縮績績繰繰置置義義習習者者肢肢能能自自致致般般良良色色英英荷荷落落蔵蔵行行表表衰衰装装補補製製複複要要見見規規視視覚覚覧覧観観角角解解言言計計記記設設許許訳訳証証評評試試該詳認認語語誤誤説読調調識識警警象象負負責責費貼資資質質赤赤起起超超足足跡跡転転軸軸軽軽辞辞込込近近返返述述追追送送逆逆途途通通速速連連進進遅遅遊遊過過適適選選避避部部配配重量鉄鉄録録長長閉閉開開間間関関閾閾防防降降限限除除陽陽隅隅際際集集雑雑難難電電青青静静非非面面韓韓音音響響頂頂順順領領頻頼題題類類飾飾香香駄駄高高鮮鮮黄黄️️！！％％（）：：＞？～～" }, { "ko-KR", "malgun.ttf", nullptr, "AppleSDGothicNeo.ttc", // auto update by update_glyph_ranges.py with pcsx2-qt_ko-KR.ts - u"“”……←↓□□△△◯◯✕✕んん茶茶가각간간갈갈감값강강같같개개거거건건걸걸검겁것것게게겟겠겨격견견결결경경계계고곡곱곱공공과과관관교교구국군군권권규규균균그극근근글글금급긍긍기기긴긴길길김깁깃깃깅깅깊깊까까깝깝깨깨꺼꺼께께꾸꾸꿉꿉끄끄끊끊끔끔끝끝나나난난날날남남낭낮내내낸낸냅냅너너널널넣네넬넬넷넷노녹높놓누누눈눈눌눌뉴뉴느느는는늘늘능능니니닌닌님닙닛닛다다단단닫달담담당당대대댑댑더더덜덜덤덤덩덩덮덮데덱덴덴델델도독돌돌동동됐됐되되된된될될됨됩두두둘둘뒤뒤듀듀듈듈드득든든들들듬듭등등디디딩딩때때떠떠떤떤떨떨또또뛰뛰뛸뛸뜁뜁뜨뜨라락란란랍랍랑랑래랙랜랜램램랫랫량량러럭런런럴럴럼럽렀렀렇렉렌렌렛렛려력련련렬렬렸령로록롤롤롭롭롯롯료료루루룸룸류류률률르르른른를를름릅리릭린린릴릴림립릿릿링링마막만만많많말말맞맞매매맨맨맵맵맺맺머머먼먼멀멀멈멈멋멋메메며며면면명명모목몬몬못못몽몽무무문문물물뮬뮬므므미믹민민밀밀밉밉밍밍및및바바반반받밝밥밥방방배백밴밴뱃뱃버버번번벌벌범법벗벗베벡벤벤벨벨벼벽변변별별병병보복본본볼볼부부분분불불붙붙뷰뷰브브블블비빅빈빈빌빌빙빙빛빛빠빠빨빨사삭산산살살삼삽상상새색샘샘생생샷샷서서선선설설성성세섹센센셀셀셈셉셋셋션션셰셰소속손손솔솔송송쇄쇄쇠쇠쇼쇼수숙순순숨숨숫숫쉬쉬슈슈스스슬슬습습시식신신실실심십싱싱싶싶쌍쌍쓰쓰쓸쓸씬씬아아안안않않알알암압았앙애액앤앤앨앨앵앵야약양양어어언언얻얼업없었었에에엔엔여역연연열열영영예예오오온온올올옵옵와와완완왑왑왔왔외외왼왼요요용용우우운운울울움웁웃웃워워원원월월웠웠웨웨웹웹위위유유율율으으은은을을음음응응의의이이인인일읽임입있있자작잘잘잠잡장장재재잿잿저적전전절절점접정정제제젠젠젤젤젯젯져져조족존존종종좋좌죄죄주주준준줄줄줍줍중중즈즉즐즐즘즘증증지직진진질질짐집짝짝짧짧째째쪽쪽찌찍차착참참창찾채책챕챕처척천천철철첨첩첫첫청청체체쳐쳐초초총총촬촬최최추축출출춤춥충충춰춰취취츠측치칙칠칠침칩칭칭카카칸칸칼칼캐캐캔캔캘캘캠캡커커컨컨컬컬컴컴케케켓켓켜켜켬켬코코콘콘콜콜콩콩쿳쿳퀀퀀퀴퀴큐큐크크큰큰클클큽큽키키킨킨킬킬킵킵킹킹타타탈탈탐탐태택탠탠탬탭터터턴턴털털텀텀테텍텐텐텔텔템템토토톨톨톱톱통통투투트특튼튼틀틀티틱팀팀팅팅파파팔팔팝팝패패팻팻퍼퍼페펙편편평평포포폴폴폼폼표표푸푸풀풀품품퓨퓨프프픈픈플플피픽핀핀필필핑핑하하한한할할함합핫핫항항해핵했행향향허허헌헌헤헤현현형형호혹혼혼홈홈홍홍화확환환활활황황회획횟횟횡횡효효후후훨훨휠휠휴휴흐흐흔흔희희히히힌힌" + u"“”……←↓□□△△◯◯✕✕んん茶茶가각간간갈갈감값강강같같개개거거건건걸걸검겁것것게게겟겠격격견견결결경경계계고곡곱곱공공과과관관교교구국군군권권귀귀규규균균그극근근글글금급긍긍기기긴긴길길김깁깃깃깅깅깊깊까까깝깝깨깨꺼꺼께께꾸꾸꿉꿉끄끄끊끊끔끔끝끝나나난난날날남남낭낮내내낸낸냅냅너너널널넣네넬넬넷넷노녹높놓누누눈눈눌눌뉴뉴느느는는늘늘능능니닉닌닌님닙닛닛다다단단닫달담담당당대대댑댑더더덜덜덤덤덩덩덮덮데덱덴덴델델도독돌돌동동됐됐되되된된될될됨됩두두둘둘뒤뒤듀듀듈듈드득든든들들듬듭등등디디딩딩때때떠떠떤떤떨떨또또뛰뛰뛸뛸뜁뜁뜨뜨라락란란랍랍랑랑래랙랜랜램램랫랫량량러럭런런럴럴럼럽렀렀렇렉렌렌렛렛려력련련렬렬렸령로록롤롤롭롭롯롯료료루루룸룸류류률률르르른른를를름릅리릭린린릴릴림립릿릿링링마막만만많많말말맞맞매매맨맨맵맵맺맺머머먼먼멀멀멈멈멋멋메메며며면면명명모목몬몬못못무무문문물물뮬뮬므므미믹민민밀밀밉밉밍밍및및바바반반받밝밥밥방방배백밴밴뱃뱃버버번번벌벌범법벗벗베벡벤벤벨벨벼벽변변별별병병보복본본볼볼부부분분불불붙붙뷰뷰브브블블비빅빈빈빌빌빙빙빛빛빠빠빨빨사삭산산살살삼삽상상새색샘샘생생샷샷서서선선설설성성세섹센센셀셀셈셉셋셋션션셰셰소속손손솔솔송송쇄쇄쇠쇠쇼쇼수숙순순숨숨숫숫슈슈스스슬슬습습시식신신실실심십싱싱싶싶쌍쌍쓰쓰쓸쓸씬씬아악안안않않알알암압았앙앞앞애액앤앤앨앨앵앵야약양양어어언언얻얼업없었었에에엔엔여역연연열열영영예예오오온온올올옵옵와와완완왑왑왔왔외외왼왼요요용용우우운운울울움웁웃웃워워원원월월웠웠웨웨웹웹위위유유율율으으은은을을음음응응의의이이인인일읽임입있있자작잘잘잠잡장장재재잿잿저적전전절절점접정정제제젠젠젤젤젯젯져져조족존존종종좋좌죄죄주주준준줄줄줍줍중중즈즉즐즐즘즘증증지직진진질질짐집짝짝짧짧째째쪽쪽찌찍차착참참창찾채책챕챕처척천천철철첨첩첫첫청청체체쳐쳐초초총총촬촬최최추축출출춤춥충충춰춰취취츠측치칙칠칠침칩칭칭카카칸칸칼칼캐캐캔캔캘캘캠캡커커컨컨컬컬컴컴케케켓켓켜켜켬켬코코콘콘콜콜콩콩쿼쿼퀀퀀퀴퀴큐큐크크큰큰클클큽큽키키킨킨킬킬킵킵킹킹타타탈탈탐탐태택탠탠탬탭터터턴턴털털텀텁테텍텐텐텔텔템템토토톨톨톱톱통통투투트특튼튼틀틀티틱팀팀팅팅파파팔팔팝팝패패팻팻퍼퍼페펙편편평평포포폴폴폼폼표표푸푸풀풀품품퓨퓨프프픈픈플플피픽핀핀필필핑핑하하한한할할함합핫핫항항해핵했행향향허허헌헌헤헤현현형형호혹혼혼홈홈홍홍화확환환활활황황회획횟횟횡횡효효후후훨훨휠휠휴휴흐흐흔흔희희히히힌힌" }, { "zh-CN", "msyh.ttc", nullptr, "Hiragino Sans GB.ttc", // auto update by update_glyph_ranges.py with pcsx2-qt_zh-CN.ts - u"‘’□□△△○○、。一丁三下不与且且世世丢丢两严个个中中串串为主么义之之乎乎乐乐乘乘也也了了事二于于互互五五亚些交交产产享享亮亮亲亲人人什什仅仅今介仍从他他代以们们件价任任份份仿仿伍伍休休优优会会传传估估伸伸似似但但位住佑佑体体何何余余作作你你佳佳使使例例供供依依侧侧便便俄俄保保信信修修倍倍倒倒借借值值倾倾假假偏偏做做停停储储像像儿儿允允元元充充先光克克免免入入全全公六兰共关关兵兹兼兼内内册再写写冲决况况冻冻净净准准减减几凡凭凭出击函函刀刀刃刃分切列列则创初初删删利利别别到到制刷刹刹前前剪剪副副力力功务动助势势勾勿包包化北匹区十十升升半半协协单单南南占卡卫卫印印即即卸卸历历压压原原去去参参叉及双反发发取变叠叠口古另另只只可台史右号司各各合吉同后向向吗吗否否含含启启呈呈告告员员味味命命和和哈哈响响哪哪唤唤商商善善器器四四回回因因团团围围固固国图圈圈在在地地场场址址均均坏坐块块坛坛垂垂型型域域基基堆堆堪堪塔塔填填增增士士声声处处备备复复外外多多够够大大天太失失头头夹夹奇奇奏奏套套奥奥女女奶奶好好如如始始威威娜娜娱娱婴婴媒媒子子字存它它安安完完宏宏官官定定宝实害害家家容容宽宿寄寄密密富富寸对导导封封射射将将小小少少尔尔尘尘尚尚尝尝就就尺尺尼尾局局层层屏屏展展属属崩崩工左巨巨巫巫差差己已巴巴希希带帧帮帮常常幅幅幕幕干平并并幸幸幻幻序序库底度度延延建建开开异弃弊弊式式引引张张弹强归当录录形形彩彩影影径待很很律律得得循循微微德德心心必忆志志忙忙快快忽忽态态性性怪怪恢恢息息恶恶您您悬悬情情惑惑惩惩惯惯想想愉愉意意感感慢慢戏我或或战战截截戳戳户户所扁扇扇手手才才打打托托执执扩扩扫扬扳扳找找技技抑抑抖抗护护拆拆拉拉拒拒拟拟拥拦择择括括拳拳持挂指指按按挑挑挡挡挪挪振振捕捕损损换换据据捷捷掌掌排排接接控掩描提插插握握搜搜摇摇摔摔摘摘撕撕撤撤播播操擎支支收收改改放放故故效效敌敌敏敏散散数数整整文文斜斜断断斯新方方旁旁旋旋无无日日旧旧时时明明易易星映昨昨是是显显晕晕普普晰晰暂暂暗暗曲曲更更替最有有服服望望期期未未本本术术机机杂权杆杆束束条条来来板板极极果果枪枪柄柄某某染染查查栅栅标栈栏栏校校样根格格框框案案档档桥桥梦梦检检棕棕榜榜槽槽模模横横橙橙次欢欧欧止步死死殊殊段段每每比比毫毫水水求求汇汇污污沙沙没没油油法法波波注注泻泻洋洋洲洲活活流流浅浅测测浏浏浪浪浮浮海海消消淡淡深深混混添添清清港港渲渲游游湖湖湾湾溃溃源源溢溢滑滑满满滤滤演演潜潜澳澳激激火火灯灰灵灵点点烈烈热热焦焦然然煞煞照照爆爆片版牌牌牙牙物物特特状状独独狼狼猎猎猩猩率率王王玛玛玩玩环现班班理理瑞瑞甚甚生生用用由由电电画画畅畅界界留留略略疤疤登登白百的的皇皇监监盖盘目目直直相相省省看看真眠着着瞄瞄矢矢知知短短石石码码破破础础硬硬确确碌碌碎碎磁磁示示神神禁禁离离种种秒秒积称移移程程稍稍稳稳空空突突窗窗立立站站竞竞端端符符第第等等答答筛筛签签简简算算管管类类粉粉粘粘精精糊糊系系素素索索紫紫繁繁纠纠红红级级纳纳纵纵纹纹线线组组细终经经绑绑结结绕绕绘给络绝统统继继绪绪续续维维绿缀缓缓编编缘缘缩缩缺缺网网罗罗罚罚置置美美翻翻考考者者而而耗耗耳耳联联肩肩胖胖能能腊腊自自至致舍舍航航良良色色节节芬芬若若英英范范荐荐荒荒荷荷莱莱获获菜菜萄萄著著葡葡蓝蓝藏藏虑虑虚虚融融行行街街衡衡补补表表被被裁裂装装西西要要覆覆见观规规视视览觉角角解解触触言言警警计计认认让让议议记记许许论论设访证证识识诊诊译译试试话话询询该详语语误误说说请诸读读调调谍谍象象豹豹负负败账质质贴贴费费赖赖赛赛赫赫起起超超越越足足跃跃跟跟跨跨路路跳跳踏踏踪踪身身车车轨轨转转轮软轴轴轻轻载载较较辅辅辑辑输输辨辨边边达达过过迎迎运近返返还这进进连迟述述追追退适逆逆选选逐逐递递通通速造遇遇道道避避那那邻邻部部都都配配醒醒采采释释里量金金针针钟钟钮钮铁铁铺铺链链销锁锐锐错错键锯镜镜长长门门闭问闲闲间间阅阅队队防防阴阵附陆降降限限除除险险随隐隔隔隙隙障障雄雄集集零零雾雾需需震震静静非非靠靠面面韩韩音音页顶项须顿顿预预频频题题颜额颠颠风风饱饱馈馈首首香香马马驱驱驾驾验验骑骑骤骤高高鬼鬼魂魂魔魔麦麦黄黄黑黑默默鼓鼓鼠鼠齐齐齿齿，，：：？？" + u"‘’□□△△○○、。一丁三下不与且且世世丢丢两严个个中中串串为主么义之之乎乎乐乐乘乘也也了了事二于于互互五五亚些交交产产享享亮亮亲亲人人什什仅仅今介仍从他他代以们们件价任任份份伍伍休休众优会会传传估估伸伸似似但但位住佑佑体体何何余余作作你你佳佳使使例例供供依依侧侧俄俄保保信信修修倍倍倒倒借借值值倾倾假假偏偏做做停停储储像像儿儿允允元元充充先光克克免免入入全全公六兰共关关兵兹兼兼内内册再写写冲决况况冻冻净净准准减减几凡凭凭出击函函刀刀刃刃分切列列则创初初删删利利别别到到制刷刹刹前前剪剪副副力力功务动助势势勾勿包包化北匹区十十升升半半协协单单南南占卡卫卫印印即即卸卸历历压压原原去去参参又及双反发发取变叠叠口古另另只只可台史右号司各各合吉同后向向吗吗否否含含启启呈呈告告员员味味命命和和哈哈响响哪哪唤唤商商善善器器四四回回因因团团围围固固国图圈圈在在地地场场址址均均坏坐块块坛坛垂垂型型域域基基堆堆堪堪塔塔填填增增士士声声处处备备复复外外多多够够大大天太失失头头夹夹奇奇奏奏套套奥奥女女奶奶好好如如始始威威娜娜娱娱婴婴媒媒子子字存它它安安完完宏宏官官定定宝实害害家家容容宽宿寄寄密密富富寸对导导封封射射将将小小少少尔尔尘尘尚尚尝尝就就尺尺尼尾局局层层屏屏展展属属崩崩工左巨巨巫巫差差己已巴巴希希带帧帮帮常常幅幅幕幕干平并并幸幸幻幻序序库底度度延延建建开开异弃弊弊式式引引张张弹强归当录录形形彩彩影影径待很很律律得得循循微微德德心心必忆志志忙忙快快忽忽态态性性怪怪总总恢恢息息恶恶您您悬悬情情惑惑惯惯想想愉愉意意感感慢慢戏我或或战战截截戳戳户户所扁扇扇手手才才打打托托执执扩扩扫扬扳扳找找技技抑抑抖抗护护拆拆拉拉拟拟拥拦择择括括拳拳持挂指指按按挑挑挡挡挪挪振振捕捕损损换换据据捷捷掌掌排排接接控掩描提插插握握搜搜摇摇摔摔摘摘撕撕撤撤播播操擎支支收收改改放放故故效效敌敌敏敏散散数数整整文文斜斜断断斯新方方旁旁旋旋无无既既日日旧旧时时明明易易星映昨昨是是显显晕晕普普晰晰暂暂暗暗曲曲更更替最有有服服望望期期未未本本术术机机杂权杆杆束束条条来来板板极极果果枪枪柄柄某某染染查查栅栅标栈栏栏树树校校样根格格框框案案档档桥桥桩桩梦梦检检棕棕榜榜槽槽模模横横橙橙次欢欧欧止步死死殊殊段段每每比比毫毫水水求求汇汇污污沙沙没没油油法法波波注注泻泻洋洋洲洲活活流流浅浅测测浏浏浪浪浮浮海海消消淡淡深深混混添添清清港港渲渲游游湖湖湾湾溃溃源源溢溢滑滑满满滤滤演演潜潜澳澳激激火火灯灰灵灵点点烈烈热热焦焦然然煞煞照照爆爆片版牌牌牙牙物物特特状状独独狼狼猩猩率率王王玛玛玩玩环现班班球球理理瑕瑕瑞瑞甚甚生生用用由由电电画画畅畅界界留留略略疤疤疵疵登登白百的的皇皇监监盖盘目目直直相相省省看看真眠着着瞄瞄矢矢知知短短石石码码破破础础硬硬确确碌碌碎碎磁磁示示神神禁禁离离种种秒秒称称移移程程稍稍稳稳空空突突窗窗立立站站竞竞端端符符第第等等答答筛筛签签简简算算管管类类粉粉粘粘精精糊糊系系素素索索紫紫纠纠红红级级纳纳纵纵纹纹线线组组细终经经绑绑结结绕绕绘给络络统统继继绪绪续续维维绿缀缓缓编编缘缘缩缩缺缺网网罗罗置置美美翻翻考考者者而而耗耗耳耳联联肩肩胖胖能能腊腊臂臂自自至致舍舍航航良良色色节节芬芬若若英英范范荐荐荒荒荷荷莱莱获获菜菜萄萄著著葡葡蓝蓝藏藏虑虑虚虚融融行行街街衡衡补补表表被被裁裂装装西西要要覆覆见观规规视视览觉角角解解触触言言警警计计认认让让议议记记许许论论设访证证识识诊诊译译试试话话询询该详语语误误说说请诸读读调调象象负负败账质质贴贴费费赖赖赛赛赫赫起起超超越越足足跃跃跟跟跤跤跨跨路路跳跳踏踏踪踪身身车车轨轨转转轮软轴轴轻轻载载较较辅辅辑辑输输辨辨边边达达过过迎迎运近返返还这进远连迟述述追追退适逆逆选选逐逐递递通通速速遇遇道道避避那那邻邻部部都都配配醒醒采采释释里量金金针针钟钟钮钮铁铁铺铺链链销锁锐锐错错键锯镜镜长长门门闭问闲闲间间阅阅队队防防阴阵附陆降降限限除除险险随隐隔隔隙隙障障雄雄集集零零雾雾需需震震静静非非靠靠面面韩韩音音页顶项须顿顿预预频频题题颜额颠颠颤颤风风饱饱馈馈首首香香马马驱驱验验骑骑骤骤高高鬼鬼魂魂魔魔麦麦黄黄黑黑默默鼓鼓鼠鼠齐齐齿齿️️，，：：？？" }, { "zh-TW", "msyh.ttc", nullptr, "Hiragino Sans GB.ttc", // auto update by update_glyph_ranges.py with pcsx2-qt_zh-TW.ts - u"□□△△○○、。『』一丁三下不不且且世世丟丟並並中中串串主主之之乎乎乘乙也也乾乾了了事二于于互互五五些些亞亞交交享享亮亮人人什什今介仍仍他他代以件件任任份份伍伍休休估估伸伸伺伺似似但佇位住佑佑佔何作作你你佳佳併併使使來來例例供供依依便便係係俄俄保保修修個個倍倍們倒借借值值假假偏偏做做停停側偵備備傳傳傾傾僅僅像像價價儘儘優優儲儲允允元元充充先光克克免免兒兒入入內兩公六共共兵典冊冊再再凍凍凡凡出出函函刀刀刃刃分切列列初初別別利刪到到制制則則前剎剛剛剪剪副副力力功加助助動動務務勢勢勾勿包包化北匯匯匹匹區十升升半半協協南南卡卡印印即即原原去去參參叉及反反取受口古另另只叫可可史右司司各各合吉同后向向否否含含呈呈告告味味呼命和和哈哈員員哪哪商商問問啓啓啟啟善善喚喚單單嗎嗎嘉嘉嘗嘗器器嚮嚮嚴嚴四四回回因因固固圈圈國國圍圍圖圖團團在在地地址址均均垂垂型型域埠執執基基堆堆堪堪場場塊塊塔塔填填塵塵增增壇壇壓壓壞壞士士外外多多夠夠夢夢大大天太失失夾夾奇奇奏奏套套奧奧女女奶奶好好如如始始威威娛娜媒媒嬰嬰子子字存它它安安完完宏宏官官定定害害家家容容宿宿密密富富實實寫寬寶寶寸寸封封射射將專對小少少尚尚就就尺尺尼尼尾尾屏屏展展層層屬屬崩崩工左巨巨巫巫差差己已巴巴希希帶帶常常幀幀幅幅幕幕幫幫平平幸幸幻幻幾幾序序底底度座庫庫延延建建弊弊式式引引張張強強彈彈彙彙形形彩彩影影待待很很律後徑徑得得從從復循微微德德心心必必忙忙快快忽忽性性怪怪恢恢息息您您情情惑惑惡惡想想愉愉意意感感態態慢慣慮慮憑憑憶憶應應懲懲懸懸成我或或截截戰戰戲戳戶戶所扁扇扇手手才才打打扳扳找找技技抑抑抖抗拆拆拉拉拒拒括括拳拳持持指指按按挑挑挪挪振振捕捕捨捨捷捷掃掃掌掌排排掛掛採採接接控掩描提插插揚換握握援援損損搖搖搜搜摔摔摘摘撕撕撤撤播播擁擁擇擇擊擋操擎據據擬擬擴擴擷擷攔攔支支收收改改放放故故效效敏敏敗敗整敵數數文文料料斜斜斯新斷斷方方於於旁旁旋旋日日明明易易星映昨昨是是時時普普晰晰暈暈暗暗暢暢暫暫曲曲更更替最會會有有服服望望期期未未本本束束板板析析果果柄柄某某染染查查柵柵校校核根格格框框案案桿桿條條棄棄棕棕極極榜榜槍槍槽槽樂樂標標模模樣樣橋橋橙橙機機橫橫檔檔檢檢檯檯欄欄權權次次歐歐歡步歷歸死死殊殊段段每每比比毫毫水水求求污污決決沒沒沙沙油油況況法法波波注注洋洋洲洲活活流流浪浪浮浮海海消消淡淡淨淨深深混混淺淺清清減減測測港港渲渲游游湊湊湖湖源源準準溢溢滑滑滿滿演演潛潛潰潰澳澳激激濾濾瀉瀉瀏瀏灣灣火火灰灰為為烈烈無無焦焦然然煞煞照照熱熱燈燈爆爆爲爲爾爾片版牌牌牙牙物物特特狀狀狼狼猩猩獨獨獲獲獵獵率率王王玩玩班班現現理理瑞瑞瑪瑪環環甚甚生生產產用用由由界界留留略略畫畫異異當當疊疊疤疤登百的的皇皇盜盜盡盡監盤目目直直相相省省看看真眠瞄瞄知知短短石石破破硬硬碌碌碎碎碟碟確確碼碼磁磁礎礎示示神神禁禁秒秒移移程程稍稍種種稱稱積積穩穩空空突突窗窗立立站站端端競競符符第第等等答答算算管管節節範範篩篩簡簡簿簿籤籤粉粉精精糊糊系系糾糾紅紅紋紋納納級級素素索索紫紫細細終終組組結結絕絕給給統統經經綠綠維維網網綴綴緒緒線線緣緣編緩縮縮縱縱繁繁織織繞繞繪繫繼繼續續缺缺置置罰罰羅羅美美義義翻翻考考者者而而耗耗耳耳聯聯聲聲肩肩胖胖能能臘臘自自至致臺臺與與舊舊舍舍航航良良色色芬芬芽芽若若英英茲茲荒荒荷荷菜菜萄萄萊萊著著葡葡蓋蓋薦薦藍藍藏藏蘭蘭處處虛虛號號融融螢螢行行術術街街衛衛衝衝衡衡表表被被裁裂補裝裡裡製製複複西西要要覆覆見見規規視視親親覺覺覽覽觀觀角角解解觸觸言言計計訊訊託記訪訪設設許許診註詢詢試試話詳誌認語語誤誤說說調調請請論論諜諜諸諸證證識識警警譯議護護讀讀變變讓讓象象豹豹負負費貼資資賓賓質質賬賬賴賴賽賽赫赫起起超超越越足足跟跟跨跨路路跳跳踏踏蹤蹤躍躍身身車車軌軌軟軟軸軸較較載載輔輕輪輪輯輯輸輸轉轉迎迎近近返返述述迴迴追追退送逆逆逐逐這通速造連連進進遇遇遊運過過道達遞遞適適遲遲選選避避還還邊邊那那部部都都鄰鄰配配醒醒重量金金針針鈕鈕銳銳銷銷鋪鋪鋸鋸錄錄錯錯鍵鍵鎖鎖鏈鏈鏡鏡鐘鐘鐵鐵長長門門閉閉開開閑閑間間閘閘閱閱關關防防附附降降限限陣除陰陰陸陸隊隊隔隔隙隙際障隨隨險險隱隱雄雄集集雙雙雜雜離離零零電電需需震震霧霧靈靈靜靜非非靠靠面面韓韓音音響響頁頂項順須須預預頓頓頭頭頻頻題額顏顏顛顛類類顯顯風風飽飽餘餘饋饋首首香香馬馬駕駕騎騎驅驅驗驗驟驟體體高高髮髮鬼鬼魂魂魔魔麥麥麼麼黃黃黑黑點點鼓鼓鼠鼠齊齊齒齒，，：：？？" + u"□□△△○○、。『』一丁三下不不且且世世丟丟並並中中串串主主之之乎乎乘乙也也乾乾了了事二于于互互五五些些亞亞交交享享亮亮人人什什今介仍仍他他代以件件任任份份休休估估伸伸伺伺似似但佇位住佔何作作你你佳佳併併使使來來例例供供依依係係俄俄保保修修個個倍倍們倒借借值值假假偏偏做做停停側偵備備傳傳傾傾僅僅像像價價儘儘優優儲儲允允元元充充先光克克免免兒兒入入內兩公六共共兵典冊冊再再凍凍出出函函刀刀分切列列初初別別利刪到到制制則則前剎剪剪副副力力功加助助動動務務勢勢勾勾包包化化匯匯匹匹區十升升半半協協南南卡卡印印即即原原去去參參叉及反反取受口口另另只叫可可史右司司各各合吉同后向向否否含含呈呈告告味味呼命和和哈哈員員哪哪商商問問啓啓啟啟善善喚喚單單嗎嗎嘉嘉嘗嘗器器嚮嚮嚴嚴四四回回因因固固圈圈國國圍圍圖圖團團在在地地址址均均垂垂型型域埠執執基基堆堆堪堪場場塊塊塔塔填填塵塵增增壇壇壓壓壞壞士士外外多多夠夠大大天太失失夾夾奇奇奏奏套套奧奧奶奶好好如如始始威威娛娜媒媒嬰嬰子子字存它它安安完完宏宏官官定定害害家家容容宿宿密密富富察察實實寫寬寶寶寸寸封封射射將專對小少少尚尚就就尺尺尼尼尾尾屏屏展展層層屬屬崩崩工左巨巨差差己已巴巴希希帳帳帶帶常常幀幀幅幅幕幕幫幫平平幸幸幾幾序序底底度座庫庫延延建建弊弊式式引引張張強強彈彈彙彙形形彩彩影影待待很很律後徑徑得得從從復循微微德德心心必必快快忽忽性性怪怪恢恢息息您您情情想想愉愉意意感感態態慢慣慮慮憑憑憶憶應應成我或或截截戰戰戲戳戶戶所扁扇扇手手才才打打扳扳找找技技抑抑抖抗拆拆拉拉括括拳拳持持指指按按挑挑挪挪振振捕捕捨捨捷捷掃掃排排掛掛採採接接控掩描提插插揚換援援損損搖搖搜搜撕撕撤撤播播擁擁擇擇擊擋操擎據據擬擬擴擴擷擷攔攔支支收收改改放放故故效效敏敏敗敗整敵數數文文料料斜斜斯新斷斷方方於於旁旁旋旋日日明明易易星映昨昨是是時時普普晰晰暈暈暗暗暢暢暫暫曲曲更更替最會會有有服服望望期期未未本本束束板板析析果果柄柄某某染染查查柵柵校校核根格格框框案案桿桿條條棄棄棕棕極極榜榜槍槍槽槽樂樂標標模模樣樣橋橋橙橙機機橫橫檔檔檢檢檯檯欄欄權權次次歐歐歡步歷歸死死殊殊段段每每比比毫毫水水求求污污決決沒沒沙沙油油況況法法波波注注洲洲活活流流浮浮消消淡淡淨淨深深混混淺淺清清減減測測港港渲渲游游湊湊湖湖源源準準溢溢滑滑滿滿演演潛潛潰潰澳澳激激濾濾瀉瀉瀏瀏灣灣灰灰為為烈烈無無焦焦然然照照熱熱爲爲爾爾片版牌牌牙牙特特狀狀猩猩獨獨獲獲率率王王玩玩班班現現理理瑞瑞瑪瑪環環甚甚生生產產用用由由界界留留略略畫畫異異當當疊疊登百的的皇皇盡盡監盤目目直直相相省省看看真眠瞄瞄知知短短石石破破硬硬碎碎碟碟確確碼碼磁磁礎礎示示禁禁秒秒移移程程稍稍種種稱稱穩穩空空突突窗窗立立站站端端符符第第等等答答算算管管節節範範篩篩簡簡簿簿籤籤粉粉精精糊糊系系糾糾紅紅紋紋納納級級素素索索紫紫細細終終組組結結給給統統經經綠綠維維網網綴綴緒緒線線緣緣編緩縮縮縱縱織織繞繞繪繫繼繼續續缺缺置置羅羅美美義義翻翻考考者者而而耗耗耳耳聯聯聲聲肩肩胖胖能能臘臘自自至致臺臺與與舊舊舍舍航航良良色色芬芬芽芽若若英英茲茲荒荒荷荷菜菜萄萄萊萊著著葡葡蓋蓋薦薦藍藍藏藏蘭蘭處處虛虛號號融融螢螢行行衝衝衡衡表表被被裁裂補裝裡裡製製複複西西要要覆覆見見規規視視親親覺覺覽覽觀觀角角解解觸觸言言計計訊訊託記訪訪設設許許診註詢詢試試話詳誌認語語誤誤說說調調請請論論諸諸證證識識警警譯議護護讀讀變變讓讓象象負負費貼資資賓賓質質賬賬賴賴赫赫起起超超越越足足跟跟跨跨路路跳跳踏踏蹤蹤躍躍身身車車軌軌軟軟軸軸較較載載輔輕輪輪輯輯輸輸轉轉迎迎近近返返述述迴迴追追退送逆逆逐逐這通速速連連進進遇遇遊運過過道達遞遞適適遲遲選選避避還還邊邊那那部部都都鄰鄰配配醒醒重量金金針針鈕鈕銳銳銷銷鋪鋪鋸鋸錄錄錯錯鍵鍵鎖鎖鏈鏈鏡鏡鐘鐘鐵鐵長長門門閉閉開開閑閑間間閘閘閱閱關關防防附附降降限限陣除陰陰陸陸隊隊隔隔隙隙際障隨隨險險隱隱雄雄集集雙雙雜雜離離零零電電需需震震霧霧靈靈靜靜非非靠靠面面韓韓音音響響頂頂項順須須預預頓頓頭頭頻頻題額顏顏顛顛類類顯顯風風飽飽餘餘饋饋首首香香馬馬驅驅驗驗驟驟體體高高髮髮鬼鬼魂魂魔魔麥麥麼麼黃黃黑黑點點鼓鼓鼠鼠齊齊齒齒️️，，：：？？" }, }; // clang-format on diff --git a/pcsx2-qt/pcsx2-qt.vcxproj b/pcsx2-qt/pcsx2-qt.vcxproj index c00807db68..5b1578d2b1 100644 --- a/pcsx2-qt/pcsx2-qt.vcxproj +++ b/pcsx2-qt/pcsx2-qt.vcxproj @@ -419,9 +419,10 @@ Document + - + \ No newline at end of file diff --git a/pcsx2-qt/pcsx2-qt.vcxproj.filters b/pcsx2-qt/pcsx2-qt.vcxproj.filters index 7665f894c9..0574cf5a6c 100644 --- a/pcsx2-qt/pcsx2-qt.vcxproj.filters +++ b/pcsx2-qt/pcsx2-qt.vcxproj.filters @@ -638,6 +638,9 @@ Settings + + Settings + diff --git a/pcsx2-qt/resources/icons/black/svg/Popn-line.svg b/pcsx2-qt/resources/icons/black/svg/Popn-line.svg new file mode 100644 index 0000000000..d0a40f7d47 --- /dev/null +++ b/pcsx2-qt/resources/icons/black/svg/Popn-line.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/pcsx2-qt/resources/icons/white/svg/Popn-line.svg b/pcsx2-qt/resources/icons/white/svg/Popn-line.svg new file mode 100644 index 0000000000..8b613ea02e --- /dev/null +++ b/pcsx2-qt/resources/icons/white/svg/Popn-line.svg @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/pcsx2-qt/resources/images/Popn.svg b/pcsx2-qt/resources/images/Popn.svg new file mode 100644 index 0000000000..d2be19357a --- /dev/null +++ b/pcsx2-qt/resources/images/Popn.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT + START + + + \ No newline at end of file diff --git a/pcsx2-qt/resources/resources.qrc b/pcsx2-qt/resources/resources.qrc index 50261c8ae5..56ab17faba 100644 --- a/pcsx2-qt/resources/resources.qrc +++ b/pcsx2-qt/resources/resources.qrc @@ -68,6 +68,7 @@ icons/black/svg/pause-line.svg icons/black/svg/play-line.svg icons/black/svg/plus-line.svg + icons/black/svg/Popn-line.svg icons/black/svg/price-tag-3-line.svg icons/black/svg/printer-line.svg icons/black/svg/refresh-line.svg @@ -161,6 +162,7 @@ icons/white/svg/pause-line.svg icons/white/svg/play-line.svg icons/white/svg/plus-line.svg + icons/white/svg/Popn-line.svg icons/white/svg/price-tag-3-line.svg icons/white/svg/printer-line.svg icons/white/svg/refresh-line.svg @@ -186,5 +188,6 @@ images/DualShock_2.svg images/GT_Force.svg images/Guitar.svg + images/Popn.svg diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 21b8ad1c02..475a3d3cf9 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -442,6 +442,7 @@ set(pcsx2PADSources SIO/Pad/PadBase.cpp SIO/Pad/PadDualshock2.cpp SIO/Pad/PadGuitar.cpp + SIO/Pad/PadPopn.cpp SIO/Pad/PadNotConnected.cpp ) set(pcsx2PADHeaders @@ -449,6 +450,7 @@ set(pcsx2PADHeaders SIO/Pad/PadBase.h SIO/Pad/PadDualshock2.h SIO/Pad/PadGuitar.h + SIO/Pad/PadPopn.h SIO/Pad/PadNotConnected.h SIO/Pad/PadTypes.h ) diff --git a/pcsx2/ImGui/ImGuiManager.cpp b/pcsx2/ImGui/ImGuiManager.cpp index 12caddc46a..35774925a6 100644 --- a/pcsx2/ImGui/ImGuiManager.cpp +++ b/pcsx2/ImGui/ImGuiManager.cpp @@ -485,7 +485,7 @@ bool ImGuiManager::AddIconFonts(float size) { // clang-format off static constexpr ImWchar range_fa[] = { 0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf01c,0xf01c,0xf021,0xf021,0xf023,0xf023,0xf025,0xf025,0xf027,0xf028,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03d,0xf04a,0xf04c,0xf04e,0xf04e,0xf050,0xf050,0xf052,0xf052,0xf059,0xf059,0xf05e,0xf05e,0xf063,0xf063,0xf065,0xf065,0xf067,0xf067,0xf06a,0xf06a,0xf071,0xf071,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf085,0xf091,0xf091,0xf0ac,0xf0ad,0xf0b0,0xf0b0,0xf0c5,0xf0c5,0xf0c7,0xf0c9,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0eb,0xf0eb,0xf0f1,0xf0f1,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf110,0xf110,0xf119,0xf119,0xf11b,0xf11c,0xf121,0xf121,0xf133,0xf133,0xf140,0xf140,0xf144,0xf144,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf188,0xf188,0xf191,0xf192,0xf1c9,0xf1c9,0xf1dd,0xf1de,0xf1e6,0xf1e6,0xf1ea,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf242,0xf242,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f2,0xf2f2,0xf2f5,0xf2f5,0xf302,0xf302,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf466,0xf466,0xf500,0xf500,0xf517,0xf517,0xf51f,0xf51f,0xf543,0xf543,0xf545,0xf545,0xf547,0xf548,0xf552,0xf552,0xf56d,0xf56d,0xf5a2,0xf5a2,0xf5e7,0xf5e7,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf756,0xf756,0xf7c2,0xf7c2,0xf807,0xf807,0xf815,0xf815,0xf818,0xf818,0xf84c,0xf84c,0xf8cc,0xf8cc,0xf8d9,0xf8d9,0x0,0x0 }; - static constexpr ImWchar range_pf[] = { 0x2198,0x2199,0x219e,0x21a1,0x21b0,0x21b3,0x21ba,0x21c3,0x21d0,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21f3,0x21f3,0x21f7,0x21f8,0x21fa,0x21fb,0x227a,0x227d,0x23b2,0x23b4,0x23f4,0x23f7,0x2427,0x243a,0x243c,0x243c,0x2443,0x2443,0x2460,0x246b,0x24f5,0x24fd,0x24ff,0x24ff,0x278a,0x278e,0xe001,0xe001,0xff21,0xff3a,0x0,0x0 }; + static constexpr ImWchar range_pf[] = { 0x2198,0x2199,0x219e,0x21a1,0x21b0,0x21b3,0x21ba,0x21c3,0x21d0,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21f3,0x21f3,0x21f7,0x21f8,0x21fa,0x21fb,0x227a,0x227d,0x22c0,0x22c8,0x23b2,0x23b4,0x23f4,0x23f7,0x2427,0x243a,0x243c,0x243c,0x2443,0x2443,0x2460,0x246b,0x24f5,0x24fd,0x24ff,0x24ff,0x278a,0x278e,0xe001,0xe001,0xff21,0xff3a,0x0,0x0 }; // clang-format on { diff --git a/pcsx2/SIO/Pad/Pad.cpp b/pcsx2/SIO/Pad/Pad.cpp index eed6af4bab..77c9ac8428 100644 --- a/pcsx2/SIO/Pad/Pad.cpp +++ b/pcsx2/SIO/Pad/Pad.cpp @@ -6,6 +6,7 @@ #include "SIO/Pad/Pad.h" #include "SIO/Pad/PadDualshock2.h" #include "SIO/Pad/PadGuitar.h" +#include "SIO/Pad/PadPopn.h" #include "SIO/Pad/PadNotConnected.h" #include "SIO/Sio.h" @@ -243,6 +244,7 @@ static const Pad::ControllerInfo* s_controller_info[] = { &PadNotConnected::ControllerInfo, &PadDualshock2::ControllerInfo, &PadGuitar::ControllerInfo, + &PadPopn::ControllerInfo, }; const Pad::ControllerInfo* Pad::GetControllerInfo(Pad::ControllerType type) @@ -480,6 +482,9 @@ PadBase* Pad::CreatePad(u8 unifiedSlot, ControllerType controllerType, size_t ej case ControllerType::Guitar: s_controllers[unifiedSlot] = std::make_unique(unifiedSlot, ejectTicks); break; + case ControllerType::Popn: + s_controllers[unifiedSlot] = std::make_unique(unifiedSlot, ejectTicks); + break; default: s_controllers[unifiedSlot] = std::make_unique(unifiedSlot, ejectTicks); break; diff --git a/pcsx2/SIO/Pad/PadPopn.cpp b/pcsx2/SIO/Pad/PadPopn.cpp new file mode 100644 index 0000000000..f3b0847ea6 --- /dev/null +++ b/pcsx2/SIO/Pad/PadPopn.cpp @@ -0,0 +1,556 @@ +// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team +// SPDX-License-Identifier: LGPL-3.0+ + +#include "SIO/Pad/PadPopn.h" +#include "SIO/Pad/Pad.h" +#include "SIO/Sio.h" +#include "SIO/Sio0.h" + +#include "Common.h" +#include "Input/InputManager.h" +#include "Host.h" + +#include "IconsPromptFont.h" + +static const InputBindingInfo s_bindings[] = { + // clang-format off + {"YellowL", TRANSLATE_NOOP("Pad", "Yellow (Left)"), ICON_PF_POPN_YELLOW_LEFT, InputBindingInfo::Type::Button, PadPopn::Inputs::PAD_YELLOW_LEFT, GenericInputBinding::Circle}, + {"YellowR", TRANSLATE_NOOP("Pad", "Yellow (Right)"), ICON_PF_POPN_YELLOW_RIGHT, InputBindingInfo::Type::Button, PadPopn::Inputs::PAD_YELLOW_RIGHT, GenericInputBinding::DPadUp}, + {"BlueL", TRANSLATE_NOOP("Pad", "Blue (Left)"), ICON_PF_POPN_BLUE_LEFT, InputBindingInfo::Type::Button, PadPopn::Inputs::PAD_BLUE_LEFT, GenericInputBinding::Cross}, + {"BlueR", TRANSLATE_NOOP("Pad", "Blue (Right)"), ICON_PF_POPN_BLUE_RIGHT, InputBindingInfo::Type::Button, PadPopn::Inputs::PAD_BLUE_RIGHT, GenericInputBinding::Square}, + {"WhiteL", TRANSLATE_NOOP("Pad", "White (Left)"), ICON_PF_POPN_WHITE_LEFT, InputBindingInfo::Type::Button, PadPopn::Inputs::PAD_WHITE_LEFT, GenericInputBinding::Triangle}, + {"WhiteR", TRANSLATE_NOOP("Pad", "White (Right)"), ICON_PF_POPN_WHITE_RIGHT, InputBindingInfo::Type::Button, PadPopn::Inputs::PAD_WHITE_RIGHT, GenericInputBinding::L2}, + {"GreenL", TRANSLATE_NOOP("Pad", "Green (Left)"), ICON_PF_POPN_GREEN_LEFT, InputBindingInfo::Type::Button, PadPopn::Inputs::PAD_GREEN_LEFT, GenericInputBinding::R1}, + {"GreenR", TRANSLATE_NOOP("Pad", "Green (Right)"), ICON_PF_POPN_GREEN_RIGHT, InputBindingInfo::Type::Button, PadPopn::Inputs::PAD_GREEN_RIGHT, GenericInputBinding::R2}, + {"Red", TRANSLATE_NOOP("Pad", "Red"), ICON_PF_POPN_RED, InputBindingInfo::Type::Button, PadPopn::Inputs::PAD_RED, GenericInputBinding::L1}, + {"Start", TRANSLATE_NOOP("Pad", "Start"), ICON_PF_START, InputBindingInfo::Type::Button, PadPopn::Inputs::PAD_START, GenericInputBinding::Start}, + {"Select", TRANSLATE_NOOP("Pad", "Select"), ICON_PF_SELECT_SHARE, InputBindingInfo::Type::Button, PadPopn::Inputs::PAD_SELECT, GenericInputBinding::Select}, + // clang-format on +}; + +const Pad::ControllerInfo PadPopn::ControllerInfo = {Pad::ControllerType::Popn, "Popn", + TRANSLATE_NOOP("Pad", "Pop'n Music"), ICON_PF_GAMEPAD, s_bindings, {}, Pad::VibrationCapabilities::NoVibration}; + +void PadPopn::ConfigLog() +{ + const auto [port, slot] = sioConvertPadToPortAndSlot(unifiedSlot); + + std::string_view pressureStr; + + switch (this->responseBytes) + { + case static_cast(Pad::ResponseBytes::DUALSHOCK2): + pressureStr = "D+A+P"; + break; + case static_cast(Pad::ResponseBytes::ANALOG): + pressureStr = "D+A"; + break; + case static_cast(Pad::ResponseBytes::DIGITAL): + pressureStr = "D"; + break; + default: + pressureStr = "U"; + break; + } + + // AL: Analog Light (is it turned on right now) + // AB: Analog Button (is it useable or is it locked in its current state) + // RB: Response Bytes (what data is included in the controller's responses - D = Digital, A = Analog, P = Pressure) + Console.WriteLn(fmt::format("[Pad] Pop'n Config Finished - P{0}/S{1} - AL: {2} - AB: {3} - RB: {4} (0x{5:08X})", + port + 1, + slot + 1, + (this->analogLight ? "On" : "Off"), + (this->analogLocked ? "Locked" : "Usable"), + pressureStr, + this->responseBytes)); +} + +u8 PadPopn::Mystery(u8 commandByte) +{ + switch (commandBytesReceived) + { + case 5: + return 0x02; + case 8: + return 0x5a; + default: + return 0x00; + } +} + +u8 PadPopn::ButtonQuery(u8 commandByte) +{ + switch (this->currentMode) + { + case Pad::Mode::DUALSHOCK2: + case Pad::Mode::ANALOG: + switch (commandBytesReceived) + { + case 3: + case 4: + return 0xff; + case 5: + return 0x03; + case 8: + g_Sio0.SetAcknowledge(false); + return 0x5a; + default: + return 0x00; + } + default: + switch (commandBytesReceived) + { + case 8: + g_Sio0.SetAcknowledge(false); + return 0x00; + default: + return 0x00; + } + } +} + +u8 PadPopn::Poll(u8 commandByte) +{ + const u32 buttons = GetButtons(); + u8 largeMotor = 0x00; + u8 smallMotor = 0x00; + + switch (commandBytesReceived) + { + case 3: + return (buttons >> 8) & 0xff; + case 4: + // PS1 mode: If the controller is still in digital mode, it is time to stop acknowledging. + if (this->currentMode == Pad::Mode::DIGITAL) + { + g_Sio0.SetAcknowledge(false); + } + + return buttons & 0xff; + } + + Console.Warning("%s(%02X) Did not reach a valid return path! Returning zero as a failsafe!", __FUNCTION__, commandByte); + return 0x00; +} + +u8 PadPopn::Config(u8 commandByte) +{ + if (commandBytesReceived == 3) + { + if (commandByte) + { + if (!this->isInConfig) + { + this->isInConfig = true; + } + else + { + Console.Warning("%s(%02X) Unexpected enter while already in config mode", __FUNCTION__, commandByte); + } + } + else + { + if (this->isInConfig) + { + this->isInConfig = false; + this->ConfigLog(); + } + else + { + Console.Warning("%s(%02X) Unexpected exit while not in config mode", __FUNCTION__, commandByte); + } + } + } + + // PS1 mode: Config mode would have been triggered by a prior byte in this command sequence; + // if we are now in config mode, check the current mode and if this is the last byte. If so, + // don't acknowledge. + if (this->isInConfig) + { + if ((this->currentMode == Pad::Mode::DIGITAL && this->commandBytesReceived == 4) || (this->currentMode == Pad::Mode::ANALOG && this->commandBytesReceived == 8)) + { + g_Sio0.SetAcknowledge(false); + } + } + + return 0x00; +} + +// Changes the mode of the controller between digital and analog, and adjusts the analog LED accordingly. +u8 PadPopn::ModeSwitch(u8 commandByte) +{ + switch (commandBytesReceived) + { + case 3: + this->analogLight = commandByte; + + if (this->analogLight) + { + this->currentMode = Pad::Mode::ANALOG; + } + else + { + this->currentMode = Pad::Mode::DIGITAL; + } + + break; + case 4: + this->analogLocked = (commandByte == 0x03); + break; + case 8: + g_Sio0.SetAcknowledge(false); + break; + default: + break; + } + + return 0x00; +} + +u8 PadPopn::StatusInfo(u8 commandByte) +{ + switch (commandBytesReceived) + { + case 3: + return static_cast(Pad::PhysicalType::STANDARD); + case 4: + return 0x02; + case 5: + return this->analogLight; + case 6: + return 0x02; + case 7: + return 0x01; + case 8: + g_Sio0.SetAcknowledge(false); + return 0x00; + default: + return 0x00; + } +} + +u8 PadPopn::Constant1(u8 commandByte) +{ + switch (commandBytesReceived) + { + case 3: + commandStage = commandByte != 0; + return 0x00; + case 5: + return 0x01; + case 6: + if (commandStage) + { + return 0x01; + } + else + { + return 0x02; + } + case 7: + if (commandStage) + { + return 0x01; + } + else + { + return 0x00; + } + case 8: + g_Sio0.SetAcknowledge(false); + return (commandStage ? 0x14 : 0x0a); + default: + return 0x00; + } +} + +u8 PadPopn::Constant2(u8 commandByte) +{ + switch (commandBytesReceived) + { + case 5: + return 0x02; + case 7: + return 0x01; + case 8: + g_Sio0.SetAcknowledge(false); + return 0x00; + default: + return 0x00; + } +} + +u8 PadPopn::Constant3(u8 commandByte) +{ + switch (commandBytesReceived) + { + case 3: + commandStage = (commandByte != 0); + return 0x00; + case 6: + if (commandStage) + { + return 0x07; + } + else + { + return 0x04; + } + case 8: + g_Sio0.SetAcknowledge(false); + return 0x00; + default: + return 0x00; + } +} + +// Set which byte of the poll command will correspond to a motor's power level. +// In all known cases, games never rearrange the motors. We've hard coded pad polls +// to always use the first vibration byte as small motor, and the second as big motor. +// There is no reason to rearrange these. Games never rearrange these. If someone does +// try to rearrange these, they should suffer. +// +// The return values for cases 3 and 4 are just to notify the pad module of what the mapping was, prior to this command. +u8 PadPopn::VibrationMap(u8 commandByte) +{ + return 0xff; +} + +u8 PadPopn::ResponseBytes(u8 commandByte) +{ + switch (commandBytesReceived) + { + case 3: + this->responseBytes = commandByte; + return 0x00; + case 4: + this->responseBytes |= (commandByte << 8); + return 0x00; + case 5: + this->responseBytes |= (commandByte << 16); + + switch (static_cast(this->responseBytes)) + { + case Pad::ResponseBytes::ANALOG: + this->analogLight = true; + this->currentMode = Pad::Mode::ANALOG; + break; + case Pad::ResponseBytes::DUALSHOCK2: + this->analogLight = true; + this->currentMode = Pad::Mode::DUALSHOCK2; + break; + default: + this->analogLight = false; + this->currentMode = Pad::Mode::DIGITAL; + break; + } + + return 0x00; + case 8: + return 0x5a; + default: + return 0x00; + } +} + +PadPopn::PadPopn(u8 unifiedSlot, size_t ejectTicks) + : PadBase(unifiedSlot, ejectTicks) +{ + currentMode = Pad::Mode::DIGITAL; +} + +PadPopn::~PadPopn() = default; + +Pad::ControllerType PadPopn::GetType() const +{ + return Pad::ControllerType::Popn; +} + +const Pad::ControllerInfo& PadPopn::GetInfo() const +{ + return ControllerInfo; +} + +void PadPopn::Set(u32 index, float value) +{ + if (index > Inputs::LENGTH) + { + return; + } + + // Since we reordered the buttons for better UI, we need to remap them here. + static constexpr std::array bitmaskMapping = {{ + 5, // PAD_YELLOW_LEFT + 12, // PAD_YELLOW_RIGHT + 6, // PAD_BLUE_LEFT + 7, // PAD_BLUE_RIGHT + 4, // PAD_WHITE_LEFT + 0, // PAD_WHITE_RIGHT + 3, // PAD_GREEN_LEFT + 1, // PAD_GREEN_RIGHT + 2, // PAD_RED + 11, // PAD_START + 8, // PAD_SELECT + }}; + + this->rawInputs[index] = static_cast(std::clamp(value * 255.0f, 0.0f, 255.0f)); + + if (value) + { + this->buttons &= ~(1u << bitmaskMapping[index]); + } + else + { + this->buttons |= (1u << bitmaskMapping[index]); + } +} + +void PadPopn::SetRawAnalogs(const std::tuple left, const std::tuple right) +{ +} + +void PadPopn::SetAxisScale(float deadzone, float scale) +{ +} + +float PadPopn::GetVibrationScale(u32 motor) const +{ + return 0; +} + +void PadPopn::SetVibrationScale(u32 motor, float scale) +{ +} + +float PadPopn::GetPressureModifier() const +{ + return 0; +} + +void PadPopn::SetPressureModifier(float mod) +{ +} + +void PadPopn::SetButtonDeadzone(float deadzone) +{ +} + +void PadPopn::SetAnalogInvertL(bool x, bool y) +{ +} + +void PadPopn::SetAnalogInvertR(bool x, bool y) +{ +} + +u8 PadPopn::GetRawInput(u32 index) const +{ + return rawInputs[index]; +} + +std::tuple PadPopn::GetRawLeftAnalog() const +{ + return std::tuple{0x7f, 0x7f}; +} + +std::tuple PadPopn::GetRawRightAnalog() const +{ + return std::tuple{0x7f, 0x7f}; +} + +u32 PadPopn::GetButtons() const +{ + // A quirk of the Pop'n controller, the "D-Pad" left right and down buttons are always pressed. + // Likely this was a simple way to identify their controllers by always reporting this button combination, + // since it was both impossible for a normal pad to do and quite impractical to imitate without + // some level of hardware tampering. This also meant they could just have the pad identify as a seemingly + // normal PS1 digital pad to work with the standard pad libraries across the board. + return buttons & ~(0xE000); +} + +u8 PadPopn::GetPressure(u32 index) const +{ + return 0; +} + +bool PadPopn::Freeze(StateWrapper& sw) +{ + if (!PadBase::Freeze(sw) || !sw.DoMarker("PadPopn")) + return false; + + // Private PadPopn members + sw.Do(&analogLight); + sw.Do(&analogLocked); + sw.Do(&analogPressed); + sw.Do(&commandStage); + sw.Do(&responseBytes); + return !sw.HasError(); +} + +u8 PadPopn::SendCommandByte(u8 commandByte) +{ + u8 ret = 0; + + switch (this->commandBytesReceived) + { + case 0: + ret = 0x00; + break; + case 1: + this->currentCommand = static_cast(commandByte); + + if (this->currentCommand != Pad::Command::POLL && this->currentCommand != Pad::Command::CONFIG && !this->isInConfig) + { + Console.Warning("%s(%02X) Config-only command was sent to a pad outside of config mode!", __FUNCTION__, commandByte); + } + + ret = this->isInConfig ? static_cast(Pad::Mode::CONFIG) : static_cast(this->currentMode); + break; + case 2: + ret = 0x5a; + break; + default: + switch (this->currentCommand) + { + case Pad::Command::MYSTERY: + ret = Mystery(commandByte); + break; + case Pad::Command::BUTTON_QUERY: + ret = ButtonQuery(commandByte); + break; + case Pad::Command::POLL: + ret = Poll(commandByte); + break; + case Pad::Command::CONFIG: + ret = Config(commandByte); + break; + case Pad::Command::MODE_SWITCH: + ret = ModeSwitch(commandByte); + break; + case Pad::Command::STATUS_INFO: + ret = StatusInfo(commandByte); + break; + case Pad::Command::CONST_1: + ret = Constant1(commandByte); + break; + case Pad::Command::CONST_2: + ret = Constant2(commandByte); + break; + case Pad::Command::CONST_3: + ret = Constant3(commandByte); + break; + case Pad::Command::VIBRATION_MAP: + ret = VibrationMap(commandByte); + break; + case Pad::Command::RESPONSE_BYTES: + ret = ResponseBytes(commandByte); + break; + default: + ret = 0x00; + break; + } + } + + this->commandBytesReceived++; + return ret; +} diff --git a/pcsx2/SIO/Pad/PadPopn.h b/pcsx2/SIO/Pad/PadPopn.h new file mode 100644 index 0000000000..e42ee6c5b1 --- /dev/null +++ b/pcsx2/SIO/Pad/PadPopn.h @@ -0,0 +1,103 @@ +// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team +// SPDX-License-Identifier: LGPL-3.0+ + +#pragma once + +#include "SIO/Pad/PadBase.h" + +#include + +// FIXME: For the brave soul. No one on earth seems to have a (functioning) real Pop'N controller. +// Those who do don't seem to have a PS2 setup which they can run the pad ID homebrew on. +// We are going with old information yanked out of Lilypad for this one, which basically means we +// imitate a DS2, and then three buttons are always pressed down. +// +// If any brave challengers wish to make this cleaner or more slim, track one of these things down +// and figure out exactly what the inputs are and how they correlate. +class PadPopn final : public PadBase +{ +public: + enum Inputs + { + PAD_YELLOW_LEFT, + PAD_YELLOW_RIGHT, + PAD_BLUE_LEFT, + PAD_BLUE_RIGHT, + PAD_WHITE_LEFT, + PAD_WHITE_RIGHT, + PAD_GREEN_LEFT, + PAD_GREEN_RIGHT, + PAD_RED, + PAD_START, + PAD_SELECT, + LENGTH, + }; + + static constexpr u8 VIBRATION_MOTORS = 2; + +private: + struct Analogs + { + u8 lx = Pad::ANALOG_NEUTRAL_POSITION; + u8 ly = Pad::ANALOG_NEUTRAL_POSITION; + u8 rx = Pad::ANALOG_NEUTRAL_POSITION; + u8 ry = Pad::ANALOG_NEUTRAL_POSITION; + bool lxInvert = false; + bool lyInvert = false; + bool rxInvert = false; + bool ryInvert = false; + }; + + u32 buttons = 0xffffffffu; + Analogs analogs; + bool analogLight = false; + bool analogLocked = false; + // Analog button can be held without changing its state. + // We track here if it is currently held down, to avoid flipping in + // and out of analog mode every frame. + bool analogPressed = false; + bool commandStage = false; + u32 responseBytes = 0; + + void ConfigLog(); + + u8 Mystery(u8 commandByte); + u8 ButtonQuery(u8 commandByte); + u8 Poll(u8 commandByte); + u8 Config(u8 commandByte); + u8 ModeSwitch(u8 commandByte); + u8 StatusInfo(u8 commandByte); + u8 Constant1(u8 commandByte); + u8 Constant2(u8 commandByte); + u8 Constant3(u8 commandByte); + u8 VibrationMap(u8 commandByte); + u8 ResponseBytes(u8 commandByte); + +public: + PadPopn(u8 unifiedSlot, size_t ejectTicks); + ~PadPopn() override; + + Pad::ControllerType GetType() const override; + const Pad::ControllerInfo& GetInfo() const override; + void Set(u32 index, float value) override; + void SetRawAnalogs(const std::tuple left, const std::tuple right) override; + void SetAxisScale(float deadzone, float scale) override; + float GetVibrationScale(u32 motor) const override; + void SetVibrationScale(u32 motor, float scale) override; + float GetPressureModifier() const override; + void SetPressureModifier(float mod) override; + void SetButtonDeadzone(float deadzone) override; + void SetAnalogInvertL(bool x, bool y) override; + void SetAnalogInvertR(bool x, bool y) override; + u8 GetRawInput(u32 index) const override; + std::tuple GetRawLeftAnalog() const override; + std::tuple GetRawRightAnalog() const override; + u32 GetButtons() const override; + u8 GetPressure(u32 index) const override; + + bool Freeze(StateWrapper& sw) override; + + u8 SendCommandByte(u8 commandByte) override; + + static const Pad::ControllerInfo ControllerInfo; +}; diff --git a/pcsx2/SIO/Pad/PadTypes.h b/pcsx2/SIO/Pad/PadTypes.h index ef089ca384..0a15006397 100644 --- a/pcsx2/SIO/Pad/PadTypes.h +++ b/pcsx2/SIO/Pad/PadTypes.h @@ -64,6 +64,7 @@ namespace Pad NotConnected, DualShock2, Guitar, + Popn, Count }; diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj index aeb183f1fb..5e10c212e5 100644 --- a/pcsx2/pcsx2.vcxproj +++ b/pcsx2/pcsx2.vcxproj @@ -248,6 +248,7 @@ + @@ -596,6 +597,7 @@ + diff --git a/pcsx2/pcsx2.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters index 45e0e4b9e0..fc14843f48 100644 --- a/pcsx2/pcsx2.vcxproj.filters +++ b/pcsx2/pcsx2.vcxproj.filters @@ -1407,6 +1407,9 @@ System\Ps2\Iop\SIO\PAD + + System\Ps2\Iop\SIO\PAD + @@ -2323,6 +2326,9 @@ System\Ps2\Iop\SIO\PAD + + System\Ps2\Iop\SIO\PAD +