Merge pull request #11 from TheGreatRambler/dev

v 2.0.1
TheGreatRambler · Jul 16, 2020 · 55e1bd2 · 55e1bd2
2 parents 59cd669 + f6f449b
commit 55e1bd2
Show file tree

Hide file tree

Showing 18 changed files with 252 additions and 184 deletions.
diff --git a/pc_application/source/dataHandling/applicationMemoryViewer.cpp b/pc_application/source/dataHandling/applicationMemoryViewer.cpp
diff --git a/pc_application/source/dataHandling/applicationMemoryViewer.hpp b/pc_application/source/dataHandling/applicationMemoryViewer.hpp
diff --git a/pc_application/source/dataHandling/dataProcessing.hpp b/pc_application/source/dataHandling/dataProcessing.hpp
@@ -251,6 +251,14 @@ class DataProcessing : public wxListCtrl {
 	void createSavestateHere();
 	void runFrame(uint8_t forAutoFrame, uint8_t updateFramebuffer, uint8_t includeFramebuffer);
 
+	uint8_t canRunAnotherFrame() {
+		if(currentRunFrame < allPlayers[viewingPlayerIndex]->at(currentSavestateHook)->inputs[viewingBranchIndex]->size() - 1) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 	// TODO cache this
 	std::shared_ptr<std::vector<std::shared_ptr<ControllerData>>> getInputsList() const;
 

diff --git a/pc_application/source/dataHandling/gameCorruptor.cpp b/pc_application/source/dataHandling/gameCorruptor.cpp
@@ -44,7 +44,4 @@ END_EVENT_TABLE()
 
 void GameCorruptor::onIdle(wxIdleEvent& event) {
 	// Check networkInstance for memory info and enable everything
-	if(!IsBeingDeleted()) {
-		event.RequestMore();
-	}
 }
diff --git a/pc_application/source/ui/mainWindow.cpp b/pc_application/source/ui/mainWindow.cpp
@@ -61,7 +61,12 @@ MainWindow::MainWindow()
 	bottomUI = std::make_shared<BottomUI>(this, &mainSettings, buttonData, mainSizer, dataProcessingInstance, projectHandler);
 
 	autoFrameAdvanceTimer = new wxTimer(this);
-	Bind(wxEVT_TIMER, &MainWindow::onAutoFrameAdvanceTimer, this);
+	autoFrameTimerID      = autoFrameAdvanceTimer->GetId();
+
+	wakeUpIdleTimer   = new wxTimer(this);
+	wakeupIdleTimerID = wakeUpIdleTimer->GetId();
+
+	Bind(wxEVT_TIMER, &MainWindow::onTimer, this);
 
 	handleNetworkQueues();
 
@@ -80,6 +85,9 @@ MainWindow::MainWindow()
 	// Override the keypress handler
 	// add_events(Gdk::KEY_PRESS_MASK);
 	handlePreviousWindowTransform();
+
+	// Wake up idle 20 times a second
+	wakeUpIdleTimer->Start(50);
 }
 
 void MainWindow::onStart() {
@@ -135,8 +143,12 @@ void MainWindow::keyDownHandler(wxKeyEvent& event) {
 	}
 }
 
-void MainWindow::onAutoFrameAdvanceTimer(wxTimerEvent& event) {
-	sideUI->sendAutoRunData();
+void MainWindow::onTimer(wxTimerEvent& event) {
+	if(event.GetId() == autoFrameTimerID) {
+		sideUI->sendAutoRunData();
+	} else if(event.GetId() == wakeupIdleTimerID) {
+		wxWakeUpIdle();
+	}
 }
 
 void MainWindow::handlePreviousWindowTransform() {
@@ -167,10 +179,6 @@ void MainWindow::onIdle(wxIdleEvent& event) {
 	PROCESS_NETWORK_CALLBACKS(networkInstance, RecieveApplicationConnected)
 	PROCESS_NETWORK_CALLBACKS(networkInstance, RecieveLogging)
 	PROCESS_NETWORK_CALLBACKS(networkInstance, RecieveMemoryRegion)
-
-	if(!IsBeingDeleted()) {
-		event.RequestMore();
-	}
 }
 
 void MainWindow::handleNetworkQueues() {
@@ -381,6 +389,9 @@ void MainWindow::onClose(wxCloseEvent& event) {
 	networkInstance->endNetwork();
 
 	delete wxLog::SetActiveTarget(NULL);
+
+	wakeUpIdleTimer->Stop();
+
 	delete autoFrameAdvanceTimer;
 
 	// TODO, this raises errors for some reason

diff --git a/pc_application/source/ui/mainWindow.hpp b/pc_application/source/ui/mainWindow.hpp
@@ -50,6 +50,10 @@ class MainWindow : public wxFrame {
 
 	// For sideUI
 	wxTimer* autoFrameAdvanceTimer;
+	wxTimer* wakeUpIdleTimer;
+
+	int autoFrameTimerID;
+	int wakeupIdleTimerID;
 
 	// Main logging window
 	wxLogWindow* logWindow;
@@ -87,7 +91,7 @@ class MainWindow : public wxFrame {
 	void onClose(wxCloseEvent& event);
 	void onIdle(wxIdleEvent& event);
 
-	void onAutoFrameAdvanceTimer(wxTimerEvent& event);
+	void onTimer(wxTimerEvent& event);
 
 	bool askForIP();
 	void handleNetworkQueues();