Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-11-12 02:00:50 +01:00
Code Releases Wiki Activity

Some adjustments

Browse Source
This commit is contained in:
KillzXGaming 2020-03-18 12:07:34 -04:00
parent 9df4bf6068
commit 360f063d95
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Switch_Toolbox_Library/GUI.cs
View File

@ -59,9 +59,7 @@ namespace Toolbox.Library
} }
public static void CreateMdiWindow(STForm form, bool Show = true) public static void CreateMdiWindow(STForm form, bool Show = true)
{ {
var mainform = Application.OpenForms[0]; ((IMdiContainer)Runtime.MainForm).AddChildContainer(form);
((IMdiContainer)mainform).AddChildContainer(form);
} }
public static ObjectEditor GetObjectEditor() public static ObjectEditor GetObjectEditor()
{ {

8
Switch_Toolbox_Library/Generics/STBone.cs
View File

@ -30,7 +30,7 @@ namespace Toolbox.Library
public short SmoothMatrixIndex; public short SmoothMatrixIndex;
private Matrix4 transform; private Matrix4 transform;
private Quaternion rotation; private Quaternion rotation = Quaternion.Identity;
private Vector3 eulerRotation; private Vector3 eulerRotation;
/// <summary> /// <summary>
@ -63,7 +63,7 @@ namespace Toolbox.Library
/// <summary> /// <summary>
/// Gets or sets the scale of the bone in world space. /// Gets or sets the scale of the bone in world space.
/// </summary> /// </summary>
public Vector3 Scale { get; set; } public Vector3 Scale { get; set; } = Vector3.One;
/// <summary> /// <summary>
/// Gets or sets the rotation of the bone in world space. /// Gets or sets the rotation of the bone in world space.
@ -95,11 +95,13 @@ namespace Toolbox.Library
set { set {
eulerRotation = value; eulerRotation = value;
rotation = STMath.FromEulerAngles(value); rotation = STMath.FromEulerAngles(value);
if (rotation.W == 0)
rotation.W = 1;
} }
} }
public Vector3 pos = Vector3.Zero, sca = new Vector3(1f, 1f, 1f); public Vector3 pos = Vector3.Zero, sca = new Vector3(1f, 1f, 1f);
public Quaternion rot = Quaternion.FromMatrix(Matrix3.Zero); public Quaternion rot = Quaternion.Identity;
public Matrix4 invert; public Matrix4 invert;
public Matrix4 GetTransform() public Matrix4 GetTransform()

BIN
Toolbox/Lib/AampLibraryCSharp.dll
View File

Binary file not shown.

BIN
Toolbox/Lib/AampLibraryCSharp.pdb
View File

Binary file not shown.

3
Toolbox/MainForm.cs
View File

@ -1473,7 +1473,8 @@ namespace Toolbox
else if (fileFormat is ITextureContainer && exportMode == ExportMode.Textures) else if (fileFormat is ITextureContainer && exportMode == ExportMode.Textures)
{ {
string name = fileFormat.FileName.Split('.').FirstOrDefault(); string name = fileFormat.FileName.Split('.').FirstOrDefault();
outputFolder = Path.Combine(outputFolder, name); if (settings.SeperateTextureContainers)
outputFolder = Path.Combine(outputFolder, name);
if (((ITextureContainer)fileFormat).TextureList.Count > 0) if (((ITextureContainer)fileFormat).TextureList.Count > 0)
{ {