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

Lara refactor: Move tests to lara_tests

Browse source
This commit is contained in:
Woops 2020-08-08 15:15:15 -05:00
parent 9d45cf40f5
commit b48c75b773
7 changed files with 1568 additions and 1542 deletions
Download patch file Download diff file Expand all files Collapse all files

1537
TR5Main/Game/Lara/lara.cpp
View file

File diff suppressed because it is too large Load diff

24
TR5Main/Game/Lara/lara.h
View file

@ -26,7 +26,6 @@ extern byte LaraNodeUnderwater[NUM_LARA_MESHES];
#define LaraRoutineFunction void(ITEM_INFO* item, COLL_INFO* coll) #define LaraRoutineFunction void(ITEM_INFO* item, COLL_INFO* coll)
extern std::function<LaraRoutineFunction> lara_control_routines[NUM_LARA_STATES + 1]; extern std::function<LaraRoutineFunction> lara_control_routines[NUM_LARA_STATES + 1];
extern std::function<LaraRoutineFunction> lara_collision_routines[NUM_LARA_STATES + 1]; extern std::function<LaraRoutineFunction> lara_collision_routines[NUM_LARA_STATES + 1];
///extern function<LaraRoutineFunction> lara_camera_routines[NUM_LARA_STATES + 1];
void lara_as_pbleapoff(ITEM_INFO* item, COLL_INFO* coll); void lara_as_pbleapoff(ITEM_INFO* item, COLL_INFO* coll);
void lara_as_parallelbars(ITEM_INFO* item, COLL_INFO* coll); void lara_as_parallelbars(ITEM_INFO* item, COLL_INFO* coll);
@ -171,43 +170,21 @@ void GetTighRopeFallOff(int Regularity);
void LookLeftRight(); void LookLeftRight();
void LookUpDown(); void LookUpDown();
void ResetLook(); void ResetLook();
void SetCornerAnim(ITEM_INFO* item, COLL_INFO* coll, short rot, short flip);
int CanLaraHangSideways(ITEM_INFO* item, COLL_INFO* coll, short angle);
void UpdateRopeSwing(ITEM_INFO* item); void UpdateRopeSwing(ITEM_INFO* item);
void JumpOffRope(ITEM_INFO* item); void JumpOffRope(ITEM_INFO* item);
void FallFromRope(ITEM_INFO* item); void FallFromRope(ITEM_INFO* item);
short GetDirOctant(int rot); short GetDirOctant(int rot);
short TestMonkeyRight(ITEM_INFO* item, COLL_INFO* coll);
short TestMonkeyLeft(ITEM_INFO* item, COLL_INFO* coll);
void MonkeySwingSnap(ITEM_INFO* item, COLL_INFO* coll); void MonkeySwingSnap(ITEM_INFO* item, COLL_INFO* coll);
void MonkeySwingFall(ITEM_INFO* item); void MonkeySwingFall(ITEM_INFO* item);
void LaraAboveWater(ITEM_INFO* item, COLL_INFO* coll); void LaraAboveWater(ITEM_INFO* item, COLL_INFO* coll);
int TestHangSwingIn(ITEM_INFO* item, short angle); int TestHangSwingIn(ITEM_INFO* item, short angle);
int LaraHangLeftCornerTest(ITEM_INFO* item, COLL_INFO* coll);
int LaraHangRightCornerTest(ITEM_INFO* item, COLL_INFO* coll);
int IsValidHangPos(ITEM_INFO* item, COLL_INFO* coll);
int LaraHangTest(ITEM_INFO* item, COLL_INFO* coll);
void SnapLaraToEdgeOfBlock(ITEM_INFO* item, COLL_INFO* coll, short angle); void SnapLaraToEdgeOfBlock(ITEM_INFO* item, COLL_INFO* coll, short angle);
int LaraTestHangOnClimbWall(ITEM_INFO* item, COLL_INFO* coll);
void LaraSlideEdgeJump(ITEM_INFO* item, COLL_INFO* coll); void LaraSlideEdgeJump(ITEM_INFO* item, COLL_INFO* coll);
void LaraDeflectEdgeJump(ITEM_INFO* item, COLL_INFO* coll); void LaraDeflectEdgeJump(ITEM_INFO* item, COLL_INFO* coll);
void lara_slide_slope(ITEM_INFO* item, COLL_INFO* coll); void lara_slide_slope(ITEM_INFO* item, COLL_INFO* coll);
void LaraCollideStop(ITEM_INFO* item, COLL_INFO* coll); void LaraCollideStop(ITEM_INFO* item, COLL_INFO* coll);
int TestWall(ITEM_INFO* item, int front, int right, int down);
int LaraTestClimbStance(ITEM_INFO* item, COLL_INFO* coll);
int LaraTestEdgeCatch(ITEM_INFO* item, COLL_INFO* coll, int* edge);
int LaraDeflectEdgeDuck(ITEM_INFO* item, COLL_INFO* coll);
int LaraDeflectEdge(ITEM_INFO* item, COLL_INFO* coll);
int LaraHitCeiling(ITEM_INFO* item, COLL_INFO* coll);
int LaraLandedBad(ITEM_INFO* l, COLL_INFO* coll);
int LaraFallen(ITEM_INFO* item, COLL_INFO* coll);
int TestLaraSlide(ITEM_INFO* item, COLL_INFO* coll);
short LaraCeilingFront(ITEM_INFO* item, short ang, int dist, int h);
short LaraFloorFront(ITEM_INFO* item, short ang, int dist);
int TestLaraVault(ITEM_INFO* item, COLL_INFO* coll);
int TestLaraSlide(ITEM_INFO* item, COLL_INFO* coll); int TestLaraSlide(ITEM_INFO* item, COLL_INFO* coll);
void LaraClimbRope(ITEM_INFO* item, COLL_INFO* coll); void LaraClimbRope(ITEM_INFO* item, COLL_INFO* coll);
int TestHangFeet(ITEM_INFO* item, short angle);
void lara_as_hang_feet(ITEM_INFO* item, COLL_INFO* coll); void lara_as_hang_feet(ITEM_INFO* item, COLL_INFO* coll);
void lara_col_hang_feet(ITEM_INFO* item, COLL_INFO* coll); void lara_col_hang_feet(ITEM_INFO* item, COLL_INFO* coll);
void lara_as_hang_feet_shimmyr(ITEM_INFO* item, COLL_INFO* coll); void lara_as_hang_feet_shimmyr(ITEM_INFO* item, COLL_INFO* coll);
@ -218,4 +195,3 @@ void lara_as_hang_feet_inRcorner(ITEM_INFO* item, COLL_INFO* coll);
void lara_as_hang_feet_inLcorner(ITEM_INFO* item, COLL_INFO* coll); void lara_as_hang_feet_inLcorner(ITEM_INFO* item, COLL_INFO* coll);
void lara_as_hang_feet_outRcorner(ITEM_INFO* item, COLL_INFO* coll); void lara_as_hang_feet_outRcorner(ITEM_INFO* item, COLL_INFO* coll);
void lara_as_hang_feet_outLcorner(ITEM_INFO* item, COLL_INFO* coll); void lara_as_hang_feet_outLcorner(ITEM_INFO* item, COLL_INFO* coll);
void SetCornerAnimFeet(ITEM_INFO* item, COLL_INFO* coll, short rot, short flip);

1508
TR5Main/Game/Lara/lara_tests.cpp Normal file
View file

File diff suppressed because it is too large Load diff

28
TR5Main/Game/Lara/lara_tests.h Normal file
View file

@ -0,0 +1,28 @@
#pragma once
#include "lara_struct.h"
int TestLaraVault(ITEM_INFO* item, COLL_INFO* coll);
int TestLaraSlide(ITEM_INFO* item, COLL_INFO* coll);
int TestWall(ITEM_INFO* item, int front, int right, int down);
int LaraHangTest(ITEM_INFO* item, COLL_INFO* coll);
int LaraHangLeftCornerTest(ITEM_INFO* item, COLL_INFO* coll);
int LaraHangRightCornerTest(ITEM_INFO* item, COLL_INFO* coll);
int LaraTestClimbStance(ITEM_INFO* item, COLL_INFO* coll);
int LaraTestHangOnClimbWall(ITEM_INFO* item, COLL_INFO* coll);
int LaraTestEdgeCatch(ITEM_INFO* item, COLL_INFO* coll, int* edge);
int IsValidHangPos(ITEM_INFO* item, COLL_INFO* coll);
int TestHangSwingIn(ITEM_INFO* item, short angle);
int TestHangFeet(ITEM_INFO* item, short angle);
int CanLaraHangSideways(ITEM_INFO* item, COLL_INFO* coll, short angle);
void SetCornerAnim(ITEM_INFO* item, COLL_INFO* coll, short rot, short flip);
void SetCornerAnimFeet(ITEM_INFO* item, COLL_INFO* coll, short rot, short flip);
short TestMonkeyRight(ITEM_INFO* item, COLL_INFO* coll);
short TestMonkeyLeft(ITEM_INFO* item, COLL_INFO* coll);
short LaraFloorFront(ITEM_INFO* item, short ang, int dist);
short LaraCeilingFront(ITEM_INFO* item, short ang, int dist, int h);
int LaraFallen(ITEM_INFO* item, COLL_INFO* coll);
int LaraLandedBad(ITEM_INFO* l, COLL_INFO* coll);
int LaraHitCeiling(ITEM_INFO* item, COLL_INFO* coll);
int LaraDeflectEdge(ITEM_INFO* item, COLL_INFO* coll);
void LaraDeflectEdgeJump(ITEM_INFO* item, COLL_INFO* coll);
int LaraDeflectEdgeDuck(ITEM_INFO* item, COLL_INFO* coll);

1
TR5Main/Game/Lara/larasurf.cpp
View file

@ -1,5 +1,6 @@
#include "framework.h" #include "framework.h"
#include "larasurf.h" #include "larasurf.h"
#include "lara_tests.h"
#include "control.h" #include "control.h"
#include "camera.h" #include "camera.h"
#include "collide.h" #include "collide.h"

6
TR5Main/TR5Main.vcxproj
View file

@ -15,14 +15,14 @@
<ProjectGuid>{15AB0220-541C-4DA1-94EB-ED3C47E4582E}</ProjectGuid> <ProjectGuid>{15AB0220-541C-4DA1-94EB-ED3C47E4582E}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>TR5Main</RootNamespace> <RootNamespace>TR5Main</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
@ -136,6 +136,7 @@ xcopy /Y "$(ProjectDir)Scripting\Scripts\*.lua" "$(TargetDir)\Scripts"</Command>
<ClInclude Include="Game\footprint.h" /> <ClInclude Include="Game\footprint.h" />
<ClInclude Include="Game\groundfx.h" /> <ClInclude Include="Game\groundfx.h" />
<ClInclude Include="Game\Lara\lara_struct.h" /> <ClInclude Include="Game\Lara\lara_struct.h" />
<ClInclude Include="Game\Lara\lara_tests.h" />
<ClInclude Include="Game\memory\linearPool.h" /> <ClInclude Include="Game\memory\linearPool.h" />
<ClInclude Include="Game\memory\MemoryPoolAllocator.h" /> <ClInclude Include="Game\memory\MemoryPoolAllocator.h" />
<ClInclude Include="Game\memory\pool.h" /> <ClInclude Include="Game\memory\pool.h" />
@ -415,6 +416,7 @@ xcopy /Y "$(ProjectDir)Scripting\Scripts\*.lua" "$(TargetDir)\Scripts"</Command>
<ClCompile Include="Game\drip.cpp" /> <ClCompile Include="Game\drip.cpp" />
<ClCompile Include="Game\explosion.cpp" /> <ClCompile Include="Game\explosion.cpp" />
<ClCompile Include="Game\footprint.cpp" /> <ClCompile Include="Game\footprint.cpp" />
<ClCompile Include="Game\Lara\lara_tests.cpp" />
<ClCompile Include="Game\misc.cpp" /> <ClCompile Include="Game\misc.cpp" />
<ClCompile Include="Game\trmath.cpp" /> <ClCompile Include="Game\trmath.cpp" />
<ClCompile Include="Game\smoke.cpp" /> <ClCompile Include="Game\smoke.cpp" />

6
TR5Main/TR5Main.vcxproj.filters
View file

@ -849,6 +849,9 @@
<ClInclude Include="Game\Lara\laraswim.h"> <ClInclude Include="Game\Lara\laraswim.h">
<Filter>File di intestazione</Filter> <Filter>File di intestazione</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Game\Lara\lara_tests.h">
<Filter>File di intestazione</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Game\box.cpp"> <ClCompile Include="Game\box.cpp">
@ -1547,6 +1550,9 @@
<ClCompile Include="Game\Lara\laraswim.cpp"> <ClCompile Include="Game\Lara\laraswim.cpp">
<Filter>File di origine</Filter> <Filter>File di origine</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Game\Lara\lara_tests.cpp">
<Filter>File di origine</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />