matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

when called with no arguments, some tpt. functions will act as get functions (unfinished)

Browse Source 
Also, redo some menu stuff to use int's instead of Menu *s, and fix bug with toggleable buttons being toggled without triggering their actions
This commit is contained in:
jacob1 2013-05-14 23:50:26 -04:00
parent ab3675d6ee
commit 94d21a1679
9 changed files with 165 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/cat/LegacyLuaAPI.cpp
View File

@ -692,9 +692,6 @@ char *luacon_geterror(){
lua_pop(luacon_ci->l, 1);
return err;
}
/*void luacon_close(){
lua_close(l);
}*/
//TPT Interface methods
int luatpt_test(lua_State* l)
@ -916,7 +913,12 @@ int luatpt_create(lua_State* l)
int luatpt_setpause(lua_State* l)
{
int pausestate;
pausestate = luaL_optint(l, 1, 0);
pausestate = luaL_optint(l, 1, -1);
if (pausestate == -1)
{
lua_pushnumber(l, luacon_model->GetPaused());
return 1;
}
luacon_model->SetPaused(pausestate==0?0:1);
return 0;
}
@ -924,21 +926,27 @@ int luatpt_setpause(lua_State* l)
int luatpt_togglepause(lua_State* l)
{
luacon_model->SetPaused(!luacon_model->GetPaused());
//sys_pause=!sys_pause;
return 0;
lua_pushnumber(l, luacon_model->GetPaused());
return 1;
}
int luatpt_togglewater(lua_State* l)
{
luacon_sim->water_equal_test=!luacon_sim->water_equal_test;
return 0;
lua_pushnumber(l, luacon_sim->water_equal_test);
return 1;
}
int luatpt_setconsole(lua_State* l)
{
int consolestate;
consolestate = luaL_optint(l, 1, 0);
if (consolestate)
consolestate = luaL_optint(l, 1, -1);
if (consolestate == -1)
{
lua_pushnumber(l, luacon_ci->Window != ui::Engine::Ref().GetWindow());
return 1;
}
else if (consolestate)
luacon_controller->ShowConsole();
else
luacon_controller->HideConsole();
@ -1542,11 +1550,13 @@ int luatpt_get_name(lua_State* l)
int luatpt_set_shortcuts(lua_State* l)
{
int shortcut = luaL_optint(l, 1, 0);
if (shortcut)
shortcuts = true;
else
shortcuts = false;
int shortcut = luaL_optint(l, 1, -1);
if (shortcut == -1)
{
lua_pushnumber(l, shortcuts);
return 1;
}
shortcuts = shortcut?true:false;
return 0;
}
@ -1785,8 +1795,13 @@ int luatpt_getPartIndex(lua_State* l)
}
int luatpt_hud(lua_State* l)
{
int hudstate = luaL_optint(l, 1, 0);
if (hudstate)
int hudstate = luaL_optint(l, 1, -1);
if (hudstate == -1)
{
lua_pushinteger(l, luacon_controller->GetHudEnable());
return 1;
}
else if (hudstate)
luacon_controller->SetHudEnable(1);
else
luacon_controller->SetHudEnable(0);
@ -1795,26 +1810,43 @@ int luatpt_hud(lua_State* l)
int luatpt_gravity(lua_State* l)
{
int gravstate;
gravstate = luaL_optint(l, 1, 0);
if(gravstate)
gravstate = luaL_optint(l, 1, -1);
if (gravstate == -1)
{
lua_pushinteger(l, luacon_sim->grav->ngrav_enable);
return 1;
}
else if(gravstate)
luacon_sim->grav->start_grav_async();
else
luacon_sim->grav->stop_grav_async();
luacon_model->UpdateQuickOptions();
return 0;
}
int luatpt_airheat(lua_State* l)
{
int aheatstate;
aheatstate = luaL_optint(l, 1, 0);
aheatstate = luaL_optint(l, 1, -1);
if (aheatstate == -1)
{
lua_pushinteger(l, luacon_sim->aheat_enable);
return 1;
}
luacon_sim->aheat_enable = (aheatstate==0?0:1);
luacon_model->UpdateQuickOptions();
return 0;
}
int luatpt_active_menu(lua_State* l)
{
int menuid;
menuid = luaL_optint(l, 1, -1);
if (menuid < SC_TOTAL && menuid >= 0)
luacon_model->SetActiveMenu(luacon_model->GetMenuList()[menuid]);
if (menuid == -1)
{
lua_pushinteger(l, luacon_model->GetActiveMenu());
return 1;
}
if (menuid >= 0 && menuid < SC_TOTAL)
luacon_controller->SetActiveMenu(menuid);
else
return luaL_error(l, "Invalid menu");
return 0;
@ -1824,6 +1856,7 @@ int luatpt_decorations_enable(lua_State* l)
int decostate;
decostate = luaL_optint(l, 1, 0);
luacon_model->SetDecoration(decostate==0?false:true);
luacon_model->UpdateQuickOptions();
return 0;
}

1
src/cat/LuaScriptInterface.cpp
View File

@ -2431,6 +2431,7 @@ std::string LuaScriptInterface::FormatCommand(std::string command)
}
LuaScriptInterface::~LuaScriptInterface() {
lua_close(l);
delete legacy;
}
#endif

14
src/gui/game/GameController.cpp
View File

@ -924,6 +924,11 @@ void GameController::SetHudEnable(bool hudState)
gameView->SetHudEnable(hudState);
}
bool GameController::GetHudEnable()
{
return gameView->GetHudEnable();
}
void GameController::SetActiveColourPreset(int preset)
{
gameModel->SetActiveColourPreset(preset);
@ -935,19 +940,16 @@ void GameController::SetColour(ui::Colour colour)
gameModel->SetPresetColour(colour);
}
void GameController::SetActiveMenu(Menu * menu)
void GameController::SetActiveMenu(int menuID)
{
gameModel->SetActiveMenu(menu);
gameModel->SetActiveMenu(menuID);
vector<Menu*> menuList = gameModel->GetMenuList();
bool set = false;
for(int i = 0; i < menuList.size(); i++)
{
if(menuList[i]==menu && i == SC_DECO)
if(menuID == SC_DECO)
{
gameModel->SetColourSelectorVisibility(true);
set = true;
}
}
if(!set)
gameModel->SetColourSelectorVisibility(false);
}

3
src/gui/game/GameController.h
View File

@ -100,7 +100,8 @@ public:
void SetDecoration();
void ShowGravityGrid();
void SetHudEnable(bool hudState);
void SetActiveMenu(Menu * menu);
bool GetHudEnable();
void SetActiveMenu(int menuID);
std::vector<Menu*> GetMenuList();
void SetActiveTool(int toolSelection, Tool * tool);
void ActiveToolChanged(int toolSelection, Tool *tool);

38
src/gui/game/GameModel.cpp
View File

@ -31,7 +31,7 @@ GameModel::GameModel():
colour(255, 0, 0, 255),
toolStrength(1.0f),
activeColourPreset(-1),
activeMenu(NULL),
activeMenu(-1),
edgeMode(0)
{
sim = new Simulation();
@ -221,9 +221,9 @@ void GameModel::BuildQuickOptionMenu(GameController * controller)
void GameModel::BuildMenus()
{
char lastMenu = 0;
if(activeMenu)
lastMenu = activeMenu->GetIcon();
int lastMenu = -1;
if(activeMenu != -1)
lastMenu = activeMenu;
std::string activeToolIdentifiers[3];
if(regularToolset[0])
@ -346,19 +346,15 @@ void GameModel::BuildMenus()
lastTool = activeTools[0];
//Set default menu
activeMenu = menuList[SC_POWDERS];
activeMenu = SC_POWDERS;
if(lastMenu)
if(lastMenu != -1) //What is this? ...
{
for(std::vector<Menu*>::iterator iter = menuList.begin(), end = menuList.end(); iter != end; ++iter)
{
if((*iter)->GetIcon() == lastMenu)
activeMenu = *iter;
}
activeMenu = lastMenu;
}
if(activeMenu)
toolList = activeMenu->GetToolList();
if(activeMenu != -1)
toolList = menuList[activeMenu]->GetToolList();
else
toolList = std::vector<Tool*>();
@ -471,17 +467,13 @@ float GameModel::GetToolStrength()
return toolStrength;
}
void GameModel::SetActiveMenu(Menu * menu)
void GameModel::SetActiveMenu(int menuID)
{
for(int i = 0; i < menuList.size(); i++)
{
if(menuList[i]==menu)
{
activeMenu = menu;
toolList = menu->GetToolList();
activeMenu = menuID;
toolList = menuList[menuID]->GetToolList();
notifyToolListChanged();
if(menu == menuList[SC_DECO])
if(menuID == SC_DECO)
{
if(activeTools != decoToolset)
{
@ -497,8 +489,6 @@ void GameModel::SetActiveMenu(Menu * menu)
notifyActiveToolsChanged();
}
}
}
}
}
vector<Tool*> GameModel::GetUnlistedTools()
@ -511,7 +501,7 @@ vector<Tool*> GameModel::GetToolList()
return toolList;
}
Menu * GameModel::GetActiveMenu()
int GameModel::GetActiveMenu()
{
return activeMenu;
}

6
src/gui/game/GameModel.h
View File

@ -53,7 +53,7 @@ private:
vector<Menu*> menuList;
vector<QuickOption*> quickOptions;
Menu * activeMenu;
int activeMenu;
int currentBrush;
vector<Brush *> brushList;
SaveInfo * currentSave;
@ -168,8 +168,8 @@ public:
void ClearSimulation();
vector<Menu*> GetMenuList();
vector<QuickOption*> GetQuickOptions();
void SetActiveMenu(Menu * menu);
Menu * GetActiveMenu();
void SetActiveMenu(int menuID);
int GetActiveMenu();
void FrameStep(int frames);
User GetUser();
void SetUser(User user);

35
src/gui/game/GameView.cpp
View File

@ -189,7 +189,7 @@ GameView::GameView():
toolTipPresence(0),
currentSaveType(0),
lastLogEntry(0.0f),
lastMenu(NULL)
lastMenu(-1)
{
int currentX = 1;
@ -403,7 +403,6 @@ GameView::GameView():
};
pauseButton = new ui::Button(ui::Point(Size.X-16, Size.Y-16), ui::Point(15, 15), "", "Pause/Resume the simulation"); //Pause
pauseButton->SetIcon(IconPause);
pauseButton->SetTogglable(true);
pauseButton->SetActionCallback(new PauseAction(this));
AddComponent(pauseButton);
@ -459,13 +458,13 @@ class GameView::MenuAction: public ui::ButtonAction
{
GameView * v;
public:
Menu * menu;
int menuID;
bool needsClick;
MenuAction(GameView * _v, Menu * menu_)
MenuAction(GameView * _v, int menuID_)
{
v = _v;
menu = menu_;
if (v->c->GetMenuList()[SC_DECO] == menu)
menuID = menuID_;
if (menuID == SC_DECO)
needsClick = true;
else
needsClick = false;
@ -473,12 +472,12 @@ public:
void MouseEnterCallback(ui::Button * sender)
{
if(!needsClick && !ui::Engine::Ref().GetMouseButton())
v->c->SetActiveMenu(menu);
v->c->SetActiveMenu(menuID);
}
void ActionCallback(ui::Button * sender)
{
if (needsClick)
v->c->SetActiveMenu(menu);
v->c->SetActiveMenu(menuID);
else
MouseEnterCallback(sender);
}
@ -566,15 +565,14 @@ void GameView::NotifyMenuListChanged(GameModel * sender)
}
toolButtons.clear();
vector<Menu*> menuList = sender->GetMenuList();
for(vector<Menu*>::reverse_iterator iter = menuList.rbegin(), end = menuList.rend(); iter != end; ++iter)
for (int i = menuList.size()-1; i >= 0; i--)
{
std::string tempString = "";
Menu * item = *iter;
tempString += item->GetIcon();
ui::Button * tempButton = new ui::Button(ui::Point(XRES+BARSIZE-16, currentY), ui::Point(15, 15), tempString, item->GetDescription());
tempString += menuList[i]->GetIcon();
ui::Button * tempButton = new ui::Button(ui::Point(XRES+BARSIZE-16, currentY), ui::Point(15, 15), tempString, menuList[i]->GetDescription());
tempButton->Appearance.Margin = ui::Border(0, 2, 3, 2);
tempButton->SetTogglable(true);
tempButton->SetActionCallback(new MenuAction(this, item));
tempButton->SetActionCallback(new MenuAction(this, i));
currentY-=16;
AddComponent(tempButton);
menuButtons.push_back(tempButton);
@ -591,6 +589,11 @@ void GameView::SetHudEnable(bool hudState)
showHud = hudState;
}
bool GameView::GetHudEnable()
{
return showHud;
}
ui::Point GameView::GetMousePosition()
{
return mousePosition;
@ -643,7 +646,7 @@ void GameView::NotifyToolListChanged(GameModel * sender)
int totalColour;
for(int i = 0; i < menuButtons.size(); i++)
{
if(((MenuAction*)menuButtons[i]->GetActionCallback())->menu==sender->GetActiveMenu())
if(((MenuAction*)menuButtons[i]->GetActionCallback())->menuID==sender->GetActiveMenu())
{
menuButtons[i]->SetToggleState(true);
}
@ -698,7 +701,7 @@ void GameView::NotifyToolListChanged(GameModel * sender)
AddComponent(tempButton);
toolButtons.push_back(tempButton);
}
if (sender->GetActiveMenu() != sender->GetMenuList()[SC_DECO])
if (sender->GetActiveMenu() != SC_DECO)
lastMenu = sender->GetActiveMenu();
}
@ -1364,7 +1367,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
{
c->SetDecoration(true);
c->SetPaused(true);
c->SetActiveMenu(c->GetMenuList()[SC_DECO]);
c->SetActiveMenu(SC_DECO);
}
break;
case 'y':

3
src/gui/game/GameView.h
View File

@ -54,7 +54,7 @@ private:
std::string introTextMessage;
int toolIndex;
int currentSaveType;
Menu * lastMenu;
int lastMenu;
int toolTipPresence;
std::string toolTip;
@ -130,6 +130,7 @@ public:
ui::Point GetMousePosition();
void SetSample(SimulationSample sample);
void SetHudEnable(bool hudState);
bool GetHudEnable();
bool CtrlBehaviour(){ return ctrlBehaviour; }
bool ShiftBehaviour(){ return shiftBehaviour; }
void ExitPrompt();

8
src/gui/interface/Button.cpp
View File

@ -153,6 +153,10 @@ void Button::OnMouseUnclick(int x, int y, unsigned int button)
{
if(isButtonDown)
{
if(isTogglable)
{
toggle = !toggle;
}
isButtonDown = false;
DoAction();
}
@ -173,10 +177,6 @@ void Button::OnMouseClick(int x, int y, unsigned int button)
return;
if(button == 1)
{
if(isTogglable)
{
toggle = !toggle;
}
isButtonDown = true;
}
else if(button == 3)