Skip to content

Commit 04f77f3

Browse files
qaisjpqaisjp
committed
Clean up client Camera luadefs
(cherry picked from commit 5287f49) Conflicts: MTA10/mods/shared_logic/lua/CLuaMain.cpp
1 parent b455787 commit 04f77f3

File tree

11 files changed

+647
-649
lines changed

11 files changed

+647
-649
lines changed

‎MTA10/mods/deathmatch/StdInc.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
#include <luadefs/CLuaBlipDefs.h>
111111
#include <luadefs/CLuaBrowserDefs.h>
112112
#include <luadefs/CLuaClassDefs.h>
113+
#include <luadefs/CLuaCameraDefs.h>
113114
#include <luadefs/CLuaElementDefs.h>
114115
#include <luadefs/CLuaMarkerDefs.h>
115116
#include <luadefs/CLuaObjectDefs.h>

‎MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@
369369
<ClCompile Include="..\shared_logic\luadefs\CLuaBitDefs.cpp" />
370370
<ClCompile Include="..\shared_logic\luadefs\CLuaBlipDefs.cpp" />
371371
<ClCompile Include="..\shared_logic\luadefs\CLuaBrowserDefs.cpp" />
372+
<ClCompile Include="..\shared_logic\luadefs\CLuaCameraDefs.cpp" />
372373
<ClCompile Include="..\shared_logic\luadefs\CLuaElementDefs.cpp" />
373374
<ClCompile Include="..\shared_logic\luadefs\CLuaMarkerDefs.cpp" />
374375
<ClCompile Include="..\shared_logic\luadefs\CLuaObjectDefs.cpp" />
@@ -568,7 +569,6 @@
568569
<ClCompile Include="..\shared_logic\lua\CLuaArguments.cpp" />
569570
<ClCompile Include="..\shared_logic\lua\CLuaCFunctions.cpp" />
570571
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.BodyClothes.cpp" />
571-
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Camera.cpp" />
572572
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Commands.cpp" />
573573
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.cpp" />
574574
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Drawing.cpp" />
@@ -595,7 +595,6 @@
595595
<ClCompile Include="..\shared_logic\lua\CLuaTimer.cpp" />
596596
<ClCompile Include="..\shared_logic\lua\CLuaTimerManager.cpp" />
597597
<ClCompile Include="..\shared_logic\lua\LuaCommon.cpp" />
598-
<ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Camera.cpp" />
599598
<ClCompile Include="..\..\..\vendor\bochs\bochs_internal\crc32.cpp" />
600599
<ClCompile Include="..\shared_logic\luadefs\CLuaClassDefs.cpp" />
601600
<ClCompile Include="..\shared_logic\luadefs\CLuaDefs.cpp" />
@@ -761,6 +760,7 @@
761760
<ClInclude Include="..\shared_logic\luadefs\CLuaBitDefs.h" />
762761
<ClInclude Include="..\shared_logic\luadefs\CLuaBlipDefs.h" />
763762
<ClInclude Include="..\shared_logic\luadefs\CLuaBrowserDefs.h" />
763+
<ClInclude Include="..\shared_logic\luadefs\CLuaCameraDefs.h" />
764764
<ClInclude Include="..\shared_logic\luadefs\CLuaElementDefs.h" />
765765
<ClInclude Include="..\shared_logic\luadefs\CLuaMarkerDefs.h" />
766766
<ClInclude Include="..\shared_logic\luadefs\CLuaObjectDefs.h" />

‎MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj.filters‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -569,9 +569,6 @@
569569
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.BodyClothes.cpp">
570570
<Filter>Source Files\shared_logic\lua</Filter>
571571
</ClCompile>
572-
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Camera.cpp">
573-
<Filter>Source Files\shared_logic\lua</Filter>
574-
</ClCompile>
575572
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Commands.cpp">
576573
<Filter>Source Files\shared_logic\lua</Filter>
577574
</ClCompile>
@@ -650,9 +647,6 @@
650647
<ClCompile Include="..\shared_logic\lua\LuaCommon.cpp">
651648
<Filter>Source Files\shared_logic\lua</Filter>
652649
</ClCompile>
653-
<ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Camera.cpp">
654-
<Filter>Source Files\shared_logic\lua\oopdefs</Filter>
655-
</ClCompile>
656650
<ClCompile Include="..\..\..\vendor\bochs\bochs_internal\crc32.cpp">
657651
<Filter>Source Files\shared_logic\utils</Filter>
658652
</ClCompile>
@@ -929,6 +923,9 @@
929923
<ClCompile Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.cpp">
930924
<Filter>Source Files\shared_logic\luadefs</Filter>
931925
</ClCompile>
926+
<ClCompile Include="..\shared_logic\luadefs\CLuaCameraDefs.cpp">
927+
<Filter>Source Files\shared_logic\luadefs</Filter>
928+
</ClCompile>
932929
</ItemGroup>
933930
<ItemGroup>
934931
<ClInclude Include="CClient.h">
@@ -1690,5 +1687,8 @@
16901687
<ClInclude Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.h">
16911688
<Filter>Header Files\shared_logic\luadefs</Filter>
16921689
</ClInclude>
1690+
<ClInclude Include="..\shared_logic\luadefs\CLuaCameraDefs.h">
1691+
<Filter>Header Files\shared_logic\luadefs</Filter>
1692+
</ClInclude>
16931693
</ItemGroup>
16941694
</Project>

‎MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -107,28 +107,6 @@ class CLuaFunctionDefs
107107
// Pickup get funcs
108108
LUA_DECLARE ( SetPickupType );
109109

110-
// Cam get funcs
111-
LUA_DECLARE ( GetCamera );
112-
LUA_DECLARE ( GetCameraViewMode );
113-
LUA_DECLARE ( GetCameraMatrix );
114-
LUA_DECLARE ( GetCameraTarget );
115-
LUA_DECLARE ( GetCameraInterior );
116-
LUA_DECLARE ( GetCameraGoggleEffect );
117-
LUA_DECLARE ( GetCameraShakeLevel );
118-
LUA_DECLARE ( GetCameraFieldOfView );
119-
120-
// Cam set funcs
121-
LUA_DECLARE ( SetCameraMatrix );
122-
LUA_DECLARE ( SetCameraTarget );
123-
LUA_DECLARE ( SetCameraInterior );
124-
LUA_DECLARE ( SetCameraFieldOfView );
125-
LUA_DECLARE ( FadeCamera );
126-
LUA_DECLARE ( SetCameraClip );
127-
LUA_DECLARE ( GetCameraClip );
128-
LUA_DECLARE ( SetCameraViewMode );
129-
LUA_DECLARE ( SetCameraGoggleEffect );
130-
LUA_DECLARE ( SetCameraShakeLevel );
131-
132110
// Cursor funcs
133111
LUA_DECLARE ( GetCursorPosition );
134112
LUA_DECLARE ( SetCursorPosition );

‎MTA10/mods/shared_logic/lua/CLuaMain.cpp‎

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -766,55 +766,7 @@ void CLuaMain::AddXMLClass ( lua_State* luaVM )
766766

767767
lua_registerclass ( luaVM, "XML" );
768768
}
769-
770-
771-
void CLuaMain::AddCameraClass ( lua_State* luaVM )
772-
{
773-
lua_newclass ( luaVM );
774-
775-
lua_classfunction ( luaVM, "fade", "fadeCamera" );
776-
lua_classfunction ( luaVM, "resetFarClipDistance", "resetFarClipDistance" );
777-
lua_classfunction ( luaVM, "resetNearClipDistance", "resetNearClipDistance" );
778-
779-
lua_classfunction ( luaVM, "getPosition", CLuaOOPDefs::GetCameraPosition );
780-
lua_classfunction ( luaVM, "getRotation", CLuaOOPDefs::GetCameraRotation );
781-
lua_classfunction ( luaVM, "getTarget", "getCameraTarget" );
782-
lua_classfunction ( luaVM, "getInterior", "getCameraInterior" );
783-
lua_classfunction ( luaVM, "getViewMode", "getCameraViewMode" );
784-
lua_classfunction ( luaVM, "getMatrix", CLuaOOPDefs::GetCameraMatrix );
785-
lua_classfunction ( luaVM, "getFieldOfView", "getCameraFieldOfView" );
786-
lua_classfunction ( luaVM, "getGoggleEffect", "getCameraGoggleEffect" );
787-
lua_classfunction ( luaVM, "getClip", "getCameraClip" );
788-
lua_classfunction ( luaVM, "getFarClipDistance", "getFarClipDistance" );
789-
lua_classfunction ( luaVM, "getNearClipDistance", "getNearClipDistance" );
790-
791-
lua_classfunction ( luaVM, "setPosition", CLuaOOPDefs::SetCameraPosition );
792-
lua_classfunction ( luaVM, "setRotation", CLuaOOPDefs::SetCameraRotation );
793-
lua_classfunction ( luaVM, "setMatrix", "setCameraMatrix" );
794-
lua_classfunction ( luaVM, "setFieldOfView", "setCameraFieldOfView" );
795-
lua_classfunction ( luaVM, "setInterior", "setCameraInterior" );
796-
lua_classfunction ( luaVM, "setTarget", "setCameraTarget" );
797-
lua_classfunction ( luaVM, "setViewMode", "setCameraViewMode" );
798-
lua_classfunction ( luaVM, "setGoggleEffect", "setCameraGoggleEffect" );
799-
lua_classfunction ( luaVM, "setClip", "setCameraClip" );
800-
lua_classfunction ( luaVM, "setFarClipDistance", "setFarClipDistance" );
801-
lua_classfunction ( luaVM, "setNearClipDistance", "setNearClipDistance" );
802-
803-
lua_classvariable ( luaVM, "interior", "setCameraInterior", "getCameraInterior" );
804-
lua_classvariable ( luaVM, "target", "setCameraTarget", "getCameraTarget" );
805-
lua_classvariable ( luaVM, "viewMode", "setViewMode", "getViewMode" );
806-
lua_classvariable ( luaVM, "goggleEffect", "setGoggleEffect", "getGoggleEffect" );
807-
lua_classvariable ( luaVM, "farClipDistance", "setFarClipDistance", "getFarClipDistance" );
808-
lua_classvariable ( luaVM, "nearClipDistance", "setNearClipDistance", "getNearClipDistance" );
809-
810-
lua_classvariable ( luaVM, "position", CLuaOOPDefs::SetCameraPosition, CLuaOOPDefs::GetCameraPosition );
811-
lua_classvariable ( luaVM, "rotation", CLuaOOPDefs::SetCameraRotation, CLuaOOPDefs::GetCameraRotation );
812-
lua_classvariable ( luaVM, "matrix", NULL, CLuaOOPDefs::GetCameraMatrix );
813-
814-
lua_registerstaticclass ( luaVM, "Camera" );
815-
}
816-
817-
769+
818770
// TODO: special tables
819771
void CLuaMain::AddEngineClass ( lua_State* luaVM )
820772
{
@@ -1016,7 +968,7 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
1016968
AddDxRenderTargetClass ( luaVM );
1017969
CLuaBlipDefs::AddClass ( luaVM );
1018970
CLuaBrowserDefs::AddClass ( luaVM );
1019-
AddCameraClass ( luaVM );
971+
CLuaCameraDefs::AddClass ( luaVM );
1020972
CLuaFileDefs::AddClass ( luaVM );
1021973
CLuaMarkerDefs::AddClass ( luaVM );
1022974
CLuaObjectDefs::AddClass ( luaVM );

‎MTA10/mods/shared_logic/lua/CLuaMain.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ class CLuaMain //: public CClient
111111
void AddEngineTxdClass ( lua_State* luaVM );
112112
void AddEngineDffClass ( lua_State* luaVM );
113113

114-
void AddCameraClass ( lua_State* luaVM );
115-
116114
void AddDxMaterialClass ( lua_State* luaVM );
117115
void AddDxTextureClass ( lua_State* luaVM );
118116
void AddDxFontClass ( lua_State* luaVM );

‎MTA10/mods/shared_logic/lua/CLuaManager.cpp‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -339,29 +339,7 @@ void CLuaManager::LoadCFunctions ( void )
339339
CLuaCFunctions::AddFunction ( "getPickupAmmo", CLuaFunctionDefs::GetPickupAmmo );
340340

341341
// Pickup set funcs
342-
CLuaCFunctions::AddFunction ( "setPickupType", CLuaFunctionDefs::SetPickupType );
343-
344-
// Cam get funcs
345-
CLuaCFunctions::AddFunction ( "getCamera", CLuaFunctionDefs::GetCamera );
346-
CLuaCFunctions::AddFunction ( "getCameraViewMode", CLuaFunctionDefs::GetCameraViewMode );
347-
CLuaCFunctions::AddFunction ( "getCameraMatrix", CLuaFunctionDefs::GetCameraMatrix );
348-
CLuaCFunctions::AddFunction ( "getCameraTarget", CLuaFunctionDefs::GetCameraTarget );
349-
CLuaCFunctions::AddFunction ( "getCameraInterior", CLuaFunctionDefs::GetCameraInterior );
350-
CLuaCFunctions::AddFunction ( "getCameraGoggleEffect", CLuaFunctionDefs::GetCameraGoggleEffect );
351-
CLuaCFunctions::AddFunction ( "getCameraShakeLevel", CLuaFunctionDefs::GetCameraShakeLevel );
352-
CLuaCFunctions::AddFunction ( "getCameraFieldOfView", CLuaFunctionDefs::GetCameraFieldOfView );
353-
354-
// Cam set funcs
355-
CLuaCFunctions::AddFunction ( "setCameraMatrix", CLuaFunctionDefs::SetCameraMatrix );
356-
CLuaCFunctions::AddFunction ( "setCameraFieldOfView", CLuaFunctionDefs::SetCameraFieldOfView );
357-
CLuaCFunctions::AddFunction ( "setCameraTarget", CLuaFunctionDefs::SetCameraTarget );
358-
CLuaCFunctions::AddFunction ( "setCameraInterior", CLuaFunctionDefs::SetCameraInterior );
359-
CLuaCFunctions::AddFunction ( "fadeCamera", CLuaFunctionDefs::FadeCamera );
360-
CLuaCFunctions::AddFunction ( "setCameraClip", CLuaFunctionDefs::SetCameraClip );
361-
CLuaCFunctions::AddFunction ( "getCameraClip", CLuaFunctionDefs::GetCameraClip );
362-
CLuaCFunctions::AddFunction ( "setCameraViewMode", CLuaFunctionDefs::SetCameraViewMode );
363-
CLuaCFunctions::AddFunction ( "setCameraGoggleEffect", CLuaFunctionDefs::SetCameraGoggleEffect );
364-
CLuaCFunctions::AddFunction ( "setCameraShakeLevel", CLuaFunctionDefs::SetCameraShakeLevel );
342+
CLuaCFunctions::AddFunction ( "setPickupType", CLuaFunctionDefs::SetPickupType );
365343

366344
// Cursor funcs
367345
CLuaCFunctions::AddFunction ( "getCursorPosition", CLuaFunctionDefs::GetCursorPosition );
@@ -778,6 +756,7 @@ void CLuaManager::LoadCFunctions ( void )
778756
CLuaBitDefs::LoadFunctions ();
779757
CLuaBlipDefs::LoadFunctions ();
780758
CLuaBrowserDefs::LoadFunctions ();
759+
CLuaCameraDefs::LoadFunctions ();
781760
CLuaElementDefs::LoadFunctions ();
782761
CLuaFileDefs::LoadFunctions ();
783762
CLuaFxDefs::LoadFunctions ();

‎MTA10/mods/shared_logic/lua/oopdefs/CLuaOOPDefs.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@ class CLuaOOPDefs : public CLuaDefs
3131
LUA_DECLARE ( SetElementRotation );
3232
LUA_DECLARE ( GetElementVelocity );
3333

34-
// Camera
35-
LUA_DECLARE ( GetCameraMatrix );
36-
LUA_DECLARE ( GetCameraPosition );
37-
LUA_DECLARE ( SetCameraPosition );
38-
LUA_DECLARE ( GetCameraRotation );
39-
LUA_DECLARE ( SetCameraRotation );
40-
4134
// Drawing
4235
LUA_DECLARE ( DxGetFontHeight );
4336
LUA_DECLARE ( DxGetTextWidth );

‎MTA10/mods/shared_logic/lua/oopdefs/CLuaOOPFunctionDefs.Camera.cpp‎

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)