added GetCameraMatrix()

Author: VTrider

src/Camera.cpp

@@ -18,72 +18,55 @@
 
 #include "Camera.h"
 
+#include "LuaHelpers.h"
+
 namespace ExtraUtilities::Lua::Camera
 {
-	int GetZoom(lua_State* L)
+	int GetMatrix(lua_State* L)
 	{
-		int camera = luaL_checkinteger(L, 1);
+		BZR::BZR_Camera* cam = mainCam.Get();
+		BZR::MAT_3D mat = cam->Matrix;
 
-		using enum BZR::Camera::View;
-		switch (camera)
-		{
-		case FIRST_PERSON:
-			lua_pushnumber(L, zoomFPP.Read());
-			break;
-		case THIRD_PERSON:
-			lua_pushnumber(L, zoomTPP.Read());
-			break;
-		default:
-			luaL_argerror(L, 1, "Extra Utilities Error: Invalid camera");
-			return 0;
-		}
-		return 1;
-	}
+		// these fields need to be negated idk why probably
+		// some 3d graphics stuff I don't understand lol
+		mat.right_z = -mat.right_z;
+		mat.up_z = -mat.up_z;
+		mat.front_x = -mat.front_x;
+		
+		// the matrix field has junk data in the position fields,
+		// but the real position is in the first field of the view pyramid
+		mat.posit_x = cam->View_Pyramid[0].x;
+		mat.posit_y = cam->View_Pyramid[0].y;
+		mat.posit_z = cam->View_Pyramid[0].z;
 
-	int SetZoom(lua_State* L)
-	{
-		int camera = luaL_checkinteger(L, 1);
-		float zoom = static_cast<float>(luaL_checknumber(L, 2));
+		PushMatrix(L, mat);
 
-		using enum BZR::Camera::View;
-		switch (camera)
-		{
-		case FIRST_PERSON:
-			zoomFPP.Write(zoom);
-			break;
-		case THIRD_PERSON:
-			zoomTPP.Write(zoom);
-			break;
-		default:
-			luaL_argerror(L, 1, "Extra Utilities Error: Invalid camera");
-			return 0;
-		}
-		return 0;
+		return 1;
 	}
 
-	int GetMinZoom(lua_State* L)
+	int GetMaxZoom(lua_State* L)
 	{
-		lua_pushnumber(L, minZoom.Read());
+		lua_pushnumber(L, maxZoom.Read());
 		return 1;
 	}
 
-	int SetMinZoom(lua_State* L)
+	int SetMaxZoom(lua_State* L)
 	{
 		float zoom = static_cast<float>(luaL_checknumber(L, 1));
-		minZoom.Write(zoom);
+		maxZoom.Write(zoom);
 		return 0;
 	}
 
-	int GetMaxZoom(lua_State* L)
+	int GetMinZoom(lua_State* L)
 	{
-		lua_pushnumber(L, maxZoom.Read());
+		lua_pushnumber(L, minZoom.Read());
 		return 1;
 	}
 
-	int SetMaxZoom(lua_State* L)
+	int SetMinZoom(lua_State* L)
 	{
 		float zoom = static_cast<float>(luaL_checknumber(L, 1));
-		maxZoom.Write(zoom);
+		minZoom.Write(zoom);
 		return 0;
 	}
 
@@ -121,4 +104,45 @@ namespace ExtraUtilities::Lua::Camera
 
 		return 0;
 	}
+
+	int GetZoom(lua_State* L)
+	{
+		int camera = luaL_checkinteger(L, 1);
+
+		using enum BZR::Camera::View;
+		switch (camera)
+		{
+		case FIRST_PERSON:
+			lua_pushnumber(L, zoomFPP.Read());
+			break;
+		case THIRD_PERSON:
+			lua_pushnumber(L, zoomTPP.Read());
+			break;
+		default:
+			luaL_argerror(L, 1, "Extra Utilities Error: Invalid camera");
+			return 0;
+		}
+		return 1;
+	}
+
+	int SetZoom(lua_State* L)
+	{
+		int camera = luaL_checkinteger(L, 1);
+		float zoom = static_cast<float>(luaL_checknumber(L, 2));
+
+		using enum BZR::Camera::View;
+		switch (camera)
+		{
+		case FIRST_PERSON:
+			zoomFPP.Write(zoom);
+			break;
+		case THIRD_PERSON:
+			zoomTPP.Write(zoom);
+			break;
+		default:
+			luaL_argerror(L, 1, "Extra Utilities Error: Invalid camera");
+			return 0;
+		}
+		return 0;
+	}
 }

src/Camera.h

@@ -25,6 +25,8 @@
 
 namespace ExtraUtilities::Lua::Camera
 {
+	inline Scanner mainCam(BZR::Camera::View_Record_MainCam, BasicScanner::Restore::DISABLED);
+
 	inline Scanner zoomFPP(BZR::Camera::zoomFactorFPP);
 	inline Scanner zoomTPP(BZR::Camera::zoomFactorTPP);
 	inline Scanner minZoom(BZR::Camera::minZoomFactor);
@@ -33,6 +35,8 @@ namespace ExtraUtilities::Lua::Camera
 	// restore needs to be disabled to prevent camera state being saved after leaving a game
 	inline Scanner currentView(BZR::Camera::currentView, BasicScanner::Restore::DISABLED);
 
+	int GetMatrix(lua_State* L);
+
 	int GetMaxZoom(lua_State* L);
 	int SetMaxZoom(lua_State* L);
 

src/bzr.h

@@ -76,8 +76,43 @@ namespace BZR
 		float x, y, z;
 	};
 
+	struct VECTOR_3D_LONG
+	{
+		VECTOR_3D_LONG() : x(0), y(0), z(0) {}
+		VECTOR_3D_LONG(double x, double y, double z) : x(x), y(y), z(z) {}
+		double x, y, z;
+	};
+
+	class BZR_Camera // todo merge camera namespaces
+	{
+	public:
+		float Orig_x;
+		float Orig_y;
+		float Const_x;
+		float Const_y;
+		float Max_Depth;
+		float Left;
+		float Bottom;
+		float Right;
+		float Top;
+		float View_Angle;
+		float Tang;
+		float Aspect;
+		float Zoom_Factor;
+		void (*Draw_Poly)(void);
+		void* Buffer; // _GRAPHIC_BUFFER*
+		MAT_3D Matrix;
+		VECTOR_3D_LONG bSphere_Center;
+		double bSphere_Radius;
+		uint8_t View_Volume[0x60]; // plane class
+		VECTOR_3D View_Frustum[8];
+		VECTOR_3D_LONG View_Pyramid[5];
+	};
+
 	namespace Camera
 	{
+		inline auto View_Record_MainCam = (BZR_Camera*)0x008EAAE0;
+
 		inline auto zoomFactorFPP = (float*)0x008EAD10;
 		inline auto zoomFactorTPP = (float*)0x008EAB10;
 		inline auto maxZoomFactor = (float*)0x008A2688;

src/luaexport.cpp

@@ -201,6 +201,7 @@ namespace ExtraUtilities::Lua
 	{
 		const luaL_Reg EXPORT[] = {
 			// Camera
+			{ "GetCameraMatrix", &Camera::GetMatrix },
 			{ "GetCameraMaxZoom", &Camera::GetMaxZoom },
 			{ "SetCameraMaxZoom", &Camera::SetMaxZoom },
 			{ "GetCameraMinZoom", &Camera::GetMinZoom },