mirror of
https://github.com/KillzXGaming/Switch-Toolbox
synced 2024-11-26 06:20:24 +00:00
Fix some bugs
This commit is contained in:
KillzXGaming
parent
2e5e32be6a
commit
08b4f3296e
16 changed files with 180 additions and 7 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -2,6 +2,7 @@
|
|||
using GL_EditorFramework.GL_Core;
|
||||
using GL_EditorFramework.Interfaces;
|
||||
using OpenTK;
|
||||
using OpenTK.Graphics.OpenGL;
|
||||
using Switch_Toolbox.Library.IO;
|
||||
using static GL_EditorFramework.EditorDrawables.EditorSceneBase;
|
||||
using FirstPlugin.Turbo.CourseMuuntStructs;
|
||||
|
|
|
|||
|
|
@ -190,14 +190,12 @@ namespace FirstPlugin
|
|||
|
||||
MipmapNum.Value = SelectedTexSettings.MipCount;
|
||||
|
||||
SwizzleNum.Value = SelectedTexSettings.swizzle;
|
||||
SwizzleNum.Value = (SelectedTexSettings.swizzle >> 8) & 7;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void SwizzleNum_ValueChanged(object sender, EventArgs e)
|
||||
{
|
||||
SelectedTexSettings.swizzle = (uint)SwizzleNum.Value;
|
||||
private void SwizzleNum_ValueChanged(object sender, EventArgs e) {
|
||||
SelectedTexSettings.swizzle |= (uint)SwizzleNum.Value << 8;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -259,7 +257,7 @@ namespace FirstPlugin
|
|||
this.SwizzleNum.ForeColor = System.Drawing.Color.White;
|
||||
this.SwizzleNum.Location = new System.Drawing.Point(877, 142);
|
||||
this.SwizzleNum.Maximum = new decimal(new int[] {
|
||||
99999,
|
||||
7,
|
||||
0,
|
||||
0,
|
||||
0});
|
||||
|
|
@ -352,6 +350,7 @@ namespace FirstPlugin
|
|||
this.MipmapNum.Name = "MipmapNum";
|
||||
this.MipmapNum.Size = new System.Drawing.Size(130, 16);
|
||||
this.MipmapNum.TabIndex = 36;
|
||||
this.MipmapNum.ValueChanged += new System.EventHandler(this.MipmapNum_ValueChanged);
|
||||
//
|
||||
// WidthLabel
|
||||
//
|
||||
|
|
@ -499,5 +498,10 @@ namespace FirstPlugin
|
|||
private System.Windows.Forms.ColumnHeader Format;
|
||||
private System.Windows.Forms.Button button2;
|
||||
private System.Windows.Forms.Button button1;
|
||||
|
||||
private void MipmapNum_ValueChanged(object sender, EventArgs e) {
|
||||
if (SelectedTexSettings != null)
|
||||
SelectedTexSettings.MipCount = (uint)MipmapNum.Value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -163,7 +163,7 @@ namespace Switch_Toolbox.Library
|
|||
string path = System.IO.Path.Combine(TexturePath, tex.Name + TextureExtension);
|
||||
|
||||
if (!File.Exists(path))
|
||||
throw new Exception("Texture not found to map");
|
||||
continue;
|
||||
|
||||
TextureSlot slot = new TextureSlot();
|
||||
slot.FilePath = path;
|
||||
|
|
|
|||
42
Switch_Toolbox_Library/Forms/GL/GLControl2D.cs
Normal file
42
Switch_Toolbox_Library/Forms/GL/GLControl2D.cs
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using OpenTK;
|
||||
using OpenTK.Graphics.OpenGL;
|
||||
using Switch_Toolbox.Library;
|
||||
|
||||
namespace Switch_Toolbox.Library.Forms
|
||||
{
|
||||
public class GLControl2D : GLControl
|
||||
{
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// GLControl2D
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.Name = "GLControl2D";
|
||||
this.Paint += new System.Windows.Forms.PaintEventHandler(this.GLControl2D_Paint);
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
||||
private void GLControl2D_Paint(object sender, System.Windows.Forms.PaintEventArgs e)
|
||||
{
|
||||
if (Runtime.OpenTKInitialized == false)
|
||||
return;
|
||||
|
||||
MakeCurrent();
|
||||
|
||||
GL.ClearColor(System.Drawing.Color.FromArgb(40, 40, 40));
|
||||
GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
|
||||
|
||||
GL.Disable(EnableCap.Texture2D);
|
||||
|
||||
SwapBuffers();
|
||||
}
|
||||
}
|
||||
}
|
||||
120
Switch_Toolbox_Library/Forms/GL/GLControl2D.resx
Normal file
120
Switch_Toolbox_Library/Forms/GL/GLControl2D.resx
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
|
|
@ -423,6 +423,9 @@
|
|||
<Compile Include="Forms\Editors\UV\UVEditor.Designer.cs">
|
||||
<DependentUpon>UVEditor.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Forms\GL\GLControl2D.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Forms\PropertyBinding.cs" />
|
||||
<Compile Include="Forms\STConsole.cs">
|
||||
<SubType>Component</SubType>
|
||||
|
|
@ -711,6 +714,9 @@
|
|||
<EmbeddedResource Include="Forms\Editors\UV\UVEditor.resx">
|
||||
<DependentUpon>UVEditor.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\GL\GLControl2D.resx">
|
||||
<DependentUpon>GLControl2D.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\Viewport.resx">
|
||||
<DependentUpon>Viewport.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
|
|
|||
Loading…
Reference in a new issue