imgui integration almost complete

Author: Aviii06

src/core/gameBoy.cpp

@@ -4,6 +4,8 @@
 
 int GBE::s_Cycles;
 
+static int i = 0;
+
 GBE::GBE()
 {
 	// Initialize the CPU
@@ -102,23 +104,29 @@ GBE::GBE()
 	update();
 }
 
-void GBE::update()
+int GBE::update()
 {
+//	printf("Updating\n");
 	// Update function of the GBE
 	// Will be called every frame
 	// GB has 59.73 frames per second
 //	while (true)
+	int cycle = 0;
 	{
 		// Execute the next instruction
 		s_Cycles += gbe_cpu->executeNextInstruction();
+		cycle += s_Cycles;
 
 		// update the DIV and TIMA timers
 		gbe_cpu->updateTimers(s_Cycles);
 		gbe_graphics->executePPU(s_Cycles);
 		s_Cycles = 0;
 		s_Cycles += gbe_cpu->performInterrupt();
 		gbe_graphics->pollEvents();
+		i++;
+//		printf("%d\n", i);
 	}
+	return cycle;
 }
 
 void GBE::executeBootROM()

src/core/gameBoy.h

@@ -34,8 +34,6 @@ class GBE
 	// File pointer for game ROM
 	FILE* gameROM;
 
-
-
 	// cycle counter of the gameboy
 	// used by CPU, PPU, APU so declared here
 	static int s_Cycles;
@@ -52,7 +50,7 @@ class GBE
 	// Update function of the GBE
 	// Will be called every frame
 	// GB has 59.73 frames per second
-	void update();
+	int update();
 
 	// Returns the CPU
 	CPU* getCPU() { return gbe_cpu; };

src/core/graphics.cpp

@@ -48,12 +48,12 @@ bool PPU::init()
 		return false;
 	}
 
-	// Set hint for VSync
-	if (!SDL_SetHint(SDL_HINT_RENDER_VSYNC, "1"))
-	{
-		printf("VSync not enabled! SDL_Error: %s\n", SDL_GetError());
-		return false;
-	}
+//	// Set hint for VSync
+//	if (!SDL_SetHint(SDL_HINT_RENDER_VSYNC, "1"))
+//	{
+//		printf("VSync not enabled! SDL_Error: %s\n", SDL_GetError());
+//		return false;
+//	}
 
 	// Create window and renderer
 	if (!(window = SDL_CreateWindow("GameBoy Emulator", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2, SDL_WINDOW_SHOWN)))

src/gui/window.cpp

@@ -59,7 +59,7 @@ namespace gbemuGUI
 		m_Window = SDL_CreateWindow(m_Title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1280, 720, window_flags);
 		m_GLContext = SDL_GL_CreateContext(m_Window);
 		SDL_GL_MakeCurrent(m_Window, m_GLContext);
-		SDL_GL_SetSwapInterval(1); // Enable vsync
+//		SDL_GL_SetSwapInterval(1); // Enable vsync
 
 
 		IMGUI_CHECKVERSION();
@@ -71,6 +71,7 @@ namespace gbemuGUI
 		ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_DockingEnable;
 
 		gbemuGUI::ImGuiThemeSetup();
+		m_Texture = SDL_CreateTexture(m_Renderer, SDL_PIXELFORMAT_RGBA32, SDL_TEXTUREACCESS_STREAMING, 160, 144);
 
 	}
 
@@ -99,7 +100,11 @@ namespace gbemuGUI
 		gbemuGUI::InitUI();
 
 		// Update the texture
-//		SDL_UpdateTexture(m_Texture, NULL, renderArray, 160 * 4);
+//		for (int i = 0; i < 160 * 144; i++)
+//		{
+//			renderArray[i] = 0x00FF00FF;
+//		}
+		SDL_UpdateTexture(m_Texture, NULL, renderArray, 160 * 4);
 
 		bool show_demo_window = true;
 		// 2. Show a simple gui that we create ourselves. We use a Begin/End pair to create a named gui.
@@ -119,6 +124,7 @@ namespace gbemuGUI
 //			ImGui::Image((ImTextureID)(intptr_t)m_Texture, ImVec2(512, 512));
 
 			ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate);
+			printf("Application average %.3f ms/frame (%.1f FPS)\n", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate);
 			ImGui::End();
 		}
 
@@ -142,8 +148,7 @@ namespace gbemuGUI
 			SDL_GL_MakeCurrent(backup_current_window, backup_current_context);
 		}
 
-
-//		SDL_GL_SwapWindow(m_Window);
+		SDL_GL_SwapWindow(m_Window);
 	}
 
 	void Window::Exit()

src/main.cpp

@@ -14,11 +14,16 @@ int main(int argv, char** argc)
 	SDL_UpdateTexture(texture, NULL, renderArray, 160 * 4);
 	SDL_RenderClear(renderer);
 	SDL_RenderCopy(renderer, texture, NULL, NULL);
+	int cyclesForPPUEExecution = 0;
 	while(!window.IsDone())
 	{
-		gbe->update();
+		cyclesForPPUEExecution += gbe->update();
 		renderArray = gbe->getRenderArray();
-		window.Update(renderArray);
+		if (cyclesForPPUEExecution >= (456 + 204 + 80 + 172))
+		{
+			window.Update(renderArray);
+			cyclesForPPUEExecution = 0;
+		}
 	}
 
 	window.Exit();