Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-11-28 17:30:57 +01:00
Code Releases Wiki Activity

Fix assimp issues please and add lock check for settings current frame

Browse Source
This commit is contained in:
KillzXGaming 2019-04-01 18:14:13 -04:00
parent 194d032798
commit 67864cd64f
10 changed files with 11 additions and 6 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.

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

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll
View File

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb
View File

Binary file not shown.

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

Binary file not shown.

8
Switch_Toolbox_Library/Forms/Editors/Animation/AnimationPanel.cs
View File

@ -362,8 +362,12 @@ namespace Switch_Toolbox.Library
if (currentFrameUpDown.Value > totalFrame.Value)
currentFrameUpDown.Value = totalFrame.Value;
animationTrackBar.CurrentFrame = (int)currentFrameUpDown.Value;
OnFrameAdvanced();
//Check locked state current frame will change during playing
if (animationTrackBar.Locked == false)
{
animationTrackBar.CurrentFrame = (int)currentFrameUpDown.Value;
OnFrameAdvanced();
}
}
public void AnimationPanel_FormClosed()

5
Switch_Toolbox_Library/Switch_Toolbox_Library.csproj
View File

@ -37,7 +37,8 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="AssimpNet, Version=4.1.0.0, Culture=neutral, PublicKeyToken=0d51b391f59f42a6, processorArchitecture=MSIL">
<HintPath>..\packages\AssimpNet.4.1.0\lib\net40\AssimpNet.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Switch_Toolbox\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\AssimpNet.dll</HintPath>
</Reference>
<Reference Include="Be.Windows.Forms.HexBox">
<HintPath>..\Toolbox\Lib\Be.Windows.Forms.HexBox.dll</HintPath>
@ -987,11 +988,9 @@
<None Include="Resources\QuestionCheck.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\AssimpNet.4.1.0\build\AssimpNet.targets" Condition="Exists('..\packages\AssimpNet.4.1.0\build\AssimpNet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\AssimpNet.4.1.0\build\AssimpNet.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\AssimpNet.4.1.0\build\AssimpNet.targets'))" />
</Target>
</Project>

4
Toolbox/Toolbox.csproj
View File

@ -236,7 +236,9 @@
<Content Include="Lib\aamp_hashed_names.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Lib\AssimpNet.dll" />
<Content Include="Lib\AssimpNet.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Lib\BarsLibrary.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>