Macintosh-Tools/Pomme
1
0
Fork 0
mirror of https://github.com/jorio/Pomme.git synced 2024-05-28 12:41:36 +00:00
Code Issues Projects Releases Wiki Activity

QD3D: Support 32-bit triangle point indices

Browse Source
This commit is contained in:
Iliyas Jorio 2023-10-19 19:21:59 +02:00
parent 1881d3aa29
commit ef94150e2d
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/QD3D/3DMFParser.cpp
View File

@ -328,9 +328,7 @@ void Q3MetaFileParser::Parse_tmsh(uint32_t chunkSize)
} }
else else
{ {
static_assert(sizeof(TQ3TriMeshTriangleData::pointIndices[0]) == 2); ReadTriangleVertexIndices<uint32_t>(f, numTriangles, currentMesh);
Assert(false, "Meshes exceeding 65535 vertices are not supported");
//ReadTriangleVertexIndices<uint32_t>(f, numTriangles, currentMesh);
} }
// Ensure all vertex indices are in the expected range // Ensure all vertex indices are in the expected range

30
src/QD3D/QD3D.cpp
View File

@ -232,9 +232,9 @@ void Q3TriMeshData_SubdivideTriangles(TQ3TriMeshData* mesh)
{ {
struct Edge struct Edge
{ {
int a; uint32_t a;
int b; uint32_t b;
int midpoint; uint32_t midpoint;
}; };
std::map<uint32_t, Edge> edges; std::map<uint32_t, Edge> edges;
@ -254,8 +254,8 @@ void Q3TriMeshData_SubdivideTriangles(TQ3TriMeshData* mesh)
for (int e = 0; e < 3; e++) for (int e = 0; e < 3; e++)
{ {
int edgeP0 = triangle.pointIndices[e]; uint32_t edgeP0 = triangle.pointIndices[e];
int edgeP1 = triangle.pointIndices[(e+1) % 3]; uint32_t edgeP1 = triangle.pointIndices[(e+1) % 3];
if (edgeP0 > edgeP1) if (edgeP0 > edgeP1)
{ {
int swap = edgeP0; int swap = edgeP0;
@ -271,7 +271,7 @@ void Q3TriMeshData_SubdivideTriangles(TQ3TriMeshData* mesh)
} }
else else
{ {
edges[edgeHash] = { edgeP0, edgeP1, -1 }; edges[edgeHash] = { edgeP0, edgeP1, (uint32_t) -1 };
triangleEdges[t*3 + e] = &edges[edgeHash]; triangleEdges[t*3 + e] = &edges[edgeHash];
numDistinctEdges++; numDistinctEdges++;
} }
@ -305,9 +305,9 @@ void Q3TriMeshData_SubdivideTriangles(TQ3TriMeshData* mesh)
edge.midpoint = numPointsWritten; edge.midpoint = numPointsWritten;
numPointsWritten++; numPointsWritten++;
int M = edge.midpoint; uint32_t M = edge.midpoint;
int A = edge.a; uint32_t A = edge.a;
int B = edge.b; uint32_t B = edge.b;
mesh->points[M].x = (mesh->points[A].x + mesh->points[B].x) / 2.0f; mesh->points[M].x = (mesh->points[A].x + mesh->points[B].x) / 2.0f;
mesh->points[M].y = (mesh->points[A].y + mesh->points[B].y) / 2.0f; mesh->points[M].y = (mesh->points[A].y + mesh->points[B].y) / 2.0f;
@ -353,12 +353,12 @@ void Q3TriMeshData_SubdivideTriangles(TQ3TriMeshData* mesh)
A ^ C A ^ C
*/ */
uint16_t A = triangle.pointIndices[0]; uint32_t A = triangle.pointIndices[0];
uint16_t B = triangle.pointIndices[1]; uint32_t B = triangle.pointIndices[1];
uint16_t C = triangle.pointIndices[2]; uint32_t C = triangle.pointIndices[2];
uint16_t A2B = triangleEdges[t*3 + 0]->midpoint; uint32_t A2B = triangleEdges[t*3 + 0]->midpoint;
uint16_t B2C = triangleEdges[t*3 + 1]->midpoint; uint32_t B2C = triangleEdges[t*3 + 1]->midpoint;
uint16_t C2A = triangleEdges[t*3 + 2]->midpoint; uint32_t C2A = triangleEdges[t*3 + 2]->midpoint;
mesh->triangles[numTrianglesWritten++] = {{A2B, B, B2C} }; mesh->triangles[numTrianglesWritten++] = {{A2B, B, B2C} };
mesh->triangles[numTrianglesWritten++] = {{B2C, C, C2A} }; mesh->triangles[numTrianglesWritten++] = {{B2C, C, C2A} };

3
src/QD3D/QD3D.h
View File

@ -266,10 +266,9 @@ typedef struct TQ3PlaneEquation
float constant; float constant;
} TQ3PlaneEquation; } TQ3PlaneEquation;
// WARNING: this structure differs from QD3D (indices were originally 32-bit)
typedef struct TQ3TriMeshTriangleData typedef struct TQ3TriMeshTriangleData
{ {
uint16_t pointIndices[3]; uint32_t pointIndices[3];
} TQ3TriMeshTriangleData; } TQ3TriMeshTriangleData;
// This structure differs from QD3D. // This structure differs from QD3D.