devZoGok/PlanetFleet
1
0
Fork 0
mirror of https://github.com/devZoGok/PlanetFleet.git synced 2026-08-26 19:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
devZoGok
2026-05-13 19:05:01 +03:00
parent a2f2367381
commit 63204751a1
3 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
activeGameState.cpp
-23
View File
@@ -123,29 +123,6 @@ namespace battleship{
vector<Button*> buttons = guiButtons;
buttons.insert(buttons.end(), unitButtons.begin(), unitButtons.end());
Vector3 mapSize = Map::getSingleton()->getMapSize();
float ratio = mapSize.x / mapSize.z;
sol::state_view SOL_LUA_VIEW = generateView();
SOL_LUA_VIEW.script_file(GameManager::getSingleton()->getPath() + "Scripts/Gui/activeGameState.lua");
sol::table sizeTbl = SOL_LUA_VIEW["minimapSize"];
float initSizeX = sizeTbl["x"], initSizeY = sizeTbl["y"];
if(ratio < 1){
float x = initSizeX * ratio;
SOL_LUA_VIEW["_minimapPos"]["x"] = .5 * (initSizeX - x) ;
SOL_LUA_VIEW["_minimapSize"]["x"] = x;
SOL_LUA_VIEW["_minimapSize"]["y"] = initSizeY;
}
else{
float y = initSizeY / ratio;
SOL_LUA_VIEW["_minimapPos"]["y"] = .5 * (initSizeY - y);
SOL_LUA_VIEW["_minimapSize"]["x"] = initSizeX;
SOL_LUA_VIEW["_minimapSize"]["y"] = y;
}
Map::Minimap::getSingleton()->load();
ConcreteGuiManager::getSingleton()->readLuaScreenScript(
"activeGameState.lua",
buttons,
inGameAppState.cpp
+1
View File
@@ -62,6 +62,7 @@ namespace battleship{
Map *map = Map::getSingleton();
map->load(mapName);
Map::Minimap::getSingleton()->load();
Camera *cam = Root::getSingleton()->getCamera();
cam->setPosition(Map::getSingleton()->getSpawnPoint(playerId) + Vector3(1, 1, 1) * configData::CAMERA_DISTANCE);
map.cpp
+22 -4
View File
@@ -43,16 +43,34 @@ namespace battleship{
}
Map::Minimap::Minimap(){
sol::state_view SOL_STATE_VIEW = generateView();
SOL_STATE_VIEW.script_file(GameManager::getSingleton()->getPath() + "Scripts/Gui/activeGameState.lua");
Vector3 mapSize = Map::getSingleton()->getMapSize();
float ratio = mapSize.x / mapSize.z;
string refIconFile = SOL_STATE_VIEW["refIcon"];
sol::state_view SOL_LUA_VIEW = generateView();
SOL_LUA_VIEW.script_file(GameManager::getSingleton()->getPath() + "Scripts/Gui/activeGameState.lua");
sol::table sizeTbl = SOL_LUA_VIEW["minimapSize"];
float initSizeX = sizeTbl["x"], initSizeY = sizeTbl["y"];
if(ratio < 1){
float x = initSizeX * ratio;
SOL_LUA_VIEW["_minimapPos"]["x"] = .5 * (initSizeX - x) ;
SOL_LUA_VIEW["_minimapSize"]["x"] = x;
SOL_LUA_VIEW["_minimapSize"]["y"] = initSizeY;
}
else{
float y = initSizeY / ratio;
SOL_LUA_VIEW["_minimapPos"]["y"] = .5 * (initSizeY - y);
SOL_LUA_VIEW["_minimapSize"]["x"] = initSizeX;
SOL_LUA_VIEW["_minimapSize"]["y"] = y;
}
string refIconFile = SOL_LUA_VIEW["refIcon"];
string basePath = GameManager::getSingleton()->getPath() + "Textures/Icons/Minimap/";
for(ResourceDeposit *rd : Game::getSingleton()->getCivilianPlayer()->getResourceDeposits())
depositIcons.push_back(initIcon(rd->getPos(), basePath + refIconFile));
string camIconFile = SOL_STATE_VIEW["eyeIcon"];
string camIconFile = SOL_LUA_VIEW["eyeIcon"];
camIcon = initIcon(Root::getSingleton()->getCamera()->getPosition(), basePath + camIconFile);
}