mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-15 09:34:18 +02:00
Code Issues Releases Wiki Activity

fix wade state for TR3, fix joint index for flame death

Browse Source
This commit is contained in:
XProger
2018-12-01 09:41:46 +03:00
parent c175f17e76
commit 1cdf1e53b4
2 changed files with 106 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
src/format.h
View File

@@ -5657,6 +5657,8 @@ namespace TR {
float getFloor(const Room::Sector *sector, const vec3 &pos, int16 *roomIndex = NULL) { float getFloor(const Room::Sector *sector, const vec3 &pos, int16 *roomIndex = NULL) {
int x = int(pos.x); int x = int(pos.x);
int z = int(pos.z); int z = int(pos.z);
int dx = x & 1023;
int dz = z & 1023;
while (sector->roomBelow != NO_ROOM) { while (sector->roomBelow != NO_ROOM) {
Room &room = rooms[sector->roomBelow]; Room &room = rooms[sector->roomBelow];
@@ -5677,12 +5679,45 @@ namespace TR {
cmd = (*fd++).cmd; cmd = (*fd++).cmd;
switch (cmd.func) { switch (cmd.func) {
case FloorData::FLOOR : { // TODO: triangulation case TR::FloorData::FLOOR :
int sx = fd->slantX; case TR::FloorData::FLOOR_NW_SE_SOLID :
int sz = fd->slantZ; case TR::FloorData::FLOOR_NE_SW_SOLID :
case TR::FloorData::FLOOR_NW_SE_PORTAL_SE :
case TR::FloorData::FLOOR_NW_SE_PORTAL_NW :
case TR::FloorData::FLOOR_NE_SW_PORTAL_SW :
case TR::FloorData::FLOOR_NE_SW_PORTAL_NE : {
int sx, sz;
if (cmd.func == TR::FloorData::FLOOR) {
sx = fd->slantX;
sz = fd->slantZ;
} else {
if (cmd.func == TR::FloorData::FLOOR_NW_SE_SOLID ||
cmd.func == TR::FloorData::FLOOR_NW_SE_PORTAL_SE ||
cmd.func == TR::FloorData::FLOOR_NW_SE_PORTAL_NW) {
if (dx <= 1024 - dz) {
floor += cmd.triangle.b * 256;
sx = fd->a - fd->b;
sz = fd->c - fd->b;
} else {
floor += cmd.triangle.a * 256;
sx = fd->d - fd->c;
sz = fd->d - fd->a;
}
} else {
if (dx <= dz) {
floor += cmd.triangle.b * 256;
sx = fd->d - fd->c;
sz = fd->c - fd->b;
} else {
floor += cmd.triangle.a * 256;
sx = fd->a - fd->b;
sz = fd->d - fd->a;
}
}
}
fd++; fd++;
int dx = x & 1023;
int dz = z & 1023;
floor -= sx * (sx > 0 ? (dx - 1023) : dx) >> 2; floor -= sx * (sx > 0 ? (dx - 1023) : dx) >> 2;
floor -= sz * (sz > 0 ? (dz - 1023) : dz) >> 2; floor -= sz * (sz > 0 ? (dz - 1023) : dz) >> 2;
break; break;
@@ -5710,6 +5745,8 @@ namespace TR {
float getCeiling(const Room::Sector *sector, const vec3 &pos) { float getCeiling(const Room::Sector *sector, const vec3 &pos) {
int x = int(pos.x); int x = int(pos.x);
int z = int(pos.z); int z = int(pos.z);
int dx = x & 1023;
int dz = z & 1023;
ASSERT(sector); ASSERT(sector);
while (sector->roomAbove != NO_ROOM) { while (sector->roomAbove != NO_ROOM) {
@@ -5723,23 +5760,71 @@ namespace TR {
return float(ceiling); return float(ceiling);
FloorData *fd = &floors[sector->floorIndex]; FloorData *fd = &floors[sector->floorIndex];
FloorData::Command cmd;
if (fd->cmd.func == FloorData::FLOOR) {
if (fd->cmd.end) return float(ceiling);
fd += 2; // skip floor slant
}
if (fd->cmd.func == FloorData::CEILING) { // TODO: triangulation do {
int sx = fd->slantX; cmd = (*fd++).cmd;
int sz = fd->slantZ;
fd++; switch (cmd.func) {
int dx = x & 1023; case TR::FloorData::CEILING :
int dz = z & 1023; case TR::FloorData::CEILING_NE_SW_SOLID :
ceiling -= sx * (sx < 0 ? (dx - 1023) : dx) >> 2; case TR::FloorData::CEILING_NW_SE_SOLID :
ceiling += sz * (sz > 0 ? (dz - 1023) : dz) >> 2; case TR::FloorData::CEILING_NE_SW_PORTAL_SW :
} case TR::FloorData::CEILING_NE_SW_PORTAL_NE :
case TR::FloorData::CEILING_NW_SE_PORTAL_SE :
case TR::FloorData::CEILING_NW_SE_PORTAL_NW : {
int sx, sz;
// TODO parse triggers to collide with objects (bridges, trap doors/floors etc) if (cmd.func == TR::FloorData::CEILING) {
sx = fd->slantX;
sz = fd->slantZ;
} else {
if (cmd.func == TR::FloorData::CEILING_NW_SE_SOLID ||
cmd.func == TR::FloorData::CEILING_NW_SE_PORTAL_SE ||
cmd.func == TR::FloorData::CEILING_NW_SE_PORTAL_NW) {
if (dx <= 1024 - dz) {
ceiling += cmd.triangle.b * 256;
sx = fd->c - fd->d;
sz = fd->b - fd->c;
} else {
ceiling += cmd.triangle.a * 256;
sx = fd->b - fd->a;
sz = fd->a - fd->d;
}
} else {
if (dx <= dz) {
ceiling += cmd.triangle.b * 256;
sx = fd->b - fd->a;
sz = fd->b - fd->c;
} else {
ceiling += cmd.triangle.a * 256;
sx = fd->c - fd->d;
sz = fd->a - fd->d;
}
}
}
fd++;
ceiling -= sx * (sx < 0 ? (dx - 1023) : dx) >> 2;
ceiling += sz * (sz > 0 ? (dz - 1023) : dz) >> 2;
break;
}
case FloorData::TRIGGER : {
fd++;
FloorData::TriggerCommand trigCmd;
do {
trigCmd = (*fd++).triggerCmd;
if (trigCmd.action != Action::ACTIVATE)
continue;
// TODO controller[trigCmd.args]->getCeiling(&ceiling, x, y, z);
} while (!trigCmd.end);
break;
}
default : floorSkipCommand(fd, cmd.func);
}
} while (!cmd.end);
return float(ceiling); return float(ceiling);
} }

2
src/trigger.h
View File

@@ -145,7 +145,7 @@ struct Flame : Sprite {
if (flame) { if (flame) {
flame->owner = owner; flame->owner = owner;
flame->jointIndex = jCount > 1 ? (jointIndex & jCount) : -1; flame->jointIndex = jCount > 1 ? (jointIndex % jCount) : -1;
} }
return flame; return flame;
} }