From 45a2466e86fc118a4ad6f6c7491c283e057fb6bb Mon Sep 17 00:00:00 2001 From: KillzXGaming Date: Sat, 5 Oct 2019 15:32:48 -0400 Subject: [PATCH] Some clr0 converting fixes --- BrawlboxHelper/BrawlHelper.cs | 4 ++++ BrawlboxHelper/BrawlboxHelper.dll | Bin 22016 -> 22016 bytes BrawlboxHelper/BrawlboxHelper.pdb | Bin 40448 -> 40448 bytes .../FileFormats/Layout/BxlytToGL.cs | 2 +- .../FileFormats/Layout/Common.cs | 11 ++++++++++- .../NodeWrappers/BfresFilters.cs | 2 +- 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/BrawlboxHelper/BrawlHelper.cs b/BrawlboxHelper/BrawlHelper.cs index dc4a3db1..3da91c6a 100644 --- a/BrawlboxHelper/BrawlHelper.cs +++ b/BrawlboxHelper/BrawlHelper.cs @@ -60,6 +60,10 @@ namespace BrawlboxHelper { ResU.ShaderParamMatAnim matAnim = new ResU.ShaderParamMatAnim(); matAnim.Name = clrMaterial.Name; + matAnim.Constants = new List(); + matAnim.Curves = new List(); + matAnim.ParamAnimInfos = new List(); + foreach (var entry in clrMaterial.Children) { ushort curveIndex = 0; diff --git a/BrawlboxHelper/BrawlboxHelper.dll b/BrawlboxHelper/BrawlboxHelper.dll index 718cef68614f6f23d0144846ff332ee78e199fb3..12dcccc34cce4a086288d705ec478e5c2c6842a1 100644 GIT binary patch delta 9533 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 delta 9537 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 aDV;Y|YH}`p{hE!Q>WhL+Irk-}y#E7$Wj4qF delta 7529 zcmdtniGNO4{=o5bABilMiY42FB(ji%Do>M8OY9*Pk;E2hBq?gAY8UZbTVhW+*4isZ z?d2JR+I3J>R8?sQ9a9W#QB$VXYRu<*-TA$Kf5SYj=Y784d+v7bz2}_!#609M4>>;U zT(Rb;lHfV+_Xkw_)_1fqI%VO6kWX)C?{2%@@ar9=tWR%GfN#3P>x=f2?|KIKKdWSy z0*@JnuZ|9mNFz!|M2#`h^wOw!zK=&08u_|aw96Qz zM@OGFw(I6G{f+&4O-y~hPsXe>0`$Q8E_SrCezMU>e@!_-S7}h{co44FHb^v@>&p#X zMr-XC`@3;Ud&iX;WqN5`B;N<(T*gQGew=pPkJSBo_SM(o!yS(!b$NWM!`D}@O$ZIC zYADm->|a7(tcC#?pot^G5<0O1*2eBw2XiqD z``He~2M^25;dVR*!&zQv$FuC^rEJ!!_%4ZhR9J;kxDlguTB989fGv%j?k42qM4Dn% zbYURAighsoV=xh2*c_YVYnY5Jup_p_uGk8*ur>C@WGuioI2haFC~S|jm2z7L$CDwUXnRf|o<7EPMrf;2YQz^RPGOV;?NSY;g^Jj#Z@z%j&^a4bH?aahYssqq+y6EG5`etn!s+yEzG z7o3c#ScF+9_0A(Vp4+@>CvM|3Dm=m&hAOE~AH#Jt8{z^?Mp>~vE+kIJcd0iER}jy| z_iznLy$!gEcn7Yb-gmf(_%3cn>BAm8beEfoj_d;xRd6d6JK!GTF8F86McH5h?j;_H z+*l=>@F?+CJdQ_D>Ycz7#24_d)T`*D)Mvz%@H~d0)QiLmZW6ChxJbo8_%-ox{2Q7m z6=&i#;zf9adY|AO;!p7|-ax7M54=bG5PzUv3?0+Y#0~HX#-iMOjcr?FfUMY&!oOM2 z33K(iCPD6Bi3SkK(joYicqsmcapdV?h=V$i{F(fLGNI@P@GYjQ_dZRb-M68H2?fh)?A>N3-xXaFa(2w{$`r|it z{svYeeu|axH&T`35;A}SbbVhBcHD87tNd<|=3Ck(?hlv9;qAe=Z4BXAhj!wDFT6K!Xr z)GxN>jDh67GNR{!6Y1w&2SPn$7%Q)&cPPA2wUPxY=s-JHEwY*b|q8TO`;7R z!1j0;JLtKH(}`2DJ7(JX zUdV}=12GFnU{4&6y^sOpzb)-ny-Adi=!5TJHtxW_cnldv%=?&&UL0vZY=U{%9P_a) z(sCx_pX!f{e`)~c<3N-%d<*Hz)F9l5gK?XTT{N}1oy2fFgd^}Qjzqc;^)?!`n%o;a zGKx!Lav!R9kV|6aX?it=m{w3@kvdj>9P-bcjpK2totMisfq1){!bA%D>;(sL67hK~ z#IJA)%Gfp)|A}%S50G`uhiKwceYPC2e3uFP1t8mr(M zl)+Y(hvHg?o4cICIu^W)>#-T~7@5f^72D(c#2L5|GqDVF?B#j5i8vqsgkx|s7U2gt z6Jf4%~}7@d)n1lPDWHgC7!K!QFTj_ux%?xy%AQ z#CPz|_!Re|gVFjg=x2@E%;cF1eUgVv$3r^xbXsnb{=Wh-&`39X?ge|@&-JwAAYNuxCOh4i>}6k~^k$c_3SL15By|;Qq3kad zzb2Mm?i-Z-U&H_3yIm)4L7vCYOvi7rKiBVjn@5DQJ z0(pMTukbE@kN2<~f50GGSJIk4QS@FmCjQAY>fmiIj^nT^Uw^3D~8^#J)lg>uA z6O3NOA?S?}Jt)xgm{I79(ddVbQC4uFKXEIpgei9Zb*xO>6RTn_GCMc>VKqIg?JvBU z7PWH*R437d;4H!eEq(8-fjxKG1v>o!AmCu3u@ z+8)~wx4?GT-pxjtmYAVHDCR`~|z= zVN6Hn?J5Jm#7w+}S@;-xpcfanCwimoxRPxU$`0ycFY=L?jfvP7o7>A-1vt}QUW{)Nm*4WBf&$ih9eKTwP7A&%cm$S@@%OQEPsxSo7N!x4)Q3dF`ii+M;Y!@5ihzr z-chViGrk!Utj~C=N_qlTN7NL&aWBrn^EemfexHXo zQR?4D<_Ol$6bmXa96uznkc2O%T8e(iwW8}T}p=`)>waFj*rZn>e^n@N&WAE5MCTTtGBM0vT9jmq_uSbpQ$im`Sq z*Hf0avTcpqSuWRghmK8cAwRd3=Y|ICA}Krh5E*{eZoMcqNPd9Zni?8F+nW9){ZaN< z$#Xe1-7sqC=&rBxJ-Vwif@U=m9zcr@$7}MGt#SupFK%;n@QT&r*+CJqdNpO^uI!f+4W_QuC8TB2{ zD(JN_p?Y{mWhqY17;5y?w=)_WZ|GW?$%aSw%ybzC^_a1~m5D9)VQiE{{4#C+t3``8WNP zzpA3r_}54m_SxcoM*k&kOfPPIdhuP;>qWVQ`s`25MjxDmFX3F2!Fe7w!1*XG%(!W_ z@Is`uRVk+7B9y^-G0Nb)1apvvaGUuQn1-1JNXKLj#TCfeD&8s0aVRae8rKjX#I-1c z@Or$48}J5h#6PeMpChw5vo2?_8N+c4@-V1v$iu*a&}qq(O^&Dy%8pWSC$V%wyRZQF zpj>KME}f5uSO!^oNNaGFd>Qe6VtyM_2T(4pa<++#B z-=Hf=%XK#YCrMgQ-9;a~hrYHoQ8pqyqvY%0_ZTa&-jEyQ_ajjX(S3b9w}mlJ|B>qq zct}pR_!CN>{KymA?~1Xgd(`6mC}XjX&X44~OTNo-%|}noZ|b<^qxa-bcQ0n|@_3DB z75P--AJ@S8{9SRW}I6^ro`N&BITP3NuVX&*3W4N!bIyutw zbYdlkKFkFl*828uHpHiz*g#L56xu(fcPSzpTk}Z+U%;wQ8nO%Cl;EZ?DTM zha~w!*YPP%{(5zNiqpF+l3&2AmF`pWu}Y6Ag;_Og=(Hjyr#z%6-stUFTC~o~=-`^7 Cay}pc diff --git a/File_Format_Library/FileFormats/Layout/BxlytToGL.cs b/File_Format_Library/FileFormats/Layout/BxlytToGL.cs index 7e027979..154456e3 100644 --- a/File_Format_Library/FileFormats/Layout/BxlytToGL.cs +++ b/File_Format_Library/FileFormats/Layout/BxlytToGL.cs @@ -942,6 +942,7 @@ namespace LayoutBXLYT if (!Runtime.LayoutEditor.IsGamePreview && !gameWindow) { var rect = pane.CreateRectangle(); + rect = rect.RotateZ(pane.Rotate.Z); GL.Disable(EnableCap.Blend); GL.Disable(EnableCap.AlphaTest); @@ -975,7 +976,6 @@ namespace LayoutBXLYT DrawEdgeSquare(top); DrawEdgeSquare(bottom); - GL.Enable(EnableCap.Blend); GL.Enable(EnableCap.AlphaTest); GL.Enable(EnableCap.Texture2D); diff --git a/File_Format_Library/FileFormats/Layout/Common.cs b/File_Format_Library/FileFormats/Layout/Common.cs index c641eaca..4f0f1b38 100644 --- a/File_Format_Library/FileFormats/Layout/Common.cs +++ b/File_Format_Library/FileFormats/Layout/Common.cs @@ -103,7 +103,7 @@ namespace LayoutBXLYT return false; else if (this is IBoundryPane) return false; - else if (this is IPartPane) + else if (this is IPartPane) return false; return true; @@ -1355,6 +1355,15 @@ namespace LayoutBXLYT BottomPoint = bottom; } + public CustomRectangle RotateZ(float rotate) + { + return new CustomRectangle( + LeftPoint, + RightPoint, + TopPoint, + BottomPoint); + } + public CustomRectangle GetTransformedRectangle(BasePane parent, Vector3F Transform, Vector2F Scale) { var rect = new CustomRectangle( diff --git a/File_Format_Library/NodeWrappers/BfresFilters.cs b/File_Format_Library/NodeWrappers/BfresFilters.cs index 2480346c..be182eb2 100644 --- a/File_Format_Library/NodeWrappers/BfresFilters.cs +++ b/File_Format_Library/NodeWrappers/BfresFilters.cs @@ -28,7 +28,7 @@ namespace FirstPlugin public static string FSHU_REPLACE_PARAM = GetFilter(".bfmaa", ".bfshu", ".yaml"); public static string FSHU_REPLACE_SRT = GetFilter(".bfmaa", ".bftsh", ".yaml"); - public static string FSHU_REPLACE_COLOR = GetFilter(".bfmaa", ".bfcsh", ".yaml"); + public static string FSHU_REPLACE_COLOR = GetFilter(".bfmaa", ".bfcsh", ".yaml", ".clr0"); public static string FSHU_EXPORT_PARAM = GetFilter(".bfmaa", ".bfshu", ".yaml"); public static string FSHU_EXPORT_SRT = GetFilter(".bfmaa", ".bftsh", ".yaml"); public static string FSHU_EXPORT_COLOR = GetFilter(".bfmaa", ".bfcsh", ".yaml");