Index: NewOpenGLGame.sln
===================================================================
--- NewOpenGLGame.sln (revision 27c40cefd96c63cd41234d37e4e62526a7c4ecdb)
+++ NewOpenGLGame.sln (revision 7bf5433f5c6c2730d8e43381bfb0d0741b7fb34a)
@@ -9,4 +9,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VulkanGame", "VulkanGame.vcxproj", "{3489E223-6118-49E3-98F3-8887B68AC32F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGLGame", "OpenGLGame.vcxproj", "{569037E7-4D03-4412-8CC1-DE51435C0BBE}"
EndProject
Global
@@ -42,4 +44,12 @@
{3489E223-6118-49E3-98F3-8887B68AC32F}.Release|x86.ActiveCfg = Release|Win32
{3489E223-6118-49E3-98F3-8887B68AC32F}.Release|x86.Build.0 = Release|Win32
+ {569037E7-4D03-4412-8CC1-DE51435C0BBE}.Debug|x64.ActiveCfg = Debug|x64
+ {569037E7-4D03-4412-8CC1-DE51435C0BBE}.Debug|x64.Build.0 = Debug|x64
+ {569037E7-4D03-4412-8CC1-DE51435C0BBE}.Debug|x86.ActiveCfg = Debug|Win32
+ {569037E7-4D03-4412-8CC1-DE51435C0BBE}.Debug|x86.Build.0 = Debug|Win32
+ {569037E7-4D03-4412-8CC1-DE51435C0BBE}.Release|x64.ActiveCfg = Release|x64
+ {569037E7-4D03-4412-8CC1-DE51435C0BBE}.Release|x64.Build.0 = Release|x64
+ {569037E7-4D03-4412-8CC1-DE51435C0BBE}.Release|x86.ActiveCfg = Release|Win32
+ {569037E7-4D03-4412-8CC1-DE51435C0BBE}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
Index: OpenGLGame.vcxproj
===================================================================
--- OpenGLGame.vcxproj (revision 7bf5433f5c6c2730d8e43381bfb0d0741b7fb34a)
+++ OpenGLGame.vcxproj (revision 7bf5433f5c6c2730d8e43381bfb0d0741b7fb34a)
@@ -0,0 +1,152 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 16.0
+ {7BED9D8B-405D-4051-B872-7090AA360091}
+ OpenGLGame
+ 10.0
+
+
+
+ Application
+ true
+ v142
+ MultiByte
+
+
+ Application
+ false
+ v142
+ true
+ MultiByte
+
+
+ Application
+ true
+ v142
+ MultiByte
+
+
+ Application
+ false
+ v142
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ include;$(IncludePath)
+ lib;$(LibraryPath)
+
+
+
+ Level3
+ Disabled
+ true
+ true
+ stdcpp17
+ _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+
+
+ Console
+ glew32s.lib;glfw3.lib;opengl32.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ Disabled
+ true
+ true
+
+
+ Console
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ true
+
+
+ Console
+ true
+ true
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ true
+
+
+ Console
+ true
+ true
+
+
+
+
+
+
Index: VulkanGame.vcxproj
===================================================================
--- VulkanGame.vcxproj (revision 27c40cefd96c63cd41234d37e4e62526a7c4ecdb)
+++ VulkanGame.vcxproj (revision 7bf5433f5c6c2730d8e43381bfb0d0741b7fb34a)
@@ -71,5 +71,5 @@
- include;$(IncludePath)
+ include;D:\VulkanSDK\1.1.108.0\Include;$(IncludePath)
lib;D:\VulkanSDK\1.1.108.0\Lib;$(LibraryPath)
@@ -82,5 +82,6 @@
stdcpp17
_CRT_SECURE_NO_WARNINGS;GAMEGUI_INCLUDE_VULKAN;%(PreprocessorDefinitions)
- D:\VulkanSDK\1.1.108.0\Include;include;%(AdditionalIncludeDirectories)
+
+
@@ -139,4 +140,5 @@
+
Index: game-gui-glfw.cpp
===================================================================
--- game-gui-glfw.cpp (revision 27c40cefd96c63cd41234d37e4e62526a7c4ecdb)
+++ game-gui-glfw.cpp (revision 7bf5433f5c6c2730d8e43381bfb0d0741b7fb34a)
@@ -1,13 +1,15 @@
#include "game-gui-glfw.hpp"
+
+#include
#include "compiler.hpp"
#include "consts.hpp"
-const int KEY_STATE_UNCHANGED = -1;
+int GameGui_GLFW::s_keyState[GLFW_KEY_LAST];
+bool GameGui_GLFW::s_keyDown[GLFW_KEY_LAST];
+
+// queue mouseEvents;
string GameGui_GLFW::s_errorMessage;
-
-int GameGui_GLFW::s_keyState[NUM_KEYS];
-bool GameGui_GLFW::s_keyDown[NUM_KEYS];
string& GameGui_GLFW::getError() {
@@ -62,8 +64,9 @@
//glfwMakeContextCurrent(window);
- //glfwSetMouseButtonCallback(window, mouse_button_callback);
+ glfwSetMouseButtonCallback(window, glfw_mouse_button_callback);
glfwSetKeyCallback(window, glfw_key_callback);
- fill(GameGui_GLFW::s_keyState, GameGui_GLFW::s_keyState + NUM_KEYS, KEY_STATE_UNCHANGED);
+ // fill(s_keyState, s_keyState + GLFW_KEY_LAST, RTWO_KEY_EVENT_NONE);
+ // fill(s_keyDown, s_keyDown + GLFW_KEY_LAST, false);
return window;
@@ -74,4 +77,31 @@
glfwDestroyWindow(window);
}
+
+/*
+void GameGui_GLFW::processEvents() {
+ fill(s_keyState, s_keyState + GLFW_KEY_LAST, RTWO_KEY_EVENT_NONE);
+
+ glfwPollEvents();
+}
+
+unsigned char GameGui_GLFW::getKeyEvent(unsigned int key) {
+ return s_keyState[key];
+}
+
+bool GameGui_GLFW::isKeyPressed(unsigned int key) {
+ return s_keyDown[key];
+}
+
+int GameGui_GLFW::pollMouseEvent(MouseEvent* event) {
+ if (mouseEvents.empty()) {
+ return 0;
+ }
+
+ *event = mouseEvents.front();
+ mouseEvents.pop();
+
+ return 1;
+}
+*/
#ifdef GAMEGUI_INCLUDE_VULKAN
@@ -107,8 +137,32 @@
}
+void glfw_mouse_button_callback(GLFWwindow* window, int button, int action, int mods) {
+ double x, y;
+ glfwGetCursorPos(window, &x, &y);
+
+ /*
+ MouseEvent e { button, action, (int)x, (int)y };
+
+ mouseEvents.push(e);
+ */
+}
+
void glfw_key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) {
GameGui_GLFW::s_keyState[key] = action;
+ /*
+ switch(action) {
+ case GLFW_PRESS:
+ s_keyState[key] = RTWO_KEY_EVENT_PRESSED;
+ break;
+ case GLFW_RELEASE:
+ s_keyState[key] = RTWO_KEY_EVENT_RELEASED;
+ break;
+ default:
+ s_keyState[key] = RTWO_KEY_EVENT_NONE;
+ break;
+ }
// should be true for GLFW_PRESS and GLFW_REPEAT
GameGui_GLFW::s_keyDown[key] = (action != GLFW_RELEASE);
+ */
}
Index: game-gui-glfw.hpp
===================================================================
--- game-gui-glfw.hpp (revision 27c40cefd96c63cd41234d37e4e62526a7c4ecdb)
+++ game-gui-glfw.hpp (revision 7bf5433f5c6c2730d8e43381bfb0d0741b7fb34a)
@@ -10,6 +10,4 @@
#include
-#define NUM_KEYS (512)
-
class GameGui_GLFW : public GameGui {
public:
@@ -18,6 +16,6 @@
// Both have to be public so that glfw_key_callback can access them
// TODO: Implement a more generic public api over this to get the key state
- static int s_keyState[NUM_KEYS];
- static bool s_keyDown[NUM_KEYS];
+ static int s_keyState[GLFW_KEY_LAST];
+ static bool s_keyDown[GLFW_KEY_LAST];
string& getError();
@@ -28,4 +26,13 @@
void* createWindow(const string& title, int width, int height, bool fullscreen);
void destroyWindow();
+
+ /*
+ void processEvents();
+
+ unsigned char getKeyEvent(unsigned int key);
+ bool isKeyPressed(unsigned int key);
+
+ int pollMouseEvent(MouseEvent* event);
+ */
#ifdef GAMEGUI_INCLUDE_VULKAN
@@ -43,4 +50,5 @@
void glfw_error_callback(int error, const char* description);
+void glfw_mouse_button_callback(GLFWwindow* window, int button, int action, int mods);
void glfw_key_callback(GLFWwindow* window, int key, int scancode, int action, int mods);
Index: opengl-game.cpp
===================================================================
--- opengl-game.cpp (revision 27c40cefd96c63cd41234d37e4e62526a7c4ecdb)
+++ opengl-game.cpp (revision 7bf5433f5c6c2730d8e43381bfb0d0741b7fb34a)
@@ -57,5 +57,19 @@
void OpenGLGame::mainLoop() {
+ //MouseEvent e;
+
while (!glfwWindowShouldClose(window)) {
+ /*
+ gui->processEvents();
+
+ if (gui->getKeyEvent(GLFW_KEY_ESCAPE) == RTWO_KEY_EVENT_PRESSED) {
+ glfwSetWindowShouldClose(window, 1);
+ }
+
+ while (gui->pollMouseEvent(&e)) {
+ cout << "Mouse click detected at (" << e.x << ", " << e.y << ")" << endl;
+ }
+ */
+
glfwPollEvents();