From 18d82287aaa48e2468ec0bff2392cbfe0b99accc Mon Sep 17 00:00:00 2001 From: Arnaud Jamin Date: Wed, 11 Oct 2023 10:33:13 -0400 Subject: [PATCH] unify data assets --- ...ilities.uasset => DA_Debug_Ability.uasset} | Bin 12298 -> 12286 bytes Content/Core/Debug/DA_Debug_Actions.uasset | Bin 1771 -> 0 bytes Content/Core/Debug/DA_Debug_Collisions.uasset | Bin 3044 -> 0 bytes Content/Core/Debug/DA_Debug_Engine.uasset | Bin 0 -> 4520 bytes Content/Core/Debug/DA_Debug_Input.uasset | Bin 0 -> 1445 bytes Content/Core/Debug/DA_Debug_Spawns.uasset | Bin 3128 -> 0 bytes .../Debug/Tweaks/GE_Tweak_MaxHealth.uasset | Bin 12532 -> 12936 bytes .../Debug/Tweaks/GE_Tweak_MaxStamina.uasset | Bin 12548 -> 12951 bytes .../Core/Debug/Tweaks/GE_Tweak_Scale.uasset | Bin 12464 -> 12868 bytes .../Core/Debug/Tweaks/GE_Tweak_Speed.uasset | Bin 12471 -> 12875 bytes .../Private/CogEngineWindow_Collisions.cpp | 3 +- .../Private/CogEngineWindow_Spawns.cpp | 2 ++ ...ataAsset_Spawns.h => CogEngineDataAsset.h} | 24 +++++++++++-- .../Public/CogEngineDataAsset_Collisions.h | 32 ------------------ .../Public/CogEngineWindow_Collisions.h | 4 +-- .../CogEngine/Public/CogEngineWindow_Spawns.h | 8 ++--- .../Private/CogInputWindow_Actions.cpp | 10 +++--- .../Private/CogInputWindow_Gamepad.cpp | 13 +++---- ...ataAsset_Actions.h => CogInputDataAsset.h} | 6 ++-- .../CogInput/Public/CogInputWindow_Actions.h | 4 +-- .../CogInput/Public/CogInputWindow_Gamepad.h | 12 ++++++- Source/CogSample/CogSampleGameState.cpp | 31 +++++++++-------- 22 files changed, 76 insertions(+), 73 deletions(-) rename Content/Core/Debug/{DA_Debug_Abilities.uasset => DA_Debug_Ability.uasset} (82%) delete mode 100644 Content/Core/Debug/DA_Debug_Actions.uasset delete mode 100644 Content/Core/Debug/DA_Debug_Collisions.uasset create mode 100644 Content/Core/Debug/DA_Debug_Engine.uasset create mode 100644 Content/Core/Debug/DA_Debug_Input.uasset delete mode 100644 Content/Core/Debug/DA_Debug_Spawns.uasset rename Plugins/CogEngine/Source/CogEngine/Public/{CogEngineDataAsset_Spawns.h => CogEngineDataAsset.h} (58%) delete mode 100644 Plugins/CogEngine/Source/CogEngine/Public/CogEngineDataAsset_Collisions.h rename Plugins/CogInput/Source/CogInput/Public/{CogInputDataAsset_Actions.h => CogInputDataAsset.h} (59%) diff --git a/Content/Core/Debug/DA_Debug_Abilities.uasset b/Content/Core/Debug/DA_Debug_Ability.uasset similarity index 82% rename from Content/Core/Debug/DA_Debug_Abilities.uasset rename to Content/Core/Debug/DA_Debug_Ability.uasset index e752dba9cc0cf9f648676844da52825a7afb9b09..a710f50c8129102a768a6df581e1355b83d01ac1 100644 GIT binary patch delta 340 zcmeB5_!mDRf>lU@fkA2VL=KV3A2|6%Dj7ha8i>0Y!Au4VzRBzL)qOx53qA%0CLo<5 z%D|uplWZwxBnmKN^muK40v;Q|L(E_6Gs; zCv!4}Xg+(liXWu$El|TLeGm%){sRHXU2Z_3bDP^3Lpd1XPGqlSs9tHQrVVzoKbP=k zeXfs;l7c{$E{^dosY#{j@s3HEIhiGu4Ej$S*KfAw3Fl-Il9=qMEj4+as0(A~QQgBG@E0&lk^@0039dTju}( delta 346 zcmewt-<2>Sf>lm}fk9>RM-Gw6?>PBIGgFHhK%g3kdl|t@2D^!qbv*3&7#Ns<{5(+x z20b7R;_Hb)6x0D}5Z(vG92d;b3b!?Sw{e*}#Xfr0xYTb+5WmwgmtLl`F$}-zmP}@6 z4AE4Y?X>}<^(#=rHGPO7F!DbTfZXH;6u7myg)x+a5$-%rkn;+f`?$5i4zA}C*sQ_z zg;81Z%nav%9WIt(hqV1=~2@*3ETxnVmH^5{zDa zC?br)pdP|{w7@7r$b^1S3n~ktpckbm5(-4beztRFX4h%kO+UDE&%Ni|@0>aJoSEUX z+po`s!{KAe0O`vBzTr$r!ZF=)XX>-{(oDuX^9^p$Vcdp$&gB4GaW+-+ZOmlzNz7zt zO+mNG&bbu9#R;;d+&SEaMmpgD-UQt$T zF0)odjWHTXO94QS%Hd}y6UK3-F^MDN(S!51Pdl9h^S$*KMn+K4E4;*_y8-k7|n_vK$>tR(BmNm=7y(xNytkD zxKF|9fSC+aiYU}UO_zo;u0X#!Dfk@*6^awuJcfN2vef$3uBlSgk>^*~^r= z$1R{*tHp0eJ5&46f$N31qrGfYwD}7fwfz&nQNHqZt|S*a(5({abrsOnP!1!|%d|&p o?Z>mUf5b5Uwyw@x0t{EED7A{HImKU5q{867Gp()P&y532!ytN;K2 diff --git a/Content/Core/Debug/DA_Debug_Collisions.uasset b/Content/Core/Debug/DA_Debug_Collisions.uasset deleted file mode 100644 index 942f177dad65fdb54e13210d4ebaa18080cea8e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3044 zcmbVOZ)hA<5P$j8zp<&trndDD_CskkCf6hvFE!-K-QHcSrZFb1RRrVa^1R!)**$hQ zsaHXQLJ6oJf?`{+g=qVs5SkQAQ4F-fDk8}T5flvg#ZXWvR4g{s>N&s7dw1uVGuaNe z_uiYCH@}%TGjDhLtw&ESWHOnT%NSc<%Gh-pK_&EDOHR)J5`Oq z8pd|e=xb94xKA-H?u+o=!Gtdo>TxGMimB_Gt(k^RYK%Qd&nvJ-R9Vj0b{eCRfYQ(y zi}{8{n@cy*EdQYRYk9+YZU$1 z7s(USl|!bb_eIi%I-teb+lQ*=q-|Hw?Whj%-#q>42S{1;KVi2g8%lxNt{GglNKC}~iNy~-)7#JE4qMn)8+6mAtG3OY z!>^4#M4H*X5!F#cw#}XVzMB5Cs~Yx}>bbEKFDgjae(tE)%;twLyoaI^@iV(^q#8#o z)>*xikDcbI0?>Vn1N)0=d5f4MUy=&-Zj;_NAzVuDez}px>J{oqjC_0Otvpj~t5~4Y z`*2ARq4$ar?gDWau|iwe^LK&$2ZSNqA0aU}^ZGsCo)Bk;rR-;g1ryj=KJCR)euQd0 zgBl`&rDA%!NtP=?QJi)EUurm1WT4a122?BUmg0eQim$-k!foibqQ0RbUE|?Fqfh5< zRW{19h`4){X-%v0B8v3dE+465LJ%YO)1pR*i D{ATtr diff --git a/Content/Core/Debug/DA_Debug_Engine.uasset b/Content/Core/Debug/DA_Debug_Engine.uasset new file mode 100644 index 0000000000000000000000000000000000000000..13b70021ceff626f826f4bf0b2cdbc745320a923 GIT binary patch literal 4520 zcmcIoYiv|S6ds-mSkMZn$fGFoDsAZ#NTslQ`w%TyDTtbAz1@!8TbI4-y?24dgfyZ^ zg2WIX#PEnH#vo0AKokN7P$0xmqajfc;}1omO*9yhRs`$$=FZ$M%Wmm5@g%b|bIv#C z%$zyr%S8~+{wiIWe{WI zsn4s@m-0N#w0K@Qua7q7mHX<%pspg^XoNXI2t=(Onutyha2Hk-7y3&y&0nOI_zQ}P zOG=803TOEIny)aw#9vrY=z(c7Z0{|M-6j{?w+azkM?KmmYM(uIjBomRqwnx1g|9v6 zzqatJ)hG63?Akte^Q@CQ&rE0^1l!PqjSQeO^ou@ zY#5H2*{GSJkYO8USS@{~^t6(>S5q6&mxn9Djum4W#;_{6E>2cunb8P)u5I6GVZjWU z7HiqS8;6jE3Qeoi=;|$<4Lot4F~ofyOP3}Euh1&Sz~6N6%&)9{8GQ;8Q9OG^-VnBc-QAUx3>*3P@@N)*Bg1Y8PG$< zO0sN*p~H@lLs+I0TMJ9#K7`M0HtN+Eq7?Hkk8at_bp*t*Jl&;7tqCw$D;(~zr?bsh zClgyHW>6=mJKVDKG>hv_)Z+Ph{+c>(!q%VZIM^+|ARb@9-aTMuWhK-95VuUBTMXD4 z{qX*jIH41`0@kdb{jf)cr0wL>FN_k4rs?UGo0v3nD&V_r@f zyrg7u$(p&Z%)6V|{!o-hEF;%G-Fk?&xmr&u{BEj_^z@o|Tt(euNyE&mA3TcD{Mv z8>j~|pqO2?b_5p6xrf^_Z9AVpe9!}K$Nr|GG*OO`mWmQ_cm^g(VRyK8!Xa`%-Qg}1 zZi)-L4tKxgA&EeL5pJqG>=t*4aMQZM}(3gi;Y6MKlnpx=t5(R}y%+U=raW^@$NesGygn)R zx@7wMlk^%1u0lxkFEwvL+yHu0V<2uuZ1%$Frd=0k!CnyTt^mlWZ~1tByMKcE|gV5(e9 zsR4oABMnMZq8ss*QP5!eR8MxVJ;}(MXw7q!lU(JD{m-5xH}uR8DLskOkd`OCTa-tf zAsH$xL^LXpV)m5`eA`V*@;8wPGyqgSpgIY{_Y+VrW8Gccdg|0{6%jYJsOoRp7I!o) zL_82R&q>Q7exrcWwy3SoEOVE_Vs%-M&!{Rz+7@B0_0%Dm+no7zi7mZfz@ zmFm5+i1Q75@sF~!EXoHV{WD%!)ifIx;h?lEs#hWHGY);&5gtw3B7QT0(zb~69oe-* z#B2N+Rm?(Z{1|f-DEy`Xji+|ge>jfPe=Zv@f6$y;dhBbwu&NG00chC|Gau{!#o;N_ I-6;e9KgeXjy#N3J literal 0 HcmV?d00001 diff --git a/Content/Core/Debug/DA_Debug_Input.uasset b/Content/Core/Debug/DA_Debug_Input.uasset new file mode 100644 index 0000000000000000000000000000000000000000..3adc3def1980414285e2214a47d95215be3e632a GIT binary patch literal 1445 zcmX@utTpe)|Ns9Jm>C$jm>3v70BI0l1md?D8=ky$n(~GFmf<4D-EMjsKrt0o1_lKn zt?!KQnIj$wgnJ^^*u1t1N=4}e(EiaX5o z>Ur0uR4p_0lD1)w5A!8`9j zZNDH$U2t+yW_7)Fbsz`905pZbxL_KaI+z%;LQvEp z^Vy*sP}1RnvO!Uc3xJXuG^sP7n+4MI56yfos6n8l;s|9MAeoPB9#k4mVKW~tiN*k# zgFTk9#PAhh2ueU50n&&?i84?aJ<;i5CLvG|gVJX}QD$ypQ6)HCg;W**6F5*1Q#ra) zP=>%}J1BL5&2lQuOUX$Er$V3*IEMUyS*a`)lD6%DVhC5lbATRLRvjS&$uyYmR|gk6 yAny|b$nm5IR7|jZI|wXrr+-`8pl5yLA}I1@&}=BXXA#J9YQH9=BxGO!sRsc32qjMd literal 0 HcmV?d00001 diff --git a/Content/Core/Debug/DA_Debug_Spawns.uasset b/Content/Core/Debug/DA_Debug_Spawns.uasset deleted file mode 100644 index f6e5b6c3ea52fcbe5870bd9b15c13ba8b533c74a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3128 zcmcInU2IfE6h4(!`LUu6prSyV7!ljA_Xd<^?Y;h-Cnl)gC>5- zbY{-^=FFLM&z#v#?z;WWnc3OdhZYbmzJlm9_dpG|UxyBy{5kyM^pbDe_k|8eeYdgf z%Y{Tu-1}qtcH!3yDf|&Jm`nO2p|~2v2eSIkjL8(6I0#FOw`%QqTR_u-TBNH(>(ZjZ z9<8&jLkq1BcWA-RXfWI!DUjJ2dg@A|tDVK&S1A?U&pld_+xx#Snh1<oLrVZCzDKNgbHU*#*%rePc4nj*Ttlf%hJQA4t}ky7->V& z*r-Ti`^{`Xmzt6-)68fc%li1k(S}uBC)C8q2%28-Sv@?yd+-sFunKO5z8gQaipBkU z;!!;*HX8{&oq9sIQbqb;T&pwvp;Mg*g9x!~CqFAzEd*h_M z1zQeSGUwT{jb6WqEOWAJNSAuT64LZ*Qs`DrigtgvKVF#7^T%fnSL6r0`~bau$Y^XV zW&chg4P{#m=(v95nHXjx2oQTy7xMNLE8BT5;B#w_~JO9m!juC{01L& zP9wz@`%BPFZ|f#R$<^5zLC@SV(t87o!|9yJ%2dXRiHwlCCAQf)v~Ewf70bM#ifi=b z*l)2Sae&2Z602WYVzbrZS=12u;fzNFmib&m(@JI)9FORht`gY2@FVLtM6YE=aUuBN zmC3F}EWb-wIu_B%;e#*m9dYxD%-HVbSm@+gf%itsJ7NXPf$Qy#{@@FSqXV$vqL_!0 zcB7-L#5>PC91Ez#JIB16Y}zHf<&F$R1~|*So9$sm-Zb-8SKzI2bm;KS0Iz@UzFr<; z2vp-;XVa?kkgq^Bd&pj(8qf9F%lnh#V6V3SqTT?=zB5ixQBcbP1s)AxQ_U;O z5kdw`ht!DZQ*7qIYtNOreJT6=sL@}nxCkZVZ*DH%+rw_<>r?9LY~?C?)HyvYl;X6o z+^r9V%jqkO=3P^Gj11_PsqMPVt1En8J}auYSG+{MBBlI+Oc@R5GTYKZ-FOzMXS|Oe zj~&7;QZbgz`CX`aKBZkdr*Z0J`4g>Gre~d7;`x@?l|FZp2(PdL<}S$leA*#7KijOaK4? diff --git a/Content/Core/Debug/Tweaks/GE_Tweak_MaxHealth.uasset b/Content/Core/Debug/Tweaks/GE_Tweak_MaxHealth.uasset index 3bcd84f9b3d4e2151f97eeb3004e640a2ffb692e..321dc8ce768f4b29b563f0f869a1fa21b0fe03ac 100644 GIT binary patch delta 1832 zcma)6O-xfk5Z;BBqC!a@P?Vq70<{DaEkE%fi6&SoNcuPbQ+q#GAp$!C(daH-L5KbzgXricGSd*>Ap?+1)ptuf9QL zXgnz@UwgUP+|L+GOTr(N?hLqER?-+Z88e~rSYj+&buo6743vkcX}!ngpL})8ZeCqG zJUV)CzIBg-cfFsre|TFxcxmrQ%f8;H9Ql-|AFlCzMfFz3_E%7jMTwzAWyTbQ4pl@_ zlG<1ApoqquHNK#ajg>kADY!l03xpJQr>y*LA?{qYzEg_J-PWPFYLuo>i_6`r_=26T zT8~$?*yPV!H(?;Hvc&c`yDsE+ZEx^;nwynlK~bWoYu6M!NDF``y)_r_%a#zlZdOw^ zoeuZXEAz9^U86MnLV=*yt5rin`;mqD>*l7+HR#vDwV%h|!gzKL44H?woTU@a( zc=K*y*9%Q*Dep7#+F@HpUbtPbz7m2qy{#tayOxbp%oxvs2hYmYl8_%hOJWmhTl4>5#3t<(>O>I^lCd9 znB8hrYr!@t&-q;!Na$JOprqm&P%XxG+p&%Vk~5vwpn$fZHdx}D7jd^+$}JLJRb3Dp z8lPH|ye@~^nN`kjONvsjQE@7&owlw*E$Wu6iUDDah>@n@M;Vg^MqzYe^3fxZ&;VG# zg^-F9U&AR*6N;Te2kAnrW`p6ZQo}PG+;BBLAKqoHOL>Ev2|2>EL!9r2>AX^KSf$)0 z^K{eVOp83Sf^kJmxRF0$!t5+ImjitTGLOMXfyYSq@Bw$MNkqyPW_ delta 1236 zcma)6T}V@L6#xIP+oIgp-Mwye>F%axF8bK?AtnR~h82z)V$cW3vQ2}nG@Rm0OAAvX z$PPUiK146|(t}*_slbO&h=_U#D#Dj2M2O}`B$ey@x9jaH3LQB2od5a#&d2|9&mD>` zMee@Q4HOds&x{9b1f>tv$T5!)p9Q>?yBl*ZAqI3-ctRM@XCWjgGK7!>TBf6@uCYBI z=DfXilaqC~79ZH})6UOn&)jUy(C~?|mWI?cMLw(32P3qhB!d}Kepch3WKh^d7clg~ zFB`bF9cGqsDiTjd$s>Q@3C>ytc2ivE!Z3uKg?e)D)7e%SFtvitT(!@M;o4{{l8kpW zHPuBD(YAP``$#MnZSEiyGq-EqS{wrQ0!W$Zg3buf}_|U!7wkW^;0mu?(}}$iQ2SG zpG^v`&DE=P_>Q-#-lW?vj4R=+>4dj7fg31>FScrUDC$frK|ATTZGSfZv$>e?SeczjTGdr^$bv>XK@1s-B!lT=pWh`v#W740kr$*X}rg=DC_Zy z36H<-j`6jXX zOJ&?_=*X(4iiS1*U?j+f%S*#^G29vqM-_I((8>fXp?*OhCoeov(gw**NSzm9ff<@VW_k0EysFd&Hb z4wV^4rc1?1CR1ZRgLi%|Tof|W+A-7~(`$JL#OAyH(0oG8LA@qjO-$QAnW&!eYCU|w znjVc&Jvq7oWJgkteT8akvR8f_9;G@$v_MGqhNwD?_NCE48r@AH`*C$Pa$yyxPD{_U z>KRL~8hyl0tKf`W!eb!VM8lK}Wwt7KB^oWrBvchU3LQu$T+k=U;I}!ef9XgQs=YKt~V9BrD6 zuH`fiOeOQA*YZ@S8P$$LOxkFCjz1FUw>aUwlt1?+24iwO%O2x=3rsI82e-qPKkI!j zn|VL+M~-u*|5CzL=NmK5&Jt6(aJoR|3AkBM!;LUr;N)h=kpYiX8Wc^&j1%k!+?PuP z+FQNWF!}}%O7r;7ctURBrYYQ&852%e>&}3)h1+=(2xZ@3r0A52_LPKpQ~X(Z8P}*q hUQ7sO!*l+Ur{cJ@bkx8bX&Dn8)^-qzb0OFB@i+A4fj|HN delta 1224 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 U{~!OPVwC50TglVRJDP|43pP%Jxc~qF delta 1152 zcmah|Ur1A76#u^4oo?pbb#t4_cJJnFE)?B*st2XOzfn*W6$RSTtp(EzH$^K65+Wqf z4nZ#=^rBBKS>Q`ZL=a>|_R>T2M|=syNbQgP)6VhU&5HybIQN|MJHPY$4&3jX>6i+S zycAm8qpw2dLB^O-zz>=P60bTeSs2T~>O&!8Rzk7%6j7hCqZrArpf{}?@9{i;xc~ZC zRb`dseC+YqY2kgy+B7_AsJT@V=;X*Jok6(4kCeT`iK{`<*tB)D7B^!Z2we-N1tFeS zKoiHp@nnSE4TdJ*L4FP7nd4$9!cZrd7}(9Xr()1+j=`#Vm!}xv`badKj3?UKn!=rt z?s&MrAsUUeCs^R=a6L2@v^sHrwxuU5=Z?cv!G!%R_Q<-_z`o*2Jus=*AZ0O{GUyk$ zFF6U}T@bS=0bI^0j*CVs_S>FeLeuUv)Q9;_A#4D)(sugWliTZj98uiUwE2MnDuJKc8ntZ zX|xtMjM^M9Z!P!#MEa_3q)%lq6UIYYeo%%bn+yw9m;Z;3N@59(V#GM4<#&i)277HH zJW-0EqDXRF&{}&i&P!_HRrECfADuE0E~+d>H@-*9#o)%?yKNFF`@ic(Xqijs6ls}! zbh5sn{*-;&5F)3`OUmRlBBGOJuy0$WKVeNgFRCdpW8Wdh@R`80*#(lro|C|$)}5|& zL^yclX2_FU(~ZS71}qN1towB?JmFz`(HAE&N*LEtB0Zl@DkLyLa_9d9Wi diff --git a/Plugins/CogEngine/Source/CogEngine/Private/CogEngineWindow_Collisions.cpp b/Plugins/CogEngine/Source/CogEngine/Private/CogEngineWindow_Collisions.cpp index 754bd82..67be8c8 100644 --- a/Plugins/CogEngine/Source/CogEngine/Private/CogEngineWindow_Collisions.cpp +++ b/Plugins/CogEngine/Source/CogEngine/Private/CogEngineWindow_Collisions.cpp @@ -2,6 +2,7 @@ #include "CogDebugDrawHelper.h" #include "CogDebugSettings.h" +#include "CogEngineDataAsset.h" #include "CogImGuiHelper.h" #include "Components/BoxComponent.h" #include "Components/CapsuleComponent.h" @@ -368,7 +369,7 @@ void UCogEngineWindow_Collisions::RenderContent() } //-------------------------------------------------------------------------------------------------------------------------- -void UCogEngineWindow_Collisions::SetCollisionsAsset(const UCogEngineDataAsset_Collisions* Asset) +void UCogEngineWindow_Collisions::SetAsset(const UCogEngineDataAsset* Asset) { if (Asset == nullptr) { diff --git a/Plugins/CogEngine/Source/CogEngine/Private/CogEngineWindow_Spawns.cpp b/Plugins/CogEngine/Source/CogEngine/Private/CogEngineWindow_Spawns.cpp index afa2e61..8b8db90 100644 --- a/Plugins/CogEngine/Source/CogEngine/Private/CogEngineWindow_Spawns.cpp +++ b/Plugins/CogEngine/Source/CogEngine/Private/CogEngineWindow_Spawns.cpp @@ -1,5 +1,7 @@ #include "CogEngineWindow_Spawns.h" +#include "CogEngineDataAsset.h" + //-------------------------------------------------------------------------------------------------------------------------- void UCogEngineWindow_Spawns::RenderHelp() { diff --git a/Plugins/CogEngine/Source/CogEngine/Public/CogEngineDataAsset_Spawns.h b/Plugins/CogEngine/Source/CogEngine/Public/CogEngineDataAsset.h similarity index 58% rename from Plugins/CogEngine/Source/CogEngine/Public/CogEngineDataAsset_Spawns.h rename to Plugins/CogEngine/Source/CogEngine/Public/CogEngineDataAsset.h index 098dcb6..036e536 100644 --- a/Plugins/CogEngine/Source/CogEngine/Public/CogEngineDataAsset_Spawns.h +++ b/Plugins/CogEngine/Source/CogEngine/Public/CogEngineDataAsset.h @@ -2,7 +2,20 @@ #include "CoreMinimal.h" #include "Engine/DataAsset.h" -#include "CogEngineDataAsset_Spawns.generated.h" +#include "CogEngineDataAsset.generated.h" + +//-------------------------------------------------------------------------------------------------------------------------- +USTRUCT() +struct COGENGINE_API FCogCollisionChannel +{ + GENERATED_BODY() + + UPROPERTY(EditAnywhere) + TEnumAsByte Channel = ECollisionChannel::ECC_WorldStatic; + + UPROPERTY(EditAnywhere) + FLinearColor Color = FLinearColor(0.5f, 0.5f, 0.5f, 1.0f); +}; //-------------------------------------------------------------------------------------------------------------------------- USTRUCT() @@ -35,12 +48,17 @@ struct COGENGINE_API FCogEngineSpawnGroup //-------------------------------------------------------------------------------------------------------------------------- UCLASS(Blueprintable) -class COGENGINE_API UCogEngineDataAsset_Spawns : public UPrimaryDataAsset +class COGENGINE_API UCogEngineDataAsset : public UPrimaryDataAsset { GENERATED_BODY() public: - UPROPERTY(EditAnywhere, meta = (TitleProperty = "Name")) + UCogEngineDataAsset() {} + + UPROPERTY(Category = "Spawns", EditAnywhere, meta = (TitleProperty = "Name")) TArray SpawnGroups; + + UPROPERTY(Category = "Collisions", EditAnywhere, meta = (TitleProperty = "Channel")) + TArray Channels; }; diff --git a/Plugins/CogEngine/Source/CogEngine/Public/CogEngineDataAsset_Collisions.h b/Plugins/CogEngine/Source/CogEngine/Public/CogEngineDataAsset_Collisions.h deleted file mode 100644 index 91dffde..0000000 --- a/Plugins/CogEngine/Source/CogEngine/Public/CogEngineDataAsset_Collisions.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include "CoreMinimal.h" -#include "Engine/DataAsset.h" -#include "CogEngineDataAsset_Collisions.generated.h" - -//-------------------------------------------------------------------------------------------------------------------------- -USTRUCT() -struct COGENGINE_API FCogCollisionChannel -{ - GENERATED_BODY() - - UPROPERTY(EditAnywhere) - TEnumAsByte Channel = ECollisionChannel::ECC_WorldStatic; - - UPROPERTY(EditAnywhere) - FLinearColor Color = FLinearColor(0.5f, 0.5f, 0.5f, 1.0f); -}; - -//-------------------------------------------------------------------------------------------------------------------------- -UCLASS(Blueprintable) -class COGENGINE_API UCogEngineDataAsset_Collisions : public UPrimaryDataAsset -{ - GENERATED_BODY() - -public: - - UCogEngineDataAsset_Collisions() {} - - UPROPERTY(EditAnywhere, meta = (TitleProperty = "Channel")) - TArray Channels; -}; diff --git a/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_Collisions.h b/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_Collisions.h index 9ff5bf8..98fbc35 100644 --- a/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_Collisions.h +++ b/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_Collisions.h @@ -15,7 +15,7 @@ public: UCogEngineWindow_Collisions(); - void SetCollisionsAsset(const UCogEngineDataAsset_Collisions* Asset); + void SetAsset(const UCogEngineDataAsset* Asset); private: @@ -29,7 +29,7 @@ private: FColor Color; }; - TWeakObjectPtr CollisionsAsset; + TWeakObjectPtr CollisionsAsset; FChannel Channels[ECC_MAX]; diff --git a/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_Spawns.h b/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_Spawns.h index eaf9002..ca407e7 100644 --- a/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_Spawns.h +++ b/Plugins/CogEngine/Source/CogEngine/Public/CogEngineWindow_Spawns.h @@ -4,7 +4,7 @@ #include "CogWindow.h" #include "CogEngineWindow_Spawns.generated.h" -class UCogEngineDataAsset_Spawns; +class UCogEngineDataAsset; struct FCogEngineSpawnGroup; UCLASS() @@ -14,9 +14,9 @@ class COGENGINE_API UCogEngineWindow_Spawns : public UCogWindow public: - const UCogEngineDataAsset_Spawns* GetSpawnsAsset() const { return SpawnAsset; } + const UCogEngineDataAsset* GetSpawnsAsset() const { return SpawnAsset; } - void SetSpawnsAsset(const UCogEngineDataAsset_Spawns* Value) { SpawnAsset = Value; } + void SetAsset(const UCogEngineDataAsset* Value) { SpawnAsset = Value; } protected: @@ -30,5 +30,5 @@ protected: private: - const UCogEngineDataAsset_Spawns* SpawnAsset = nullptr; + const UCogEngineDataAsset* SpawnAsset = nullptr; }; diff --git a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp index 2373677..476e179 100644 --- a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp +++ b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp @@ -1,6 +1,6 @@ #include "CogInputWindow_Actions.h" -#include "CogInputDataAsset_Actions.h" +#include "CogInputDataAsset.h" #include "CogWindowWidgets.h" #include "Engine/LocalPlayer.h" #include "EnhancedInputSubsystems.h" @@ -15,7 +15,7 @@ void UCogInputWindow_Actions::RenderHelp() "This window displays the current state of each Input Action. " "It can also be used to inject inputs to help debugging. " "The input action are read from a Input Mapping Context defined in '%s' data asset. " - , TCHAR_TO_ANSI(*GetNameSafe(ActionsAsset.Get())) + , TCHAR_TO_ANSI(*GetNameSafe(Asset.Get())) ); } @@ -30,13 +30,13 @@ void UCogInputWindow_Actions::RenderContent() { Super::RenderContent(); - if (ActionsAsset == nullptr) + if (Asset == nullptr) { ImGui::Text("No Actions Asset"); return; } - if (ActionsAsset->MappingContext == nullptr) + if (Asset->MappingContext == nullptr) { ImGui::Text("No MappingContext"); return; @@ -77,7 +77,7 @@ void UCogInputWindow_Actions::RenderContent() if (Actions.Num() == 0) { - for (const FEnhancedActionKeyMapping& Mapping : ActionsAsset->MappingContext->GetMappings()) + for (const FEnhancedActionKeyMapping& Mapping : Asset->MappingContext->GetMappings()) { if (Mapping.Action != nullptr && Actions.ContainsByPredicate([&Mapping](const FCogInjectActionInfo& ActionInfo) { return Mapping.Action == ActionInfo.Action; }) == false) { diff --git a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Gamepad.cpp b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Gamepad.cpp index 9457f99..bf93f2f 100644 --- a/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Gamepad.cpp +++ b/Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Gamepad.cpp @@ -1,6 +1,7 @@ #include "CogInputWindow_Gamepad.h" #include "CogImguiHelper.h" +#include "CogInputDataAsset.h" #include "Engine/LocalPlayer.h" #include "EnhancedInputSubsystems.h" #include "imgui_internal.h" @@ -16,10 +17,10 @@ void UCogInputWindow_Gamepad::PreRender(ImGuiWindowFlags& WindowFlags) if (bShowAsOverlay) { WindowFlags = ImGuiWindowFlags_NoTitleBar - | ImGuiWindowFlags_NoScrollbar - | ImGuiWindowFlags_NoCollapse - | ImGuiWindowFlags_NoBackground - | ImGuiWindowFlags_NoResize; + | ImGuiWindowFlags_NoScrollbar + | ImGuiWindowFlags_NoCollapse + | ImGuiWindowFlags_NoBackground + | ImGuiWindowFlags_NoResize; } } @@ -197,7 +198,7 @@ void UCogInputWindow_Gamepad::RenderContent() return; } - if (ActionsAsset != nullptr && ActionsAsset->MappingContext != nullptr) + if (Asset != nullptr && Asset->MappingContext != nullptr) { if (Actions.Num() == 0) { @@ -228,7 +229,7 @@ void UCogInputWindow_Gamepad::RenderContent() Actions.FindOrAdd(EKeys:: Gamepad_DPad_Right); Actions.FindOrAdd(EKeys:: Gamepad_DPad_Left); - for (const FEnhancedActionKeyMapping& Mapping : ActionsAsset->MappingContext->GetMappings()) + for (const FEnhancedActionKeyMapping& Mapping : Asset->MappingContext->GetMappings()) { if (Mapping.Action != nullptr) { diff --git a/Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset_Actions.h b/Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset.h similarity index 59% rename from Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset_Actions.h rename to Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset.h index 2aad86f..6dc5f12 100644 --- a/Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset_Actions.h +++ b/Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset.h @@ -1,18 +1,18 @@ #pragma once #include "CoreMinimal.h" -#include "CogInputDataAsset_Actions.generated.h" +#include "CogInputDataAsset.generated.h" class UInputAction; class UInputMappingContext; UCLASS(Blueprintable) -class COGINPUT_API UCogInputDataAsset_Actions : public UPrimaryDataAsset +class COGINPUT_API UCogInputDataAsset : public UPrimaryDataAsset { GENERATED_BODY() public: - UCogInputDataAsset_Actions() {} + UCogInputDataAsset() {} UPROPERTY(EditAnywhere) TObjectPtr MappingContext; diff --git a/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h b/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h index 3480b46..aade226 100644 --- a/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h +++ b/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Actions.h @@ -6,7 +6,7 @@ #include "CogInputWindow_Actions.generated.h" class UInputAction; -class UCogInputDataAsset_Actions; +class UCogInputDataAsset; UCLASS(Config = Cog) class COGINPUT_API UCogInputWindow_Actions : public UCogWindow @@ -17,7 +17,7 @@ public: UCogInputWindow_Actions(); - TWeakObjectPtr ActionsAsset; + TWeakObjectPtr Asset; protected: diff --git a/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h b/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h index 6eeb992..eca897a 100644 --- a/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h +++ b/Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h @@ -5,6 +5,7 @@ #include "CogInputWindow_Gamepad.generated.h" class UEnhancedPlayerInput; +class UCogInputDataAsset; struct ImDrawList; UCLASS(Config = Cog) @@ -22,13 +23,16 @@ public: virtual void RenderTick(float DeltaSeconds) override; - TWeakObjectPtr ActionsAsset; + TWeakObjectPtr Asset; private: void AddButton(const FKey& Key, const ImVec2& Position, const ImVec2& Size, const ImVec2& Alignment, float Rounding, ImDrawFlags Flags = 0); + void AddStick(const FKey& Key2D, const FKey& KeyBool, bool InvertY, float Amplitude, const ImVec2& Position, float Radius); + void InputContextMenu(const FKey& Key, FCogInjectActionInfo* ActionInfoBool, FCogInjectActionInfo* ActionInfo2D); + void OnButtonClicked(FCogInjectActionInfo* ActionInfo); UPROPERTY(Config) @@ -61,10 +65,16 @@ private: TMap Actions; UEnhancedPlayerInput* Input = nullptr; + ImDrawList* DrawList = nullptr; + float RepeatPeriod = 0.5f; + float RepeatTime = 0.0f; + ImVec2 CanvasMin; + ImVec2 CanvasSize; + ImVec2 CanvasMax; }; diff --git a/Source/CogSample/CogSampleGameState.cpp b/Source/CogSample/CogSampleGameState.cpp index 89f578a..47b6374 100644 --- a/Source/CogSample/CogSampleGameState.cpp +++ b/Source/CogSample/CogSampleGameState.cpp @@ -20,8 +20,7 @@ #include "CogAbilityWindow_Tweaks.h" #include "CogDebugDrawImGui.h" #include "CogDebugPlot.h" -#include "CogEngineDataAsset_Collisions.h" -#include "CogEngineDataAsset_Spawns.h" +#include "CogEngineDataAsset.h" #include "CogEngineModule.h" #include "CogEngineWindow_Collisions.h" #include "CogEngineWindow_DebugSettings.h" @@ -38,7 +37,7 @@ #include "CogEngineWindow_Stats.h" #include "CogEngineWindow_TimeScale.h" #include "CogImguiModule.h" -#include "CogInputDataAsset_Actions.h" +#include "CogInputDataAsset.h" #include "CogInputWindow_Actions.h" #include "CogInputWindow_Gamepad.h" #include "CogWindowManager.h" @@ -127,8 +126,10 @@ void ACogSampleGameState::InitializeCog() //--------------------------------------- // Engine //--------------------------------------- + const UCogEngineDataAsset* EngineAsset = GetFirstAssetByClass(); + UCogEngineWindow_Collisions* CollisionsWindow = CogWindowManager->CreateWindow("Engine.Collision"); - CollisionsWindow->SetCollisionsAsset(GetFirstAssetByClass()); + CollisionsWindow->SetAsset(EngineAsset); CogWindowManager->CreateWindow("Engine.Debug Settings"); @@ -154,7 +155,7 @@ void ACogSampleGameState::InitializeCog() CogWindowManager->CreateWindow("Engine.Skeleton"); UCogEngineWindow_Spawns* SpawnWindow = CogWindowManager->CreateWindow("Engine.Spawns"); - SpawnWindow->SetSpawnsAsset(GetFirstAssetByClass()); + SpawnWindow->SetAsset(EngineAsset); UCogEngineWindow_Stats* StatsWindow = CogWindowManager->CreateWindow("Engine.Stats"); @@ -163,36 +164,38 @@ void ACogSampleGameState::InitializeCog() //--------------------------------------- // Abilities //--------------------------------------- - const UCogAbilityDataAsset* AbilitiesAsset = GetFirstAssetByClass(); + const UCogAbilityDataAsset* AbilityAsset = GetFirstAssetByClass(); UCogAbilityWindow_Abilities* AbilitiesWindow = CogWindowManager->CreateWindow("Gameplay.Abilities"); - AbilitiesWindow->Asset = AbilitiesAsset; + AbilitiesWindow->Asset = AbilityAsset; UCogAbilityWindow_Attributes* AttributesWindow = CogWindowManager->CreateWindow("Gameplay.Attributes"); - AttributesWindow->Asset = AbilitiesAsset; + AttributesWindow->Asset = AbilityAsset; UCogAbilityWindow_Cheats* CheatsWindow = CogWindowManager->CreateWindow("Gameplay.Cheats"); - CheatsWindow->SetAsset(AbilitiesAsset); + CheatsWindow->SetAsset(AbilityAsset); UCogAbilityWindow_Effects* EffectsWindow = CogWindowManager->CreateWindow("Gameplay.Effects"); - EffectsWindow->Asset = AbilitiesAsset; + EffectsWindow->Asset = AbilityAsset; UCogAbilityWindow_Pools* PoolsWindow = CogWindowManager->CreateWindow("Gameplay.Pools"); - PoolsWindow->Asset = AbilitiesAsset; + PoolsWindow->Asset = AbilityAsset; CogWindowManager->CreateWindow("Gameplay.Tags"); UCogAbilityWindow_Tweaks* TweaksWindow = CogWindowManager->CreateWindow("Gameplay.Tweaks"); - TweaksWindow->Asset = AbilitiesAsset; + TweaksWindow->Asset = AbilityAsset; //--------------------------------------- // Input //--------------------------------------- + const UCogInputDataAsset* InputAsset = GetFirstAssetByClass(); + UCogInputWindow_Actions* ActionsWindow = CogWindowManager->CreateWindow("Input.Actions"); - ActionsWindow->ActionsAsset = GetFirstAssetByClass(); + ActionsWindow->Asset = InputAsset; UCogInputWindow_Gamepad* GamepadWindow = CogWindowManager->CreateWindow("Input.Gamepad"); - GamepadWindow->ActionsAsset = GetFirstAssetByClass(); + GamepadWindow->Asset = InputAsset; //--------------------------------------- // Main Menu Widget