mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-22 17:32:19 -05:00
Code Issues Projects Releases Wiki Activity

Fixes error in LUS where there were multiple Vertex classes declared.

Browse Source
This commit is contained in:
Kenix3 2022-08-10 22:55:38 -04:00
parent 3bcc9514ab
commit d34a6d7666
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libultraship/libultraship/Model.cpp
View File

@ -2,7 +2,7 @@
namespace Ship
{
Vertex::Vertex()
ModelVertex::ModelVertex()
{
pos = Vec3f(0, 0, 0);
normal = Vec3f(0, 0, 0);
@ -10,7 +10,7 @@ namespace Ship
uv = Vec2f(0, 0);
}
Vertex::Vertex(BinaryReader* reader)
ModelVertex::ModelVertex(BinaryReader* reader)
{
pos = reader->ReadVec3f();
normal = reader->ReadVec3f();
@ -36,7 +36,7 @@ namespace Ship
uvCoords = reader->ReadUInt32();
boneWeights = reader->ReadUInt32();
Vertex* vtxData = new Vertex[numVerts];
ModelVertex* vtxData = new ModelVertex[numVerts];
uint32_t* indicesData = new uint32_t[numPolys];
if (vertices != 0)

8
libultraship/libultraship/Model.h
View File

@ -43,15 +43,15 @@ namespace Ship
void ParseFileBinary(BinaryReader* reader, Resource* res) override;
};
struct Vertex
struct ModelVertex
{
Vec3f pos;
Vec3f normal;
Color3b color;
Vec2f uv;
Vertex();
Vertex(BinaryReader* reader);
ModelVertex();
ModelVertex(BinaryReader* reader);
};
class Model : public Resource
@ -62,7 +62,7 @@ namespace Ship
uint32_t numVerts;
uint32_t numPolys;
Vertex* vertices;
ModelVertex* vertices;
Vec2f* boneWeights;
uint32_t* indices;
};