summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-04-09 05:18:23 +0200
committerbunnei <ericbunnie@gmail.com>2014-04-09 05:18:23 +0200
commit5da03e821ef281909e65c3df33f67596074ae98a (patch)
tree15f1bb0f91a88082a21e4e2e4531e1f8dee026bf /src/citra
parentfixed licensing and updated code style naming for arm_interface/arm_interpreter frontend module (diff)
downloadyuzu-5da03e821ef281909e65c3df33f67596074ae98a.tar
yuzu-5da03e821ef281909e65c3df33f67596074ae98a.tar.gz
yuzu-5da03e821ef281909e65c3df33f67596074ae98a.tar.bz2
yuzu-5da03e821ef281909e65c3df33f67596074ae98a.tar.lz
yuzu-5da03e821ef281909e65c3df33f67596074ae98a.tar.xz
yuzu-5da03e821ef281909e65c3df33f67596074ae98a.tar.zst
yuzu-5da03e821ef281909e65c3df33f67596074ae98a.zip
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/citra.h12
-rw-r--r--src/citra/citra.vcxproj1
-rw-r--r--src/citra/citra.vcxproj.filters1
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp30
-rw-r--r--src/citra/emu_window/emu_window_glfw.h2
-rw-r--r--src/citra/version.h6
6 files changed, 22 insertions, 30 deletions
diff --git a/src/citra/citra.h b/src/citra/citra.h
index 5a2c60aac..b9254c5da 100644
--- a/src/citra/citra.h
+++ b/src/citra/citra.h
@@ -4,10 +4,12 @@
#pragma once
-#include "version.h"
+#include <string>
-#define APP_NAME "citra"
-#define APP_VERSION "0.01-" VERSION
-#define APP_TITLE APP_NAME " " APP_VERSION
-#define COPYRIGHT "Copyright (C) 2013 Citra Emulator"
+#include "common/common.h"
+
+#define APP_NAME std::string("citra")
+#define APP_VERSION std::string("0.01-") + std::string(g_scm_rev_str)
+#define APP_TITLE (APP_NAME + " " + APP_VERSION)
+#define COPYRIGHT "Copyright (C) 2014 Citra Emulator"
diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj
index 4ea222fcd..d81ac5bfc 100644
--- a/src/citra/citra.vcxproj
+++ b/src/citra/citra.vcxproj
@@ -206,7 +206,6 @@
<ClInclude Include="citra.h" />
<ClInclude Include="emu_window\emu_window_glfw.h" />
<ClInclude Include="resource.h" />
- <ClInclude Include="version.h" />
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters
index b41cdf146..b2685691f 100644
--- a/src/citra/citra.vcxproj.filters
+++ b/src/citra/citra.vcxproj.filters
@@ -14,7 +14,6 @@
<ItemGroup>
<ClInclude Include="citra.h" />
<ClInclude Include="resource.h" />
- <ClInclude Include="version.h" />
<ClInclude Include="emu_window\emu_window_glfw.h">
<Filter>emu_window</Filter>
</ClInclude>
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index 442176d91..e6943f146 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -3,7 +3,10 @@
// Refer to the license.txt file included.
#include "common/common.h"
+
#include "video_core/video_core.h"
+
+#include "citra/citra.h"
#include "citra/emu_window/emu_window_glfw.h"
static void OnKeyEvent(GLFWwindow* win, int key, int action) {
@@ -11,9 +14,9 @@ static void OnKeyEvent(GLFWwindow* win, int key, int action) {
}
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* emu_window = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win);
+ emu_window->SetClientAreaWidth(width);
+ emu_window->SetClientAreaHeight(height);
}
/// EmuWindow_GLFW constructor
@@ -25,13 +28,14 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
}
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
- render_window_ = glfwCreateWindow(VideoCore::kScreenTopWidth,
- (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), "citra", NULL, NULL);
+ m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth,
+ (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight),
+ m_window_title.c_str(), NULL, NULL);
// Setup callbacks
- glfwSetWindowUserPointer(render_window_, this);
- //glfwSetKeyCallback(render_window_, OnKeyEvent);
- //glfwSetWindowSizeCallback(render_window_, OnWindowSizeEvent);
+ glfwSetWindowUserPointer(m_render_window, this);
+ //glfwSetKeyCallback(m_render_window, OnKeyEvent);
+ //glfwSetWindowSizeCallback(m_render_window, OnWindowSizeEvent);
DoneCurrent();
}
@@ -43,23 +47,17 @@ EmuWindow_GLFW::~EmuWindow_GLFW() {
/// Swap buffers to display the next frame
void EmuWindow_GLFW::SwapBuffers() {
- glfwSwapBuffers(render_window_);
+ glfwSwapBuffers(m_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_);
+ glfwMakeContextCurrent(m_render_window);
}
/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h
index 6499315c8..5898ec177 100644
--- a/src/citra/emu_window/emu_window_glfw.h
+++ b/src/citra/emu_window/emu_window_glfw.h
@@ -26,7 +26,7 @@ public:
/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
void DoneCurrent();
- GLFWwindow* render_window_; ///< Internal GLFW render window
+ GLFWwindow* m_render_window; ///< Internal GLFW render window
private:
diff --git a/src/citra/version.h b/src/citra/version.h
deleted file mode 100644
index 07b88c641..000000000
--- a/src/citra/version.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// GENERATED - Do not edit!
-#ifndef VERSION_H_
-#define VERSION_H_
-#define __BUILD__ "122"
-#define VERSION __BUILD__
-#endif // VERSION_H_