Various cleanups in main.cpp

Adapted to new Ghoul version
This commit is contained in:
Alexander Bock
2015-05-19 13:58:00 +02:00
parent 9e02d35d8a
commit 683ce14449
4 changed files with 34 additions and 48 deletions

View File

@@ -690,13 +690,13 @@ void OpenSpaceEngine::mouseButtonCallback(int key, int action) {
}
}
void OpenSpaceEngine::mousePositionCallback(int x, int y) {
void OpenSpaceEngine::mousePositionCallback(double x, double y) {
if (_isMaster) {
_interactionHandler->mousePositionCallback(x, y);
}
}
void OpenSpaceEngine::mouseScrollWheelCallback(int pos) {
void OpenSpaceEngine::mouseScrollWheelCallback(double pos) {
if (_isMaster) {
if (_gui->isEnabled()) {
bool isConsumed = _gui->mouseWheelCallback(pos);