From 5bc558c7b1e39270430fa5d719889557ae27686f Mon Sep 17 00:00:00 2001
From: Johannes Theiner <johannes.theiner@stud.hs-emden-leer.de>
Date: Wed, 18 Dec 2019 12:18:35 +0100
Subject: [PATCH] ~ adjust keycodes

---
 main/main.cpp      | 14 +++++++-------
 src/DrawRender.hpp |  1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/main/main.cpp b/main/main.cpp
index fd6c1cc..7fe5f25 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -32,12 +32,12 @@ int main() {
                 vkvm::callEvent(vkvm::EventType::Redraw);
             }
 
-            if((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::C) {
+            if((drawRender.getKeyCode()) == vkvm::KeyCode::C) {
                 drawRender.graphicsUpdate(CIRCLE);
                 vkvm::callEvent(vkvm::EventType::Redraw);
             }
 
-            else if((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::R) {
+            else if((drawRender.getKeyCode()) == vkvm::KeyCode::R) {
                 drawRender.graphicsUpdate(RECTANGLE);
                 vkvm::callEvent(vkvm::EventType::Redraw);
             }
@@ -67,12 +67,12 @@ int main() {
         mousePosition.y = mousePosition.y - 30;
         drawRender.setMousePostion(mousePosition);
 
-        if(((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::C) && drawRender.getPainting()) {
+        if(((drawRender.getKeyCode()) == vkvm::KeyCode::C) && drawRender.getPainting()) {
             drawRender.graphicsUpdate(CIRCLE);
             vkvm::callEvent(vkvm::EventType::Redraw);
         }
 
-        else if(((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::R) && drawRender.getPainting()) {
+        else if(((drawRender.getKeyCode()) == vkvm::KeyCode::R) && drawRender.getPainting()) {
             drawRender.graphicsUpdate(RECTANGLE);
             vkvm::callEvent(vkvm::EventType::Redraw);
         }
@@ -87,12 +87,12 @@ int main() {
     vkvm::registerEvent(vkvm::EventType::KeyDown, [&drawRender]() {
         drawRender.setKeyCode(vkvm::getLastPressedKey());
 
-        if((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::D) {
+        if((drawRender.getKeyCode()) == vkvm::KeyCode::D) {
             drawRender.clear();
             vkvm::callEvent(vkvm::EventType::Redraw);
         }
 
-        else if((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::Q) {
+        else if((drawRender.getKeyCode()) == vkvm::KeyCode::Q) {
             drawRender.graphicsUpdate(SHAPE);
             vkvm::callEvent(vkvm::EventType::Redraw);
         }
@@ -101,7 +101,7 @@ int main() {
     vkvm::registerEvent(vkvm::EventType::KeyUp, [&drawRender]() {
         drawRender.setKeyCode(vkvm::getLastPressedKey());
 
-        if((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::D) {
+        if((drawRender.getKeyCode()) == vkvm::KeyCode::D) {
             drawRender.clear();
             vkvm::callEvent(vkvm::EventType::Redraw);
         }
diff --git a/src/DrawRender.hpp b/src/DrawRender.hpp
index 4f1697a..724b030 100644
--- a/src/DrawRender.hpp
+++ b/src/DrawRender.hpp
@@ -8,7 +8,6 @@
 #include <Color.hpp>
 #include <vkvm.hpp>
 #include <iostream>
-#include "Font.h"
 #include "vector"
 #include "utils.hpp"
 #include <cmath>