Macintosh-Tools/Pomme
1
0
Fork 0
mirror of https://github.com/jorio/Pomme.git synced 2024-12-26 14:29:38 +00:00
Code Issues Projects Releases Wiki Activity

QD3D: Q3TriMeshData constructor can now alloc vertex colors

Browse Source
This commit is contained in:
Iliyas Jorio 2021-02-21 15:02:23 +01:00
parent ee34771758
commit 19ece0fc17
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/QD3D/3DMFParser.cpp
View File

@ -290,7 +290,11 @@ void Q3MetaFileParser::Parse_tmsh(uint32_t chunkSize)
Assert(0 == numEdges, "edges are not supported");
Assert(0 == numEdgeAttributes, "edge attributes are not supported");
currentMesh = Q3TriMeshData_New(numTriangles, numVertices);
currentMesh = Q3TriMeshData_New(
numTriangles,
numVertices,
false // Don't allocate per-vertex colors yet. We'll allocate them later if the mesh needs them.
);
__Q3EnlargeArray(metaFile.meshes, metaFile.numMeshes, 'MLST');
metaFile.meshes[metaFile.numMeshes-1] = currentMesh;

12
src/QD3D/QD3D.cpp
View File

@ -148,7 +148,7 @@ void Q3Pixmap_Dispose(TQ3Pixmap* pixmap)
#pragma mark -
TQ3TriMeshData* Q3TriMeshData_New(int numTriangles, int numPoints)
TQ3TriMeshData* Q3TriMeshData_New(int numTriangles, int numPoints, bool perVertexColors)
{
TQ3TriMeshData* mesh = __Q3Alloc<TQ3TriMeshData>(1, 'MESH');
@ -158,16 +158,22 @@ TQ3TriMeshData* Q3TriMeshData_New(int numTriangles, int numPoints)
mesh->triangles = __Q3Alloc<TQ3TriMeshTriangleData>(numTriangles, 'TMtr');
mesh->vertexNormals = __Q3Alloc<TQ3Vector3D>(numPoints, 'TMvn');
mesh->vertexUVs = __Q3Alloc<TQ3Param2D>(numPoints, 'TMuv');
mesh->vertexColors = nullptr;
mesh->vertexColors = perVertexColors? __Q3Alloc<TQ3ColorRGBA>(numPoints, 'TMvc'): nullptr;
mesh->diffuseColor = {1, 1, 1, 1};
mesh->texturingMode = kQ3TexturingModeOff;
mesh->internalTextureID = -1;
mesh->bBox = {{0,0,0}, {0,0,0}, kQ3True}; // empty
for (int i = 0; i < numPoints; i++)
{
mesh->vertexNormals[i] = {0, 1, 0};
mesh->vertexUVs[i] = {.5f, .5f};
// triMeshData->vertexColors[i] = {1, 1, 1, 1};
}
if (perVertexColors)
{
for (int i = 0; i < numPoints; i++)
mesh->vertexColors[i] = {1, 1, 1, 1};
}
return mesh;

2
src/QD3D/QD3D.h
View File

@ -350,7 +350,7 @@ void Q3Pixmap_Dispose(TQ3Pixmap*);
#pragma mark -
TQ3TriMeshData* Q3TriMeshData_New(int numTriangles, int numPoints);
TQ3TriMeshData* Q3TriMeshData_New(int numTriangles, int numPoints, bool perVertexColors);
TQ3TriMeshData* Q3TriMeshData_Duplicate(const TQ3TriMeshData* source);