Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-29 08:17:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change IsEnabled back to Enabled

Browse source
This commit is contained in:
Sezz 2023-08-12 17:04:07 +10:00
parent 57a9d64bee
commit d12f2d03a0
4 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TombEngine/Game/control/volume.cpp
View file

@ -128,7 +128,7 @@ namespace TEN::Control::Volumes
for (auto& volume : room.triggerVolumes)
{
if (!volume.IsEnabled)
if (!volume.Enabled)
continue;
if (volume.EventSetIndex == NO_EVENT_SET)
@ -238,16 +238,15 @@ namespace TEN::Control::Volumes
void TestVolumes(int roomNumber, MESH_INFO* meshPtr)
{
auto box = GetBoundsAccurate(*meshPtr, false).ToBoundingOrientedBox(meshPtr->pos);
TestVolumes(roomNumber, box, VolumeActivatorFlags::Static, meshPtr);
}
void TestVolumes(CAMERA_INFO* cameraPtr)
{
constexpr auto CAMERA_EXTENT = 32.0f;
constexpr auto CAMERA_EXTENTS = Vector3(32.0f);
// TODO: Camera box is currently AABB. Should derive orientation from look-at? -- Sezz 2023.08.11
auto box = BoundingOrientedBox(cameraPtr->pos.ToVector3(), Vector3(CAMERA_EXTENT), Quaternion::Identity);
// TODO: Camera box is currently an AABB. Should derive orientation from look-at? -- Sezz 2023.08.11
auto box = BoundingOrientedBox(cameraPtr->pos.ToVector3(), CAMERA_EXTENTS, Quaternion::Identity);
TestVolumes(cameraPtr->pos.RoomNumber, box, VolumeActivatorFlags::Flyby, cameraPtr);
}
}

2
TombEngine/Game/control/volume.h
View file

@ -46,7 +46,7 @@ namespace TEN::Control::Volumes
// ActivatorVolume
struct TriggerVolume
{
bool IsEnabled = true;
bool Enabled = true;
int EventSetIndex = 0;
std::string Name = {};

4
TombEngine/Game/savegame.cpp
View file

@ -930,7 +930,7 @@ bool SaveGame::Save(int slot)
volume.add_room_number(room->index);
volume.add_number(j);
volume.add_name(nameOffset);
volume.add_enabled(currVolume.IsEnabled);
volume.add_enabled(currVolume.Enabled);
volume.add_position(&FromVector3(currVolume.Box.Center));
volume.add_rotation(&FromVector4(currVolume.Box.Orientation));
volume.add_scale(&FromVector3(currVolume.Box.Extents));
@ -1416,7 +1416,7 @@ bool SaveGame::Load(int slot)
auto room = &g_Level.Rooms[volume->room_number()];
int number = volume->number();
room->triggerVolumes[number].IsEnabled = volume->enabled();
room->triggerVolumes[number].Enabled = volume->enabled();
room->triggerVolumes[number].Name = volume->name()->str();
room->triggerVolumes[number].Box.Center =
room->triggerVolumes[number].Sphere.Center = ToVector3(volume->position());

6
TombEngine/Scripting/Internal/TEN/Objects/Volume/VolumeObject.cpp
View file

@ -95,18 +95,18 @@ void Volume::Register(sol::table& parent)
void Volume::Enable()
{
m_volume.IsEnabled = true;
m_volume.Enabled = true;
}
void Volume::Disable()
{
ClearActivators();
m_volume.IsEnabled = false;
m_volume.Enabled = false;
}
bool Volume::GetActive() const
{
return m_volume.IsEnabled;
return m_volume.Enabled;
}
Vec3 Volume::GetPos() const