add preliminary touch support for windows 8/10 via mouse input

Author: unknown

pseuthe/include/InputComponent.hpp

@@ -72,6 +72,8 @@ class InputComponent final : public Component
     float m_health;
     bool m_parseInput;
     bool m_controllerEnabled;
+    bool m_mouseClickPending;
+    sf::Vector2f m_mouseClick;
 
     float m_mass;
     float m_invMass;
@@ -84,6 +86,8 @@ class InputComponent final : public Component
 
     sf::Vector2f getKeyboardArcade(float);
     sf::Vector2f getControllerArcade(float);
+
+    sf::Vector2f getMouse(float, const sf::Vector2f&);
 };
 
 #endif //INPUT_COMPONENT_HPP_

pseuthe/include/MessageBus.hpp

@@ -99,11 +99,13 @@ class Message final
             RequestControlsArcade,
             RequestControllerEnable,
             RequestControllerDisable,
-            ResizedWindow
+            ResizedWindow,
+            MouseClicked
         }type;
         float value;
         States::ID stateId;
         Difficulty difficulty;
+        float mouseX, mouseY;
     };
 
     struct PlayerEvent

pseuthe/src/GameState.cpp

@@ -109,6 +109,19 @@ GameState::GameState(StateStack& stateStack, Context context)
 
 bool GameState::update(float dt)
 {
+    if (sf::Mouse::isButtonPressed(sf::Mouse::Left))
+    {
+        auto& rw = getContext().renderWindow;
+        auto pos = rw.mapPixelToCoords(sf::Mouse::getPosition(rw));
+        Message msg;
+        msg.type = Message::Type::UI;
+        msg.ui.mouseX = pos.x;
+        msg.ui.mouseY = pos.y;
+        msg.ui.type = Message::UIEvent::MouseClicked;
+        m_messageBus.send(msg);
+    }
+    
+    
     //probably ok to do here, although we could always raise an event when resizing window
     m_vignette.setPosition(getContext().defaultView.getCenter()); //TODO this should be part of the scene
     m_scene.setView(getContext().defaultView);
@@ -156,6 +169,17 @@ bool GameState::handleEvent(const sf::Event& evt)
         default: break;
         }
     }
+    //else if (evt.type == sf::Event::MouseButtonPressed)
+    //{
+    //    auto& rw = getContext().renderWindow;
+    //    auto pos = rw.mapPixelToCoords(sf::Mouse::getPosition(rw));
+    //    Message msg;
+    //    msg.type = Message::Type::UI;
+    //    msg.ui.mouseX = pos.x;
+    //    msg.ui.mouseY = pos.y;
+    //    msg.ui.type = Message::UIEvent::MouseClicked;
+    //    m_messageBus.send(msg);
+    //}
     return true;
 }
 

pseuthe/src/InputComponent.cpp

@@ -88,6 +88,7 @@ InputComponent::InputComponent(MessageBus& mb)
     m_health            (maxHealth),
     m_parseInput        (true),
     m_controllerEnabled (true),
+    m_mouseClickPending (false),
     m_mass              (0.f),
     m_invMass           (1.f)
 {
@@ -112,6 +113,12 @@ void InputComponent::entityUpdate(Entity& entity, float dt)
         {
             forceVec = getController(dt);
         }
+
+        if (Util::Vector::lengthSquared(forceVec) < 0.1f
+            && m_mouseClickPending)
+        {
+            forceVec = getMouse(dt, entity.getPosition());
+        }
     }
 
     //limit speed
@@ -194,6 +201,11 @@ void InputComponent::handleMessage(const Message& msg)
                 m_physicsComponent->setVelocity(m_physicsComponent->getVelocity() * 0.1f);
             }
             break;
+        case Message::UIEvent::MouseClicked:
+            m_mouseClickPending = true;
+            m_mouseClick.x = msg.ui.mouseX;
+            m_mouseClick.y = msg.ui.mouseY;
+            break;
         default:break;
         }
     }
@@ -495,4 +507,10 @@ sf::Vector2f InputComponent::getControllerArcade(float dt)
     }
 
     return forceVec;
+}
+
+sf::Vector2f InputComponent::getMouse(float dt, const sf::Vector2f& position)
+{
+    m_mouseClickPending = false;
+    return (force * 0.05f) * Util::Vector::normalise(m_mouseClick - position) * m_invMass;
 }