Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-26 06:20:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some clr0 converting fixes

Browse source
This commit is contained in:
KillzXGaming 2019-10-05 15:32:48 -04:00
parent d9f23be131
commit 45a2466e86
6 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BrawlboxHelper/BrawlHelper.cs
View file

@ -60,6 +60,10 @@ namespace BrawlboxHelper
{ {
ResU.ShaderParamMatAnim matAnim = new ResU.ShaderParamMatAnim(); ResU.ShaderParamMatAnim matAnim = new ResU.ShaderParamMatAnim();
matAnim.Name = clrMaterial.Name; matAnim.Name = clrMaterial.Name;
matAnim.Constants = new List<ResU.AnimConstant>();
matAnim.Curves = new List<ResU.AnimCurve>();
matAnim.ParamAnimInfos = new List<ResU.ParamAnimInfo>();
foreach (var entry in clrMaterial.Children) foreach (var entry in clrMaterial.Children)
{ {
ushort curveIndex = 0; ushort curveIndex = 0;

BIN
BrawlboxHelper/BrawlboxHelper.dll
View file

Binary file not shown.

BIN
BrawlboxHelper/BrawlboxHelper.pdb
View file

Binary file not shown.

2
File_Format_Library/FileFormats/Layout/BxlytToGL.cs
View file

@ -942,6 +942,7 @@ namespace LayoutBXLYT
if (!Runtime.LayoutEditor.IsGamePreview && !gameWindow) if (!Runtime.LayoutEditor.IsGamePreview && !gameWindow)
{ {
var rect = pane.CreateRectangle(); var rect = pane.CreateRectangle();
rect = rect.RotateZ(pane.Rotate.Z);
GL.Disable(EnableCap.Blend); GL.Disable(EnableCap.Blend);
GL.Disable(EnableCap.AlphaTest); GL.Disable(EnableCap.AlphaTest);
@ -975,7 +976,6 @@ namespace LayoutBXLYT
DrawEdgeSquare(top); DrawEdgeSquare(top);
DrawEdgeSquare(bottom); DrawEdgeSquare(bottom);
GL.Enable(EnableCap.Blend); GL.Enable(EnableCap.Blend);
GL.Enable(EnableCap.AlphaTest); GL.Enable(EnableCap.AlphaTest);
GL.Enable(EnableCap.Texture2D); GL.Enable(EnableCap.Texture2D);

11
File_Format_Library/FileFormats/Layout/Common.cs
View file

@ -103,7 +103,7 @@ namespace LayoutBXLYT
return false; return false;
else if (this is IBoundryPane) else if (this is IBoundryPane)
return false; return false;
else if (this is IPartPane) else if (this is IPartPane)
return false; return false;
return true; return true;
@ -1355,6 +1355,15 @@ namespace LayoutBXLYT
BottomPoint = bottom; BottomPoint = bottom;
} }
public CustomRectangle RotateZ(float rotate)
{
return new CustomRectangle(
LeftPoint,
RightPoint,
TopPoint,
BottomPoint);
}
public CustomRectangle GetTransformedRectangle(BasePane parent, Vector3F Transform, Vector2F Scale) public CustomRectangle GetTransformedRectangle(BasePane parent, Vector3F Transform, Vector2F Scale)
{ {
var rect = new CustomRectangle( var rect = new CustomRectangle(

2
File_Format_Library/NodeWrappers/BfresFilters.cs
View file

@ -28,7 +28,7 @@ namespace FirstPlugin
public static string FSHU_REPLACE_PARAM = GetFilter(".bfmaa", ".bfshu", ".yaml"); 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_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_PARAM = GetFilter(".bfmaa", ".bfshu", ".yaml");
public static string FSHU_EXPORT_SRT = GetFilter(".bfmaa", ".bftsh", ".yaml"); public static string FSHU_EXPORT_SRT = GetFilter(".bfmaa", ".bftsh", ".yaml");
public static string FSHU_EXPORT_COLOR = GetFilter(".bfmaa", ".bfcsh", ".yaml"); public static string FSHU_EXPORT_COLOR = GetFilter(".bfmaa", ".bfcsh", ".yaml");