From 48db82013bd79d81f0b30a72972d4409e0138c92 Mon Sep 17 00:00:00 2001 From: ShizZy Date: Wed, 4 Sep 2013 22:10:47 -0400 Subject: [PATCH] added missing files --- src/akiru/src/emu_window/emu_window_glfw.cpp | 96 ++++++++++++++++++++ src/akiru/src/emu_window/emu_window_glfw.h | 56 ++++++++++++ src/core/src/core.cpp | 2 + 3 files changed, 154 insertions(+) create mode 100644 src/akiru/src/emu_window/emu_window_glfw.cpp create mode 100644 src/akiru/src/emu_window/emu_window_glfw.h create mode 100644 src/core/src/core.cpp diff --git a/src/akiru/src/emu_window/emu_window_glfw.cpp b/src/akiru/src/emu_window/emu_window_glfw.cpp new file mode 100644 index 000000000..01e5992e5 --- /dev/null +++ b/src/akiru/src/emu_window/emu_window_glfw.cpp @@ -0,0 +1,96 @@ +/** + * Copyright (C) 2013 Akiru Emulator + * + * @file emu_window_glfw.cpp + * @author ShizZy + * @date 2013-09-04 + * @brief Implementation implementation of EmuWindow class for GLFW + * + * @section LICENSE + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details at + * http://www.gnu.org/copyleft/gpl.html + * + * Official project repository can be found at: + * http://code.google.com/p/gekko-gc-emu/ + */ + +#include "common.h" +#include "emu_window_glfw.h" + +static void OnKeyEvent(GLFWwindow* win, int key, int action) { + // EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win); + //input_common::GCController::GCButtonState state; + + //if (action == GLFW_PRESS) { + // state = input_common::GCController::PRESSED; + //} else { + // state = input_common::GCController::RELEASED; + //} + // for (int channel = 0; channel < 4 && emuwin->controller_interface(); ++channel) { + // emuwin->controller_interface()->SetControllerStatus(channel, key, state); + // } +} + +static void OnWindowSizeEvent(GLFWwindow* win, int width, int height) { + EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win); + emuwin->set_client_area_width(width); + emuwin->set_client_area_height(height); +} + +/// EmuWindow_GLFW constructor +EmuWindow_GLFW::EmuWindow_GLFW() { + // Initialize the window + if(glfwInit() != GL_TRUE) { + printf("Failed to initialize GLFW! Exiting..."); + exit(1); + } + glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); + glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1); + render_window_ = glfwCreateWindow(640, 480, "akiru", NULL, NULL); + + // Setup callbacks + glfwSetWindowUserPointer(render_window_, this); + //glfwSetKeyCallback(render_window_, OnKeyEvent); + //glfwSetWindowSizeCallback(render_window_, OnWindowSizeEvent); + + DoneCurrent(); +} + +/// EmuWindow_GLFW destructor +EmuWindow_GLFW::~EmuWindow_GLFW() { + glfwTerminate(); +} + +/// Swap buffers to display the next frame +void EmuWindow_GLFW::SwapBuffers() { + glfwSwapBuffers(render_window_); +} + +/// Polls window events +void EmuWindow_GLFW::PollEvents() { + // TODO(ShizZy): Does this belong here? This is a reasonable place to update the window title + // from the main thread, but this should probably be in an event handler... + static char title[128]; + sprintf(title, "%s (FPS: %02.02f)", window_title_.c_str(), 0.0f); + glfwSetWindowTitle(render_window_, title); + + glfwPollEvents(); +} + +/// Makes the GLFW OpenGL context current for the caller thread +void EmuWindow_GLFW::MakeCurrent() { + glfwMakeContextCurrent(render_window_); +} + +/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread +void EmuWindow_GLFW::DoneCurrent() { + glfwMakeContextCurrent(NULL); +} diff --git a/src/akiru/src/emu_window/emu_window_glfw.h b/src/akiru/src/emu_window/emu_window_glfw.h new file mode 100644 index 000000000..927d726b8 --- /dev/null +++ b/src/akiru/src/emu_window/emu_window_glfw.h @@ -0,0 +1,56 @@ +/** + * Copyright (C) 2013 Akiru Emulator + * + * @file emu_window_glfw.h + * @author ShizZy + * @date 2013-09-04 + * @brief Implementation implementation of EmuWindow class for GLFW + * + * @section LICENSE + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details at + * http://www.gnu.org/copyleft/gpl.html + * + * Official project repository can be found at: + * http://code.google.com/p/gekko-gc-emu/ + */ + +#ifndef AKIRU_EMUWINDOW_GLFW_ +#define AKIRU_EMUWINDOW_GLFW_ + +#include +#include + +#include "emu_window.h" + +class EmuWindow_GLFW : public EmuWindow { +public: + EmuWindow_GLFW(); + ~EmuWindow_GLFW(); + + /// Swap buffers to display the next frame + void SwapBuffers(); + + /// Polls window events + void PollEvents(); + + /// Makes the graphics context current for the caller thread + void MakeCurrent(); + + /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread + void DoneCurrent(); + + GLFWwindow* render_window_; ///< Internal GLFW render window + +private: + +}; + +#endif // AKIRU_EMUWINDOW_GLFW_ diff --git a/src/core/src/core.cpp b/src/core/src/core.cpp new file mode 100644 index 000000000..b5ac85648 --- /dev/null +++ b/src/core/src/core.cpp @@ -0,0 +1,2 @@ +void null() { +} \ No newline at end of file