Fixed Lua debug reporting in player, made IDE throttle down instead of pausing core on lose focus, added open files dropdown and active project name display to the IDE

Bindings/Scripts/create_lua_library/create_lua_library.py

@@ -131,6 +131,7 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 		wrappersHeaderOut += "public:\n"
 		wrappersHeaderOut += "	LuaEventHandler() : EventHandler() {}\n"
 		wrappersHeaderOut += "	void handleEvent(Event *e) {\n"
+		wrappersHeaderOut += "		lua_getfield (L, LUA_GLOBALSINDEX, \"__customError\");\n"
 		wrappersHeaderOut += "		int errH = lua_gettop(L);\n"
 		wrappersHeaderOut += "		lua_getfield(L, LUA_GLOBALSINDEX, \"__handleEvent\");\n"
 		wrappersHeaderOut += "		lua_rawgeti( L, LUA_REGISTRYINDEX, wrapperIndex );\n"

Core/Contents/Include/PolyCore.h

@@ -241,7 +241,11 @@ namespace Polycode {
 		/**
 		* Opens a system folder picker and suspends operation.
 		* @return The selected path returned from the picker.
-		*/																					
+		*/		
+		
+
+		void setFramerate(int frameRate);
+
 		virtual String openFolderPicker() = 0;
 		
 		/**

Core/Contents/Source/PolyCore.cpp

@@ -80,6 +80,10 @@ namespace Polycode {
 		threadedEventMutex = NULL;
 	}
 	
+	void Core::setFramerate(int frameRate) {
+		refreshInterval = 1000 / frameRate;
+	}
+	
 	void Core::enableMouse(bool newval) {
 		mouseEnabled = newval;
 	}

IDE/Contents/Include/PolycodeEditorManager.h

@@ -27,7 +27,7 @@
 
 using namespace Polycode;
 
-class PolycodeEditorManager { 
+class PolycodeEditorManager : public EventDispatcher { 
 	public:
 		PolycodeEditorManager();
 		~PolycodeEditorManager();
@@ -36,15 +36,15 @@ class PolycodeEditorManager {
 		PolycodeEditor *createEditorForExtension(String extension);
 		void registerEditorFactory(PolycodeEditorFactory *editorFactory);
 	
-		void setCurrentEditor(PolycodeEditor *editor) { currentEditor = editor; }
+		void setCurrentEditor(PolycodeEditor *editor, bool sendChangeEvent = true);
 		PolycodeEditor *getCurrentEditor() { return currentEditor; }
 		
 	//	int close
-	
+	std::vector<PolycodeEditor*> openEditors;
+		
 protected:
 	
 	PolycodeEditor *currentEditor;
 	
-	std::vector<PolycodeEditor*> openEditors;
 	std::vector<PolycodeEditorFactory*> editorFactories;	
 };

IDE/Contents/Include/PolycodeFrame.h

@@ -32,6 +32,7 @@
 #include "NewFileWindow.h"
 #include "ToolWindows.h"
 #include "PolycodeProjectManager.h"
+#include "PolycodeEditorManager.h"
 
 using namespace Polycode;
 
@@ -187,6 +188,7 @@ public:
 	
 	ScreenEntity *welcomeEntity;	
 	PolycodeProjectBrowser *projectBrowser;
+	PolycodeEditorManager *editorManager;
 		
 	UIImageButton *playButton;
 	UIImageButton *stopButton;
@@ -223,6 +225,9 @@ private:
 	ScreenLabel *dragLabel;
 	bool isDragging;
 	
+	ScreenLabel *currentProjectTitle;
+	UIComboBox *currentFileSelector;
+	
 	ScreenImage *welcomeImage;	
 	
 	

IDE/Contents/Include/PolycodeProjectManager.h

@@ -29,7 +29,7 @@
 
 using namespace Polycode;
 
-class PolycodeProjectManager {
+class PolycodeProjectManager : public EventDispatcher {
 	public:
 		PolycodeProjectManager();
 		~PolycodeProjectManager();

IDE/Contents/Source/PolycodeEditorManager.cpp

@@ -23,7 +23,7 @@
 #include "PolycodeEditorManager.h"
 
 
-PolycodeEditorManager::PolycodeEditorManager() {
+PolycodeEditorManager::PolycodeEditorManager()  : EventDispatcher() {
 	currentEditor = NULL;
 }
 
@@ -43,6 +43,14 @@ PolycodeEditor *PolycodeEditorManager::createEditorForExtension(String extension
 	return NULL;
 }
 
+void PolycodeEditorManager::setCurrentEditor(PolycodeEditor *editor, bool sendChangeEvent) {
+	currentEditor = editor;
+	if(sendChangeEvent){
+		dispatchEvent(new Event(), Event::CHANGE_EVENT);
+	}
+}
+
+
 PolycodeEditor *PolycodeEditorManager::getEditorForPath(String path) {
 	for(int i=0; i < openEditors.size();i++) {
 		PolycodeEditor *editor = openEditors[i];

IDE/Contents/Source/PolycodeFrame.cpp

@@ -555,6 +555,16 @@ PolycodeFrame::PolycodeFrame() : ScreenEntity() {
 	addChild(stopButton);
 	stopButton->setPosition(10,4);
 
+	currentProjectTitle = new ScreenLabel("", 32, "section");
+	addChild(currentProjectTitle);
+	currentProjectTitle->color.a = 0.4;
+	currentProjectTitle->setPosition(70, 0);
+
+	currentFileSelector = new UIComboBox(globalMenu, 300);
+	currentFileSelector->addEventListener(this, UIEvent::CHANGE_EVENT);
+	
+	addChild(currentFileSelector);
+
 	
 	resizer = new ScreenImage("Images/corner_resize.png");	
 	addChild(resizer);
@@ -728,6 +738,29 @@ void PolycodeFrame::showAssetBrowser(std::vector<String> extensions) {
 
 void PolycodeFrame::handleEvent(Event *event) {
 	
+	if(event->getDispatcher() == currentFileSelector && event->getEventType() == "UIEvent") {
+		PolycodeEditor *editor = editorManager->openEditors[currentFileSelector->getSelectedIndex()];
+		editorManager->setCurrentEditor(editor, false);
+		showEditor(editor);
+	}
+	
+	if(event->getDispatcher() == editorManager) {	
+		currentFileSelector->clearItems();
+		
+		for(int i=0; i < editorManager->openEditors.size(); i++) {
+			OSFileEntry entry(editorManager->openEditors[i]->getFilePath(), OSFileEntry::TYPE_FILE);
+			currentFileSelector->addComboItem(entry.name);
+			if(editorManager->getCurrentEditor() == editorManager->openEditors[i]) {
+				currentFileSelector->setSelectedIndex(i);
+			}
+			
+		}
+	}
+	
+	if(event->getDispatcher() == projectManager) {
+		currentProjectTitle->setText(projectManager->getActiveProject()->getProjectName());
+	}
+	
 	if(event->getDispatcher() == aboutOKButton && event->getEventType() == "UIEvent") {
 		hideModal();
 	}
@@ -814,6 +847,8 @@ void PolycodeFrame::Resize(int x, int y) {
 	modalBlocker->setShapeSize(x, y);
 	fileDialogBlocker->setShapeSize(x, y);
 		
+	currentFileSelector->setPosition(x-350, 11);
+	
 	
 	if(this->modalChild) {
 		modalChild->setPosition((x-modalChild->getWidth())/2.0f, (y-modalChild->getHeight())/2.0f);

IDE/Contents/Source/PolycodeIDEApp.cpp

@@ -32,10 +32,12 @@ PolycodeClipboard *globalClipboard;
 
 PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 	core = new POLYCODE_CORE(view, 900,700,false,true, 0, 0,30, -1);	
-	core->pauseOnLoseFocus = true;
+//	core->pauseOnLoseFocus = true;
 	
 	core->addEventListener(this, Core::EVENT_CORE_RESIZE);
-	
+	core->addEventListener(this, Core::EVENT_LOST_FOCUS);
+	core->addEventListener(this, Core::EVENT_GAINED_FOCUS);
+			
 	globalClipboard = new PolycodeClipboard();
 	
 	CoreServices::getInstance()->getRenderer()->setTextureFilteringMode(Renderer::TEX_FILTERING_NEAREST);
@@ -65,6 +67,7 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 	
 	willRunProject = false;
 
+	globalMenu	= new UIGlobalMenu();
 		
 	printf("creating font editor\n"); 
 	
@@ -76,6 +79,9 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 	frame = new PolycodeFrame();
 	frame->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
 
+	frame->editorManager = editorManager;
+	editorManager->addEventListener(frame, Event::CHANGE_EVENT);
+
 	frame->console->backtraceWindow->addEventListener(this, BackTraceEvent::EVENT_BACKTRACE_SELECTED);
 
 	frame->textInputPopup->addEventListener(this, UIEvent::OK_EVENT);	
@@ -96,6 +102,8 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 	projectManager->setProjectBrowser(frame->getProjectBrowser());
 	
 	frame->projectManager = projectManager;
+
+	projectManager->addEventListener(frame, Event::CHANGE_EVENT);
 	
 	frame->getProjectBrowser()->addEventListener(this, Event::CHANGE_EVENT);
 	frame->getProjectBrowser()->addEventListener(this, PolycodeProjectBrowserEvent::HANDLE_MENU_COMMAND);
@@ -115,7 +123,6 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 	editorManager->registerEditorFactory(new PolycodeSpriteEditorFactory());
 
 		
-	globalMenu	= new UIGlobalMenu();
 	screen->addChild(globalMenu);	
 				
 	loadConfigFile();
@@ -451,6 +458,12 @@ void PolycodeIDEApp::handleEvent(Event *event) {
 
 	if(event->getDispatcher() == core) {
 		switch(event->getEventCode()) {
+			case Core::EVENT_LOST_FOCUS:
+				core->setFramerate(1);
+			break;		
+			case Core::EVENT_GAINED_FOCUS:
+				core->setFramerate(30);			
+			break;					
 			case Core::EVENT_CORE_RESIZE:
 				if(menuBar) {
 					frame->Resize(core->getXRes(), core->getYRes()-25);
@@ -715,16 +728,7 @@ bool PolycodeIDEApp::Update() {
 		frame->mainSizer->enabled = false;		
 	}
 
-	// ugly hack to update the screen when debugger connects
-	bool oldPaused = core->paused;
-	if(needsRedraw) {
-		core->paused = false;
-	}
-	bool retStat = core->Update();
-	if(oldPaused == true && needsRedraw) {
-		core->paused = true;
-		needsRedraw = false;
-	}
-	return retStat;
+
+	return core->Update();
 }
 

IDE/Contents/Source/PolycodeProjectManager.cpp

@@ -23,7 +23,7 @@
 #include "PolycodeProjectManager.h"
 #include "PolycodeToolLauncher.h"
 
-PolycodeProjectManager::PolycodeProjectManager() {
+PolycodeProjectManager::PolycodeProjectManager() : EventDispatcher() {
 	activeProject = NULL;
 	activeFolder = "";
 	selectedFile = "";
@@ -106,6 +106,7 @@ void PolycodeProjectManager::setActiveProject(PolycodeProject* project) {
 		if(project){			
 			CoreServices::getInstance()->getResourceManager()->addArchive(project->getRootFolder());
 		}
+		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 }
 

Modules/Contents/UI/Source/PolyUIComboBox.cpp

@@ -133,7 +133,7 @@ UIComboBoxItem *UIComboBox::getSelectedItem() {
 
 void UIComboBox::toggleDropDown() {
 	Vector2 screenPos = this->getScreenPosition();
-	dropDownMenu = globalMenu->showMenu(screenPos.x, screenPos.y - height, width);
+	dropDownMenu = globalMenu->showMenu(screenPos.x, screenPos.y, width);
 	
 	for(int i=0; i < items.size(); i++) {
 		dropDownMenu->addOption(items[i]->label, String::IntToString(i));

Player/Contents/Source/PolycodePlayer.cpp

@@ -814,50 +814,65 @@ void PolycodePlayer::handleEvent(Event *event) {
 			case InputEvent::EVENT_KEYDOWN:
 			{
 				if(L && !crashed) {
+					lua_getfield (L, LUA_GLOBALSINDEX, "__customError");
+					errH = lua_gettop(L);					
 					lua_getfield(L, LUA_GLOBALSINDEX, "onKeyDown");
 					lua_pushinteger(L, inputEvent->keyCode());
-					lua_pcall(L, 1,0,errH);					
+					lua_pcall(L, 1,0,errH);
+					lua_settop(L, 0);
 				}
 			}
 			break;
 			case InputEvent::EVENT_KEYUP:
 			{
 				if(L && !crashed) {
+					lua_getfield (L, LUA_GLOBALSINDEX, "__customError");
+					errH = lua_gettop(L);									
 					lua_getfield(L, LUA_GLOBALSINDEX, "onKeyUp");
 					lua_pushinteger(L, inputEvent->keyCode());
-					lua_pcall(L, 1,0,errH);					
+					lua_pcall(L, 1,0,errH);
+					lua_settop(L, 0);								
 				}
 			}
 			break;
 			case InputEvent::EVENT_MOUSEDOWN:
 			{
 				if(L && !crashed) {
+					lua_getfield (L, LUA_GLOBALSINDEX, "__customError");
+					errH = lua_gettop(L);									
 					lua_getfield(L, LUA_GLOBALSINDEX, "onMouseDown");
 					lua_pushinteger(L, inputEvent->mouseButton);
 					lua_pushnumber(L, inputEvent->mousePosition.x);
-					lua_pushnumber(L, inputEvent->mousePosition.y);					
+					lua_pushnumber(L, inputEvent->mousePosition.y);	
 					lua_pcall(L, 3,0,errH);					
+					lua_settop(L, 0);					
 				}
 			}
 			break;	
 			case InputEvent::EVENT_MOUSEUP:
 			{
 				if(L && !crashed) {
+					lua_getfield (L, LUA_GLOBALSINDEX, "__customError");
+					errH = lua_gettop(L);									
 					lua_getfield(L, LUA_GLOBALSINDEX, "onMouseUp");
 					lua_pushinteger(L, inputEvent->mouseButton);
 					lua_pushnumber(L, inputEvent->mousePosition.x);
-					lua_pushnumber(L, inputEvent->mousePosition.y);					
+					lua_pushnumber(L, inputEvent->mousePosition.y);		
 					lua_pcall(L, 3,0,errH);					
+					lua_settop(L, 0);					
 				}
 			}
 			break;	
 			case InputEvent::EVENT_MOUSEMOVE:
 			{
 				if(L && !crashed) {
+					lua_getfield (L, LUA_GLOBALSINDEX, "__customError");
+					errH = lua_gettop(L);									
 					lua_getfield(L, LUA_GLOBALSINDEX, "onMouseMove");
 					lua_pushnumber(L, inputEvent->mousePosition.x);
-					lua_pushnumber(L, inputEvent->mousePosition.y);					
+					lua_pushnumber(L, inputEvent->mousePosition.y);	
 					lua_pcall(L, 2,0,errH);					
+					lua_settop(L, 0);					
 				}
 			}
 			break;																			
@@ -868,6 +883,8 @@ void PolycodePlayer::handleEvent(Event *event) {
 
 bool PolycodePlayer::Update() {
 	if(L) {
+		lua_getfield (L, LUA_GLOBALSINDEX, "__customError");
+		errH = lua_gettop(L);	
 		if(doCodeInject) {
 			printf("INJECTING CODE:[%s]\n", injectCodeString.c_str());
 			doCodeInject = false;			
@@ -880,6 +897,7 @@ bool PolycodePlayer::Update() {
 			lua_pushnumber(L, core->getElapsed());
 			lua_pcall(L, 1,0,errH);
 		}
+		lua_settop(L, 0);
 	}
 	return core->Update();
 }