From d8c48dc5fc323109891d244d0260c55528959751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= Date: Sun, 16 May 2021 00:24:42 +0200 Subject: [PATCH] some tweaks and fixes for texed --- art/demo.ecotex | Bin 153 -> 153 bytes art/gen/demo.ecotex.h | 1596 +++++++++++----------- art/gen/demo.ecotex.png | Bin 8554 -> 9418 bytes code/game/source/editors/texed.c | 2 +- code/game/source/editors/texed_widgets.c | 8 +- 5 files changed, 805 insertions(+), 801 deletions(-) diff --git a/art/demo.ecotex b/art/demo.ecotex index 69cc276afca5340a337002c3092ef1bd163e4c67..7a893ca65c8d1b57afcc7ffc11be038f95b18ec1 100644 GIT binary patch delta 83 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 S$@-5Hv~d2?FR#oca{mvS2>wO@ literal 8554 zcmWlfX`<(B2&MlJ1F1E9E zvjqUaZt0RQS5BVN|6fdGazFpgw*LUYJ9z1rviO}FQp>lU7@`IqrWG8tt&pBN_Cs|< zHVkwP9rR$vXlewPag)FfyH7(2i{N+OD=nJ`vDsANcV5K!F^B2cdPpP^<^7SLa-Z$} z=W+J3u{t(8PF!b`5I_hF`-I3#9lS@V5f#!bk>XnUWvz;DrI2hZ{Dgvk3I>ak zR6Hw{jGFD7sUfEp>-d2V2^0DzL8&ZgYtIc9TE^~@w7nF5pPEQbLsQ1uOat%33;HFh zV9R)Gi>b3G35g~WYqeA`R!bp|DW@8$UA1qamKtj^b@Xp7NTR&|xH0x%wMK2F7Jp{4 zet%6p(W=-<71;4gVyfl9q8Tm9>1`nvc$Z@rUrqv_Ach$t;OWT zV-`!}G{6(fI3u3*{XJE*OMyyj4bfOrQ_XEHH1>2QYCF+t8h^$mHuCx6#6Nhs@Mnve zI)NW_;OV9Bt-vd@AcG#FkKqu(T52NM46~VG#LYghFnwd0SHs6uRiKH{%ippk0YT(I z%0Q%#zJsFhPP<+)(Lq)~1AHu)^Svi5HsUyw10)dM6t2Xf-WN%efv7@+6Ddm6($)Zo z#`+IPNJUzTd8kLw*e{TVsML@1AWj8>%}Gm5NjHzbj}Ut024`K#5?W|y-O6I+o5ow2 z%Zj{)ynow!(t(%ZwF899_7_!l^ix`PJ4M}{(#96USoO&x_JvH%71^i|b5vi7$17|!RN(8?01WJYse5R#zuMYg*n6bRaH1q&w%dDfAj=|@Ch z)I;XgLeKK^nC!l7jAsmmCDQ*#ZDRloMgZ*Y>JGy?SW^z%zbl0CIjI)ps>Kf$7m2ch zr7PJ&dn-H?=;KcZQjg#zMfiZb{G*Tl3JI8prts{gH)FJw{0fywq_L!=19V^iyIIf! zbDJGI@@zX>HJQp(lb`Sne$Oq#&p%T_Ssswh4-wr037$=1yo%L4uk^<%G@E{$Jtt18 z49=@#h_{Ijoq|rO7;AxL0wG)E(z~lU$(|cxLDHqfAJR7XYuf>_zps?;>r}%Ap0m>| z^z-oULmdHdV|$R4&EBVK$1mFz|ENU&W6ZNFFQo95_TfHoNRWQ0O2wP+qf+lEp69w&Ngto=#yIgqP61g2FxQbe-f%DoEc=&BN$Cp*@x# z(O4}Yj$`?t$FG4T37tJeQ7Xu3WGkXXjbMla>{K&GPq#rGDb^?dns)^>Km*YK>$pL_@md4*h!MEBOf zXR4@nD#S8jQ~M16Aq*CBDbTH%mL2IH(kMYkN!@UDM_U`krm*g&bNyQE16IwZ@OQh! ziF`BGZ9kOcTc9H4)QGF%JOw>vlh7d>p0KL8maL)&GO#C}PChl!DKv%$tITfMKGKB= z`vVn~yro`*q*08=_Rwytpk{{6Oo8+RxZWGPVxKeeAwZm#Xa$d0@UDw0a=N8w zie8S+w2nX9TF_QKKP1Ou-rq5Dj$&68uV=q*fJny^mAFl>_vDps&ZW}KP39vVei}11 zOu0AuHA~q2_~j;$?Tp?Du|Q{;38?I@rSL>Y=kjP&7aWpfHWzlZa($7bm&m8apjg|DlT`}3k`>vDr;iI%_x#~Wo#L(^ zRKMGb&TVGu;;9XjWoFD0(KsT|;+IDYJ3e(jWADgSrI^9Y@0L?NDf)>y4a97pCSaCl zCC(XZ1!|Y6;KS5N`(*t{Gs7{zOiCR+46_PvOjz=>E{p-+Y8Uc|c*mj6B6b~#!MzhV!} z5}NR9ynuR>l@Z9W9y~=S=}|RrZSVJN#q)WZa%$kMU;Wat{vK}DJ0rdMs$Sq*5G38N zqDFODojnXhb~cH9e*GbGffFx4OXaQGL$o9#JHExvLw@z&1kC^H*>5GyyC>wM72SEjGS@S`G;0;^O<((wLW%jRapYRzKVVwQQ>vo z^-A!pt-O;J591l=_EhLeCDp!sNS zeX?AVv}5;%;YLZRfSvccn7y7n>Y=&7m@_In=}!C)FOeycImFKv@^vhB;0S)~KoNf6 z#7X?bkz;swP&ho!Nj#tkvu>}A`Zt%o zNdA`dwklYdcU+^A&4`5St4)H6H5E8WHju0skVxRv*bKRg5g<)HHY&CBj7YKqPQs6y zy1UZM!vda|+-;=R@*irEl>9yNKWm~WU)abw?0lJpL)AQAb&J0S($|$zeQ|lPg>$VAc%LPM(I;S zQ)t8E6bQeiwxU}-E4ox*6vZ-78)-i*!9ZwBIRKaPdGgvmopDwPzgHfM?nfer8*BnY zalHBA1S2&5u89@@A@BI##$iwSM7y@^znL`|(33jpH7z#NF}_6<9K2vRPMi(4S8w)4 zH>5F+Fg$8cZ^S9RBGr80tZTWO^x{Gj+9J^`jbpUI7%6RuG12mc%e0LUz=rYVRQr#S_i-TCb^gizOo8> zq3DDqjqu~Y;IPMdCq`z2@jIYy3R+&DBv6TRDCk{7-k*8oOXm0HIC*3K6h#VfMZXpG zD=ImG<5LtwUJ7@w>_@JA|J2Yv`qb5s?+@G2TNM1sQY|UN?ez5^tluQB+lYPdeA{O! zg)gnjKQc@2T zUiE7FqQ;KX_fIYymV>2GF~f5`q3FWGH)27ui-L{4?#tlR=y@F-$encszn0Bwl^dbDte7UN?&hUaZC6V2(afQX>P`E^; z+)4M?(b?&WqJZ6Z>J(d#8OGrm)B9mhvmpLH%n`y77Hz`*nlsch|p*`%MKA3Ug}2C?Mm}boFgHpUR1A{tKZBf zejgT~EK`s$i-J!)B8KU3&4|qvM#g+r{W6gA>jd(IB4mdoY@_dIiGH7>kAba}yU=#q zi|a^}y8^KQ%0huk>I0TtULfBDUz?J(8Wyhte6s9cw;j7g4(u{2TteL88&hk*dN=2a6A=wY>5n}FY5EAZ#$aKlg^S#M>1JR>`w>}&L*u{5)+RKH+n*{6Uk zvO8QK)mK|)h3f4XCr*%#wqn>AkaczBRZsgQ3v)p3Jn%wDmJK`9HBw;eml(DYc`O}J z;Lvh~NbnBG>YLi-uPo>%3z(W>h0{|;j{>UZ%s1Ra-(J1puh}t#*9mm1PQAolu667ID zdH#J`-+FM>jIsy1`%8950PzBfu_752aT@z7N0Zn(ub@{Uwk?TSB)keByr$=v=PftHs$0hPP~V37AH zkldy+g}Q%l{>j1FNHp7N{$g#yvNh^MFO#z7jB<}}fqlP|&u7e4S%Ez#+wpJn1=0~~ zdcjVY_!W7Mx3?0{DFW88r=I}`oZGH~z8Lg_f3;_c6GeEztz7(gD9IaZW%Fl3*Q^HY z@9BugKgdI?P@6%Yp(=Otmq@!?vUX z0kIA6)n~m`^@cX9knQM{77m-O&zj}##CkguD8JYazaNy4_FZo#fsyOko@%j~^_A>Q zl;$-&!oy2EP;_E+_#~d_P*I*PRacYK-nwVKoXX=pi;GMZ51QsSt|Rc+_5ZN5*%orp z$#Hot8SNnK6j^8qe^leaobzKlu~(_S@-_$O55%ZM9^llK>mt8fbOa1F+f>zoahE3O zrE{&oSzQw83@o)Hotcjt?TVe}%Wr`tGJw@B&{p1K0>n{9|E=H~s!ylzRUAVaTxzt^ zw=b4`*sb6DroD}L!_yBD-W$)FiPlkQ) zZ1j`=Z%V}unbU?C(vX%)FKM^JVb?Jn*)$*i0CA=XbF4sLA~Y24w_gbR1nJKaKY1$l ziJ+zmEWKGJuVdI9&MRoZR{OH_g(~bC#0|;t`WU3?Xud<*WX54%tRa97+P|L*@!~*W z*=YeD{N13Hf&9g7=htIl*nK}a0<4I(f?+$cM<>|Er@WeY#up!7_@UC9qxZ>irkH2T zE*DJZ+{G9p^v|~d-D`>8ywtKp#uD|Wk|1(4H$i?4(G67*ZpRMO#dJ<>KYk|S!ag26 z3H4z>=~64a;?e||9*#b^gSefhALZ(FW&iTUaU}awu)ENG8&LQ{dUJ^qC9|L&dy1l8 zOSsnp5x4J3q>H1F(y`o}Q8m8YvBIuGdK9|gVU*iDWm!%ggcU!j!0S)6!e9$f`k%$j z?sI`J{H%(U7Un7U?5*VQ#TO<~?U#i)jHlZrGWY@+JtdQ{ITTE(7iUZD`10%Bw1jn; zI%!;P&Rx^{neK4m4W`gu!MDPznDq{vPoeddL)?E$!0T4UJe)4n^e{JE0ZS*eY!7l9 zLuq7>RBt8n4pvQ?xe?%_F(>1a?hic@{+(-Bfo9?EA7XS8Ud1005vKIz;g^TUSs}1{ zODY*T#t8ks4ViV5g68WUE2M~4$EAcZL zZEH$~8TEhebyDPFLs8-eX~?5A8g}tGq!vqp)WR(0@`RO4#frMoQ^KkSlkQ0|?c zq(sMo(DpXk_mNqgV*H?!SZ66b+`-MtF;NmDGc-%o{VWwNjB!(F@(T3QPB*d^e)mb3 zch-oXiSh~1Tr)fU^NPOWst96j_SG{TmvG|kv6Z?VB4xp$lQDd;^y|lMx!s+?AL2#KD)SqIM0p$1wP?Rj9P=rELN@u{Gky5m)rg5S!Sv!-r7;I6^a|K%;YJQI zVr0d}r5yQhtXX{Tn^OI(gIZElG({0590DSwq_f%eu`TqbQ$;rMBvjc!h+Mv61AH#* z6da*$PvqU&W>KOJDL|XW(rHwhDF>eCCH%@<@{b(lqFlt6k3M0zRf5BPyj-Xo1Mjx9 z+#?%q-!{3%6Ik^3*z>pHLL15oZwdg$h@8J()P& zNWA~w4hbHzynX3bhVUl+y5^KnWZB)uJXLIgJzl2($}Cg1v#G)>>(#@}D7XLKMnv9U z`jumarTRvy83_!U59}$F{QRhkh~?INFgx{*t|8aHcFO8#(#ENHd-01A8whSao|x}i z(YDKK5?TZ>1`aCiI zojrMWZcPs@FozlhuLMLe;7*3JAc^c781m!4>gW%`&J6jv6i7(uz$$0MX=7&!YN1zs zNFGP32y>%}D;~M4Yh=dSsBQrlW)W)(4v>3yznKej z!N7F~>`HV@B$=J(RCjit!}^=hUtJ_Q&S2M86Zv0fX0mnUTvmG$_-bH4kVPIXDL!iS z)3?kKCN2Y(XWPUU7-tvqo-Q^7V=i8o;Wgh0@#gwbX+A3m_Q?_r1!ej6Xsej&_DenN zh)-wu4O_IS23p`53NL7tc8-#7X8UNmCe514%3bw*g_(v;eVuL|Dk z;`+{S#f_R5hVl+q;S_4zrs`lyy5FQ>xZ3uFFiW?=k@sGY|6nYS+WAduk`c8z=A|E6 zu%5JuL&J93uD{F3v=Ld<&S5dzNjZ!Fzn%<)orG^G_{=)JXr3|6ujbCiWLmR%5Bl>c z+i=uE^SD79X3JQ=SmAa1i-}Qa18SvDDI+@uC0eaW0~EIM@d=BH43pGEr+3kt=Q~YL zRMD@m*cNm1}#OT;}*ne14{dx3G94SMlVt9dVISp8-1 zuA=s4Dl(IuyY3-6Ys}`jh!IwXsZSTP(;h<}uSpAY?QR=R#*+STuN{jr{6dl7ADR`5 z$-aw=lx!6?n^eVVMYJt{*}07Gauq@McDgz)Z_WP!5BZDCvlai3H#RJ8Jg`QBU657s zh+heI61JIHH*cyiChcGvip6%#Ui}YzHWv+X6YufJra;5X)pftHbtySyG>_4!LgzWw zzxQa|%2|S5+A$Xl+h^eO@XZ``tOpcyaDrR=t<>jlcG^Yzj_ANS>XLK9g`Ojfd(!?} zt9U=RnVo(ywQ={w${T4{3xN2qac33yFiix%&-K;caFM?a3PT;~VGahF-ERl%I~8L5 ziMK}B{pF@c4dx~;CXS?#^B|Wc=PlF+KSg7|mdxWChRq`mj=fs^ntjHd-f+!_fuSB% z)jj6M@VAnkY4p0OBa*ZUeqe)~z3x!@ZQytSNLFPB7oPxuO;2#&71m&{1=wn=q$6B| zSzy~Kb26@4@R&Ul4CPa%VCKWUMDMRZy(OP_9NK)#gi z=gS%&886Ffih>`-q7|Ooho>q6`=(8&3fmXWW*FurlFR!P`0{m9u*^E(t@yEF=tS0) zX}?$96^?{wy_*nZes~?UWESfc{T|hEu9T>u80RT`O6v|ZXpnnqbX!$x_knYZLNLTA zRi7fB{7gJCc)62@SCC5Ij1rSXZ_5SIY})T1X}`e_1~obA)3md3#BE2TKPSu19?p8z zHkpSQ{OA?!7;>s{Bg9!L1lJT`-#KOUaVxs`($+T$uiFoh^`5qm?K~pE?XVlNr&sSz_b`ZZo*2mF24$(RP=FmBPR;W}#ztzs< zc>Qv$6<*T~`=v`+$8o!9@;WGew!SU|)zZ2+@=a#DO}oHx3nlvzL0x%)P{SIZtV#(~A^U6KuvuWt zW16xz6VGGT6Z3ZIkAr9utay?)HjR>X!bI>gbch#P+H$9jR;fdFAD&_u9i^{5VRo&n zc-I;yI^IBZUm|47zuX57d1%6tX$ku!iPi$}1fdEfYQTVg7#;$kqm+%}wpH5?)tM6unmIij99P)GH)A|A^AG zS_(bm5l!BjA}d%B`6wJ6ajAHA`%Hwexe_lqqatsSlCr2IJl#e3T>WO2ba}c8TvybN z2RxZ?nf9wEuq=p3c_Yc(U@xXMF*EHazz3`GWhlDmGq;AtcJs6X#f#9zMF-t^Jn0H8 zZg*HEy=F`l$g4f#hr#7J@}7JLLnC}`fWrTopRwJeybFKuPOE=9%O^wRoHj4xwbRuY zm-s<-9rLOVzW6UZ`$;-t7nt|LpS-6)uN<@KS}gxCZg;i#fWwV_?_GsMs>wl$AN=uo za#g-p#-DDXI@-e_uU4F6VYvO20$+TIG(X7$|4cO&6?{wc+4Rhi z#RibxE#glA*#c1mwKXX`1h~3_x9d`89^&$Ab<&GVTl!|Gr_dG8|> V6-AXy{-FStE{gr~_XTL){{bo_FyH_H diff --git a/code/game/source/editors/texed.c b/code/game/source/editors/texed.c index 7589a22..fc34afa 100644 --- a/code/game/source/editors/texed.c +++ b/code/game/source/editors/texed.c @@ -241,7 +241,7 @@ void texed_swp_op(int idx, int idx2) { td_op tmp = ctx.ops[idx2]; ctx.ops[idx2] = ctx.ops[idx]; ctx.ops[idx] = tmp; - ctx.selected_op = idx2; + if (idx == ctx.selected_op) ctx.selected_op = idx2; texed_repaint_preview(); } diff --git a/code/game/source/editors/texed_widgets.c b/code/game/source/editors/texed_widgets.c index c741bb1..02a178c 100644 --- a/code/game/source/editors/texed_widgets.c +++ b/code/game/source/editors/texed_widgets.c @@ -118,13 +118,17 @@ void texed_draw_oplist_pane(zpl_aabb2 r) { zpl_aabb2 swap_top = zpl_aabb2_cut_left(&swap_r, aabb2_ray(swap_r).width/2.0f); zpl_aabb2 swap_bottom = swap_r; - if (i > 0 && GuiButton(aabb2_ray(swap_top), "#121#")) { + if (i <= 0) GuiSetState(GUI_STATE_DISABLED); + if (GuiButton(aabb2_ray(swap_top), "#121#")) { texed_swp_op(i, i-1); } + GuiSetState(GUI_STATE_NORMAL); - if (i+1 < zpl_array_count(ctx.ops) && GuiButton(aabb2_ray(swap_bottom), "#120#")) { + if (i+1 >= zpl_array_count(ctx.ops)) GuiSetState(GUI_STATE_DISABLED); + if (GuiButton(aabb2_ray(swap_bottom), "#120#")) { texed_swp_op(i, i+1); } + GuiSetState(GUI_STATE_NORMAL); zpl_aabb2 remove_r = zpl_aabb2_cut_right(&op_item_r, 60.0f);