Skip to content

#429 TR1 Fix Outfit Inconsistencies #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lahm86 merged 1 commit into from
Mar 24, 2023
Merged

#429 TR1 Fix Outfit Inconsistencies #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TRModelTransporter/Utilities/Export/MassTR1ModelExporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ protected override TRLevel ReadLevel(string path)
{
TREntities.Pistols_M_H, TREntities.Shotgun_M_H, TREntities.Magnums_M_H, TREntities.Uzis_M_H,
TREntities.Lara, TREntities.Bat, TREntities.Bear, TREntities.Wolf,
TREntities.FallingBlock, TREntities.DartEmitter, TREntities.WallSwitch
TREntities.FallingBlock, TREntities.DartEmitter, TREntities.WallSwitch, TREntities.LaraMiscAnim_H_General
},
[TRLevelNames.VILCABAMBA] = new List<TREntities>
{
Expand Down
42 changes: 38 additions & 4 deletions TRRandomizerCore/Meshes/MeshEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public TRMesh CloneMesh(TRMesh mesh)
clone.ColouredRectangles[i] = new TRFace4
{
Texture = mesh.ColouredRectangles[i].Texture,
Vertices = mesh.ColouredRectangles[i].Vertices
Vertices = new List<ushort>(mesh.ColouredRectangles[i].Vertices).ToArray()
};
}

Expand All @@ -168,7 +168,7 @@ public TRMesh CloneMesh(TRMesh mesh)
clone.ColouredTriangles[i] = new TRFace3
{
Texture = mesh.ColouredTriangles[i].Texture,
Vertices = mesh.ColouredTriangles[i].Vertices
Vertices = new List<ushort>(mesh.ColouredTriangles[i].Vertices).ToArray()
};
}

Expand All @@ -177,7 +177,7 @@ public TRMesh CloneMesh(TRMesh mesh)
clone.TexturedRectangles[i] = new TRFace4
{
Texture = mesh.TexturedRectangles[i].Texture,
Vertices = mesh.TexturedRectangles[i].Vertices
Vertices = new List<ushort>(mesh.TexturedRectangles[i].Vertices).ToArray()
};
}

Expand All @@ -186,7 +186,7 @@ public TRMesh CloneMesh(TRMesh mesh)
clone.TexturedTriangles[i] = new TRFace3
{
Texture = mesh.TexturedTriangles[i].Texture,
Vertices = mesh.TexturedTriangles[i].Vertices
Vertices = new List<ushort>(mesh.TexturedTriangles[i].Vertices).ToArray()
};
}

Expand All @@ -203,6 +203,40 @@ public TRMesh CloneMesh(TRMesh mesh)
return clone;
}

public TRMesh CloneMeshAsColoured(TRMesh mesh, ushort paletteIndex)
{
TRMesh clone = CloneMesh(mesh);

clone.ColouredRectangles = new TRFace4[mesh.NumTexturedRectangles];
clone.ColouredTriangles = new TRFace3[mesh.NumTexturedTriangles];
clone.NumColouredRectangles = mesh.NumTexturedRectangles;
clone.NumColouredTriangles = mesh.NumTexturedTriangles;
clone.NumTexturedRectangles = 0;
clone.NumTexturedTriangles = 0;
clone.TexturedRectangles = new TRFace4[] { };
clone.TexturedTriangles = new TRFace3[] { };

for (int i = 0; i < mesh.NumTexturedRectangles; i++)
{
clone.ColouredRectangles[i] = new TRFace4
{
Texture = paletteIndex,
Vertices = new List<ushort>(mesh.TexturedRectangles[i].Vertices).ToArray()
};
}

for (int i = 0; i < mesh.NumTexturedTriangles; i++)
{
clone.ColouredTriangles[i] = new TRFace3
{
Texture = paletteIndex,
Vertices = new List<ushort>(mesh.TexturedTriangles[i].Vertices).ToArray()
};
}

return clone;
}

public void WriteToLevel(TRLevel level)
{
TRMeshUtilities.UpdateMeshPointers(level, Mesh, _oldLength);
Expand Down
Loading