Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-12 21:47:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix savegames and FX colors (#656)

Browse source 
* Fix savegames and FX colors
* Update Changes.txt
* Simplify savegame code more
This commit is contained in:
Lwmte 2022-08-12 20:23:05 +03:00 • committed by GitHub
parent 9bad72e9bc
commit 4600dd6f79
19 changed files with 325 additions and 1231 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Documentation/Changes.txt
View file

@ -9,6 +9,7 @@ Version 1.0.1
- Fixed camera behaviour with pushable blocks.
- Fixed minecart unduck on inclines.
- Fixed quadbike dismount with jump key and allow to shoot big gun with action key.
- Fixed static meshes having wrong colors on savegame reload.
- Fixed rollingball incorrectly killing Lara in water and in jump.
- Fixed resurfacing on underwater death.
- Fixed ripples not appearing on water connections higher than room bottom.

2
TombEngine/Game/effects/effects.h
View file

@ -49,7 +49,7 @@ struct FX_INFO
short fallspeed;
int frameNumber;
short counter;
short shade;
Vector4 color;
short flag1;
short flag2;
};

2
TombEngine/Game/effects/tomb4fx.cpp
View file

@ -1506,7 +1506,7 @@ void ExplodingDeath(short itemNumber, short flags)
}
fx->objectNumber = ID_BODY_PART;
fx->shade = 16912;
fx->color = item->Color;
fx->flag2 = flags;
fx->frameNumber = obj->meshIndex + i;
}

2
TombEngine/Game/items.cpp
View file

@ -374,7 +374,7 @@ short CreateNewEffect(short roomNum)
room->fxNumber = fxNumber;
fx->nextActive = NextFxActive;
NextFxActive = fxNumber;
fx->shade = GRAY555;
fx->color = Vector4::One;
}
return fxNumber;

6
TombEngine/Game/items.h
View file

@ -10,12 +10,6 @@
enum GAME_OBJECT_ID : short;
// used by fx->shade !
#define RGB555(r, g, b) ((r << 7) & 0x7C00 | (g << 2) & 0x3E0 | (b >> 3) & 0x1F)
#define WHITE555 RGB555(255, 255, 255)
#define GRAY555 RGB555(128, 128, 128)
#define BLACK555 RGB555( 0, 0, 0)
constexpr auto NO_ITEM = -1;
constexpr auto NOT_TARGETABLE = -16384;
constexpr auto NUM_ITEMS = 1024;

6
TombEngine/Game/missile.cpp
View file

@ -178,7 +178,7 @@ short ShardGun(int x, int y, int z, short velocity, short yRot, short roomNumber
fx->speed = SHARD_VELOCITY;
fx->frameNumber = 0;
fx->objectNumber = ID_PROJ_SHARD;
fx->shade = 14 * 256;
fx->color = Vector4::One;
ShootAtLara(fx);
}
@ -201,7 +201,7 @@ short BombGun(int x, int y, int z, short velocity, short yRot, short roomNumber)
fx->speed = ROCKET_VELOCITY;
fx->frameNumber = 0;
fx->objectNumber = ID_PROJ_BOMB;
fx->shade = 16 * 256;
fx->color = Vector4::One;
ShootAtLara(fx);
}
@ -224,7 +224,7 @@ short NatlaGun(int x, int y, int z, short velocity, short yRot, short roomNumber
fx->speed = NATLA_GUN_VELOCITY;
fx->frameNumber = 0;
fx->objectNumber = ID_PROJ_NATLA;
fx->shade = 16 * 256;
fx->color = Vector4::One;
ShootAtLara(fx);
}

387
TombEngine/Game/savegame.cpp
View file

@ -102,6 +102,46 @@ Save::Position FromPHD(PHD_3DPOS const& src)
};
}
Save::Vector3 FromVector3(Vector3 vec)
{
return Save::Vector3(vec.x, vec.y, vec.z);
}
Save::Vector3 FromVector3(Vector3Int vec)
{
return Save::Vector3(vec.x, vec.y, vec.z);
}
Save::Vector3 FromVector3(Vector3Shrt vec)
{
return Save::Vector3(vec.x, vec.y, vec.z);
}
Save::Vector4 FromVector4(Vector4 vec)
{
return Save::Vector4(vec.x, vec.y, vec.z, vec.w);
}
Vector3Shrt ToVector3Shrt(const Save::Vector3* vec)
{
return Vector3Shrt(short(vec->x()), short(vec->y()), short(vec->z()));
}
Vector3Int ToVector3Int(const Save::Vector3* vec)
{
return Vector3Int(int(vec->x()), int(vec->y()), int(vec->z()));
}
Vector3 ToVector3(const Save::Vector3* vec)
{
return Vector3(vec->x(), vec->y(), vec->z());
}
Vector4 ToVector4(const Save::Vector4* vec)
{
return Vector4(vec->x(), vec->y(), vec->z(), vec->w());
}
bool SaveGame::Save(int slot)
{
auto fileName = std::string(SAVEGAME_PATH) + "savegame." + std::to_string(slot);
@ -196,17 +236,6 @@ bool SaveGame::Save(int slot)
wet.push_back(Lara.Wet[i] == 1);
auto wetOffset = fbb.CreateVector(wet);
Save::Vector3 nextCornerPos = Save::Vector3(Lara.NextCornerPos.Position.x, Lara.NextCornerPos.Position.y, Lara.NextCornerPos.Position.z);
Save::Vector3 nextCornerRot = Save::Vector3(Lara.NextCornerPos.Orientation.x, Lara.NextCornerPos.Orientation.y, Lara.NextCornerPos.Orientation.z);
Save::Vector3 leftArmRotation = Save::Vector3(Lara.LeftArm.Orientation.x, Lara.LeftArm.Orientation.y, Lara.LeftArm.Orientation.z);
Save::Vector3 rightArmRotation = Save::Vector3(Lara.RightArm.Orientation.x, Lara.RightArm.Orientation.y, Lara.RightArm.Orientation.z);
Save::Vector3 extraHeadRot = Save::Vector3(Lara.ExtraHeadRot.x, Lara.ExtraHeadRot.y, Lara.ExtraHeadRot.z);
Save::Vector3 extraTorsoRot = Save::Vector3(Lara.ExtraTorsoRot.x, Lara.ExtraTorsoRot.y, Lara.ExtraTorsoRot.z);
Save::Vector3 extraVelocity = Save::Vector3(Lara.ExtraVelocity.x, Lara.ExtraVelocity.y, Lara.ExtraVelocity.z);
Save::Vector3 waterCurrentPull = Save::Vector3(Lara.WaterCurrentPull.x, Lara.WaterCurrentPull.y, Lara.WaterCurrentPull.z);
std::vector<int> laraTargetAngles{};
laraTargetAngles.push_back(Lara.TargetArmOrient.y);
laraTargetAngles.push_back(Lara.TargetArmOrient.x);
@ -230,7 +259,7 @@ bool SaveGame::Save(int slot)
leftArm.add_frame_base(Lara.LeftArm.FrameBase);
leftArm.add_frame_number(Lara.LeftArm.FrameNumber);
leftArm.add_locked(Lara.LeftArm.Locked);
leftArm.add_rotation(&leftArmRotation);
leftArm.add_rotation(&FromVector3(Lara.LeftArm.Orientation));
auto leftArmOffset = leftArm.Finish();
Save::ArmInfoBuilder rightArm{ fbb };
@ -240,7 +269,7 @@ bool SaveGame::Save(int slot)
rightArm.add_frame_base(Lara.RightArm.FrameBase);
rightArm.add_frame_number(Lara.RightArm.FrameNumber);
rightArm.add_locked(Lara.RightArm.Locked);
rightArm.add_rotation(&rightArmRotation);
rightArm.add_rotation(&FromVector3(Lara.RightArm.Orientation));
auto rightArmOffset = rightArm.Finish();
Save::FlareDataBuilder flare{ fbb };
@ -397,12 +426,11 @@ bool SaveGame::Save(int slot)
lara.add_burn_blue(Lara.BurnBlue);
lara.add_burn_smoke(Lara.BurnSmoke);
lara.add_control(controlOffset);
lara.add_next_corner_position(&nextCornerPos);
lara.add_next_corner_rotation(&nextCornerRot);
lara.add_next_corner_pose(&FromPHD(Lara.NextCornerPos));
lara.add_extra_anim(Lara.ExtraAnim);
lara.add_extra_head_rot(&extraHeadRot);
lara.add_extra_torso_rot(&extraTorsoRot);
lara.add_extra_velocity(&extraVelocity);
lara.add_extra_head_rot(&FromVector3(Lara.ExtraHeadRot));
lara.add_extra_torso_rot(&FromVector3(Lara.ExtraTorsoRot));
lara.add_extra_velocity(&FromVector3(Lara.ExtraVelocity));
lara.add_flare(flareOffset);
lara.add_highest_location(Lara.HighestLocation);
lara.add_hit_direction(Lara.HitDirection);
@ -424,7 +452,7 @@ bool SaveGame::Save(int slot)
lara.add_torch(torchOffset);
lara.add_vehicle(Lara.Vehicle);
lara.add_water_current_active(Lara.WaterCurrentActive);
lara.add_water_current_pull(&waterCurrentPull);
lara.add_water_current_pull(&FromVector3(Lara.WaterCurrentPull));
lara.add_water_surface_dist(Lara.WaterSurfaceDist);
lara.add_weapons(carriedWeaponsOffset);
lara.add_wet(wetOffset);
@ -563,13 +591,7 @@ bool SaveGame::Save(int slot)
kayakBuilder.add_front_vertical_velocity(kayak->FrontVerticalVelocity);
kayakBuilder.add_left_right_count(kayak->LeftRightPaddleCount);
kayakBuilder.add_left_vertical_velocity(kayak->LeftVerticalVelocity);
kayakBuilder.add_old_pos(&Save::Position(
kayak->OldPose.Position.x,
kayak->OldPose.Position.y,
kayak->OldPose.Position.z,
kayak->OldPose.Orientation.x,
kayak->OldPose.Orientation.y,
kayak->OldPose.Orientation.z));
kayakBuilder.add_old_pos(&FromPHD(kayak->OldPose));
kayakBuilder.add_right_vertical_velocity(kayak->RightVerticalVelocity);
kayakBuilder.add_true_water(kayak->TrueWater);
kayakBuilder.add_turn(kayak->Turn);
@ -592,20 +614,6 @@ bool SaveGame::Save(int slot)
intOffset = ib.Finish();
}
Save::Position position = Save::Position(
(int32_t)itemToSerialize.Pose.Position.x,
(int32_t)itemToSerialize.Pose.Position.y,
(int32_t)itemToSerialize.Pose.Position.z,
(int32_t)itemToSerialize.Pose.Orientation.x,
(int32_t)itemToSerialize.Pose.Orientation.y,
(int32_t)itemToSerialize.Pose.Orientation.z);
Save::Vector4 color = Save::Vector4(
itemToSerialize.Color.x,
itemToSerialize.Color.y,
itemToSerialize.Color.z,
itemToSerialize.Color.w);
Save::ItemBuilder serializedItem{ fbb };
serializedItem.add_next_item(itemToSerialize.NextItem);
@ -624,12 +632,12 @@ bool SaveGame::Save(int slot)
serializedItem.add_item_flags(itemFlagsOffset);
serializedItem.add_mesh_bits(itemToSerialize.MeshBits);
serializedItem.add_object_id(itemToSerialize.ObjectNumber);
serializedItem.add_position(&position);
serializedItem.add_pose(&FromPHD(itemToSerialize.Pose));
serializedItem.add_required_state(itemToSerialize.Animation.RequiredState);
serializedItem.add_room_number(itemToSerialize.RoomNumber);
serializedItem.add_velocity(itemToSerialize.Animation.Velocity);
serializedItem.add_timer(itemToSerialize.Timer);
serializedItem.add_color(&color);
serializedItem.add_color(&FromVector4(itemToSerialize.Color));
serializedItem.add_touch_bits(itemToSerialize.TouchBits);
serializedItem.add_trigger_flags(itemToSerialize.TriggerFlags);
serializedItem.add_triggered((itemToSerialize.Flags & (TRIGGERED | CODE_BITS | ONESHOT)) != 0);
@ -700,9 +708,8 @@ bool SaveGame::Save(int slot)
for (auto& effectToSerialize : EffectList)
{
Save::FXInfoBuilder serializedEffect{ fbb };
auto savedPos = FromPHD(effectToSerialize.pos);
serializedEffect.add_pos(&savedPos);
serializedEffect.add_pose(&FromPHD(effectToSerialize.pos));
serializedEffect.add_room_number(effectToSerialize.roomNumber);
serializedEffect.add_object_number(effectToSerialize.objectNumber);
serializedEffect.add_next_fx(effectToSerialize.nextFx);
@ -711,7 +718,7 @@ bool SaveGame::Save(int slot)
serializedEffect.add_fall_speed(effectToSerialize.fallspeed);
serializedEffect.add_frame_number(effectToSerialize.frameNumber);
serializedEffect.add_counter(effectToSerialize.counter);
serializedEffect.add_shade(effectToSerialize.shade);
serializedEffect.add_color(&FromVector4(effectToSerialize.color));
serializedEffect.add_flag1(effectToSerialize.flag1);
serializedEffect.add_flag2(effectToSerialize.flag2);
@ -808,18 +815,8 @@ bool SaveGame::Save(int slot)
{
Save::StaticMeshInfoBuilder staticMesh{ fbb };
staticMesh.add_position(&Save::Vector3(room->mesh[j].pos.Position.x,
room->mesh[j].pos.Position.y,
room->mesh[j].pos.Position.z));
staticMesh.add_rotation(&Save::Vector3(room->mesh[j].pos.Orientation.x,
room->mesh[j].pos.Orientation.y,
room->mesh[j].pos.Orientation.z));
staticMesh.add_color(&Save::Vector4(room->mesh[j].color.x,
room->mesh[j].color.y,
room->mesh[j].color.z,
room->mesh[j].color.w));
staticMesh.add_pose(&FromPHD(room->mesh[j].pos));
staticMesh.add_color(&FromVector4(room->mesh[j].color));
staticMesh.add_flags(room->mesh[j].flags);
staticMesh.add_hit_points(room->mesh[j].HitPoints);
@ -837,18 +834,9 @@ bool SaveGame::Save(int slot)
volumeState.add_room_number(i);
volumeState.add_number(j);
volumeState.add_position(&Save::Vector3(volume.Position.x,
volume.Position.y,
volume.Position.z));
volumeState.add_rotation(&Save::Vector4(volume.Rotation.x,
volume.Rotation.y,
volume.Rotation.z,
volume.Rotation.w));
volumeState.add_scale(&Save::Vector3(volume.Scale.x,
volume.Scale.y,
volume.Scale.z));
volumeState.add_position(&FromVector3(volume.Position));
volumeState.add_rotation(&FromVector4(volume.Rotation));
volumeState.add_scale(&FromVector3(volume.Scale));
int triggerer = -1;
if (std::holds_alternative<short>(volume.Triggerer))
@ -916,86 +904,66 @@ bool SaveGame::Save(int slot)
}
auto particleOffset = fbb.CreateVector(particles);
// Particle enemies
std::vector<flatbuffers::Offset<Save::BatInfo>> bats;
// Swarm enemies
std::vector<flatbuffers::Offset<Save::SwarmObjectInfo>> bats;
for (int i = 0; i < NUM_BATS; i++)
{
auto* bat = &Bats[i];
Save::BatInfoBuilder batInfo{ fbb };
Save::SwarmObjectInfoBuilder batInfo{ fbb };
batInfo.add_counter(bat->Counter);
batInfo.add_flags(bat->Counter);
batInfo.add_on(bat->On);
batInfo.add_room_number(bat->RoomNumber);
batInfo.add_x(bat->Pose.Position.x);
batInfo.add_y(bat->Pose.Position.y);
batInfo.add_z(bat->Pose.Position.z);
batInfo.add_x_rot(bat->Pose.Orientation.x);
batInfo.add_y_rot(bat->Pose.Orientation.y);
batInfo.add_z_rot(bat->Pose.Orientation.z);
batInfo.add_pose(&FromPHD(bat->Pose));
bats.push_back(batInfo.Finish());
}
auto batsOffset = fbb.CreateVector(bats);
std::vector<flatbuffers::Offset<Save::SpiderInfo>> spiders;
std::vector<flatbuffers::Offset<Save::SwarmObjectInfo>> spiders;
for (int i = 0; i < NUM_SPIDERS; i++)
{
auto* spider = &Spiders[i];
Save::SpiderInfoBuilder spiderInfo{ fbb };
Save::SwarmObjectInfoBuilder spiderInfo{ fbb };
spiderInfo.add_flags(spider->Flags);
spiderInfo.add_on(spider->On);
spiderInfo.add_room_number(spider->RoomNumber);
spiderInfo.add_x(spider->Pose.Position.x);
spiderInfo.add_y(spider->Pose.Position.y);
spiderInfo.add_z(spider->Pose.Position.z);
spiderInfo.add_x_rot(spider->Pose.Orientation.x);
spiderInfo.add_y_rot(spider->Pose.Orientation.y);
spiderInfo.add_z_rot(spider->Pose.Orientation.z);
spiderInfo.add_pose(&FromPHD(spider->Pose));
spiders.push_back(spiderInfo.Finish());
}
auto spidersOffset = fbb.CreateVector(spiders);
std::vector<flatbuffers::Offset<Save::RatInfo>> rats;
std::vector<flatbuffers::Offset<Save::SwarmObjectInfo>> rats;
for (int i = 0; i < NUM_RATS; i++)
{
auto* rat = &Rats[i];
Save::RatInfoBuilder ratInfo{ fbb };
Save::SwarmObjectInfoBuilder ratInfo{ fbb };
ratInfo.add_flags(rat->Flags);
ratInfo.add_on(rat->On);
ratInfo.add_room_number(rat->RoomNumber);
ratInfo.add_x(rat->Pose.Position.x);
ratInfo.add_y(rat->Pose.Position.y);
ratInfo.add_z(rat->Pose.Position.z);
ratInfo.add_x_rot(rat->Pose.Orientation.x);
ratInfo.add_y_rot(rat->Pose.Orientation.y);
ratInfo.add_z_rot(rat->Pose.Orientation.z);
ratInfo.add_pose(&FromPHD(rat->Pose));
rats.push_back(ratInfo.Finish());
}
auto ratsOffset = fbb.CreateVector(rats);
std::vector<flatbuffers::Offset<Save::ScarabInfo>> scarabs;
std::vector<flatbuffers::Offset<Save::SwarmObjectInfo>> scarabs;
for (int i = 0; i < NUM_BATS; i++)
{
auto* beetle = &BeetleSwarm[i];
Save::ScarabInfoBuilder scarabInfo{ fbb };
Save::SwarmObjectInfoBuilder scarabInfo{ fbb };
scarabInfo.add_flags(beetle->Flags);
scarabInfo.add_on(beetle->On);
scarabInfo.add_room_number(beetle->RoomNumber);
scarabInfo.add_x(beetle->Pose.Position.x);
scarabInfo.add_y(beetle->Pose.Position.y);
scarabInfo.add_z(beetle->Pose.Position.z);
scarabInfo.add_x_rot(beetle->Pose.Orientation.x);
scarabInfo.add_y_rot(beetle->Pose.Orientation.y);
scarabInfo.add_z_rot(beetle->Pose.Orientation.z);
scarabInfo.add_pose(&FromPHD(beetle->Pose));
scarabs.push_back(scarabInfo.Finish());
}
@ -1012,42 +980,27 @@ bool SaveGame::Save(int slot)
std::vector<const Save::Vector3*> segments;
for (int i = 0; i < ROPE_SEGMENTS; i++)
segments.push_back(&Save::Vector3(
rope->segment[i].x,
rope->segment[i].y,
rope->segment[i].z));
segments.push_back(&FromVector3(rope->segment[i]));
auto segmentsOffset = fbb.CreateVector(segments);
std::vector<const Save::Vector3*> velocities;
for (int i = 0; i < ROPE_SEGMENTS; i++)
velocities.push_back(&Save::Vector3(
rope->velocity[i].x,
rope->velocity[i].y,
rope->velocity[i].z));
velocities.push_back(&FromVector3(rope->velocity[i]));
auto velocitiesOffset = fbb.CreateVector(velocities);
std::vector<const Save::Vector3*> normalisedSegments;
for (int i = 0; i < ROPE_SEGMENTS; i++)
normalisedSegments.push_back(&Save::Vector3(
rope->normalisedSegment[i].x,
rope->normalisedSegment[i].y,
rope->normalisedSegment[i].z));
normalisedSegments.push_back(&FromVector3(rope->normalisedSegment[i]));
auto normalisedSegmentsOffset = fbb.CreateVector(normalisedSegments);
std::vector<const Save::Vector3*> meshSegments;
for (int i = 0; i < ROPE_SEGMENTS; i++)
meshSegments.push_back(&Save::Vector3(
rope->meshSegment[i].x,
rope->meshSegment[i].y,
rope->meshSegment[i].z));
meshSegments.push_back(&FromVector3(rope->meshSegment[i]));
auto meshSegmentsOffset = fbb.CreateVector(meshSegments);
std::vector<const Save::Vector3*> coords;
for (int i = 0; i < ROPE_SEGMENTS; i++)
coords.push_back(&Save::Vector3(
rope->coords[i].x,
rope->coords[i].y,
rope->coords[i].z));
coords.push_back(&FromVector3(rope->coords[i]));
auto coordsOffset = fbb.CreateVector(coords);
Save::RopeBuilder ropeInfo{ fbb };
@ -1058,36 +1011,21 @@ bool SaveGame::Save(int slot)
ropeInfo.add_normalised_segments(normalisedSegmentsOffset);
ropeInfo.add_coords(coordsOffset);
ropeInfo.add_coiled(rope->coiled);
ropeInfo.add_position(&Save::Vector3(
rope->position.x,
rope->position.y,
rope->position.z));
ropeInfo.add_position(&FromVector3(rope->position));
ropeInfo.add_segment_length(rope->segmentLength);
ropeOffset = ropeInfo.Finish();
Save::PendulumBuilder pendulumInfo{ fbb };
pendulumInfo.add_node(CurrentPendulum.node);
pendulumInfo.add_position(&Save::Vector3(
CurrentPendulum.position.x,
CurrentPendulum.position.y,
CurrentPendulum.position.z));
pendulumInfo.add_velocity(&Save::Vector3(
CurrentPendulum.velocity.x,
CurrentPendulum.velocity.y,
CurrentPendulum.velocity.z));
pendulumInfo.add_position(&FromVector3(CurrentPendulum.position));
pendulumInfo.add_velocity(&FromVector3(CurrentPendulum.velocity));
pendulumOffset = pendulumInfo.Finish();
Save::PendulumBuilder alternatePendulumInfo{ fbb };
alternatePendulumInfo.add_node(AlternatePendulum.node);
alternatePendulumInfo.add_position(&Save::Vector3(
AlternatePendulum.position.x,
AlternatePendulum.position.y,
AlternatePendulum.position.z));
alternatePendulumInfo.add_velocity(&Save::Vector3(
AlternatePendulum.velocity.x,
AlternatePendulum.velocity.y,
AlternatePendulum.velocity.z));
alternatePendulumInfo.add_position(&FromVector3(AlternatePendulum.position));
alternatePendulumInfo.add_velocity(&FromVector3(AlternatePendulum.velocity));
alternatePendulumOffset = alternatePendulumInfo.Finish();
}
@ -1298,18 +1236,8 @@ bool SaveGame::Load(int slot)
auto room = &g_Level.Rooms[staticMesh->room_number()];
int number = staticMesh->number();
room->mesh[number].pos.Position = Vector3Int(staticMesh->position()->x(),
staticMesh->position()->y(),
staticMesh->position()->z());
room->mesh[number].pos.Orientation = Vector3Shrt(short(staticMesh->rotation()->x()),
short(staticMesh->rotation()->y()),
short(staticMesh->rotation()->z()));
room->mesh[number].color = Vector4(staticMesh->color()->x(),
staticMesh->color()->y(),
staticMesh->color()->z(),
staticMesh->color()->w());
room->mesh[number].pos = ToPHD(staticMesh->pose());
room->mesh[number].color = ToVector4(staticMesh->color());
room->mesh[number].flags = staticMesh->flags();
room->mesh[number].HitPoints = staticMesh->hit_points();
@ -1330,18 +1258,9 @@ bool SaveGame::Load(int slot)
auto room = &g_Level.Rooms[volume->room_number()];
int number = volume->number();
room->triggerVolumes[number].Position = Vector3(volume->position()->x(),
volume->position()->y(),
volume->position()->z());
room->triggerVolumes[number].Rotation = Vector4(volume->rotation()->x(),
volume->rotation()->y(),
volume->rotation()->z(),
volume->rotation()->w());
room->triggerVolumes[number].Scale = Vector3(volume->scale()->x(),
volume->scale()->y(),
volume->scale()->z());
room->triggerVolumes[number].Position = ToVector3(volume->position());
room->triggerVolumes[number].Rotation = ToVector4(volume->rotation());
room->triggerVolumes[number].Scale = ToVector3(volume->scale());
int triggerer = volume->triggerer();
if (triggerer >= 0)
@ -1410,13 +1329,7 @@ bool SaveGame::Load(int slot)
g_GameScriptEntities->TryAddColliding(i);
item->Pose.Position.x = savedItem->position()->x_pos();
item->Pose.Position.y = savedItem->position()->y_pos();
item->Pose.Position.z = savedItem->position()->z_pos();
item->Pose.Orientation.x = savedItem->position()->x_rot();
item->Pose.Orientation.y = savedItem->position()->y_rot();
item->Pose.Orientation.z = savedItem->position()->z_rot();
item->Pose = ToPHD(savedItem->pose());
item->RoomNumber = savedItem->room_number();
item->Animation.Velocity = savedItem->velocity();
@ -1454,10 +1367,7 @@ bool SaveGame::Load(int slot)
item->Flags = savedItem->flags();
// Color
item->Color = Vector4(savedItem->color()->x(),
savedItem->color()->y(),
savedItem->color()->z(),
savedItem->color()->w());
item->Color = ToVector4(savedItem->color());
// Carried item
item->CarriedItem = savedItem->carried_item();
@ -1591,12 +1501,7 @@ bool SaveGame::Load(int slot)
kayak->FrontVerticalVelocity = savedKayak->front_vertical_velocity();
kayak->LeftRightPaddleCount = savedKayak->left_right_count();
kayak->LeftVerticalVelocity = savedKayak->left_vertical_velocity();
kayak->OldPose.Position.x = savedKayak->old_pos()->x_pos();
kayak->OldPose.Position.y = savedKayak->old_pos()->y_pos();
kayak->OldPose.Position.z = savedKayak->old_pos()->z_pos();
kayak->OldPose.Orientation.x = savedKayak->old_pos()->x_rot();
kayak->OldPose.Orientation.y = savedKayak->old_pos()->y_rot();
kayak->OldPose.Orientation.z = savedKayak->old_pos()->z_rot();
kayak->OldPose = ToPHD(savedKayak->old_pos());
kayak->RightVerticalVelocity = savedKayak->right_vertical_velocity();
kayak->TrueWater = savedKayak->true_water();
kayak->Turn = savedKayak->turn();
@ -1669,14 +1574,9 @@ bool SaveGame::Load(int slot)
auto* bat = &Bats[i];
bat->On = batInfo->on();
bat->Counter = batInfo->counter();
bat->Counter = batInfo->flags();
bat->RoomNumber = batInfo->room_number();
bat->Pose.Position.x = batInfo->x();
bat->Pose.Position.y = batInfo->y();
bat->Pose.Position.z = batInfo->z();
bat->Pose.Orientation.x = batInfo->x_rot();
bat->Pose.Orientation.y = batInfo->y_rot();
bat->Pose.Orientation.z = batInfo->z_rot();
bat->Pose = ToPHD(batInfo->pose());
}
for (int i = 0; i < s->rats()->size(); i++)
@ -1687,12 +1587,7 @@ bool SaveGame::Load(int slot)
rat->On = ratInfo->on();
rat->Flags = ratInfo->flags();
rat->RoomNumber = ratInfo->room_number();
rat->Pose.Position.x = ratInfo->x();
rat->Pose.Position.y = ratInfo->y();
rat->Pose.Position.z = ratInfo->z();
rat->Pose.Orientation.x = ratInfo->x_rot();
rat->Pose.Orientation.y = ratInfo->y_rot();
rat->Pose.Orientation.z = ratInfo->z_rot();
rat->Pose = ToPHD(ratInfo->pose());
}
for (int i = 0; i < s->spiders()->size(); i++)
@ -1703,28 +1598,18 @@ bool SaveGame::Load(int slot)
spider->On = spiderInfo->on();
spider->Flags = spiderInfo->flags();
spider->RoomNumber = spiderInfo->room_number();
spider->Pose.Position.x = spiderInfo->x();
spider->Pose.Position.y = spiderInfo->y();
spider->Pose.Position.z = spiderInfo->z();
spider->Pose.Orientation.x = spiderInfo->x_rot();
spider->Pose.Orientation.y = spiderInfo->y_rot();
spider->Pose.Orientation.z = spiderInfo->z_rot();
spider->Pose = ToPHD(spiderInfo->pose());
}
for (int i = 0; i < s->scarabs()->size(); i++)
{
auto beetleInfo = s->scarabs()->Get(i);
auto* Beetle = &BeetleSwarm[i];
auto* beetle = &BeetleSwarm[i];
Beetle->On = beetleInfo->on();
Beetle->Flags = beetleInfo->flags();
Beetle->RoomNumber = beetleInfo->room_number();
Beetle->Pose.Position.x = beetleInfo->x();
Beetle->Pose.Position.y = beetleInfo->y();
Beetle->Pose.Position.z = beetleInfo->z();
Beetle->Pose.Orientation.x = beetleInfo->x_rot();
Beetle->Pose.Orientation.y = beetleInfo->y_rot();
Beetle->Pose.Orientation.z = beetleInfo->z_rot();
beetle->On = beetleInfo->on();
beetle->Flags = beetleInfo->flags();
beetle->RoomNumber = beetleInfo->room_number();
beetle->Pose = ToPHD(beetleInfo->pose());
}
NextFxFree = s->next_fx_free();
@ -1734,7 +1619,7 @@ bool SaveGame::Load(int slot)
{
auto& fx = EffectList[i];
auto fx_saved = s->fxinfos()->Get(i);
fx.pos = ToPHD(fx_saved->pos());
fx.pos = ToPHD(fx_saved->pose());
fx.roomNumber = fx_saved->room_number();
fx.objectNumber = fx_saved->object_number();
fx.nextFx = fx_saved->next_fx();
@ -1743,7 +1628,7 @@ bool SaveGame::Load(int slot)
fx.fallspeed = fx_saved->fall_speed();
fx.frameNumber = fx_saved->frame_number();
fx.counter = fx_saved->counter();
fx.shade = fx_saved->shade();
fx.color = ToVector4(fx_saved->color());
fx.flag1 = fx_saved->flag1();
fx.flag2 = fx_saved->flag2();
}
@ -1901,18 +1786,10 @@ bool SaveGame::Load(int slot)
Lara.LeftArm.FrameBase = s->lara()->left_arm()->frame_base();
Lara.LeftArm.FrameNumber = s->lara()->left_arm()->frame_number();
Lara.LeftArm.Locked = s->lara()->left_arm()->locked();
Lara.LeftArm.Orientation.x = s->lara()->left_arm()->rotation()->x();
Lara.LeftArm.Orientation.y = s->lara()->left_arm()->rotation()->y();
Lara.LeftArm.Orientation.z = s->lara()->left_arm()->rotation()->z();
Lara.LeftArm.Orientation = ToVector3Shrt(s->lara()->left_arm()->rotation());
Lara.Location = s->lara()->location();
Lara.LocationPad = s->lara()->location_pad();
Lara.NextCornerPos = PHD_3DPOS(
s->lara()->next_corner_position()->x(),
s->lara()->next_corner_position()->y(),
s->lara()->next_corner_position()->z(),
s->lara()->next_corner_rotation()->x(),
s->lara()->next_corner_rotation()->y(),
s->lara()->next_corner_rotation()->z());
Lara.NextCornerPos = ToPHD(s->lara()->next_corner_pose());
Lara.PoisonPotency = s->lara()->poison_potency();
Lara.ProjectedFloorHeight = s->lara()->projected_floor_height();
Lara.RightArm.AnimNumber = s->lara()->right_arm()->anim_number();
@ -1921,9 +1798,7 @@ bool SaveGame::Load(int slot)
Lara.RightArm.FrameBase = s->lara()->right_arm()->frame_base();
Lara.RightArm.FrameNumber = s->lara()->right_arm()->frame_number();
Lara.RightArm.Locked = s->lara()->right_arm()->locked();
Lara.RightArm.Orientation.x = s->lara()->right_arm()->rotation()->x();
Lara.RightArm.Orientation.y = s->lara()->right_arm()->rotation()->y();
Lara.RightArm.Orientation.z = s->lara()->right_arm()->rotation()->z();
Lara.RightArm.Orientation = ToVector3Shrt(s->lara()->right_arm()->rotation());
Lara.Torch.IsLit = s->lara()->torch()->is_lit();
Lara.Torch.State = (TorchState)s->lara()->torch()->state();
Lara.Control.Rope.Segment = s->lara()->control()->rope()->segment();
@ -2001,61 +1876,25 @@ bool SaveGame::Load(int slot)
for (int i = 0; i < ROPE_SEGMENTS; i++)
{
rope->segment[i] = Vector3Int(
s->rope()->segments()->Get(i)->x(),
s->rope()->segments()->Get(i)->y(),
s->rope()->segments()->Get(i)->z());
rope->normalisedSegment[i] = Vector3Int(
s->rope()->normalised_segments()->Get(i)->x(),
s->rope()->normalised_segments()->Get(i)->y(),
s->rope()->normalised_segments()->Get(i)->z());
rope->meshSegment[i] = Vector3Int(
s->rope()->mesh_segments()->Get(i)->x(),
s->rope()->mesh_segments()->Get(i)->y(),
s->rope()->mesh_segments()->Get(i)->z());
rope->coords[i] = Vector3Int(
s->rope()->coords()->Get(i)->x(),
s->rope()->coords()->Get(i)->y(),
s->rope()->coords()->Get(i)->z());
rope->velocity[i] = Vector3Int(
s->rope()->velocities()->Get(i)->x(),
s->rope()->velocities()->Get(i)->y(),
s->rope()->velocities()->Get(i)->z());
rope->segment[i] = ToVector3Int(s->rope()->segments()->Get(i));
rope->normalisedSegment[i] = ToVector3Int(s->rope()->normalised_segments()->Get(i));
rope->meshSegment[i] = ToVector3Int(s->rope()->mesh_segments()->Get(i));
rope->coords[i] = ToVector3Int(s->rope()->coords()->Get(i));
rope->velocity[i] = ToVector3Int(s->rope()->velocities()->Get(i));
}
rope->coiled = s->rope()->coiled();
rope->active = s->rope()->active();
rope->position = Vector3Int(
s->rope()->position()->x(),
s->rope()->position()->y(),
s->rope()->position()->z());
CurrentPendulum.position = Vector3Int(
s->pendulum()->position()->x(),
s->pendulum()->position()->y(),
s->pendulum()->position()->z());
CurrentPendulum.velocity = Vector3Int(
s->pendulum()->velocity()->x(),
s->pendulum()->velocity()->y(),
s->pendulum()->velocity()->z());
rope->position = ToVector3Int(s->rope()->position());
CurrentPendulum.position = ToVector3Int(s->pendulum()->position());
CurrentPendulum.velocity = ToVector3Int(s->pendulum()->velocity());
CurrentPendulum.node = s->pendulum()->node();
CurrentPendulum.rope = rope;
AlternatePendulum.position = Vector3Int(
s->alternate_pendulum()->position()->x(),
s->alternate_pendulum()->position()->y(),
s->alternate_pendulum()->position()->z());
AlternatePendulum.velocity = Vector3Int(
s->alternate_pendulum()->velocity()->x(),
s->alternate_pendulum()->velocity()->y(),
s->alternate_pendulum()->velocity()->z());
AlternatePendulum.position = ToVector3Int(s->alternate_pendulum()->position());
AlternatePendulum.velocity = ToVector3Int(s->alternate_pendulum()->velocity());
AlternatePendulum.node = s->alternate_pendulum()->node();
AlternatePendulum.rope = rope;

2
TombEngine/Objects/TR3/Entity/tr3_tony.cpp
View file

@ -97,7 +97,7 @@ namespace TEN::Entities::TR3
fx->pos.Orientation.z = 0;
fx->objectNumber = ID_TONY_BOSS_FLAME;
fx->speed = flame.speed;
fx->shade = 0;
fx->color = Vector4::Zero;
fx->flag1 = flame.type;
fx->flag2 = (GetRandomControl() & 3) + 1;

2
TombEngine/Objects/TR4/Entity/tr4_skeleton.cpp
View file

@ -130,7 +130,7 @@ namespace TEN::Entities::TR4
fx->fallspeed = -(GetRandomControl() / 1024);
fx->frameNumber = Objects[103].meshIndex;
fx->objectNumber = ID_BODY_PART;
fx->shade = 0x4210;
fx->color = Vector4::One;
fx->flag2 = 0x601;
auto* spark = GetFreeParticle();

2
TombEngine/Objects/TR5/Entity/tr5_imp.cpp
View file

@ -107,7 +107,7 @@ static void ImpThrowStones(ItemInfo* item)
fx->fallspeed = 0;
fxNumber = Objects[ID_IMP_ROCK].meshIndex + (GetRandomControl() & 7);
fx->objectNumber = ID_IMP_ROCK;
fx->shade = 16912;
fx->color = Vector4::One;
fx->counter = 0;
fx->frameNumber = fxNumber;
fx->flag1 = 2;

2
TombEngine/Objects/TR5/Entity/tr5_roman_statue.cpp
View file

@ -74,7 +74,7 @@ static void RomanStatueHitEffect(ItemInfo* item, Vector3Int* pos, int joint)
fx->speed = 1;
fx->fallspeed = 0;
fx->objectNumber = ID_BODY_PART;
fx->shade = 16912;
fx->color = Vector4::One;
fx->flag2 = 9729;
fx->frameNumber = Objects[ID_BUBBLES].meshIndex + (GetRandomControl() & 7);
fx->counter = 0;

2
TombEngine/Renderer/Renderer11.h
View file

@ -129,6 +129,8 @@ namespace TEN::Renderer
int RoomNumber;
Vector3 Position;
Matrix World;
Vector4 Color;
Vector4 AmbientLight;
RendererMesh* Mesh;
std::vector<RendererLight*> LightsToDraw;
};

4
TombEngine/Renderer/Renderer11DrawEffect.cpp
View file

@ -1036,8 +1036,8 @@ namespace TEN::Renderer
RendererRoom const& room = m_rooms[effect->RoomNumber];
m_stStatic.World = effect->World;
m_stStatic.Color = Vector4::One;
m_stStatic.AmbientLight = room.AmbientLight;
m_stStatic.Color = effect->Color;
m_stStatic.AmbientLight = effect->AmbientLight;
m_stStatic.LightMode = LIGHT_MODES::LIGHT_MODE_DYNAMIC;
m_cbStatic.updateData(m_stStatic, m_context.Get());
BindConstantBufferVS(CB_STATIC, m_cbStatic.get());

2
TombEngine/Renderer/Renderer11Frame.cpp
View file

@ -724,6 +724,8 @@ namespace TEN::Renderer
newEffect->ObjectNumber = fx->objectNumber;
newEffect->RoomNumber = fx->roomNumber;
newEffect->Position = fx->pos.Position.ToVector3();
newEffect->AmbientLight = room.AmbientLight;
newEffect->Color = fx->color;
newEffect->World = rotation * translation;
newEffect->Mesh = GetMesh(obj->nmeshes ? obj->meshIndex : fx->frameNumber);

32
TombEngine/Specific/savegame/flatbuffers/ten_itemdata_generated.h
View file

@ -559,9 +559,9 @@ struct Position::Traits {
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Vector3 FLATBUFFERS_FINAL_CLASS {
private:
int32_t x_;
int32_t y_;
int32_t z_;
float x_;
float y_;
float z_;
public:
struct Traits;
@ -570,18 +570,18 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Vector3 FLATBUFFERS_FINAL_CLASS {
y_(0),
z_(0) {
}
Vector3(int32_t _x, int32_t _y, int32_t _z)
Vector3(float _x, float _y, float _z)
: x_(flatbuffers::EndianScalar(_x)),
y_(flatbuffers::EndianScalar(_y)),
z_(flatbuffers::EndianScalar(_z)) {
}
int32_t x() const {
float x() const {
return flatbuffers::EndianScalar(x_);
}
int32_t y() const {
float y() const {
return flatbuffers::EndianScalar(y_);
}
int32_t z() const {
float z() const {
return flatbuffers::EndianScalar(z_);
}
};
@ -593,10 +593,10 @@ struct Vector3::Traits {
FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Vector4 FLATBUFFERS_FINAL_CLASS {
private:
int32_t x_;
int32_t y_;
int32_t z_;
int32_t w_;
float x_;
float y_;
float z_;
float w_;
public:
struct Traits;
@ -606,22 +606,22 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Vector4 FLATBUFFERS_FINAL_CLASS {
z_(0),
w_(0) {
}
Vector4(int32_t _x, int32_t _y, int32_t _z, int32_t _w)
Vector4(float _x, float _y, float _z, float _w)
: x_(flatbuffers::EndianScalar(_x)),
y_(flatbuffers::EndianScalar(_y)),
z_(flatbuffers::EndianScalar(_z)),
w_(flatbuffers::EndianScalar(_w)) {
}
int32_t x() const {
float x() const {
return flatbuffers::EndianScalar(x_);
}
int32_t y() const {
float y() const {
return flatbuffers::EndianScalar(y_);
}
int32_t z() const {
float z() const {
return flatbuffers::EndianScalar(z_);
}
int32_t w() const {
float w() const {
return flatbuffers::EndianScalar(w_);
}
};

1020
TombEngine/Specific/savegame/flatbuffers/ten_savegame_generated.h
View file

File diff suppressed because it is too large Load diff

14
TombEngine/Specific/savegame/schema/ten_itemdata.fbs
View file

@ -186,16 +186,16 @@ table ShortArray {
}
struct Vector3 {
x: int32;
y: int32;
z: int32;
x: float;
y: float;
z: float;
}
struct Vector4 {
x: int32;
y: int32;
z: int32;
w: int32;
x: float;
y: float;
z: float;
w: float;
}
union ItemData {

65
TombEngine/Specific/savegame/schema/ten_savegame.fbs
View file

@ -27,7 +27,7 @@ table Item {
carried_item: int32;
after_death: int32;
item_flags: [int32];
position: Position;
pose: Position;
next_item: int32;
next_item_active: int32;
triggered: bool;
@ -48,7 +48,7 @@ table Item {
}
table FXInfo {
pos : Position;
pose : Position;
room_number: int32;
object_number: int32;
next_fx: int32;
@ -57,7 +57,7 @@ table FXInfo {
fall_speed: int32;
frame_number: int32;
counter : int32;
shade: int32;
color: Vector4;
flag1: int32;
flag2: int32;
}
@ -248,8 +248,7 @@ table Lara {
target_facing_angle: int32;
water_surface_dist: int32;
interacted_item: int32;
next_corner_position: Vector3;
next_corner_rotation: Vector3;
next_corner_pose: Position;
burn_type: int32;
burn_count: uint32;
burn: bool;
@ -277,8 +276,7 @@ table Sink {
table StaticMeshInfo {
number: int32;
room_number: int32;
position: Vector3;
rotation: Vector3;
pose: Position;
color: Vector4;
hit_points: int32;
flags: int32;
@ -324,54 +322,13 @@ table ParticleInfo {
node_number: int32;
}
table RatInfo {
table SwarmObjectInfo {
on: bool;
x: int32;
y: int32;
z: int32;
x_rot: int32;
y_rot: int32;
z_rot: int32;
pose: Position;
room_number: int32;
flags: int32;
}
table SpiderInfo {
on: bool;
x: int32;
y: int32;
z: int32;
x_rot: int32;
y_rot: int32;
z_rot: int32;
room_number: int32;
flags: int32;
}
table ScarabInfo {
on: bool;
x: int32;
y: int32;
z: int32;
x_rot: int32;
y_rot: int32;
z_rot: int32;
room_number: int32;
flags: int32;
}
table BatInfo {
on: bool;
x: int32;
y: int32;
z: int32;
x_rot: int32;
y_rot: int32;
z_rot: int32;
room_number: int32;
counter: int32;
}
table Rope {
segments: [Vector3];
velocities: [Vector3];
@ -481,10 +438,10 @@ table SaveGame {
static_meshes: [StaticMeshInfo];
flyby_cameras: [FlyByCamera];
particles: [ParticleInfo];
rats: [RatInfo];
spiders: [SpiderInfo];
scarabs: [ScarabInfo];
bats: [BatInfo];
rats: [SwarmObjectInfo];
spiders: [SwarmObjectInfo];
scarabs: [SwarmObjectInfo];
bats: [SwarmObjectInfo];
flip_maps: [int32];
flip_stats: [int32];
flip_effect: int32;

3
TombEngine/Specific/trmath.cpp
View file

@ -1,8 +1,7 @@
#include "framework.h"
#include "Specific/trmath.h"
#include <cmath>
#include "Specific/prng.h"
#include <cmath>
using namespace TEN::Math::Random;