Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2025-01-31 12:23:52 +01:00
Code Releases Wiki Activity

Convert triangle strip primitive types for DAE.

Browse Source
This commit is contained in:
KillzXGaming 2019-11-16 14:08:27 -05:00
parent e7246fb79f
commit 76ff237935
3 changed files with 68 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Switch_Toolbox_Library/Compression/Formats/Yay0.cs
View File

@ -25,6 +25,10 @@ namespace Toolbox.Library
public bool CanCompress { get; } = false; public bool CanCompress { get; } = false;
//Algorithm from
//https://github.com/Daniel-McCarthy/Mr-Peeps-Compressor/blob/master/PeepsCompress/PeepsCompress/Algorithm%20Classes/YAY0.cs
//License https://github.com/Daniel-McCarthy/Mr-Peeps-Compressor/blob/master/LICENSE
public Stream Decompress(Stream stream) public Stream Decompress(Stream stream)
{ {
return new MemoryStream(Decompress(stream.ToArray())); return new MemoryStream(Decompress(stream.ToArray()));
@ -44,7 +48,7 @@ namespace Toolbox.Library
while (output.Count < decompressedSize) while (output.Count < decompressedSize)
{ {
break;
} }
} }

21
Switch_Toolbox_Library/FileFormats/DAE/DAE.cs
View File

@ -323,8 +323,15 @@ namespace Toolbox.Library
triangleLists.Add(triangleList); triangleLists.Add(triangleList);
var lodMesh = mesh.lodMeshes[mesh.DisplayLODIndex]; var lodMesh = mesh.lodMeshes[mesh.DisplayLODIndex];
for (int i = 0; i < lodMesh.faces.Count; i++)
triangleList.Indices.Add((uint)lodMesh.faces[i]); List<int> faces = new List<int>();
if (lodMesh.PrimativeType == STPrimativeType.TrangleStrips)
faces = STGenericObject.ConvertTriangleStripsToTriangles(lodMesh.faces);
else
faces = lodMesh.faces;
for (int i = 0; i < faces.Count; i++)
triangleList.Indices.Add((uint)faces[i]);
} }
if (mesh.PolygonGroups.Count > 0) if (mesh.PolygonGroups.Count > 0)
{ {
@ -337,8 +344,14 @@ namespace Toolbox.Library
if (group.MaterialIndex != -1) if (group.MaterialIndex != -1)
triangleList.Material = Materials[group.MaterialIndex].Text; triangleList.Material = Materials[group.MaterialIndex].Text;
for (int i = 0; i < group.faces.Count; i++) List<int> faces = new List<int>();
triangleList.Indices.Add((uint)group.faces[i]); if (group.PrimativeType == STPrimativeType.TrangleStrips)
faces = STGenericObject.ConvertTriangleStripsToTriangles(group.faces);
else
faces = group.faces;
for (int i = 0; i < faces.Count; i++)
triangleList.Indices.Add((uint)faces[i]);
} }
} }

46
Switch_Toolbox_Library/Generics/GenericObject.cs
View File

@ -180,6 +180,52 @@ namespace Toolbox.Library
#region Methods #region Methods
public static List<int> ConvertTriangleStripsToTriangles(List<int> faces)
{
List<int> f = new List<int>();
int startDirection = 1;
int p = 0;
int f1 = faces[p++];
int f2 = faces[p++];
int faceDirection = startDirection;
int f3;
do
{
f3 = faces[p++];
if (f3 == 0xFFFF)
{
f1 = faces[p++];
f2 = faces[p++];
faceDirection = startDirection;
}
else
{
faceDirection *= -1;
if ((f1 != f2) && (f2 != f3) && (f3 != f1))
{
if (faceDirection > 0)
{
f.Add(f3);
f.Add(f2);
f.Add(f1);
}
else
{
f.Add(f2);
f.Add(f3);
f.Add(f1);
}
}
f1 = f2;
f2 = f3;
}
} while (p < faces.Count);
return f;
}
public void TransformPosition(Vector3 Position, Vector3 Rotation, Vector3 Scale) public void TransformPosition(Vector3 Position, Vector3 Rotation, Vector3 Scale)
{ {
Matrix4 positionMat = Matrix4.CreateTranslation(Position); Matrix4 positionMat = Matrix4.CreateTranslation(Position);