Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix getElementBoundingBox() OOP version returning 6 numbers instead of a 2 vectors #305

Merged
merged 8 commits into from Aug 10, 2018
Merged

Fix getElementBoundingBox() OOP version returning 6 numbers instead of a 2 vectors #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9aa6471
Fix getElementBoundingBox() OOP version returning 6 numbers instead o…
Pirulax Aug 6, 2018
3248b5c
Remove LUA_DECLARE_OOP at line 45 from the header.
Pirulax Aug 6, 2018
2870280
Added check for client version instead of bLegacy argument
Pirulax Aug 7, 2018
a683700
Added LUA_DECLARE_OOP instead of LUA_DECLARE
Pirulax Aug 7, 2018
831f172
fixed errors hopefully
Pirulax Aug 8, 2018
64fdbd0
maybe now I fixed every mistake I made in my life
Pirulax Aug 8, 2018
c7947ed
rm -rf comment
qaisjp Aug 10, 2018
691a839
bump rev
qaisjp Aug 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 40 additions & 1 deletion Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@

#include "StdInc.h"
using std::list;
#define MIN_CLIENT_REQ_GETBOUNDINGBOX_OOP "1.5.5-9.13999"

void CLuaElementDefs::LoadFunctions(void)
{
Expand Down Expand Up @@ -129,7 +130,7 @@ void CLuaElementDefs::AddClass(lua_State* luaVM)
lua_classfunction(luaVM, "getChildrenCount", "getElementChildrenCount");
lua_classfunction(luaVM, "getID", "getElementID");
lua_classfunction(luaVM, "getParent", "getElementParent");
lua_classfunction(luaVM, "getBoundingBox", "getElementBoundingBox");
lua_classfunction(luaVM, "getBoundingBox", OOP_GetElementBoundingBox);
lua_classfunction(luaVM, "getPosition", OOP_GetElementPosition);
lua_classfunction(luaVM, "getRotation", OOP_GetElementRotation);
lua_classfunction(luaVM, "getMatrix", OOP_GetElementMatrix);
Expand Down Expand Up @@ -199,6 +200,7 @@ void CLuaElementDefs::AddClass(lua_State* luaVM)
lua_classvariable(luaVM, "distanceFromCentreOfMassToBaseOfModel", NULL, "getElementDistanceFromCentreOfMassToBaseOfModel");
lua_classvariable(luaVM, "radius", NULL, "getElementRadius");
lua_classvariable(luaVM, "childrenCount", NULL, "getElementChildrenCount");
lua_classvariable(luaVM, "boundingBox", NULL, OOP_GetElementBoundingBox);
lua_classvariable(luaVM, "position", SetElementPosition, OOP_GetElementPosition);
lua_classvariable(luaVM, "rotation", OOP_SetElementRotation, OOP_GetElementRotation);
lua_classvariable(luaVM, "matrix", SetElementMatrix, OOP_GetElementMatrix);
Expand Down Expand Up @@ -1000,6 +1002,43 @@ int CLuaElementDefs::GetElementDimension(lua_State* luaVM)
return 1;
}

int CLuaElementDefs::OOP_GetElementBoundingBox(lua_State* luaVM)
{
CClientEntity* pEntity;
CScriptArgReader argStream(luaVM);
argStream.ReadUserData(pEntity);

if (!argStream.HasErrors())
{
// Grab the bounding box and return it
CVector vecMin, vecMax;
if (CStaticFunctionDefinitions::GetElementBoundingBox(*pEntity, vecMin, vecMax))
{
if (!MinClientReqCheck(argStream, MIN_CLIENT_REQ_GETBOUNDINGBOX_OOP))
{
lua_pushvector(luaVM, vecMin);
lua_pushvector(luaVM, vecMax);
return 2;
}
else
{
lua_pushnumber(luaVM, vecMin.fX);
lua_pushnumber(luaVM, vecMin.fY);
lua_pushnumber(luaVM, vecMin.fZ);
lua_pushnumber(luaVM, vecMax.fX);
lua_pushnumber(luaVM, vecMax.fY);
lua_pushnumber(luaVM, vecMax.fZ);
return 6;
}
}
}
else
m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());

// Failed
lua_pushboolean(luaVM, false);
}

int CLuaElementDefs::GetElementBoundingBox(lua_State* luaVM)
{
// Verify the argument
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ class CLuaElementDefs : public CLuaDefs
LUA_DECLARE(GetElementsWithinRange);
LUA_DECLARE(GetElementDimension);
LUA_DECLARE(GetElementZoneName);
LUA_DECLARE(GetElementBoundingBox);
LUA_DECLARE_OOP(GetElementBoundingBox);
LUA_DECLARE(GetElementRadius);
LUA_DECLARE(IsElementAttached);
LUA_DECLARE(GetElementAttachedTo);
Expand Down