Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2025-02-20 20:51:35 +01:00
Code Releases Wiki Activity

More error fixes

Browse Source
This commit is contained in:
KillzXGaming 2020-01-18 21:09:29 -05:00
parent 4f46089733
commit 0c5bdca7ef
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
File_Format_Library/FileFormats/Layout/BxlytToGL.cs
View File

@ -45,7 +45,7 @@ namespace LayoutBXLYT
}
}
public static void DrawPictureBox(BasePane pane, bool gameWindow, byte effectiveAlpha, Dictionary<string, STGenericTexture> Textures, bool isSelected)
public static void DrawPictureBox(BasePane pane, LayoutViewer.Camera2D camera, bool gameWindow, byte effectiveAlpha, Dictionary<string, STGenericTexture> Textures, bool isSelected)
{
if (!Runtime.LayoutEditor.DisplayPicturePane)
return;
@ -74,7 +74,10 @@ namespace LayoutBXLYT
var mat = pic1Pane.Material as BFLYT.Material;
var mvp = camera.ModelViewMatrix;
ShaderLoader.CafeShader.Enable();
ShaderLoader.CafeShader.SetMatrix("modelViewMatrix", ref mvp);
BflytShader.SetMaterials(ShaderLoader.CafeShader, mat, pane, Textures);
if (pic1Pane.TexCoords.Length > 0)
@ -152,9 +155,9 @@ namespace LayoutBXLYT
ShaderLoader.RevShader.Disable();
}
GL.BindTexture(TextureTarget.Texture2D, 0);
GL.Disable(EnableCap.Texture2D);
GL.UseProgram(0);
// GL.BindTexture(TextureTarget.Texture2D, 0);
// GL.Disable(EnableCap.Texture2D);
// GL.UseProgram(0);
}
public static void DrawBoundryPane(BasePane pane, bool gameWindow, byte effectiveAlpha, bool isSelected)
@ -243,7 +246,7 @@ namespace LayoutBXLYT
BxlytToGL.DrawRectangle(pane, gameWindow, pane.Rectangle, TexCoords, Colors, false, effectiveAlpha);
}
public static void DrawTextbox(BasePane pane, bool gameWindow, Bitmap fontBitmap, byte effectiveAlpha,
public static void DrawTextbox(BasePane pane, LayoutViewer.Camera2D camera, bool gameWindow, Bitmap fontBitmap, byte effectiveAlpha,
Dictionary<string, STGenericTexture> Textures, List<BasePane> SelectedPanes, bool updateBitmap, bool isSelected)
{
GL.Enable(EnableCap.Texture2D);
@ -398,7 +401,7 @@ namespace LayoutBXLYT
//Huge thanks to layout studio for the window pane rendering code
//https://github.com/Treeki/LayoutStudio/blob/master/layoutgl/widget.cpp
//Note i still need to fix UV coordinates being flips and transformed!
public static void DrawWindowPane(BasePane pane,bool gameWindow, byte effectiveAlpha, Dictionary<string, STGenericTexture> Textures, bool isSelected)
public static void DrawWindowPane(BasePane pane, LayoutViewer.Camera2D camera, bool gameWindow, byte effectiveAlpha, Dictionary<string, STGenericTexture> Textures, bool isSelected)
{
if (!Runtime.LayoutEditor.DisplayWindowPane)
return;

27
File_Format_Library/FileFormats/Layout/CAFE/BFLYT.cs
View File

@ -879,6 +879,32 @@ namespace LayoutBXLYT.Cafe
}
}
public override BasePane Copy()
{
TXT1 pane = new TXT1();
pane.Material = Material;
pane.MaterialIndex = MaterialIndex;
pane.FontIndex = FontIndex;
pane.FontName = FontName;
pane.FontTopColor = FontTopColor;
pane.FontBottomColor = FontBottomColor;
pane.FontSize = FontSize;
pane.LineSpace = LineSpace;
pane.CharacterSpace = CharacterSpace;
pane.ShadowXY = ShadowXY;
pane.ShadowXYSize = ShadowXYSize;
pane.ShadowForeColor = ShadowForeColor;
pane.ShadowBackColor = ShadowBackColor;
pane.ShadowItalic = ShadowItalic;
pane.LineAlignment = LineAlignment;
pane.TextAlignment = TextAlignment;
pane.MaxTextLength = MaxTextLength;
pane.ItalicTilt = ItalicTilt;
pane._flags = _flags;
return pane;
}
public TXT1() : base()
{
@ -1023,6 +1049,7 @@ namespace LayoutBXLYT.Cafe
set
{
text = value;
TextLength = (ushort)((text.Length * 2) + 2);
UpdateTextRender();
}
}