Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-09-24 03:28:21 +02:00
Code Releases Wiki Activity

Fix normals. Load vertex colors for some types

Browse Source
This commit is contained in:
KillzXGaming 2019-07-27 12:29:38 -04:00
parent 1885319061
commit 5b55e210ed
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Toolbox/v15/.suo
View File

Binary file not shown.

39
File_Format_Library/FileFormats/Archives/LM2/LM2_Model.cs
View File

@ -187,21 +187,14 @@ namespace FirstPlugin.LuigisMansion.DarkMoon
UShortToFloatDecode(reader.ReadInt16()),
UShortToFloatDecode(reader.ReadInt16()));
reader.BaseStream.Position += 0x4;
Vector4 nrm = Read_8_8_8_8_Snorm(reader);
vert.nrm = nrm.Xyz;
vert.pos = Vector3.TransformPosition(vert.pos, mesh.Transform);
vert.uv0 = NormalizeUvCoordsToFloat(reader.ReadUInt16(), reader.ReadUInt16());
vert.nrm = new Vector3(
UShortToFloatDecode(reader.ReadInt16()),
UShortToFloatDecode(reader.ReadInt16()),
UShortToFloatDecode(reader.ReadInt16()));
// vert.uv1 = NormalizeUvCoordsToFloat(reader.ReadUInt16(), reader.ReadUInt16());
reader.SeekBegin(bufferOffet + (v * formatInfo.BufferLength) + 38);
vert.col = new Vector4(
UShortToFloatDecode(reader.ReadInt16()),
UShortToFloatDecode(reader.ReadInt16()),
UShortToFloatDecode(reader.ReadInt16()),
UShortToFloatDecode(reader.ReadInt16()));
// vert.col = Read_8_8_8_8_Unorm(reader);
if (formatInfo.BufferLength == 22)
@ -267,9 +260,14 @@ namespace FirstPlugin.LuigisMansion.DarkMoon
vert.pos = new Vector3(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
vert.pos = Vector3.TransformPosition(vert.pos, mesh.Transform);
Console.WriteLine("F32_32 unk 1 " + reader.ReadUInt16());
Console.WriteLine("F32_32 unk 2 " + reader.ReadUInt16());
Vector4 nrm = Read_8_8_8_8_Snorm(reader);
vert.nrm = nrm.Xyz;
vert.uv0 = NormalizeUvCoordsToFloat(reader.ReadUInt16(), reader.ReadUInt16());
vert.uv1 = NormalizeUvCoordsToFloat(reader.ReadUInt16(), reader.ReadUInt16());
if (formatInfo.BufferLength > 20)
vert.col = Read_8_8_8_8_Unorm(reader);
}
break;
}
@ -281,6 +279,21 @@ namespace FirstPlugin.LuigisMansion.DarkMoon
}
}
public static Vector4 Read_8_8_8_8_Snorm(FileReader reader)
{
return new Vector4(reader.ReadSByte() / 255f, reader.ReadSByte() / 255f, reader.ReadSByte() / 255f, reader.ReadSByte() / 255f);
}
public static Vector4 Read_8_8_8_8_Unorm(FileReader reader)
{
return new Vector4(reader.ReadByte() / 255f, reader.ReadByte() / 255f, reader.ReadByte() / 255f, reader.ReadByte() / 255f);
}
public static Vector3 Read_8_8_8_Unorm(FileReader reader)
{
return new Vector3(reader.ReadByte() / 255f, reader.ReadByte() / 255f, reader.ReadByte() / 255f );
}
public static Vector2 NormalizeUvCoordsToFloat(ushort U, ushort V)
{
return new Vector2( U / 1024f, V / 1024f);

4
Toolbox/Shader/GenericShader.frag
View File

@ -183,9 +183,9 @@ void main()
if (uvChannel == 1)
displayTexCoord = f_texcoord0;
if (uvChannel == 2)
displayTexCoord = f_texcoord2;
displayTexCoord = f_texcoord1;
if (uvChannel == 3)
displayTexCoord = f_texcoord3;
displayTexCoord = f_texcoord2;
vec3 displayNormal = (normal.xyz * 0.5) + 0.5;
if (renderType == 1) // normals color