mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-05 04:37:50 +02:00
Code Issues Releases Wiki Activity

fields renaming

Browse Source
This commit is contained in:
XProger
2016-10-17 23:07:08 +03:00
parent e827cf201f
commit f7849b23c9
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/mesh.h
View File

@@ -73,8 +73,8 @@ struct MeshBuilder {
} *meshInfo; } *meshInfo;
int mCount; int mCount;
MeshRange *sequenceRanges; // sprite sequences MeshRange *spriteSequences;
MeshRange shadowSpot; MeshRange shadowBlob;
// indexed mesh // indexed mesh
Mesh *mesh; Mesh *mesh;
@@ -160,21 +160,21 @@ struct MeshBuilder {
meshInfo = new MeshInfo[mCount]; meshInfo = new MeshInfo[mCount];
// get size of mesh for sprite sequences // get size of mesh for sprite sequences
sequenceRanges = new MeshRange[level.spriteSequencesCount]; spriteSequences = new MeshRange[level.spriteSequencesCount];
for (int i = 0; i < level.spriteSequencesCount; i++) { for (int i = 0; i < level.spriteSequencesCount; i++) {
// TODO: sequences not only first frame // TODO: sequences not only first frame
sequenceRanges[i].vStart = vCount; spriteSequences[i].vStart = vCount;
sequenceRanges[i].iStart = iCount; spriteSequences[i].iStart = iCount;
sequenceRanges[i].iCount = level.spriteSequences[i].sCount * 6; spriteSequences[i].iCount = level.spriteSequences[i].sCount * 6;
iCount += level.spriteSequences[i].sCount * 6; iCount += level.spriteSequences[i].sCount * 6;
vCount += level.spriteSequences[i].sCount * 4; vCount += level.spriteSequences[i].sCount * 4;
} }
// get size of simple shadow spot mesh (8 triangles, 8 vertices) // get size of simple shadow spot mesh (8 triangles, 8 vertices)
shadowSpot.vStart = vCount; shadowBlob.vStart = vCount;
shadowSpot.iStart = iCount; shadowBlob.iStart = iCount;
shadowSpot.iCount = 8 * 3; shadowBlob.iCount = 8 * 3;
iCount += shadowSpot.iCount; iCount += shadowBlob.iCount;
vCount += 8; vCount += 8;
// make meshes buffer (single vertex buffer object for all geometry & sprites on level) // make meshes buffer (single vertex buffer object for all geometry & sprites on level)
@@ -393,7 +393,7 @@ struct MeshBuilder {
indices[idx + 1] = 0; indices[idx + 1] = 0;
indices[idx + 2] = (i + 1) % 8; indices[idx + 2] = (i + 1) % 8;
} }
iCount += shadowSpot.iCount; iCount += shadowBlob.iCount;
vCount += 8; vCount += 8;
mesh = new Mesh(indices, iCount, vertices, vCount); mesh = new Mesh(indices, iCount, vertices, vCount);
@@ -406,7 +406,7 @@ struct MeshBuilder {
delete[] animTexOffsets; delete[] animTexOffsets;
delete[] roomRanges; delete[] roomRanges;
delete[] meshInfo; delete[] meshInfo;
delete[] sequenceRanges; delete[] spriteSequences;
delete mesh; delete mesh;
} }
@@ -572,7 +572,7 @@ struct MeshBuilder {
} }
void renderSprite(int sequenceIndex, int frame) { void renderSprite(int sequenceIndex, int frame) {
MeshRange range = sequenceRanges[sequenceIndex]; MeshRange range = spriteSequences[sequenceIndex];
range.iCount = 6; range.iCount = 6;
range.iStart += frame * 6; range.iStart += frame * 6;
range.vStart += frame * 4; range.vStart += frame * 4;
@@ -580,7 +580,7 @@ struct MeshBuilder {
} }
void renderShadowSpot() { void renderShadowSpot() {
mesh->render(shadowSpot); mesh->render(shadowBlob);
} }
}; };