mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -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

9
include/openspace/engine/openspaceengine.h
View File

@@ -25,9 +25,13 @@
#ifndef __OPENSPACEENGINE_H__
#define __OPENSPACEENGINE_H__
#include <ghoul/glm.h>
#include <ghoul/misc/dictionary.h>
#include <openspace/util/keys.h>
#include <openspace/util/mouse.h>
#include <string>
#include <vector>
@@ -100,9 +104,10 @@ public:
void postSynchronizationPreDraw();
void render(const glm::mat4 &projectionMatrix, const glm::mat4 &viewMatrix);
void postDraw();
void keyboardCallback(int key, int action);
// void keyboardCallback(int key, int action);
void keyboardCallback(Key key, KeyModifier mod, KeyAction action);
void charCallback(unsigned int codepoint);
void mouseButtonCallback(int key, int action);
void mouseButtonCallback(MouseButton button, MouseAction action);
void mousePositionCallback(double x, double y);
void mouseScrollWheelCallback(double pos);
void externalControlCallback(const char* receivedChars, int size, int clientId);