mirror of
https://github.com/KillzXGaming/Switch-Toolbox
synced 2024-11-10 07:04:36 +00:00
Fix typos
This commit is contained in:
parent
6cbe123a8c
commit
e2cd3ff150
17 changed files with 58 additions and 58 deletions
|
@ -149,7 +149,7 @@ namespace FirstPlugin
|
|||
{
|
||||
foreach (var buffer in faceDescriptors.Buffers)
|
||||
{
|
||||
msh.PrimativeType = STPrimativeType.Triangles;
|
||||
msh.PrimativeType = STPrimitiveType.Triangles;
|
||||
msh.FirstVertex = 0;
|
||||
|
||||
uint[] indicesArray = buffer.GetIndices().ToArray();
|
||||
|
|
|
@ -134,19 +134,19 @@ namespace FirstPlugin
|
|||
msh.SubMeshes = new List<SubMesh>();
|
||||
switch (mesh.PrimativeType)
|
||||
{
|
||||
case STPrimativeType.Triangles:
|
||||
case STPrimitiveType.Triangles:
|
||||
msh.PrimitiveType = PrimitiveType.Triangles;
|
||||
break;
|
||||
case STPrimativeType.TrangleStrips:
|
||||
case STPrimitiveType.TrangleStrips:
|
||||
msh.PrimitiveType = PrimitiveType.TriangleStrip;
|
||||
break;
|
||||
case STPrimativeType.Lines:
|
||||
case STPrimitiveType.Lines:
|
||||
msh.PrimitiveType = PrimitiveType.Lines;
|
||||
break;
|
||||
case STPrimativeType.LineStrips:
|
||||
case STPrimitiveType.LineStrips:
|
||||
msh.PrimitiveType = PrimitiveType.LineStrip;
|
||||
break;
|
||||
case STPrimativeType.Points:
|
||||
case STPrimitiveType.Points:
|
||||
msh.PrimitiveType = PrimitiveType.Points;
|
||||
break;
|
||||
}
|
||||
|
@ -232,16 +232,16 @@ namespace FirstPlugin
|
|||
switch (msh.PrimitiveType)
|
||||
{
|
||||
case PrimitiveType.Triangles:
|
||||
lod.PrimativeType = STPrimativeType.Triangles;
|
||||
lod.PrimativeType = STPrimitiveType.Triangles;
|
||||
break;
|
||||
case PrimitiveType.TriangleStrip:
|
||||
lod.PrimativeType = STPrimativeType.TrangleStrips;
|
||||
lod.PrimativeType = STPrimitiveType.TrangleStrips;
|
||||
break;
|
||||
case PrimitiveType.Lines:
|
||||
lod.PrimativeType = STPrimativeType.Lines;
|
||||
lod.PrimativeType = STPrimitiveType.Lines;
|
||||
break;
|
||||
case PrimitiveType.Points:
|
||||
lod.PrimativeType = STPrimativeType.Points;
|
||||
lod.PrimativeType = STPrimitiveType.Points;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -164,22 +164,22 @@ namespace FirstPlugin
|
|||
switch (msh.PrimitiveType)
|
||||
{
|
||||
case GX2PrimitiveType.Triangles:
|
||||
lod.PrimativeType = STPrimativeType.Triangles;
|
||||
lod.PrimativeType = STPrimitiveType.Triangles;
|
||||
break;
|
||||
case GX2PrimitiveType.TriangleStrip:
|
||||
lod.PrimativeType = STPrimativeType.TrangleStrips;
|
||||
lod.PrimativeType = STPrimitiveType.TrangleStrips;
|
||||
break;
|
||||
case GX2PrimitiveType.Quads:
|
||||
lod.PrimativeType = STPrimativeType.Quads;
|
||||
lod.PrimativeType = STPrimitiveType.Quads;
|
||||
break;
|
||||
case GX2PrimitiveType.Lines:
|
||||
lod.PrimativeType = STPrimativeType.Lines;
|
||||
lod.PrimativeType = STPrimitiveType.Lines;
|
||||
break;
|
||||
case GX2PrimitiveType.LineStrip:
|
||||
lod.PrimativeType = STPrimativeType.LineStrips;
|
||||
lod.PrimativeType = STPrimitiveType.LineStrips;
|
||||
break;
|
||||
case GX2PrimitiveType.Points:
|
||||
lod.PrimativeType = STPrimativeType.Points;
|
||||
lod.PrimativeType = STPrimitiveType.Points;
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -413,16 +413,16 @@ namespace FirstPlugin
|
|||
{
|
||||
switch (s.lodMeshes[indx].PrimativeType)
|
||||
{
|
||||
case STPrimativeType.Triangles:
|
||||
case STPrimitiveType.Triangles:
|
||||
mesh.PrimitiveType = GX2PrimitiveType.Triangles;
|
||||
break;
|
||||
case STPrimativeType.Lines:
|
||||
case STPrimitiveType.Lines:
|
||||
mesh.PrimitiveType = GX2PrimitiveType.Lines;
|
||||
break;
|
||||
case STPrimativeType.LineStrips:
|
||||
case STPrimitiveType.LineStrips:
|
||||
mesh.PrimitiveType = GX2PrimitiveType.LineStrip;
|
||||
break;
|
||||
case STPrimativeType.Points:
|
||||
case STPrimitiveType.Points:
|
||||
mesh.PrimitiveType = GX2PrimitiveType.Points;
|
||||
break;
|
||||
}
|
||||
|
@ -891,22 +891,22 @@ namespace FirstPlugin
|
|||
msh.SubMeshes = new List<SubMesh>();
|
||||
switch (mesh.PrimativeType)
|
||||
{
|
||||
case STPrimativeType.Triangles:
|
||||
case STPrimitiveType.Triangles:
|
||||
msh.PrimitiveType = GX2PrimitiveType.Triangles;
|
||||
break;
|
||||
case STPrimativeType.TrangleStrips:
|
||||
case STPrimitiveType.TrangleStrips:
|
||||
msh.PrimitiveType = GX2PrimitiveType.TriangleStrip;
|
||||
break;
|
||||
case STPrimativeType.Quads:
|
||||
case STPrimitiveType.Quads:
|
||||
msh.PrimitiveType = GX2PrimitiveType.Quads;
|
||||
break;
|
||||
case STPrimativeType.Lines:
|
||||
case STPrimitiveType.Lines:
|
||||
msh.PrimitiveType = GX2PrimitiveType.Lines;
|
||||
break;
|
||||
case STPrimativeType.LineStrips:
|
||||
case STPrimitiveType.LineStrips:
|
||||
msh.PrimitiveType = GX2PrimitiveType.LineStrip;
|
||||
break;
|
||||
case STPrimativeType.Points:
|
||||
case STPrimitiveType.Points:
|
||||
msh.PrimitiveType = GX2PrimitiveType.Points;
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -104,7 +104,7 @@ namespace FirstPlugin
|
|||
STobj.ObjectName = model.Name;
|
||||
lod = new STGenericObject.LOD_Mesh();
|
||||
lod.IndexFormat = STIndexFormat.UInt16;
|
||||
lod.PrimativeType = STPrimativeType.Triangles;
|
||||
lod.PrimativeType = STPrimitiveType.Triangles;
|
||||
STobj.lodMeshes.Add(lod);
|
||||
STobj.VertexBufferIndex = Index;
|
||||
objects.Add(STobj);
|
||||
|
|
|
@ -141,7 +141,7 @@ namespace FirstPlugin
|
|||
{
|
||||
renderedMesh.lodMeshes = new List<STGenericObject.LOD_Mesh>();
|
||||
var msh = new STGenericObject.LOD_Mesh();
|
||||
msh.PrimativeType = STPrimativeType.Triangles;
|
||||
msh.PrimativeType = STPrimitiveType.Triangles;
|
||||
msh.FirstVertex = 0;
|
||||
|
||||
/* int VertexID = 0;
|
||||
|
|
|
@ -516,7 +516,7 @@ namespace FirstPlugin
|
|||
|
||||
subMeshNode.lodMeshes = new List<GenericRenderedObject.LOD_Mesh>();
|
||||
var submsh = new GenericRenderedObject.LOD_Mesh();
|
||||
submsh.PrimativeType = STPrimativeType.Triangles;
|
||||
submsh.PrimativeType = STPrimitiveType.Triangles;
|
||||
submsh.FirstVertex = 0;
|
||||
submsh.faces = subMesh.Faces;
|
||||
subMeshNode.lodMeshes.Add(submsh);
|
||||
|
|
|
@ -518,7 +518,7 @@ namespace FirstPlugin
|
|||
|
||||
subMeshNode.lodMeshes = new List<GenericRenderedObject.LOD_Mesh>();
|
||||
var submsh = new GenericRenderedObject.LOD_Mesh();
|
||||
submsh.PrimativeType = STPrimativeType.Triangles;
|
||||
submsh.PrimativeType = STPrimitiveType.Triangles;
|
||||
submsh.FirstVertex = 0;
|
||||
submsh.faces = subMesh.Faces;
|
||||
subMeshNode.lodMeshes.Add(submsh);
|
||||
|
|
|
@ -354,9 +354,9 @@ namespace FirstPlugin.NLG
|
|||
}
|
||||
|
||||
if (model.Meshes[i].FaceType == MeshData.PolygonType.TriangleStrips)
|
||||
polyGroup.PrimativeType = STPrimativeType.TrangleStrips;
|
||||
polyGroup.PrimativeType = STPrimitiveType.TrangleStrips;
|
||||
else
|
||||
polyGroup.PrimativeType = STPrimativeType.Triangles;
|
||||
polyGroup.PrimativeType = STPrimitiveType.Triangles;
|
||||
|
||||
if (IsGamecube)
|
||||
{
|
||||
|
|
|
@ -349,9 +349,9 @@ namespace FirstPlugin.PunchOutWii
|
|||
}
|
||||
|
||||
if (mesh.FaceType == PO_Mesh.PolygonType.TriangleStrips)
|
||||
polyGroup.PrimativeType = STPrimativeType.TrangleStrips;
|
||||
polyGroup.PrimativeType = STPrimitiveType.TrangleStrips;
|
||||
else
|
||||
polyGroup.PrimativeType = STPrimativeType.Triangles;
|
||||
polyGroup.PrimativeType = STPrimitiveType.Triangles;
|
||||
|
||||
|
||||
for (int a = 0; a < mesh.NumAttributePointers; a++)
|
||||
|
|
|
@ -767,16 +767,16 @@ namespace FirstPlugin
|
|||
|
||||
switch (m.lodMeshes[m.DisplayLODIndex].PrimativeType)
|
||||
{
|
||||
case STPrimativeType.Lines:
|
||||
case STPrimitiveType.Lines:
|
||||
primitiveType = PrimitiveType.Lines;
|
||||
break;
|
||||
case STPrimativeType.LineStrips:
|
||||
case STPrimitiveType.LineStrips:
|
||||
primitiveType = PrimitiveType.LineStrip;
|
||||
break;
|
||||
case STPrimativeType.Points:
|
||||
case STPrimitiveType.Points:
|
||||
primitiveType = PrimitiveType.Points;
|
||||
break;
|
||||
case STPrimativeType.Triangles:
|
||||
case STPrimitiveType.Triangles:
|
||||
primitiveType = PrimitiveType.Triangles;
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -287,7 +287,7 @@ namespace FirstPlugin
|
|||
lodFormatCB.Bind(typeof(STIndexFormat), activeLodMesh, "IndexFormat");
|
||||
lodFormatCB.SelectedItem = activeLodMesh.IndexFormat;
|
||||
|
||||
lodPrimativeTypeCB.Bind(typeof(STPrimativeType), activeLodMesh, "PrimitiveType");
|
||||
lodPrimativeTypeCB.Bind(typeof(STPrimitiveType), activeLodMesh, "PrimitiveType");
|
||||
lodPrimativeTypeCB.SelectedItem = activeLodMesh.PrimativeType;
|
||||
|
||||
lodVertexSkipUD.Value = activeLodMesh.FirstVertex;
|
||||
|
|
|
@ -604,7 +604,7 @@ namespace Toolbox.Library
|
|||
STGenericObject.LOD_Mesh lod = new STGenericObject.LOD_Mesh();
|
||||
lod.faces = GetFaces(msh);
|
||||
lod.IndexFormat = STIndexFormat.UInt16;
|
||||
lod.PrimativeType = STPrimativeType.Triangles;
|
||||
lod.PrimativeType = STPrimitiveType.Triangles;
|
||||
lod.GenerateSubMesh();
|
||||
obj.lodMeshes.Add(lod);
|
||||
obj.vertices = GetVertices(msh, transform, obj);
|
||||
|
|
|
@ -347,7 +347,7 @@ namespace Toolbox.Library
|
|||
var lodMesh = mesh.lodMeshes[mesh.DisplayLODIndex];
|
||||
|
||||
List<int> faces = new List<int>();
|
||||
if (lodMesh.PrimativeType == STPrimativeType.TrangleStrips)
|
||||
if (lodMesh.PrimativeType == STPrimitiveType.TrangleStrips)
|
||||
faces = STGenericObject.ConvertTriangleStripsToTriangles(lodMesh.faces);
|
||||
else
|
||||
faces = lodMesh.faces;
|
||||
|
@ -367,7 +367,7 @@ namespace Toolbox.Library
|
|||
triangleList.Material = Materials[group.MaterialIndex].Text;
|
||||
|
||||
List<int> faces = new List<int>();
|
||||
if (group.PrimativeType == STPrimativeType.TrangleStrips)
|
||||
if (group.PrimativeType == STPrimitiveType.TrangleStrips)
|
||||
faces = STGenericObject.ConvertTriangleStripsToTriangles(group.faces);
|
||||
else
|
||||
faces = group.faces;
|
||||
|
|
|
@ -182,7 +182,7 @@ namespace Toolbox.Library
|
|||
|
||||
mesh.lodMeshes = new List<STGenericObject.LOD_Mesh>();
|
||||
var lodMesh = new STGenericObject.LOD_Mesh();
|
||||
lodMesh.PrimativeType = STPrimativeType.Triangles;
|
||||
lodMesh.PrimativeType = STPrimitiveType.Triangles;
|
||||
mesh.lodMeshes.Add(lodMesh);
|
||||
for (int f = 0; f < seMesh.FaceCount; f++)
|
||||
{
|
||||
|
|
|
@ -91,7 +91,7 @@ namespace Toolbox.Library
|
|||
public List<LOD_Mesh> lodMeshes = new List<LOD_Mesh>();
|
||||
public class LOD_Mesh
|
||||
{
|
||||
public STPrimativeType PrimativeType = STPrimativeType.Triangles;
|
||||
public STPrimitiveType PrimativeType = STPrimitiveType.Triangles;
|
||||
public STIndexFormat IndexFormat = STIndexFormat.UInt16;
|
||||
public uint FirstVertex;
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ using System.Threading.Tasks;
|
|||
|
||||
namespace Toolbox.Library
|
||||
{
|
||||
public enum STPrimativeType
|
||||
public enum STPrimitiveType
|
||||
{
|
||||
Points = 0,
|
||||
Lines = 1,
|
||||
|
@ -24,7 +24,7 @@ namespace Toolbox.Library
|
|||
|
||||
public List<int> faces = new List<int>();
|
||||
|
||||
public STPrimativeType PrimativeType = STPrimativeType.Triangles;
|
||||
public STPrimitiveType PrimativeType = STPrimitiveType.Triangles;
|
||||
|
||||
public int strip = 0x40;
|
||||
public int displayFaceSize = 0;
|
||||
|
|
|
@ -491,12 +491,12 @@ namespace Toolbox.Library.Rendering
|
|||
{
|
||||
switch (p.PrimativeType)
|
||||
{
|
||||
case STPrimativeType.Triangles: return PrimitiveType.Triangles;
|
||||
case STPrimativeType.TrangleStrips: return PrimitiveType.TriangleStrip;
|
||||
case STPrimativeType.Quads: return PrimitiveType.Quads;
|
||||
case STPrimativeType.Points: return PrimitiveType.Points;
|
||||
case STPrimativeType.LineStrips: return PrimitiveType.LineStrip;
|
||||
case STPrimativeType.Lines: return PrimitiveType.Lines;
|
||||
case STPrimitiveType.Triangles: return PrimitiveType.Triangles;
|
||||
case STPrimitiveType.TrangleStrips: return PrimitiveType.TriangleStrip;
|
||||
case STPrimitiveType.Quads: return PrimitiveType.Quads;
|
||||
case STPrimitiveType.Points: return PrimitiveType.Points;
|
||||
case STPrimitiveType.LineStrips: return PrimitiveType.LineStrip;
|
||||
case STPrimitiveType.Lines: return PrimitiveType.Lines;
|
||||
default: return PrimitiveType.Triangles;
|
||||
}
|
||||
}
|
||||
|
@ -505,12 +505,12 @@ namespace Toolbox.Library.Rendering
|
|||
{
|
||||
switch (p.PrimativeType)
|
||||
{
|
||||
case STPrimativeType.Triangles: return PrimitiveType.Triangles;
|
||||
case STPrimativeType.TrangleStrips: return PrimitiveType.TriangleStrip;
|
||||
case STPrimativeType.Quads: return PrimitiveType.Quads;
|
||||
case STPrimativeType.Points: return PrimitiveType.Points;
|
||||
case STPrimativeType.LineStrips: return PrimitiveType.LineStrip;
|
||||
case STPrimativeType.Lines: return PrimitiveType.Lines;
|
||||
case STPrimitiveType.Triangles: return PrimitiveType.Triangles;
|
||||
case STPrimitiveType.TrangleStrips: return PrimitiveType.TriangleStrip;
|
||||
case STPrimitiveType.Quads: return PrimitiveType.Quads;
|
||||
case STPrimitiveType.Points: return PrimitiveType.Points;
|
||||
case STPrimitiveType.LineStrips: return PrimitiveType.LineStrip;
|
||||
case STPrimitiveType.Lines: return PrimitiveType.Lines;
|
||||
default: return PrimitiveType.Triangles;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue