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

Rename some files and folders.

Browse source
This commit is contained in:
hispidence 2022-02-05 15:56:04 +00:00
parent 54b519776c
commit 00b6e76bea
16 changed files with 58 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Scripting/Scripting.vcxproj
View file

@ -41,7 +41,6 @@
<ClInclude Include="include\ReservedScriptNames.h" />
<ClInclude Include="include\ScriptAssert.h" />
<ClInclude Include="include\Scripting\AudioTracks.h" />
<ClInclude Include="include\Scripting\Entities\ScriptInterfaceEntities.h" />
<ClInclude Include="include\Scripting\GameFlowScript.h" />
<ClInclude Include="include\Scripting\GameLogicScript.h" />
<ClInclude Include="include\Scripting\GameScriptAIObject.h" />
@ -66,6 +65,7 @@
<ClInclude Include="include\Scripting\ItemEnumPair.h" />
<ClInclude Include="include\Scripting\LuaHandler.h" />
<ClInclude Include="include\Scripting\ObjectIDs.h" />
<ClInclude Include="include\Scripting\Objects\ScriptInterfaceObjectsHandler.h" />
<ClInclude Include="include\Scripting\ReservedScriptNames.h" />
<ClInclude Include="include\Scripting\ScriptAssert.h" />
<ClInclude Include="include\Scripting\ScriptInterfaceFlow.h" />
@ -78,10 +78,6 @@
<ClInclude Include="include\ScriptInterfaceLevel.h" />
<ClInclude Include="include\ScriptUtil.h" />
<ClInclude Include="src\AudioTracks.h" />
<ClInclude Include="src\Entities\Entities.h" />
<ClInclude Include="src\Entities\Moveable\GameScriptItemInfo.h" />
<ClInclude Include="src\Entities\ObjectIDs.h" />
<ClInclude Include="src\Entities\Static\GameScriptMeshInfo.h" />
<ClInclude Include="src\GameFlowScript.h" />
<ClInclude Include="src\GameLogicScript.h" />
<ClInclude Include="src\GameScriptAIObject.h" />
@ -103,6 +99,10 @@
<ClInclude Include="src\InventorySlots.h" />
<ClInclude Include="src\ItemEnumPair.h" />
<ClInclude Include="src\LuaHandler.h" />
<ClInclude Include="src\Objects\Moveable\GameScriptItemInfo.h" />
<ClInclude Include="src\Objects\ObjectIDs.h" />
<ClInclude Include="src\Objects\ObjectsHandler.h" />
<ClInclude Include="src\Objects\Static\GameScriptMeshInfo.h" />
<ClInclude Include="src\ReservedScriptNames.h" />
<ClInclude Include="src\ScriptAssert.h" />
<ClInclude Include="src\ScriptInterfaceState.h" />
@ -116,10 +116,10 @@
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\Entities\Entities.cpp" />
<ClCompile Include="src\Entities\Moveable\GameScriptItemInfo.cpp" />
<ClCompile Include="src\Entities\Static\GameScriptMeshInfo.cpp" />
<ClCompile Include="src\GameFlowScript.cpp" />
<ClCompile Include="src\Objects\Moveable\GameScriptItemInfo.cpp" />
<ClCompile Include="src\Objects\ObjectsHandler.cpp" />
<ClCompile Include="src\Objects\Static\GameScriptMeshInfo.cpp" />
<ClCompile Include="src\ScriptInterfaceState.cpp" />
<ClCompile Include="src\GameLogicScript.cpp" />
<ClCompile Include="src\GameScriptAIObject.cpp" />

48
Scripting/Scripting.vcxproj.filters
View file

@ -261,9 +261,6 @@
<ClInclude Include="src\ScriptUtil.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Entities\Entities.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Scripting\Entities\ScriptInterfaceEntities.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -273,9 +270,6 @@
<ClInclude Include="src\Entities\Moveable\GameScriptItemInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Entities\ObjectIDs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Strings\DisplayString\GameScriptDisplayString.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -285,6 +279,27 @@
<ClInclude Include="include\Scripting\Strings\ScriptInterfaceStringsHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Scripting\Objects\ScriptInterfaceEntities.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Objects\Moveable\GameScriptItemInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Objects\Static\GameScriptMeshInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Objects\Entities.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Objects\ObjectIDs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Objects\ObjectsHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Scripting\Objects\ScriptInterfaceObjectsHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="frameworkandsol.cpp">
@ -350,21 +365,24 @@
<ClCompile Include="src\ScriptInterfaceState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Entities\Entities.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Entities\Static\GameScriptMeshInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Entities\Moveable\GameScriptItemInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Strings\DisplayString\GameScriptDisplayString.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Strings\StringsHandler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Objects\Moveable\GameScriptItemInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Objects\Static\GameScriptMeshInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Objects\Entities.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Objects\ObjectsHandler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />

6
Scripting/include/Scripting/Entities/ScriptInterfaceEntities.h → Scripting/include/Scripting/Objects/ScriptInterfaceObjectsHandler.h
View file

@ -13,13 +13,13 @@ using VarMapVal = std::variant< short,
using CallbackDrawString = std::function<void(std::string const&, D3DCOLOR, int, int, int)>;
class ScriptInterfaceEntities {
class ScriptInterfaceObjectsHandler {
public:
virtual ~ScriptInterfaceEntities() = default;
virtual ~ScriptInterfaceObjectsHandler() = default;
virtual bool AddName(std::string const& key, VarMapVal val) = 0;
virtual void FreeEntities() = 0;
virtual void AssignLara() = 0;
};
extern ScriptInterfaceEntities* g_GameScriptEntities;
extern ScriptInterfaceObjectsHandler* g_GameScriptEntities;

4
Scripting/include/Scripting/ScriptInterfaceState.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "ScriptInterfaceGame.h"
#include "ScriptInterfaceFlow.h"
#include "Entities/ScriptInterfaceEntities.h"
#include "Objects/ScriptInterfaceObjectsHandler.h"
#include "Strings/ScriptInterfaceStringsHandler.h"
class ScriptInterfaceState
@ -9,7 +9,7 @@ class ScriptInterfaceState
public:
static ScriptInterfaceGame* CreateGame();
static ScriptInterfaceFlow* CreateFlow();
static ScriptInterfaceEntities* CreateEntities();
static ScriptInterfaceObjectsHandler* CreateEntities();
static ScriptInterfaceStringsHandler* CreateStringsHandler();
static void ScriptInterfaceState::Init();
};

3
Scripting/src/GameFlowScript.cpp
View file

@ -5,6 +5,7 @@
#include "GameScriptInventoryObject.h"
#include "InventorySlots.h"
#include "Game/gui.h"
#include "Objects/ScriptInterfaceObjectsHandler.h"
/***
Scripts that will be run on game startup.
@ -18,7 +19,7 @@ using std::unordered_map;
ScriptInterfaceFlow* g_GameFlow;
ScriptInterfaceGame* g_GameScript;
ScriptInterfaceEntities* g_GameScriptEntities;
ScriptInterfaceObjectsHandler* g_GameScriptEntities;
ScriptInterfaceStringsHandler* g_GameStringsHandler;
GameFlow::GameFlow(sol::state* lua) : LuaHandler{ lua }

1
Scripting/src/GameFlowScript.h
View file

@ -9,7 +9,6 @@
#include "GameScriptAnimations.h"
#include "ScriptInterfaceGame.h"
#include "ScriptInterfaceFlow.h"
#include "Entities/Entities.h"
class GameFlow : public LuaHandler, public ScriptInterfaceFlow
{

0
Scripting/src/Entities/Moveable/GameScriptItemInfo.cpp → Scripting/src/Objects/Moveable/GameScriptItemInfo.cpp
View file

0
Scripting/src/Entities/Moveable/GameScriptItemInfo.h → Scripting/src/Objects/Moveable/GameScriptItemInfo.h
View file

0
Scripting/src/Entities/ObjectIDs.h → Scripting/src/Objects/ObjectIDs.h
View file

2
Scripting/src/Entities/Entities.cpp → Scripting/src/Objects/ObjectsHandler.cpp
View file

@ -1,7 +1,7 @@
#include "frameworkandsol.h"
#include "ReservedScriptNames.h"
#include "Lara/lara.h"
#include "Entities.h"
#include "ObjectsHandler.h"
#include "ReservedScriptNames.h"
#include "ObjectIDs.h"

8
Scripting/src/Entities/Entities.h → Scripting/src/Objects/ObjectsHandler.h
View file

@ -1,15 +1,15 @@
#pragma once
#include <unordered_map>
#include "LuaHandler.h"
#include "Scripting/Entities/ScriptInterfaceEntities.h"
#include "Entities/Moveable/GameScriptItemInfo.h"
#include "Entities/Static/GameScriptMeshInfo.h"
#include "Scripting/Objects/ScriptInterfaceObjectsHandler.h"
#include "Objects/Moveable/GameScriptItemInfo.h"
#include "Objects/Static/GameScriptMeshInfo.h"
#include "GameScriptSinkInfo.h"
#include "GameScriptAIObject.h"
#include "GameScriptSoundSourceInfo.h"
#include "GameScriptCameraInfo.h"
class GameEntities : public ScriptInterfaceEntities, public LuaHandler
class GameEntities : public ScriptInterfaceObjectsHandler, public LuaHandler
{
public:

0
Scripting/src/Entities/Static/GameScriptMeshInfo.cpp → Scripting/src/Objects/Static/GameScriptMeshInfo.cpp
View file

0
Scripting/src/Entities/Static/GameScriptMeshInfo.h → Scripting/src/Objects/Static/GameScriptMeshInfo.h
View file

4
Scripting/src/ScriptInterfaceState.cpp
View file

@ -2,7 +2,7 @@
#include "ScriptInterfaceState.h"
#include "GameLogicScript.h"
#include "GameFlowScript.h"
#include "Entities/Entities.h"
#include "Objects/ObjectsHandler.h"
#include "Strings/StringsHandler.h"
sol::state g_solState;
@ -22,7 +22,7 @@ ScriptInterfaceFlow* ScriptInterfaceState::CreateFlow()
return new GameFlow(&g_solState);
}
ScriptInterfaceEntities* ScriptInterfaceState::CreateEntities()
ScriptInterfaceObjectsHandler* ScriptInterfaceState::CreateEntities()
{
return new GameEntities(&g_solState);
}

2
TR5Main/Game/control/control.cpp
View file

@ -47,7 +47,7 @@
#include "Specific/winmain.h"
#include "Scripting/ScriptInterfaceFlow.h"
#include "Scripting/ScriptInterfaceGame.h"
#include "Scripting/Entities/ScriptInterfaceEntities.h"
#include "Scripting/Objects/ScriptInterfaceObjectsHandler.h"
#include "Scripting/Strings/ScriptInterfaceStringsHandler.h"
using std::vector;

2
TR5Main/Specific/level.cpp
View file

@ -20,7 +20,7 @@
#include "Scripting/ScriptInterfaceFlow.h"
#include "Scripting/ScriptInterfaceGame.h"
#include "Scripting/ScriptInterfaceLevel.h"
#include "Scripting/Entities/ScriptInterfaceEntities.h"
#include "Scripting/Objects/ScriptInterfaceObjectsHandler.h"
#include "Sound/sound.h"
#include "Specific/setup.h"