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

Fix Texture SRT/shader param animation playing in viewport.

Browse source
This commit is contained in:
KillzXGaming 2019-06-09 18:41:33 -04:00
parent 8b052bf4b4
commit 7176063af3
7 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View file

Binary file not shown.

29
Switch_FileFormatsMain/GUI/BFRES/ParamAnim/AnimParamEditor.cs
View file

@ -83,18 +83,23 @@ namespace FirstPlugin.Forms
{
if (IsKeyed(paramAnim, Frame))
{
/* var item1 = new ListViewItem($"{Frame}");
var item1 = new ListViewItem($"{Frame}");
listViewCustom1.Items.Add(item1);
foreach (var track in paramAnim.Values)
{
var keyFrame = track.GetKeyFrame(Frame);
var keyFrame = track.GetKeyFrame(Frame, false);
if (track.AnimDataOffset == (uint)TexSRT.Mode)
item1.SubItems.Add(((uint)keyFrame.Value).ToString());
if (keyFrame != null)
{
if (track.AnimDataOffset == (uint)TexSRT.Mode)
item1.SubItems.Add(((uint)keyFrame.Value).ToString());
else
item1.SubItems.Add(keyFrame.Value.ToString());
}
else
item1.SubItems.Add(keyFrame.Value.ToString());
}*/
item1.SubItems.Add("");
}
}
}
}
@ -110,15 +115,19 @@ namespace FirstPlugin.Forms
{
if (IsKeyed(paramAnim, Frame))
{
/* var item1 = new ListViewItem($"{Frame}");
var item1 = new ListViewItem($"{Frame}");
listViewCustom1.Items.Add(item1);
foreach (var track in paramAnim.Values)
{
var keyFrame = track.GetKeyFrame(Frame);
item1.SubItems.Add(keyFrame.Value.ToString());
}*/
if (keyFrame != null)
item1.SubItems.Add(keyFrame.Value.ToString());
else
item1.SubItems.Add("");
}
}
}
}
@ -128,7 +137,7 @@ namespace FirstPlugin.Forms
{
foreach (var track in paramKeyGroup.Values)
{
if (track.GetKeyFrame(Frame).IsKeyed == true)
if (track.GetKeyFrame(Frame, false) != null && track.GetKeyFrame(Frame).IsKeyed == true)
return true;
}

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
View file

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View file

Binary file not shown.

6
Switch_Toolbox_Library/Animations/Animation.cs
View file

@ -137,8 +137,6 @@ namespace Switch_Toolbox.Library.Animations
public bool HasKeyedFrames(float frame)
{
return false;
return (XPOS.HasAnimation() && XPOS.GetKeyFrame(frame).IsKeyed ||
YPOS.HasAnimation() && YPOS.GetKeyFrame(frame).IsKeyed ||
ZPOS.HasAnimation() && ZPOS.GetKeyFrame(frame).IsKeyed ||
@ -291,7 +289,7 @@ namespace Switch_Toolbox.Library.Animations
}
}
public KeyFrame GetKeyFrame(float frame)
public KeyFrame GetKeyFrame(float frame, bool InsertNewKey = true)
{
KeyFrame key = null;
int i;
@ -308,7 +306,7 @@ namespace Switch_Toolbox.Library.Animations
}
}
if (key == null)
if (key == null && InsertNewKey)
{
key = new KeyFrame();
key.Frame = frame;