From 42b697b363a28fa8b7c7464e828b83f905d953ba Mon Sep 17 00:00:00 2001
From: Nao Pross <naopross@thearcway.org>
Date: Mon, 12 Feb 2018 00:37:24 +0100
Subject: Add more events and fix typos in comments

---
 src/main/cpp/Subconscious.cpp | 23 ++++++++++++++++++++---
 src/main/headers/Scene.hpp    |  2 ++
 2 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main/cpp/Subconscious.cpp b/src/main/cpp/Subconscious.cpp
index 8e1bd02..b53a38b 100644
--- a/src/main/cpp/Subconscious.cpp
+++ b/src/main/cpp/Subconscious.cpp
@@ -14,6 +14,8 @@ Subconscious::Subconscious()
 {
     _window.setVerticalSyncEnabled(true);
     _window.setFramerateLimit(90);
+
+    // TODO currentScene = new MenuScene("main-menu") or something
 }
 
 Subconscious::~Subconscious()
@@ -29,12 +31,27 @@ void Subconscious::run()
         while (_window.pollEvent(event)) {
             switch (event.type) {
             /*** Keyboard Events ***/
+            case sf::Event::KeyPressed:
+                break;
+
+            case sf::Event::KeyReleased:
+                break;
+
             /*** Mouse Events ***/
+            case sf::Event::MouseButtonPressed:
+                break;
+
+            case sf::Event::MouseButtonReleased:
+                break;
+
+            case sf::Event::MouseMoved:
+                break;
+
             case sf::Event::MouseWheelScrolled:
                 // my mouse always outputs +/- 1.0000, so the zoom speed
-                // is by 1/10.0 => .1
-                // TODO make this a setting that chan be changed
-                // (mousewheel sensibility
+                // is 1/10.0 => .1
+                // TODO make this a setting that can be changed
+                // (mousewheel sensibility)
                 //
                 // std::cout << std::fixed << std::setprecision(3)
                 //           << event.mouseWheelScroll.delta << std::endl;
diff --git a/src/main/headers/Scene.hpp b/src/main/headers/Scene.hpp
index b7a46e6..757202c 100644
--- a/src/main/headers/Scene.hpp
+++ b/src/main/headers/Scene.hpp
@@ -12,6 +12,8 @@ public:
     virtual void render() = 0;
     virtual void resize(const sf::Event::SizeEvent &size) = 0;
 
+    virtual void click(const sf::Event::MouseButtonEvent &click) {}
+    virtual void keyPress(const sf::Event::KeyEvent &event) {}
     virtual void zoom(float factor) {}
 
 protected:
-- 
cgit v1.2.1