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

Formatting

Browse source
This commit is contained in:
Sezz 2024-04-02 02:42:03 +11:00
parent f3e46fe816
commit 02a21ac33c
2 changed files with 47 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

32
TombEngine/Game/spotcam.h
View file

@ -27,22 +27,22 @@ struct SPOTCAM
enum SPOTCAM_FLAGS
{
SCF_CUT_PAN = (1 << 0), // Cut without panning smoothly.
SCF_OVERLAY = (1 << 1), // TODO: Add vignette.
SCF_LOOP_SEQUENCE = (1 << 2),
SCF_TRACKING_CAM = (1 << 3),
SCF_HIDE_LARA = (1 << 4),
SCF_FOCUS_LARA_HEAD = (1 << 5),
SCF_CUT_TO_LARA_CAM = (1 << 6),
SCF_CUT_TO_CAM = (1 << 7),
SCF_STOP_MOVEMENT = (1 << 8), // Stop movement for a given time (cf. `Timer` field).
SCF_DISABLE_BREAKOUT = (1 << 9), // Disable breaking out from cutscene using LOOK key.
SCF_DISABLE_LARA_CONTROLS = (1 << 10), // Also add widescreen bars.
SCF_REENABLE_LARA_CONTROLS = (1 << 11), // Used with 0x0400, keeps widescreen bars.
SCF_SCREEN_FADE_IN = (1 << 12),
SCF_SCREEN_FADE_OUT = (1 << 13),
SCF_ACTIVATE_HEAVY_TRIGGERS = (1 << 14), // When camera is moving above heavy trigger sector, it will be activated.
SCF_CAMERA_ONE_SHOT = (1 << 15),
SCF_CUT_PAN = 1 << 0, // Cut without panning smoothly.
SCF_OVERLAY = 1 << 1, // TODO: Add vignette.
SCF_LOOP_SEQUENCE = 1 << 2,
SCF_TRACKING_CAM = 1 << 3,
SCF_HIDE_LARA = 1 << 4,
SCF_FOCUS_LARA_HEAD = 1 << 5,
SCF_CUT_TO_LARA_CAM = 1 << 6,
SCF_CUT_TO_CAM = 1 << 7,
SCF_STOP_MOVEMENT = 1 << 8, // Stop movement for a given time (cf. `Timer` field).
SCF_DISABLE_BREAKOUT = 1 << 9, // Disable breaking out from cutscene using LOOK key.
SCF_DISABLE_LARA_CONTROLS = 1 << 10, // Also add widescreen bars.
SCF_REENABLE_LARA_CONTROLS = 1 << 11, // Used with 0x0400, keeps widescreen bars.
SCF_SCREEN_FADE_IN = 1 << 12,
SCF_SCREEN_FADE_OUT = 1 << 13,
SCF_ACTIVATE_HEAVY_TRIGGERS = 1 << 14, // When camera is moving above heavy trigger sector, it will be activated.
SCF_CAMERA_ONE_SHOT = 1 << 15,
};
extern SPOTCAM SpotCam[MAX_SPOTCAMS];

55
TombEngine/Specific/level.cpp
View file

@ -122,7 +122,7 @@ static float ReadFloat()
static Vector2 ReadVector2()
{
Vector2 value;
auto value = Vector2::Zero;
value.x = ReadFloat();
value.y = ReadFloat();
return value;
@ -130,7 +130,7 @@ static Vector2 ReadVector2()
static Vector3 ReadVector3()
{
Vector3 value;
auto value = Vector3::Zero;
value.x = ReadFloat();
value.y = ReadFloat();
value.z = ReadFloat();
@ -148,7 +148,7 @@ static Vector3i ReadVector3i()
static Vector4 ReadVector4()
{
Vector4 value;
auto value = Vector4::Zero;
value.x = ReadFloat();
value.y = ReadFloat();
value.z = ReadFloat();
@ -158,7 +158,7 @@ static Vector4 ReadVector4()
static bool ReadBool()
{
return bool(ReadUInt8());
return (bool)ReadUInt8();
}
static void ReadBytes(void* dest, int count)
@ -177,15 +177,17 @@ static long long ReadLEB128(bool sign)
{
currentByte = ReadUInt8();
result |= (long long)(currentByte & 0x7F) << currentShift;
result |= long long(currentByte & 0x7F) << currentShift;
currentShift += 7;
} while ((currentByte & 0x80) != 0);
}
while ((currentByte & 0x80) != 0);
if (sign) // Sign extend
// Sign extend.
if (sign)
{
int shift = 64 - currentShift;
if (shift > 0)
result = (long long)(result << shift) >> shift;
result = long long(result << shift) >> shift;
}
return result;
@ -193,14 +195,16 @@ static long long ReadLEB128(bool sign)
static std::string ReadString()
{
auto numBytes = ReadLEB128(false);
if (numBytes <= 0)
return std::string();
long long bytes = ReadLEB128(false);
if (bytes <= 0)
{
return {};
}
else
{
auto newPtr = LevelDataPtr + numBytes;
auto newPtr = LevelDataPtr + bytes;
auto result = std::string(LevelDataPtr, newPtr);
LevelDataPtr = newPtr;
return result;
}
@ -487,11 +491,11 @@ void LoadObjects()
void LoadCameras()
{
int numCameras = ReadInt32();
TENLog("Num cameras: " + std::to_string(numCameras), LogLevel::Info);
int cameraCount = ReadInt32();
TENLog("Cameras: " + std::to_string(cameraCount), LogLevel::Info);
g_Level.Cameras.reserve(numCameras);
for (int i = 0; i < numCameras; i++)
g_Level.Cameras.reserve(cameraCount);
for (int i = 0; i < cameraCount; i++)
{
auto& camera = g_Level.Cameras.emplace_back();
camera.Index = i;
@ -506,12 +510,15 @@ void LoadCameras()
g_GameScriptEntities->AddName(camera.Name, camera);
}
int spotCameraCount = ReadInt32();
TENLog("Spot cameras: " + std::to_string(cameraCount), LogLevel::Info);
ReadBytes(SpotCam, NumberSpotcams * sizeof(SPOTCAM));
// Load spot cameras.
NumberSpotcams = ReadInt32();
for (int i = 0; i < NumberSpotcams; i++)
NumberSpotcams = spotCameraCount;
for (int i = 0; i < spotCameraCount; i++)
{
auto& spotCamera = SpotCam[i];
spotCamera.Position = ReadVector3i();
spotCamera.PositionTarget = ReadVector3i();
spotCamera.sequence = ReadUInt8();
@ -527,11 +534,11 @@ void LoadCameras()
ReadInt16();
}
int numSinks = ReadInt32();
TENLog("Num sinks: " + std::to_string(numSinks), LogLevel::Info);
int skinkCount = ReadInt32();
TENLog("Sinks: " + std::to_string(skinkCount), LogLevel::Info);
g_Level.Sinks.reserve(numSinks);
for (int i = 0; i < numSinks; i++)
g_Level.Sinks.reserve(skinkCount);
for (int i = 0; i < skinkCount; i++)
{
auto& sink = g_Level.Sinks.emplace_back();
sink.Position.x = ReadInt32();