mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-23 05:19:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

More work on transitioning to windowwrapper for keyboard and mouse interaction

Browse Source
This commit is contained in:
Alexander Bock
2015-10-25 17:34:03 -05:00
parent 5456b5ee85
commit d84edc4090
19 changed files with 498 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/onscreengui/include/gui.h
View File

@@ -32,6 +32,9 @@
#include <modules/onscreengui/include/guitimecomponent.h>
#include <openspace/scripting/scriptengine.h>
#include <openspace/util/keys.h>
#include <openspace/util/mouse.h>
namespace openspace {
namespace gui {
@@ -49,12 +52,14 @@ public:
void initializeGL();
void deinitializeGL();
bool mouseButtonCallback(int key, int action);
bool mouseButtonCallback(MouseButton button, MouseAction action);
// bool mouseButtonCallback(int key, int action);
bool mouseWheelCallback(double position);
bool keyCallback(int key, int action);
bool keyCallback(Key key, KeyAction action);
// bool keyCallback(int key, int action);
bool charCallback(unsigned int character);
void startFrame(float deltaTime, const glm::vec2& windowSize, const glm::vec2& mousePos, bool mouseButtonsPressed[2]);
void startFrame(float deltaTime, const glm::vec2& windowSize, const glm::vec2& mousePos, uint32_t mouseButtons);
void endFrame();
void renderMainWindow();

25
modules/onscreengui/src/gui.cpp
View File

@@ -257,7 +257,7 @@ void GUI::deinitializeGL() {
void GUI::startFrame(float deltaTime,
const glm::vec2& windowSize,
const glm::vec2& mousePos,
bool mouseButtonsPressed[2])
uint32_t mouseButtonsPressed)
{
ImGuiIO& io = ImGui::GetIO();
@@ -268,8 +268,8 @@ void GUI::startFrame(float deltaTime,
#else
io.MousePos = ImVec2(mousePos.x, mousePos.y);
#endif
io.MouseDown[0] = mouseButtonsPressed[0];
io.MouseDown[1] = mouseButtonsPressed[1];
io.MouseDown[0] = mouseButtonsPressed & (1 << 0);
io.MouseDown[1] = mouseButtonsPressed & (1 << 1);
ImGui::NewFrame();
}
@@ -287,7 +287,8 @@ void GUI::endFrame() {
ImGui::Render();
}
bool GUI::mouseButtonCallback(int key, int action) {
bool GUI::mouseButtonCallback(MouseButton button, MouseAction action) {
//bool GUI::mouseButtonCallback(int key, int action) {
ImGuiIO& io = ImGui::GetIO();
bool consumeEvent = io.WantCaptureMouse;
return consumeEvent;
@@ -302,14 +303,20 @@ bool GUI::mouseWheelCallback(double position) {
return consumeEvent;
}
bool GUI::keyCallback(int key, int action) {
bool GUI::keyCallback(Key key, KeyAction action) {
//bool GUI::keyCallback(int key, int action) {
ImGuiIO& io = ImGui::GetIO();
bool consumeEvent = io.WantCaptureKeyboard;
if (consumeEvent) {
if (action == SGCT_PRESS)
io.KeysDown[key] = true;
if (action == SGCT_RELEASE)
io.KeysDown[key] = false;
int keyIndex = static_cast<int>(key);
if (keyIndex < 0)
LERROR("Pressed key of index '" << keyIndex << "' was negative");
else {
if (action == KeyAction::Press)
io.KeysDown[keyIndex] = true;
if (action == KeyAction::Release)
io.KeysDown[keyIndex] = false;
}
}
return consumeEvent;
}