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

Improve bounding box calculating for gfbmdl

Browse Source
This commit is contained in:
KillzXGaming 2019-12-14 15:41:39 -05:00
parent af365f1b3e
commit 0a10f27787
3 changed files with 92 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
File_Format_Library/FileFormats/Pokemon/GFLX/GFBMDL/GFBMDL.cs
View File

@ -462,6 +462,38 @@ namespace FirstPlugin
mesh.vertices[i].nrm = OpenTK.Vector3.TransformPosition(mesh.vertices[i].nrm, transform);
}
if (importer.Settings.OptmizeZeroWeights)
{
float MaxWeight = 1;
for (int j = 0; j < 4; j++)
{
if (mesh.vertices[i].boneWeights.Count <= j)
continue;
if (mesh.vertices[i].boneIds.Count < j + 1)
{
mesh.vertices[i].boneWeights[j] = 0;
MaxWeight = 0;
}
else
{
float weight = mesh.vertices[i].boneWeights[j];
if (mesh.vertices[i].boneWeights.Count == j + 1)
weight = MaxWeight;
if (weight >= MaxWeight)
{
weight = MaxWeight;
MaxWeight = 0;
}
else
MaxWeight -= weight;
mesh.vertices[i].boneWeights[j] = weight;
}
}
}
for (int j = 0; j < mesh.vertices[i].boneNames?.Count; j++)
{
string boneName = mesh.vertices[i].boneNames[j];
@ -513,7 +545,7 @@ namespace FirstPlugin
var meshData = new Mesh();
Model.Model.Meshes.Add(meshData);
if (setting.HasBitangents)
if (setting.HasTangents || setting.HasBitangents)
{
try {
mesh.CalculateTangentBitangent(false);
@ -521,9 +553,6 @@ namespace FirstPlugin
catch { }
}
for (int i = 0; i < mesh.vertices.Count; i++)
mesh.vertices[i].bitan = mesh.vertices[i].tan;
//Add attributes based on settings
IList<MeshAttribute> attributes = new List<MeshAttribute>();
attributes.Add(new MeshAttribute()
@ -593,7 +622,7 @@ namespace FirstPlugin
if (setting.HasBitangents) {
attributes.Add(new MeshAttribute()
{
VertexType = (uint)VertexType.Binormal,
VertexType = (uint)VertexType.Bitangent,
BufferFormat = (uint)setting.BitangentnFormat,
ElementCount = 4,
});

10
File_Format_Library/FileFormats/Pokemon/GFLX/GFBMDL/GfbmdlImportSettings.cs
View File

@ -9,6 +9,8 @@ namespace FirstPlugin
{
public class GfbmdlImportSettings
{
public bool OptmizeZeroWeights { get; set; } = false;
public List<MeshSetting> MeshSettings = new List<MeshSetting>();
public class MeshSetting
@ -16,8 +18,8 @@ namespace FirstPlugin
public bool FlipUVsVertical { get; set; }
public bool HasNormals { get; set; }
public bool HasBitangents { get; set; }
public bool HasTangents { get; set; }
public bool HasBitangents { get; set; }
public bool HasTexCoord1 { get; set; }
public bool HasTexCoord2 { get; set; }
public bool HasTexCoord3 { get; set; }
@ -33,7 +35,7 @@ namespace FirstPlugin
public BufferFormat PositionFormat { get; set; } = BufferFormat.Float;
public BufferFormat NormalFormat { get; set; } = BufferFormat.HalfFloat;
public BufferFormat BitangentnFormat { get; set; } = BufferFormat.HalfFloat;
public BufferFormat TangentsFormat { get; set; } = BufferFormat.HalfFloat;
public BufferFormat TexCoord1Format { get; set; } = BufferFormat.Float;
public BufferFormat TexCoord2Format { get; set; } = BufferFormat.Float;
public BufferFormat TexCoord3Format { get; set; } = BufferFormat.Float;
@ -44,8 +46,8 @@ namespace FirstPlugin
public BufferFormat Color4Format { get; set; } = BufferFormat.Byte;
public BufferFormat BoneIndexFormat { get; set; } = BufferFormat.Byte;
public BufferFormat BoneWeightFormat { get; set; } = BufferFormat.BytesAsFloat;
public BufferFormat TangentsFormat { get; set; } = BufferFormat.HalfFloat;
public BufferFormat BitangentnFormat { get; set; } = BufferFormat.HalfFloat;
public string Material { get; set; }
public string MaterialFile { get; set; }

104
File_Format_Library/GUI/GFBMDL/GFLXModelImporter.Designer.cs generated
View File

@ -42,8 +42,6 @@
this.chkHasUv2 = new Toolbox.Library.Forms.STCheckBox();
this.color1FormatCB = new Toolbox.Library.Forms.STComboBox();
this.chkUseColor2 = new Toolbox.Library.Forms.STCheckBox();
this.bitangentFormatCB = new Toolbox.Library.Forms.STComboBox();
this.chkBitangents = new Toolbox.Library.Forms.STCheckBox();
this.positionFormatCB = new Toolbox.Library.Forms.STComboBox();
this.stCheckBox8 = new Toolbox.Library.Forms.STCheckBox();
this.stLabel2 = new Toolbox.Library.Forms.STLabel();
@ -53,6 +51,7 @@
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.weightFormatCB = new Toolbox.Library.Forms.STComboBox();
this.stPanel1 = new Toolbox.Library.Forms.STPanel();
this.chkSetNormalsToColorChannel = new Toolbox.Library.Forms.STCheckBox();
this.tangentFormatCB = new Toolbox.Library.Forms.STComboBox();
this.chkTangents = new Toolbox.Library.Forms.STCheckBox();
this.chkUseBoneWeights = new Toolbox.Library.Forms.STCheckBox();
@ -65,7 +64,8 @@
this.chkUseOriginalBones = new Toolbox.Library.Forms.STCheckBox();
this.stCheckBox7 = new Toolbox.Library.Forms.STCheckBox();
this.stButton2 = new Toolbox.Library.Forms.STButton();
this.chkSetNormalsToColorChannel = new Toolbox.Library.Forms.STCheckBox();
this.chkBitangents = new Toolbox.Library.Forms.STCheckBox();
this.bitangentFormatCB = new Toolbox.Library.Forms.STComboBox();
this.contentContainer.SuspendLayout();
this.stPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.rotateModel90YUD)).BeginInit();
@ -119,7 +119,7 @@
// chkHasUv1
//
this.chkHasUv1.AutoSize = true;
this.chkHasUv1.Location = new System.Drawing.Point(12, 187);
this.chkHasUv1.Location = new System.Drawing.Point(11, 197);
this.chkHasUv1.Name = "chkHasUv1";
this.chkHasUv1.Size = new System.Drawing.Size(114, 17);
this.chkHasUv1.TabIndex = 15;
@ -130,7 +130,7 @@
// chkUseBoneIndex
//
this.chkUseBoneIndex.AutoSize = true;
this.chkUseBoneIndex.Location = new System.Drawing.Point(12, 327);
this.chkUseBoneIndex.Location = new System.Drawing.Point(11, 337);
this.chkUseBoneIndex.Name = "chkUseBoneIndex";
this.chkUseBoneIndex.Size = new System.Drawing.Size(110, 17);
this.chkUseBoneIndex.TabIndex = 16;
@ -141,7 +141,7 @@
// chkUseColor1
//
this.chkUseColor1.AutoSize = true;
this.chkUseColor1.Location = new System.Drawing.Point(12, 243);
this.chkUseColor1.Location = new System.Drawing.Point(11, 253);
this.chkUseColor1.Name = "chkUseColor1";
this.chkUseColor1.Size = new System.Drawing.Size(123, 17);
this.chkUseColor1.TabIndex = 17;
@ -169,7 +169,7 @@
this.uv0FormatCB.ButtonColor = System.Drawing.Color.Empty;
this.uv0FormatCB.FormattingEnabled = true;
this.uv0FormatCB.IsReadOnly = false;
this.uv0FormatCB.Location = new System.Drawing.Point(147, 183);
this.uv0FormatCB.Location = new System.Drawing.Point(146, 193);
this.uv0FormatCB.Name = "uv0FormatCB";
this.uv0FormatCB.Size = new System.Drawing.Size(131, 21);
this.uv0FormatCB.TabIndex = 19;
@ -182,7 +182,7 @@
this.boneFormatCB.ButtonColor = System.Drawing.Color.Empty;
this.boneFormatCB.FormattingEnabled = true;
this.boneFormatCB.IsReadOnly = false;
this.boneFormatCB.Location = new System.Drawing.Point(143, 323);
this.boneFormatCB.Location = new System.Drawing.Point(142, 333);
this.boneFormatCB.Name = "boneFormatCB";
this.boneFormatCB.Size = new System.Drawing.Size(133, 21);
this.boneFormatCB.TabIndex = 21;
@ -195,7 +195,7 @@
this.color0FormatCB.ButtonColor = System.Drawing.Color.Empty;
this.color0FormatCB.FormattingEnabled = true;
this.color0FormatCB.IsReadOnly = false;
this.color0FormatCB.Location = new System.Drawing.Point(145, 241);
this.color0FormatCB.Location = new System.Drawing.Point(144, 251);
this.color0FormatCB.Name = "color0FormatCB";
this.color0FormatCB.Size = new System.Drawing.Size(131, 21);
this.color0FormatCB.TabIndex = 20;
@ -208,7 +208,7 @@
this.uv1FormatCB.ButtonColor = System.Drawing.Color.Empty;
this.uv1FormatCB.FormattingEnabled = true;
this.uv1FormatCB.IsReadOnly = false;
this.uv1FormatCB.Location = new System.Drawing.Point(147, 210);
this.uv1FormatCB.Location = new System.Drawing.Point(146, 220);
this.uv1FormatCB.Name = "uv1FormatCB";
this.uv1FormatCB.Size = new System.Drawing.Size(131, 21);
this.uv1FormatCB.TabIndex = 23;
@ -217,7 +217,7 @@
// chkHasUv2
//
this.chkHasUv2.AutoSize = true;
this.chkHasUv2.Location = new System.Drawing.Point(12, 214);
this.chkHasUv2.Location = new System.Drawing.Point(11, 224);
this.chkHasUv2.Name = "chkHasUv2";
this.chkHasUv2.Size = new System.Drawing.Size(114, 17);
this.chkHasUv2.TabIndex = 22;
@ -232,7 +232,7 @@
this.color1FormatCB.ButtonColor = System.Drawing.Color.Empty;
this.color1FormatCB.FormattingEnabled = true;
this.color1FormatCB.IsReadOnly = false;
this.color1FormatCB.Location = new System.Drawing.Point(145, 268);
this.color1FormatCB.Location = new System.Drawing.Point(144, 278);
this.color1FormatCB.Name = "color1FormatCB";
this.color1FormatCB.Size = new System.Drawing.Size(131, 21);
this.color1FormatCB.TabIndex = 25;
@ -241,7 +241,7 @@
// chkUseColor2
//
this.chkUseColor2.AutoSize = true;
this.chkUseColor2.Location = new System.Drawing.Point(12, 270);
this.chkUseColor2.Location = new System.Drawing.Point(11, 280);
this.chkUseColor2.Name = "chkUseColor2";
this.chkUseColor2.Size = new System.Drawing.Size(123, 17);
this.chkUseColor2.TabIndex = 24;
@ -249,30 +249,6 @@
this.chkUseColor2.UseVisualStyleBackColor = true;
this.chkUseColor2.CheckedChanged += new System.EventHandler(this.ApplySettings);
//
// bitangentFormatCB
//
this.bitangentFormatCB.BorderColor = System.Drawing.Color.Empty;
this.bitangentFormatCB.BorderStyle = System.Windows.Forms.ButtonBorderStyle.Solid;
this.bitangentFormatCB.ButtonColor = System.Drawing.Color.Empty;
this.bitangentFormatCB.FormattingEnabled = true;
this.bitangentFormatCB.IsReadOnly = false;
this.bitangentFormatCB.Location = new System.Drawing.Point(147, 129);
this.bitangentFormatCB.Name = "bitangentFormatCB";
this.bitangentFormatCB.Size = new System.Drawing.Size(131, 21);
this.bitangentFormatCB.TabIndex = 27;
this.bitangentFormatCB.SelectedIndexChanged += new System.EventHandler(this.ApplySettings);
//
// chkBitangents
//
this.chkBitangents.AutoSize = true;
this.chkBitangents.Location = new System.Drawing.Point(12, 131);
this.chkBitangents.Name = "chkBitangents";
this.chkBitangents.Size = new System.Drawing.Size(98, 17);
this.chkBitangents.TabIndex = 26;
this.chkBitangents.Text = "Use Bitangents";
this.chkBitangents.UseVisualStyleBackColor = true;
this.chkBitangents.CheckedChanged += new System.EventHandler(this.ApplySettings);
//
// positionFormatCB
//
this.positionFormatCB.BorderColor = System.Drawing.Color.Empty;
@ -359,7 +335,7 @@
this.weightFormatCB.ButtonColor = System.Drawing.Color.Empty;
this.weightFormatCB.FormattingEnabled = true;
this.weightFormatCB.IsReadOnly = false;
this.weightFormatCB.Location = new System.Drawing.Point(143, 350);
this.weightFormatCB.Location = new System.Drawing.Point(142, 360);
this.weightFormatCB.Name = "weightFormatCB";
this.weightFormatCB.Size = new System.Drawing.Size(135, 21);
this.weightFormatCB.TabIndex = 35;
@ -397,6 +373,17 @@
this.stPanel1.Size = new System.Drawing.Size(378, 382);
this.stPanel1.TabIndex = 36;
//
// chkSetNormalsToColorChannel
//
this.chkSetNormalsToColorChannel.AutoSize = true;
this.chkSetNormalsToColorChannel.Location = new System.Drawing.Point(11, 305);
this.chkSetNormalsToColorChannel.Name = "chkSetNormalsToColorChannel";
this.chkSetNormalsToColorChannel.Size = new System.Drawing.Size(176, 17);
this.chkSetNormalsToColorChannel.TabIndex = 41;
this.chkSetNormalsToColorChannel.Text = "Set Normals to Color Channel 2";
this.chkSetNormalsToColorChannel.UseVisualStyleBackColor = true;
this.chkSetNormalsToColorChannel.CheckedChanged += new System.EventHandler(this.ApplySettings);
//
// tangentFormatCB
//
this.tangentFormatCB.BorderColor = System.Drawing.Color.Empty;
@ -404,7 +391,7 @@
this.tangentFormatCB.ButtonColor = System.Drawing.Color.Empty;
this.tangentFormatCB.FormattingEnabled = true;
this.tangentFormatCB.IsReadOnly = false;
this.tangentFormatCB.Location = new System.Drawing.Point(147, 156);
this.tangentFormatCB.Location = new System.Drawing.Point(147, 131);
this.tangentFormatCB.Name = "tangentFormatCB";
this.tangentFormatCB.Size = new System.Drawing.Size(131, 21);
this.tangentFormatCB.TabIndex = 40;
@ -413,7 +400,7 @@
// chkTangents
//
this.chkTangents.AutoSize = true;
this.chkTangents.Location = new System.Drawing.Point(12, 158);
this.chkTangents.Location = new System.Drawing.Point(12, 133);
this.chkTangents.Name = "chkTangents";
this.chkTangents.Size = new System.Drawing.Size(93, 17);
this.chkTangents.TabIndex = 39;
@ -424,7 +411,7 @@
// chkUseBoneWeights
//
this.chkUseBoneWeights.AutoSize = true;
this.chkUseBoneWeights.Location = new System.Drawing.Point(12, 354);
this.chkUseBoneWeights.Location = new System.Drawing.Point(11, 364);
this.chkUseBoneWeights.Name = "chkUseBoneWeights";
this.chkUseBoneWeights.Size = new System.Drawing.Size(115, 17);
this.chkUseBoneWeights.TabIndex = 38;
@ -542,16 +529,29 @@
this.stButton2.Text = "Ok";
this.stButton2.UseVisualStyleBackColor = false;
//
// chkSetNormalsToColorChannel
// chkBitangents
//
this.chkSetNormalsToColorChannel.AutoSize = true;
this.chkSetNormalsToColorChannel.Location = new System.Drawing.Point(12, 295);
this.chkSetNormalsToColorChannel.Name = "chkSetNormalsToColorChannel";
this.chkSetNormalsToColorChannel.Size = new System.Drawing.Size(176, 17);
this.chkSetNormalsToColorChannel.TabIndex = 41;
this.chkSetNormalsToColorChannel.Text = "Set Normals to Color Channel 2";
this.chkSetNormalsToColorChannel.UseVisualStyleBackColor = true;
this.chkSetNormalsToColorChannel.CheckedChanged += new System.EventHandler(this.ApplySettings);
this.chkBitangents.AutoSize = true;
this.chkBitangents.Location = new System.Drawing.Point(12, 164);
this.chkBitangents.Name = "chkBitangents";
this.chkBitangents.Size = new System.Drawing.Size(98, 17);
this.chkBitangents.TabIndex = 26;
this.chkBitangents.Text = "Use Bitangents";
this.chkBitangents.UseVisualStyleBackColor = true;
this.chkBitangents.CheckedChanged += new System.EventHandler(this.ApplySettings);
//
// bitangentFormatCB
//
this.bitangentFormatCB.BorderColor = System.Drawing.Color.Empty;
this.bitangentFormatCB.BorderStyle = System.Windows.Forms.ButtonBorderStyle.Solid;
this.bitangentFormatCB.ButtonColor = System.Drawing.Color.Empty;
this.bitangentFormatCB.FormattingEnabled = true;
this.bitangentFormatCB.IsReadOnly = false;
this.bitangentFormatCB.Location = new System.Drawing.Point(147, 162);
this.bitangentFormatCB.Name = "bitangentFormatCB";
this.bitangentFormatCB.Size = new System.Drawing.Size(131, 21);
this.bitangentFormatCB.TabIndex = 27;
this.bitangentFormatCB.SelectedIndexChanged += new System.EventHandler(this.ApplySettings);
//
// GFLXModelImporter
//
@ -582,8 +582,6 @@
private Toolbox.Library.Forms.STCheckBox chkUseBoneIndex;
private Toolbox.Library.Forms.STCheckBox chkHasUv1;
private Toolbox.Library.Forms.STCheckBox chkUseNormals;
private Toolbox.Library.Forms.STComboBox bitangentFormatCB;
private Toolbox.Library.Forms.STCheckBox chkBitangents;
private Toolbox.Library.Forms.STComboBox color1FormatCB;
private Toolbox.Library.Forms.STCheckBox chkUseColor2;
private Toolbox.Library.Forms.STComboBox uv1FormatCB;
@ -610,5 +608,7 @@
private Toolbox.Library.Forms.STCheckBox chkTangents;
private Toolbox.Library.Forms.STCheckBox chkMatchAttributes;
private Toolbox.Library.Forms.STCheckBox chkSetNormalsToColorChannel;
private Toolbox.Library.Forms.STComboBox bitangentFormatCB;
private Toolbox.Library.Forms.STCheckBox chkBitangents;
}
}