mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-19 03:11:22 +02:00
Code Issues Releases Wiki Activity

#16 remap mesh offsets, fix VAO for sprite sequences

Browse Source
This commit is contained in:
XProger
2016-11-04 00:49:01 +03:00
parent 9d13776c5f
commit 37b716c96c
5 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/format.h
View File

@@ -3,8 +3,6 @@
#include "utils.h"
#define TR1_DEMO
#define MAX_RESERVED_ENTITIES 64
#define MAX_SECRETS_COUNT 16
@@ -703,7 +701,7 @@ namespace TR {
bool secrets[MAX_SECRETS_COUNT];
void *cameraController;
Level(Stream &stream) {
Level(Stream &stream, bool demo) {
// read version
stream.read(version);
// tiles
@@ -776,9 +774,8 @@ namespace TR {
for (int i = 0; i < spriteSequencesCount; i++)
spriteSequences[i].sCount = -spriteSequences[i].sCount;
#ifdef TR1_DEMO
stream.read(palette, 256);
#endif
if (demo)
stream.read(palette, 256);
// cameras
stream.read(cameras, stream.read(camerasCount));
@@ -807,9 +804,8 @@ namespace TR {
// palette
stream.seek(32 * 256); // skip lightmap palette
#ifndef TR1_DEMO
stream.read(palette, 256);
#endif
if (!demo)
stream.read(palette, 256);
// cinematic frames for cameras
stream.read(cameraFrames, stream.read(cameraFramesCount));

3
src/game.h
View File

@@ -13,7 +13,7 @@ namespace Game {
void init() {
Core::init();
Stream stream("LEVEL2_DEMO.PHD");
level = new Level(stream);
level = new Level(stream, true);
#ifndef __EMSCRIPTEN__
//Sound::play(Sound::openWAD("05_Lara's_Themes.wav"), 1, 1, 0);
@@ -36,7 +36,6 @@ namespace Game {
Core::clear(vec4(0.0f));
Core::setViewport(0, 0, Core::width, Core::height);
Core::setBlending(bmAlpha);
level->render();
}
}

4
src/lara.h
View File

@@ -171,12 +171,12 @@ struct Lara : Controller {
pos = vec3(30800, -7936, 22131);
angle = vec3(0.0f, 0.0f, 0.0f);
getEntity().room = 58;
*/
// level 2 (block)
pos = vec3(60843, 1024, 30557);
angle = vec3(0.0f, PI, 0.0f);
getEntity().room = 19;
/*
// level 3a
pos = vec3(41015, 3584, 34494);
angle = vec3(0.0f, -PI, 0.0f);

37
src/level.h
View File

@@ -30,7 +30,7 @@ struct Level {
float time;
Level(Stream &stream) : level{stream}, time(0.0f), lara(NULL) {
Level(Stream &stream, bool demo) : level{stream, demo}, time(0.0f), lara(NULL) {
#ifdef _DEBUG
Debug::init();
#endif
@@ -210,7 +210,7 @@ struct Level {
case 144 : id = 150; break;
}
}
*/
*/
}
Shader *setRoomShader(const TR::Room &room, float intensity) {
@@ -324,40 +324,15 @@ struct Level {
camera->frustum = camFrustum; // pop camera frustum
}
MeshBuilder::MeshInfo* getMeshInfoByOffset(uint32 meshOffset) {
if (!level.meshOffsets[meshOffset] && meshOffset)
return NULL;
for (int i = 0; i < mesh->mCount; i++)
if (mesh->meshInfo[i].offset == level.meshOffsets[meshOffset])
return &mesh->meshInfo[i];
ASSERT(false);
return NULL;
}
void renderMesh(uint32 meshOffset) {
MeshBuilder::MeshInfo *m = getMeshInfoByOffset(meshOffset);
if (!m) return; // invisible mesh (level.meshOffsets[meshOffset] == 0) camera target entity etc.
void renderMesh(uint32 offsetIndex) {
MeshBuilder::MeshInfo *m = mesh->meshMap[offsetIndex];
if (!m) return; // invisible mesh (offsetIndex > 0 && level.meshOffsets[offsetIndex] == 0) camera target entity etc.
Core::active.shader->setParam(uModel, Core::mModel);
mesh->renderMesh(m);
}
float lerpAngle(float a, float b, float t) {
float d = b - a;
if (d >= PI)
a += PI * 2.0f;
else
if (d <= -PI)
a -= PI * 2.0f;
return a + (b - a) * t;
}
quat lerpAngle(const vec3 &a, const vec3 &b, float t) {
// return vec3(lerpAngle(a.x, b.x, t),
// lerpAngle(a.y, b.y, t),
// lerpAngle(a.z, b.z, t));
quat lerpAngle(const vec3 &a, const vec3 &b, float t) { // TODO: optimization
mat4 ma, mb;
ma.identity();
mb.identity();

31
src/mesh.h
View File

@@ -121,6 +121,7 @@ struct MeshBuilder {
TR::Collider collider;
} *meshInfo;
int mCount;
MeshInfo **meshMap; // meshInfo by meshOffsetIndex
MeshRange *spriteSequences;
MeshRange shadowBlob;
@@ -211,6 +212,8 @@ struct MeshBuilder {
}
aCount += mCount;
meshInfo = new MeshInfo[mCount];
meshMap = new MeshInfo*[level.meshOffsetsCount];
memset(meshMap, 0, sizeof(meshMap[0]) * level.meshOffsetsCount);
// get size of mesh for sprite sequences
spriteSequences = new MeshRange[level.spriteSequencesCount];
@@ -221,8 +224,8 @@ struct MeshBuilder {
spriteSequences[i].iCount = level.spriteSequences[i].sCount * 6;
iCount += level.spriteSequences[i].sCount * 6;
vCount += level.spriteSequences[i].sCount * 4;
}
aCount += level.spriteSequencesCount;
aCount += level.spriteSequences[i].sCount;
}
// get size of simple shadow spot mesh (8 triangles, 8 vertices)
shadowBlob.vStart = vCount;
@@ -300,6 +303,13 @@ struct MeshBuilder {
info.center = ptr->center;
info.collider = ptr->collider;
if (!info.offset)
meshMap[0] = &info;
else
for (int j = 0; j < level.meshOffsetsCount; j++)
if (info.offset == level.meshOffsets[j])
meshMap[j] = &info;
TR::Vertex *mVertices = (TR::Vertex*)&ptr->vertices;
OFFSET(ptr->vCount * sizeof(TR::Vertex));
@@ -471,8 +481,18 @@ struct MeshBuilder {
if (r.sprites.iCount)
mesh->initRange(r.sprites);
}
for (int i = 0; i < level.spriteSequencesCount; i++)
mesh->initRange(spriteSequences[i]);
for (int j = 0; j < spriteSequences[i].iCount / 6; j++) { // init VAO for each frame
MeshRange range = spriteSequences[i];
range.iCount = 6;
range.iStart += j * 6;
range.vStart += j * 4;
mesh->initRange(range);
if (j == 0)
spriteSequences[i].aIndex = range.aIndex;
}
for (int i = 0; i < mCount; i++)
mesh->initRange(meshInfo[i]);
mesh->initRange(shadowBlob);
@@ -483,6 +503,7 @@ struct MeshBuilder {
delete[] animTexOffsets;
delete[] roomRanges;
delete[] meshInfo;
delete[] meshMap;
delete[] spriteSequences;
delete mesh;
}
@@ -650,9 +671,7 @@ struct MeshBuilder {
void renderSprite(int sequenceIndex, int frame) {
MeshRange range = spriteSequences[sequenceIndex];
range.iCount = 6;
range.iStart += frame * 6;
range.vStart += frame * 4;
range.aIndex += frame;
mesh->render(range);
}