mirror of
https://github.com/TombEngine/TombEngine.git
synced 2025-05-01 09:18:00 +03:00
8ef2351a7c
* Use spiky gunflash for MP5 if available * Make order to Test/Touch/Mesh bits in ItemInfo and convert all to uint64 properly * Fix TR4 sentry gun using wrong rotations after wad conversion * Fix find and replace error * Convert ExplodingDeath to also use all 64-bit range * Fix stack overflow due to strange compiler quirks * Fix gunflashes for TR4 enemies * Reorganize sound condition checking to finally resolve all problems * Remove weird sound play condition casts * Update ten_savegame.fbs * Update ten_savegame_generated.h * Convert meshbits back to 32 bit * Update Renderer11DrawEffect.cpp * Enable multiple blend modes for particles, add poisoned particles support * Reduce max poison potency * Add debug box output for pathfinding * Properly clean and restore game and level statistics * Fix wrong condition in keyhole collision check which led to infinite inventory call * Fix keyholes again * Save particles in savegames * Update tomb4fx.h * Clean up particle code, save quadbike info in savegames * Save UPV info in savegames * Allow quadbike to ride through shallow water * Update quad.cpp * Make slowdown dependent on water depth * Fix epic bug with calculating water depth * Clean up quadbike water code * Remove incorrect debug box drawing * Tidy up current iteration of joint bit helpers * Customize drag for water and quicksand separately * Use auto* instead of auto to make code more readable * Add quadbike hack for ending up in shallow underwater caverns Co-authored-by: Sezz
110 lines
2.4 KiB
C++
110 lines
2.4 KiB
C++
#include "framework.h"
|
|
#include "Game/collision/sphere.h"
|
|
|
|
#include "Game/Lara/lara.h"
|
|
#include "Game/animation.h"
|
|
#include "Game/items.h"
|
|
#include "Specific/level.h"
|
|
#include "Specific/setup.h"
|
|
#include "Specific/trmath.h"
|
|
#include "Renderer/Renderer11.h"
|
|
|
|
using namespace TEN::Renderer;
|
|
|
|
SPHERE LaraSpheres[MAX_SPHERES];
|
|
SPHERE CreatureSpheres[MAX_SPHERES];
|
|
|
|
int GetSpheres(ItemInfo* item, SPHERE* ptr, int worldSpace, Matrix local)
|
|
{
|
|
if (!item)
|
|
return 0;
|
|
|
|
BoundingSphere spheres[MAX_SPHERES];
|
|
short itemNumber = (item - g_Level.Items.data());
|
|
|
|
int num = g_Renderer.getSpheres(itemNumber, spheres, worldSpace, local);
|
|
|
|
for (int i = 0; i < MAX_SPHERES; i++)
|
|
{
|
|
ptr[i].x = spheres[i].Center.x;
|
|
ptr[i].y = spheres[i].Center.y;
|
|
ptr[i].z = spheres[i].Center.z;
|
|
ptr[i].r = spheres[i].Radius;
|
|
}
|
|
|
|
return num;
|
|
}
|
|
|
|
int TestCollision(ItemInfo* item, ItemInfo* laraItem)
|
|
{
|
|
int flags = 0;
|
|
|
|
int creatureSphereCount = GetSpheres(item, CreatureSpheres, SPHERES_SPACE_WORLD, Matrix::Identity);
|
|
int laraSphereCount = GetSpheres(laraItem, LaraSpheres, SPHERES_SPACE_WORLD, Matrix::Identity);
|
|
|
|
laraItem->TouchBits = NO_JOINT_BITS;
|
|
|
|
if (creatureSphereCount <= 0)
|
|
{
|
|
item->TouchBits = NO_JOINT_BITS;
|
|
return 0;
|
|
}
|
|
else
|
|
{
|
|
for (int i = 0; i < creatureSphereCount; i++)
|
|
{
|
|
auto* ptr1 = &CreatureSpheres[i];
|
|
|
|
int x1 = item->Pose.Position.x + ptr1->x;
|
|
int y1 = item->Pose.Position.y + ptr1->y;
|
|
int z1 = item->Pose.Position.z + ptr1->z;
|
|
int r1 = ptr1->r;
|
|
|
|
if (r1 > 0)
|
|
{
|
|
for (int j = 0; j < laraSphereCount; j++)
|
|
{
|
|
auto* ptr2 = &LaraSpheres[j];
|
|
|
|
int x2 = item->Pose.Position.x + ptr2->x;
|
|
int y2 = item->Pose.Position.y + ptr2->y;
|
|
int z2 = item->Pose.Position.z + ptr2->z;
|
|
int r2 = ptr2->r;
|
|
|
|
if (r2 > 0)
|
|
{
|
|
int dx = x1 - x2;
|
|
int dy = y1 - y2;
|
|
int dz = z1 - z2;
|
|
int r = r1 + r2;
|
|
|
|
if ((pow(dx, 2) + pow(dy, 2) + pow(dz, 2)) < pow(r, 2))
|
|
{
|
|
item->SetBits(JointBitType::Touch, i);
|
|
laraItem->SetBits(JointBitType::Touch, j);
|
|
flags |= 1 << i;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return flags;
|
|
}
|
|
}
|
|
|
|
void GetJointAbsPosition(ItemInfo* item, Vector3Int* vec, int joint)
|
|
{
|
|
// Get the real item number
|
|
short itemNumber = item - g_Level.Items.data();
|
|
|
|
// Use matrices done in the renderer and transform the input vector
|
|
auto p = vec->ToVector3();
|
|
g_Renderer.GetItemAbsBonePosition(itemNumber, &p, joint);
|
|
|
|
// Store the result
|
|
vec->x = p.x;
|
|
vec->y = p.y;
|
|
vec->z = p.z;
|
|
}
|