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

Organise

Browse source
This commit is contained in:
Sezz 2023-01-15 15:10:55 +11:00
parent b174098c3b
commit a78c828377
2 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
TombEngine/Objects/TR5/Entity/tr5_twogun.cpp
View file

@ -32,13 +32,13 @@ using namespace TEN::Effects::Spark;
namespace TEN::Entities::Creatures::TR5
{
constexpr auto HEAVY_GUARD_RAYGUN_DAMAGE = 250;
constexpr auto HEAVY_GUARD_HEAD_MESH_RANGE = 260;
constexpr auto HEAVY_GUARD_ALERT_RANGE = SQUARE(BLOCK(2));
constexpr auto HEAVY_GUARD_IDLE_AIM_RANGE = SQUARE(BLOCK(3));
constexpr auto HEAVY_GUARD_CLOSE_RANGE = SQUARE(BLOCK(1));
constexpr auto HEAVY_GUARD_HEAD_JOINT_RANGE = BLOCK(0.25f);
constexpr auto HEAVY_GUARD_ALERT_RANGE = SQUARE(BLOCK(2));
constexpr auto HEAVY_GUARD_IDLE_AIM_RANGE = SQUARE(BLOCK(3));
constexpr auto HEAVY_GUARD_CLOSE_RANGE = SQUARE(BLOCK(1));
constexpr auto HEAVY_GUARD_IDLE_TURN_RATE_MAX = ANGLE(2.0f); // TODO: ANGLE(1.0f)?
constexpr auto HEAVY_GUARD_IDLE_TURN_RATE_MAX = ANGLE(2.0f);
constexpr auto HEAVY_GUARD_WALK_TURN_RATE_MAX = ANGLE(5.0f);
constexpr auto HEAVY_GUARD_PLAYER_ALERT_VELOCITY = 20.0f;
@ -101,7 +101,8 @@ namespace TEN::Entities::Creatures::TR5
void InitialiseHeavyGuard(short itemNumber)
{
auto& item = g_Level.Items[itemNumber];
item.ItemFlags[7] = HEAVY_GUARD_HEAD_MESH_RANGE;
item.ItemFlags[7] = HEAVY_GUARD_HEAD_JOINT_RANGE;
SetAnimation(&item, HEAVY_GUARD_ANIM_IDLE);
}
@ -442,9 +443,6 @@ namespace TEN::Entities::Creatures::TR5
void HeavyGuardHit(ItemInfo& target, ItemInfo& source, std::optional<GameVector> pos, int damage, bool isExplosive, int jointIndex)
{
const auto& player = *GetLaraInfo(&source);
const auto& object = Objects[target.ObjectNumber];
if (pos.has_value())
{
if (jointIndex == 2 )

30
TombEngine/Renderer/Renderer11DrawEffect.cpp
View file

@ -29,6 +29,7 @@
using namespace TEN::Effects::Lightning;
using namespace TEN::Effects::Environment;
using namespace TEN::Effects::Footprints;
using namespace TEN::Math;
using namespace TEN::Entities::Creatures::TR5;
@ -56,17 +57,14 @@ BiteInfo EnemyBites[12] =
{ 0, -110, 480, 13 },
{ -20, -80, 190, -10 },
{ 10, -60, 200, 13 },
{ 10, -60, 200, 11 }, // Baddy 2
{ 20, -60, 400, 7 }, // SAS
{ 0, -64, 250, 7 } // Troops
{ 10, -60, 200, 11 }, // Baddy 2
{ 20, -60, 400, 7 }, // SAS
{ 0, -64, 250, 7 } // Troops
};
namespace TEN::Renderer
{
using namespace TEN::Effects::Footprints;
using std::vector;
constexpr auto MAX_LIGHTNING_RANGE = BLOCK(24);
constexpr auto ELECTRIC_ARC_RANGE_MAX = BLOCK(24);
struct RendererSpriteBucket
{
@ -117,9 +115,9 @@ namespace TEN::Renderer
HelixSpline(&LightningPos[0], LightningBuffer, laser);
if (abs(LightningPos[0].x) <= MAX_LIGHTNING_RANGE &&
abs(LightningPos[0].y) <= MAX_LIGHTNING_RANGE &&
abs(LightningPos[0].z) <= MAX_LIGHTNING_RANGE)
if (abs(LightningPos[0].x) <= ELECTRIC_ARC_RANGE_MAX &&
abs(LightningPos[0].y) <= ELECTRIC_ARC_RANGE_MAX &&
abs(LightningPos[0].z) <= ELECTRIC_ARC_RANGE_MAX)
{
short* interpolatedPos = &LightningBuffer[0];
@ -229,9 +227,9 @@ namespace TEN::Renderer
CalcLightningSpline(&LightningPos[0], LightningBuffer, arc);
if (abs(LightningPos[0].x) <= MAX_LIGHTNING_RANGE &&
abs(LightningPos[0].y) <= MAX_LIGHTNING_RANGE &&
abs(LightningPos[0].z) <= MAX_LIGHTNING_RANGE)
if (abs(LightningPos[0].x) <= ELECTRIC_ARC_RANGE_MAX &&
abs(LightningPos[0].y) <= ELECTRIC_ARC_RANGE_MAX &&
abs(LightningPos[0].z) <= ELECTRIC_ARC_RANGE_MAX)
{
short* interpolatedPos = &LightningBuffer[0];
@ -926,7 +924,7 @@ namespace TEN::Renderer
Texture2D Renderer11::CreateDefaultNormalTexture()
{
vector<byte> data = { 128, 128, 255, 1 };
std::vector<byte> data = { 128, 128, 255, 1 };
return Texture2D(m_device.Get(), 1, 1, data.data());
}
@ -1306,8 +1304,8 @@ namespace TEN::Renderer
void Renderer11::DrawDebris(RenderView& view, bool transparent)
{
extern vector<DebrisFragment> DebrisFragments;
vector<RendererVertex> vertices;
extern std::vector<DebrisFragment> DebrisFragments;
std::vector<RendererVertex> vertices;
BLEND_MODES lastBlendMode = BLEND_MODES::BLENDMODE_UNSET;