Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2025-02-16 13:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Try to fix assimp issues

Browse source
This commit is contained in:
KillzXGaming 2019-07-18 14:31:27 -04:00
parent 4c15462c7f
commit f37fe42728
6 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
File_Format_Library/GUI/BFFNT/BffntEditor.Designer.cs generated
View file

@ -475,7 +475,7 @@
this.imagePanel.MouseMove += new System.Windows.Forms.MouseEventHandler(this.imagePanel_MouseMove);
this.imagePanel.MouseUp += new System.Windows.Forms.MouseEventHandler(this.imagePanel_MouseUp);
this.imagePanel.MouseLeave += new System.EventHandler(this.imagePanel_MouseLeave);
this.imagePanel.ContextMenuStrip = imageMenuStrip;
this.imagePanel.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imagePanel_MouseClick);
//
// imagesCB
//
@ -501,9 +501,7 @@
//
// imageMenuStrip
//
this.imageMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.exportToolStripMenuItem,
this.copyToolStripMenuItem});
this.imageMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {});
this.imageMenuStrip.Name = "stContextMenuStrip1";
this.imageMenuStrip.Size = new System.Drawing.Size(108, 48);
//

19
File_Format_Library/GUI/BFFNT/BffntEditor.cs
View file

@ -31,7 +31,6 @@ namespace FirstPlugin.Forms
InitializeComponent();
}
public List<IFileFormat> GetFileFormats()
{
return new List<IFileFormat>() { FileFormat };
@ -85,6 +84,24 @@ namespace FirstPlugin.Forms
imagesCB.SelectedIndex = 0;
}
private void imagePanel_MouseClick(object sender, MouseEventArgs e)
{
if (ActiveFile == null) return;
int ImageIndex = imagesCB.SelectedIndex;
if (e.Button == MouseButtons.Right && ImageIndex != -1)
{
var image = ActiveFile.FontSection.TextureGlyph.GetImageSheet(ImageIndex);
if (image is IContextMenuNode)
{
imageMenuStrip.Items.Clear();
imageMenuStrip.Items.AddRange(((IContextMenuNode)image).GetContextMenuItems());
imageMenuStrip.Show(Cursor.Position);
}
}
}
private void imagesCB_SelectedIndexChanged(object sender, EventArgs e)
{
int ImageIndex = imagesCB.SelectedIndex;

11
Toolbox/Toolbox.csproj
View file

@ -48,6 +48,9 @@
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</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>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Octokit, Version=0.31.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -165,6 +168,7 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="packages.config" />
<None Include="Properties\app.manifest" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
@ -521,4 +525,11 @@
</ItemGroup>
<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/packages.config Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AssimpNet" version="4.1.0" targetFramework="net462" />
</packages>

1
Updater/obj/Debug/Updater.csproj.FileListAbsolute.txt
View file

@ -35,3 +35,4 @@ C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Debug\Updater.appli
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Debug\Updater.csproj.CopyComplete
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Debug\Updater.exe
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Debug\Updater.pdb
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Debug\Updater.csprojAssemblyReference.cache

1
appveyor.yml
View file

@ -25,6 +25,7 @@ after_build:
- 7z a "Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Toolbox.pdb"
- 7z a "Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Toolbox.exe"
- 7z a "Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Lib"
- 7z a "Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\runtimes"
- 7z a "Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Version.txt"
- 7z a "Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Updater.exe"
- 7z a "Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Updater.pdb"