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

Cleanup. Add file references, clean up some todos, register GameScriptSkyLayer::GetColor, remove an unused function, change some includes that for some reason didn't stop it from compiling beforehand.

Browse source
This commit is contained in:
hispidence 2022-01-30 00:15:20 +00:00
parent 7c380d12a2
commit dc11d354b2
14 changed files with 135 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Scripting/Scripting.vcxproj
View file

@ -76,6 +76,36 @@
<ClInclude Include="include\ScriptInterfaceGame.h" />
<ClInclude Include="include\ScriptInterfaceLevel.h" />
<ClInclude Include="include\ScriptUtil.h" />
<ClInclude Include="src\AudioTracks.h" />
<ClInclude Include="src\GameFlowScript.h" />
<ClInclude Include="src\GameLogicScript.h" />
<ClInclude Include="src\GameScriptAIObject.h" />
<ClInclude Include="src\GameScriptAnimations.h" />
<ClInclude Include="src\GameScriptAudioTrack.h" />
<ClInclude Include="src\GameScriptCameraInfo.h" />
<ClInclude Include="src\GameScriptColor.h" />
<ClInclude Include="src\GameScriptDisplayString.h" />
<ClInclude Include="src\GameScriptFreeFunctions.h" />
<ClInclude Include="src\GameScriptInventoryObject.h" />
<ClInclude Include="src\GameScriptItemInfo.h" />
<ClInclude Include="src\GameScriptLevel.h" />
<ClInclude Include="src\GameScriptMeshInfo.h" />
<ClInclude Include="src\GameScriptMirror.h" />
<ClInclude Include="src\GameScriptNamedBase.h" />
<ClInclude Include="src\GameScriptPosition.h" />
<ClInclude Include="src\GameScriptRotation.h" />
<ClInclude Include="src\GameScriptSettings.h" />
<ClInclude Include="src\GameScriptSinkInfo.h" />
<ClInclude Include="src\GameScriptSkyLayer.h" />
<ClInclude Include="src\GameScriptSoundSourceInfo.h" />
<ClInclude Include="src\InventorySlots.h" />
<ClInclude Include="src\ItemEnumPair.h" />
<ClInclude Include="src\LuaHandler.h" />
<ClInclude Include="src\ObjectIDs.h" />
<ClInclude Include="src\ReservedScriptNames.h" />
<ClInclude Include="src\ScriptAssert.h" />
<ClInclude Include="src\ScriptInterfaceState.h" />
<ClInclude Include="src\ScriptUtil.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="frameworkandsol.cpp">

90
Scripting/Scripting.vcxproj.filters
View file

@ -186,6 +186,96 @@
<ClInclude Include="include\Scripting\ScriptInterfaceState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\AudioTracks.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameFlowScript.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameLogicScript.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptAIObject.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptAnimations.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptAudioTrack.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptCameraInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptColor.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptDisplayString.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptFreeFunctions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptInventoryObject.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptItemInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptLevel.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptMeshInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptMirror.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptNamedBase.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptPosition.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptRotation.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptSettings.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptSinkInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptSkyLayer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GameScriptSoundSourceInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\InventorySlots.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ItemEnumPair.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\LuaHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ObjectIDs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ReservedScriptNames.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ScriptAssert.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ScriptInterfaceState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\ScriptUtil.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="frameworkandsol.cpp">

3
Scripting/include/Scripting/ScriptInterfaceLevel.h
View file

@ -9,8 +9,7 @@ enum class WeatherType
Snow
};
// todo make this a scoped enum
enum LaraType
enum class LaraType
{
Normal = 1,
Young = 2,

1
Scripting/src/GameScriptColor.h
View file

@ -11,7 +11,6 @@ namespace sol {
class GameScriptColor {
public:
GameScriptColor(byte r, byte g, byte b);
GameScriptColor(RGBAColor8Byte col);
GameScriptColor(byte r, byte g, byte b, byte a);
GameScriptColor(Vector3 const &);
GameScriptColor(Vector4 const &);

3
Scripting/src/GameScriptSkyLayer.cpp
View file

@ -15,7 +15,7 @@ void GameScriptSkyLayer::Register(sol::state* lua)
/// (@{Color}) RGB sky color
//@mem color
"color", sol::property(&GameScriptSkyLayer::SetColor),
"color", sol::property(&GameScriptSkyLayer::GetColor, &GameScriptSkyLayer::SetColor),
/*** (int) cloud speed.
@ -51,7 +51,6 @@ void GameScriptSkyLayer::SetColor(GameScriptColor const & col)
B = col.GetB();
}
//todo can this return an RGBAColor8Byte instead?
GameScriptColor GameScriptSkyLayer::GetColor() const {
return GameScriptColor{ R, G, B };
}