From 3fad4b17d422d9542e820b816be01207999f4a03 Mon Sep 17 00:00:00 2001 From: hgn Date: Thu, 11 Apr 2024 00:53:16 +0100 Subject: [PATCH] update overlay to have ps controls too --- control_overlay.c | 24 ++++++++++++++++++++---- models_src/rs_overlay.mdl | Bin 456288 -> 480000 bytes 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/control_overlay.c b/control_overlay.c index f0b7a9a..a39d77b 100644 --- a/control_overlay.c +++ b/control_overlay.c @@ -276,6 +276,14 @@ void control_overlay_render(void) press_dpad_w = 0, press_dpad_e = 0, press_dpad_n = 0, press_dpad_s = 0, press_menu = 0, press_back = 0; + bool is_ps = 0; + if( (vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS3) || + (vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS4) || + (vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS5) ) + { + is_ps = 1; + } + vg_exec_input_program( k_vg_input_type_button_u8, (vg_input_op[]){ vg_joy_button, SDL_CONTROLLER_BUTTON_A, vg_end }, &press_a ); @@ -324,7 +332,9 @@ void control_overlay_render(void) { colorize( 0, 0 ); } - render_overlay_mesh( press_b? ov_b_down: ov_b ); + + if( is_ps ) render_overlay_mesh( press_b? ov_b_down_ps: ov_b_ps ); + else render_overlay_mesh( press_b? ov_b_down: ov_b ); /* Y / SKATE / WALK / GLIDE */ @@ -355,7 +365,9 @@ void control_overlay_render(void) } else colorize( 0, 0 ); - render_overlay_mesh( press_y? ov_y_down: ov_y ); + + if( is_ps ) render_overlay_mesh( press_y? ov_y_down_ps: ov_y_ps ); + else render_overlay_mesh( press_y? ov_y_down: ov_y ); /* X / TREFLIP */ if( subsytem == k_player_subsystem_skate ) @@ -365,7 +377,9 @@ void control_overlay_render(void) } else colorize( press_x, 0 ); - render_overlay_mesh( press_x? ov_x_down: ov_x ); + + if( is_ps ) render_overlay_mesh( press_x? ov_x_down_ps: ov_x_ps ); + else render_overlay_mesh( press_x? ov_x_down: ov_x ); /* A / JUMP / SHUVIT */ if( subsytem == k_player_subsystem_skate ) @@ -381,7 +395,9 @@ void control_overlay_render(void) colorize( press_a, !in_air ); render_overlay_mesh( ov_text_a_jump_mid ); } - render_overlay_mesh( press_a? ov_a_down: ov_a ); + + if( is_ps ) render_overlay_mesh( press_a? ov_a_down_ps: ov_a_ps ); + else render_overlay_mesh( press_a? ov_a_down: ov_a ); /* JUMP CHARGE */ if( subsytem == k_player_subsystem_skate ) diff --git a/models_src/rs_overlay.mdl b/models_src/rs_overlay.mdl index 7c89d41b080927081823776df0a51cc1958e859a..96c6a96b60d3ec5a7726efe365d5c52dba251c6b 100644 GIT binary patch delta 4013 zcmeH}YfMyE5XaAjy?4R8M2r@6mAb&*1uEJV--0L!Hciy1NVGLuaY0m+R~M>FjDnAr z##)eGlVj8m8q@k{W3e3Mlb7t?J>|l6e(N9B$@1}Zblysy-#J@k zj)#P*4V5KT-uiN1g|`y(ZyK>gBUWGTuYbo^jv+QUyX~Ak2L4~MuN{Ou{4?{s)fFI9 zQBw`fjAeq4`diBzHu}6(B!aOgFEi#gV%y4n_2AN9Q>?;TR_Xat(&WySR_2D&;DKtr zWm}C5T7E9FcGO8Htc{l59lL6_l{A#p*0J!BYV^J6FUzPwzZCtGb127;{?SXNWt6|6 zW_vY)vuDrlozl6T_C>IL$7Y6Ue*`;H^zaEVf5~&!F*ZJHd@N(f^&9b8@+RmFyWMAv z>{Y}z8?l2gh*cP|V-Yb4G}TdB@)jd@IwHncJJrLHV7)J25W`OrW1$zss*Kp(h?oSL zP%j=oJlr?bF+KItm;~2y#(ePTOJU5VH>6HZI1FSzki$US`o}=hRxs8BBm`uUehbJw zAbucm@F{2N&w#95DRkUGgib#Y)LD&h0_m(S5<2ez5jsh$gifESv-fFE^V1v&ECwtV z%o2E-BOiG8q`OeDJ&J4U21VAC-rB8)XE<$Ft)&Fw?{5)6{e2CAHb;3kx3x%`Y7tu| z+&UyOo)xq{-!jRojaq)l+@a?dY9|*hRcsBH{lr$BkDE(%hOX=+kUsTvE`egZm%#0b zYypAH1P_6h8$aX`I8b_!zyse<9`|UnrVe~aAnDtL1-k7`O+DU7&&OW>ESKMXY|&KT z9s)zb>GMb;W&JJ!&13FdB#`rq=*#83{WSsm(h|z3obb3yZ24*ffsF<6LEW=kQ)ji% zvnwPADdGM@(UvE4uZw#!p{*8CHKyl#p?Ud%=xhDeI~RHX8H?6&zW5K>Hc)mUh_kmUGc zsL-e#$cP4JAE-emGW(cpYLwR8rn1Gb@}(ca5zl-_U@@#wWzE)Av$5X%(fosJF)kGj ziHEgA!&Jl%heS{W4HJNim_Rl(j6hWkP%)6fKW(woFZRnxP48MHLS)IOVX)|H>tC$~_tijocFOHV@wtffLE{$Tcx? zO|ZYYCQc=$!*}MtxF=Ne>VbQLFWGI$2=uincFTopN_$+O=eqK~#2pKjaeOdMu{4MK zD~kFJ$q zN@KYUe#@#Pa~qWB*^3ohV-CQXV6(umb36%ZqK_-q#u(<{?|<}hodY%<41d(mHGEv> zfnf}D<{Lh)xnLN>oIJyawUI4=2Ml5ojuL%bahy}YUICk7__$)j`Ctpd@X+X+gP96G zo)Tl|dgQE delta 301 zcmZozCi~!x^aK^z7Ip>(Mg|6k;*z4wy!2uq3j!oK85q(hI*PM8D1sQV;#NP5ASxw* z3UX6&;&T&AQj0PZb3p0^j3IIYP`Q%SijvZzRFD*dg7L(4QcOVdlvI=gP#p-s)FtL+ z0*%Sc&jX6VE1&PVoP!(Xx;~U%NV#bB+o2PJUNNk>?yhE^gi&^^?Ge#h00%B$$X4$^Q YjJ2n=y@8o+djm8344dsc0@*zn0nW`uNdN!< -- 2.25.1