Skip to content

0009742: add support for Vec2s on createColPolygon client-side and allow passing in more Vec2s server-side #217

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

Merged
merged 2 commits into from
Jul 5, 2018
Merged

0009742: add support for Vec2s on createColPolygon client-side and allow passing in more Vec2s server-side #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90e0bb6
server/createColPolygon: allow passing in more Vec2 args
patrikjuvonen Jul 3, 2018
8ebc876
client/createColPolygon: support Vec2s and require 3 more Vec2 args
patrikjuvonen Jul 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,15 @@ int CLuaColShapeDefs::CreateColPolygon(lua_State* luaVM)
CScriptArgReader argStream(luaVM);
argStream.ReadVector2D(vecPosition);

// Get the points
std::vector<CVector2D> vecPointList;
for (uint i = 0; i < 3 || argStream.NextIsVector2D(); i++)
{
CVector2D vecPoint;
argStream.ReadVector2D(vecPoint);
vecPointList.push_back(vecPoint);
}

if (!argStream.HasErrors())
{
CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
Expand All @@ -267,11 +276,10 @@ int CLuaColShapeDefs::CreateColPolygon(lua_State* luaVM)
CClientColPolygon* pShape = CStaticFunctionDefinitions::CreateColPolygon(*pResource, vecPosition);
if (pShape)
{
// Get the points
while (argStream.NextCouldBeNumber() && argStream.NextCouldBeNumber(1))
// Add the points
for (uint i = 0; i < vecPointList.size(); i++)
{
argStream.ReadVector2D(vecPosition);
pShape->AddPoint(vecPosition);
pShape->AddPoint(vecPointList[i]);
}

CElementGroup* pGroup = pResource->GetElementGroup();
Expand Down
2 changes: 1 addition & 1 deletion Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ int CLuaColShapeDefs::CreateColPolygon(lua_State* luaVM)
std::vector<CVector2D> vecPointList;

CScriptArgReader argStream(luaVM);
for (uint i = 0; i < 4 || argStream.NextCouldBeNumber(); i++)
for (uint i = 0; i < 4 || argStream.NextIsVector2D(); i++)
{
CVector2D vecPoint;
argStream.ReadVector2D(vecPoint);
Expand Down