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

Add a macro to stop complaints about [[likely]].

Browse source
This commit is contained in:
hispidence 2022-05-12 21:42:31 +01:00
parent 6587f3e3ac
commit 952b3981c0
6 changed files with 51 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

54
TombEngine/Game/Lara/lara_basic.cpp
View file

@ -170,7 +170,7 @@ void lara_as_walk_forward(ItemInfo* item, CollisionInfo* coll)
}
else if (lara->Control.WaterStatus == WaterStatus::Wade)
item->Animation.TargetState = LS_WADE_FORWARD;
else if (TrInput & IN_WALK) [[likely]]
else if (TrInput & IN_WALK) USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_WALK_FORWARD;
else
item->Animation.TargetState = LS_RUN_FORWARD;
@ -314,7 +314,7 @@ void lara_as_run_forward(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_WALK_FORWARD;
else if (TrInput & IN_SPRINT && lara->SprintEnergy)
item->Animation.TargetState = LS_SPRINT;
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_RUN_FORWARD;
return;
@ -439,7 +439,7 @@ void lara_as_idle(ItemInfo* item, CollisionInfo* coll)
{
if (isSwamp)
PseudoLaraAsSwampIdle(item, coll);
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
PseudoLaraAsWadeIdle(item, coll);
return;
@ -489,7 +489,7 @@ void lara_as_idle(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_SPRINT;
return;
}
else if (TestLaraRunForward(item, coll)) [[likely]]
else if (TestLaraRunForward(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_RUN_FORWARD;
return;
@ -505,7 +505,7 @@ void lara_as_idle(ItemInfo* item, CollisionInfo* coll)
return;
}
}
else if (TestLaraRunBack(item, coll)) [[likely]]
else if (TestLaraRunBack(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_RUN_BACK;
return;
@ -538,7 +538,7 @@ void lara_as_idle(ItemInfo* item, CollisionInfo* coll)
{
item->Animation.TargetState = LS_TURN_LEFT_FAST;
}
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_TURN_LEFT_SLOW;
return;
@ -550,7 +550,7 @@ void lara_as_idle(ItemInfo* item, CollisionInfo* coll)
{
item->Animation.TargetState = LS_TURN_RIGHT_FAST;
}
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_TURN_RIGHT_SLOW;
return;
@ -594,7 +594,7 @@ void PseudoLaraAsWadeIdle(ItemInfo* item, CollisionInfo* coll)
SetLaraVault(item, coll, vaultResult);
return;
}
else if (TestLaraRunForward(item, coll)) [[likely]]
else if (TestLaraRunForward(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_WADE_FORWARD;
return;
@ -887,7 +887,7 @@ void lara_as_turn_right_slow(ItemInfo* item, CollisionInfo* coll)
{
if (isSwamp)
PsuedoLaraAsSwampTurnRightSlow(item, coll);
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
PsuedoLaraAsWadeTurnRightSlow(item, coll);
return;
@ -938,7 +938,7 @@ void lara_as_turn_right_slow(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_SPRINT;
return;
}
else if (TestLaraRunForward(item, coll)) [[likely]]
else if (TestLaraRunForward(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_RUN_FORWARD;
return;
@ -954,7 +954,7 @@ void lara_as_turn_right_slow(ItemInfo* item, CollisionInfo* coll)
return;
}
}
else if (TestLaraRunBack(item, coll)) [[likely]]
else if (TestLaraRunBack(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_RUN_BACK;
return;
@ -992,7 +992,7 @@ void lara_as_turn_right_slow(ItemInfo* item, CollisionInfo* coll)
}
else */if (lara->Control.TurnRate > LARA_SLOW_MED_TURN_MAX)
item->Animation.TargetState = LS_TURN_RIGHT_FAST;
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_TURN_RIGHT_SLOW;
return;
@ -1026,7 +1026,7 @@ void PsuedoLaraAsWadeTurnRightSlow(ItemInfo* item, CollisionInfo* coll)
SetLaraVault(item, coll, vaultResult);
return;
}
else if (TestLaraRunForward(item, coll)) [[likely]]
else if (TestLaraRunForward(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_WADE_FORWARD;
return;
@ -1084,7 +1084,7 @@ void PsuedoLaraAsSwampTurnRightSlow(ItemInfo* item, CollisionInfo* coll)
SetLaraVault(item, coll, vaultResult);
return;
}
else if (TestLaraWadeForwardSwamp(item, coll)) [[likely]]
else if (TestLaraWadeForwardSwamp(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_WADE_FORWARD;
return;
@ -1157,7 +1157,7 @@ void lara_as_turn_left_slow(ItemInfo* item, CollisionInfo* coll)
{
if (isSwamp)
PsuedoLaraAsSwampTurnLeftSlow(item, coll);
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
PsuedoLaraAsWadeTurnLeftSlow(item, coll);
return;
@ -1208,7 +1208,7 @@ void lara_as_turn_left_slow(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_SPRINT;
return;
}
else if (TestLaraRunForward(item, coll)) [[likely]]
else if (TestLaraRunForward(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_RUN_FORWARD;
return;
@ -1224,7 +1224,7 @@ void lara_as_turn_left_slow(ItemInfo* item, CollisionInfo* coll)
return;
}
}
else if (TestLaraRunBack(item, coll)) [[likely]]
else if (TestLaraRunBack(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_RUN_BACK;
return;
@ -1262,7 +1262,7 @@ void lara_as_turn_left_slow(ItemInfo* item, CollisionInfo* coll)
}
else */if (lara->Control.TurnRate < -LARA_SLOW_MED_TURN_MAX)
item->Animation.TargetState = LS_TURN_LEFT_FAST;
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_TURN_LEFT_SLOW;
return;
@ -1296,7 +1296,7 @@ void PsuedoLaraAsWadeTurnLeftSlow(ItemInfo* item, CollisionInfo* coll)
SetLaraVault(item, coll, vaultResult);
return;
}
else if (TestLaraRunForward(item, coll)) [[likely]]
else if (TestLaraRunForward(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_WADE_FORWARD;
return;
@ -1354,7 +1354,7 @@ void PsuedoLaraAsSwampTurnLeftSlow(ItemInfo* item, CollisionInfo* coll)
SetLaraVault(item, coll, vaultResult);
return;
}
else if (TestLaraWadeForwardSwamp(item, coll)) [[likely]]
else if (TestLaraWadeForwardSwamp(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_WADE_FORWARD;
return;
@ -1688,7 +1688,7 @@ void lara_as_turn_right_fast(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_SPRINT;
return;
}
else if (TestLaraRunForward(item, coll)) [[likely]]
else if (TestLaraRunForward(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_RUN_FORWARD;
return;
@ -1704,7 +1704,7 @@ void lara_as_turn_right_fast(ItemInfo* item, CollisionInfo* coll)
return;
}
}
else if (TestLaraRunBack(item, coll)) [[likely]]
else if (TestLaraRunBack(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_RUN_BACK;
return;
@ -1819,7 +1819,7 @@ void lara_as_turn_left_fast(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_SPRINT;
return;
}
else if (TestLaraRunForward(item, coll)) [[likely]]
else if (TestLaraRunForward(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_RUN_FORWARD;
return;
@ -1835,7 +1835,7 @@ void lara_as_turn_left_fast(ItemInfo* item, CollisionInfo* coll)
return;
}
}
else if (TestLaraRunBack(item, coll)) [[likely]]
else if (TestLaraRunBack(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_RUN_BACK;
return;
@ -2257,7 +2257,7 @@ void lara_as_wade_forward(ItemInfo* item, CollisionInfo* coll)
}
else if (lara->Control.WaterStatus == WaterStatus::Dry)
item->Animation.TargetState = LS_RUN_FORWARD;
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_WADE_FORWARD;
return;
@ -2298,7 +2298,7 @@ void PseudoLaraAsSwampWadeForward(ItemInfo* item, CollisionInfo* coll)
SetLaraVault(item, coll, vaultResult);
return;
}
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_WADE_FORWARD;
return;
@ -2428,7 +2428,7 @@ void lara_as_sprint(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_RUN_FORWARD; // TODO: Dispatch to wade forward state directly. @Sezz 2021.09.29
else if (TrInput & IN_WALK)
item->Animation.TargetState = LS_RUN_FORWARD;
else if (TrInput & IN_SPRINT && lara->SprintEnergy > 0) [[likely]]
else if (TrInput & IN_SPRINT && lara->SprintEnergy > 0) USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_SPRINT;
else
item->Animation.TargetState = LS_RUN_FORWARD;

4
TombEngine/Game/Lara/lara_crawl.cpp
View file

@ -395,7 +395,7 @@ void lara_as_crawl_idle(ItemInfo* item, CollisionInfo* coll)
ResetLaraFlex(item);
return;
}
else if (TestLaraCrawlForward(item, coll)) [[likely]]
else if (TestLaraCrawlForward(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_CRAWL_FORWARD;
return;
@ -409,7 +409,7 @@ void lara_as_crawl_idle(ItemInfo* item, CollisionInfo* coll)
DoLaraCrawlToHangSnap(item, coll);
return;
}
else if (TestLaraCrawlBack(item, coll)) [[likely]]
else if (TestLaraCrawlBack(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
{
item->Animation.TargetState = LS_CRAWL_BACK;
return;

4
TombEngine/Game/Lara/lara_helpers.cpp
View file

@ -332,7 +332,7 @@ void DoLaraFallDamage(ItemInfo* item)
{
if (item->Animation.VerticalVelocity >= LARA_DEATH_VELOCITY)
item->HitPoints = 0;
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
{
int base = item->Animation.VerticalVelocity - (LARA_DAMAGE_VELOCITY - 1);
item->HitPoints -= LARA_HEALTH_MAX * (pow(base, 2) / 196);
@ -543,7 +543,7 @@ void SetLaraJumpDirection(ItemInfo* item, CollisionInfo* coll)
{
lara->Control.JumpDirection = JumpDirection::Right;
}
else if (TestLaraJumpUp(item, coll)) [[likely]]
else if (TestLaraJumpUp(item, coll)) USE_FEATURE_IF_CPP20([[likely]])
lara->Control.JumpDirection = JumpDirection::Up;
else
lara->Control.JumpDirection = JumpDirection::None;

20
TombEngine/Game/Lara/lara_jump.cpp
View file

@ -68,7 +68,7 @@ void lara_as_jump_forward(ItemInfo* item, CollisionInfo* coll)
{
DoLaraFallDamage(item);
if (item->HitPoints <= 0) [[unlikely]]
if (item->HitPoints <= 0) USE_FEATURE_IF_CPP20([[unlikely]])
item->Animation.TargetState = LS_DEATH;
else if (TestLaraSlide(item, coll))
SetLaraSlideAnimation(item, coll);
@ -152,7 +152,7 @@ void lara_as_freefall(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_DEATH;
else if (TestLaraSlide(item, coll))
SetLaraSlideAnimation(item, coll);
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_IDLE;
SetLaraLand(item, coll);
@ -219,7 +219,7 @@ void lara_as_reach(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_DEATH;
else if (TestLaraSlide(item, coll))
SetLaraSlideAnimation(item, coll);
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_IDLE;
SetLaraLand(item, coll);
@ -455,7 +455,7 @@ void lara_as_jump_back(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_DEATH;
else if (TestLaraSlide(item, coll))
SetLaraSlideAnimation(item, coll);
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_IDLE;
SetLaraLand(item, coll);
@ -511,7 +511,7 @@ void lara_as_jump_right(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_DEATH;
else if (TestLaraSlide(item, coll))
SetLaraSlideAnimation(item, coll);
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_IDLE;
SetLaraLand(item, coll);
@ -568,7 +568,7 @@ void lara_as_jump_left(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_DEATH;
else if (TestLaraSlide(item, coll))
SetLaraSlideAnimation(item, coll);
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_IDLE;
SetLaraLand(item, coll);
@ -623,7 +623,7 @@ void lara_as_jump_up(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_DEATH;
else if (TestLaraSlide(item, coll))
SetLaraSlideAnimation(item, coll);
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_IDLE;
SetLaraLand(item, coll);
@ -728,7 +728,7 @@ void lara_as_fall_back(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_DEATH;
else if (TestLaraSlide(item, coll))
SetLaraSlideAnimation(item, coll);
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_IDLE;
SetLaraLand(item, coll);
@ -817,7 +817,7 @@ void lara_as_swan_dive(ItemInfo* item, CollisionInfo* coll)
item->Animation.TargetState = LS_CROUCH_IDLE;
MoveItem(item, coll->Setup.ForwardAngle, CLICK(0.5f)); // HACK: Move forward to avoid standing up or falling out on an edge.
}
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_IDLE;
SetLaraLand(item, coll);
@ -889,7 +889,7 @@ void lara_as_freefall_dive(ItemInfo* item, CollisionInfo* coll)
}
else if (TestLaraSlide(item, coll))
SetLaraSlideAnimation(item, coll);
else [[likely]]
else USE_FEATURE_IF_CPP20([[likely]])
item->Animation.TargetState = LS_IDLE;
SetLaraLand(item, coll);

4
TombEngine/TombEngine.vcxproj
View file

@ -74,6 +74,7 @@
<PrecompiledHeaderFile>framework.h</PrecompiledHeaderFile>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<BufferSecurityCheck>false</BufferSecurityCheck>
<AdditionalOptions>/Zc:__cplusplus /experimental:external /external:W0 /external:anglebrackets</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -122,7 +123,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<FloatingPointModel>Fast</FloatingPointModel>
<StringPooling>true</StringPooling>
<AdditionalOptions>/experimental:external /external:W0 /external:anglebrackets</AdditionalOptions>
<AdditionalOptions>/Zc:__cplusplus /experimental:external /external:W0 /external:anglebrackets</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -565,6 +566,7 @@ CALL gen.bat</Command>
<ClInclude Include="Specific\IO\Streams.h" />
<ClInclude Include="Specific\level.h" />
<ClInclude Include="Specific\newtypes.h" />
<ClInclude Include="Specific\RGBAColor8Byte.h" />
<ClInclude Include="Specific\savegame\flatbuffers\ten_itemdata_generated.h" />
<ClInclude Include="Specific\savegame\flatbuffers\ten_savegame_generated.h" />
<ClInclude Include="Specific\setup.h" />

7
TombEngine/framework.h
View file

@ -18,6 +18,13 @@
#define TEN_OPTIONAL_LUA 1
#if __cplusplus >= 202002L
#define USE_FEATURE_IF_CPP20(x) x
#else
#define USE_FEATURE_IF_CPP20(x)
#endif
using namespace DirectX;
using namespace DirectX::SimpleMath;