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

Improve pane transformation of children from parent

Browse source
This commit is contained in:
KillzXGaming 2019-10-19 14:09:16 -04:00
parent b2b27cb807
commit b23876416c
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1104,6 +1104,10 @@ namespace LayoutBXLYT
mat.Shader.Enable();
if (mat is Cafe.BFLYT.Material)
((BflytShader)mat.Shader).SetMaterials(pane, textures);
else if (mat is BRLYT.Material)
((BrlytShader)mat.Shader).SetMaterials(pane, textures);
else if (mat is BCLYT.Material)
((BclytShader)mat.Shader).SetMaterials(pane, textures);
}
private static void RenderWindowContent(BasePane pane, uint sizeX, uint sizeY, BxlytWindowContent content,
@ -1116,7 +1120,7 @@ namespace LayoutBXLYT
Vector2[] texCoords = new Vector2[] {
new Vector2(1,1),
new Vector2(0,1),
new Vector2(0,1),
new Vector2(0,0),
new Vector2(1,0)
};

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

@ -168,12 +168,6 @@ namespace LayoutBXLYT
}
}
public void ApplyNewParentTransform()
{
//Get the new transform and apply it
// Translate += transform;
}
public void ResetParentTransform(BasePane newParent)
{
//We need to get the difference in the parent transform and remove it to the current transform of this pane
@ -202,17 +196,17 @@ namespace LayoutBXLYT
public void KeepChildrenTransform(float newTransX, float newTransY)
{
Vector2F distance = new Vector2F(newTransX - Translate.X, newTransY - Translate.Y);
KeepChildrenTransform(distance);
KeepChildrenTransform(distance, newTransX, newTransY);
}
private void KeepChildrenTransform(Vector2F distance)
private void KeepChildrenTransform(Vector2F distance, float newTransX, float newTransY)
{
if (HasChildern)
{
foreach (var child in Childern)
{
child.Translate -= new Vector3F(distance.X, distance.Y, 0);
child.KeepChildrenTransform(distance);
child.KeepChildrenTransform(child.Translate.X, child.Translate.Y);
}
}
}
@ -278,7 +272,6 @@ namespace LayoutBXLYT
float pickWidth = pickMouseX;
float pickHeight = pickMouseY;
Vector2F pos = new Vector2F();
switch (pickAction)
{
case LayoutViewer.PickAction.DragLeft:
@ -356,6 +349,9 @@ namespace LayoutBXLYT
break;
}
if (!Runtime.LayoutEditor.TransformChidlren)
KeepChildrenTransform(posX, posY);
Translate = new Vector3F(posX, posY, posZ);
}