refactored unit, projectile and resource deposit data scripts with coresponding namespaces

This commit is contained in:
devZoGok
2023-10-07 16:36:37 +03:00
parent cf9ac6199e
commit 3696158e78
22 changed files with 648 additions and 596 deletions
+2 -3
View File
@@ -45,7 +45,7 @@ namespace battleship{
buildDir = gameObjectFrames[1].getModel()->getPosition() - gameObjectFrames[0].getModel()->getPosition();
Vector3 pos = paintSelectRowStart + buildDir.norm() * hypothenuse * gameObjectFrames.size();
addGameObjectFrame(GameObjectFrame(structureId, GameObjectFrame::UNIT, pos));
addGameObjectFrame(GameObjectFrame(structureId, GameObject::Type::UNIT, pos));
}
}
@@ -100,8 +100,7 @@ namespace battleship{
if(results.empty()) return;
Vector3 newPos, rowEnd;
sol::state_view SOL_LUA_STATE = generateView();
sol::table unitTable = SOL_LUA_STATE["unitCornerPoints"][gameObjectFrames[0].getId() + 1];
sol::table unitTable = generateView()[gameObjectFrames[0].getGameObjTableName()]["unitCornerPoints"][gameObjectFrames[0].getId() + 1];
float width = (float)unitTable[1]["x"] - (float)unitTable[2]["x"];
float length = (float)unitTable[4]["z"] - (float)unitTable[1]["z"];