EpicSparrow/SparrowInput
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set version number and change return type of getPosition()

Browse Source
This commit is contained in:
Lendemor 2017-01-30 01:07:40 +01:00
parent 8b7d644958
commit bbf58d0104
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -1,6 +1,9 @@
project(SparrowInput) project(SparrowInput)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
SET(VERSION_MAJOR 1)
SET(VERSION_MINOR 0)
# choose source file # choose source file
file(GLOB LIB_SRC_LIST src/input.cpp src/keybindings.cpp src/textbuffer.cpp) file(GLOB LIB_SRC_LIST src/input.cpp src/keybindings.cpp src/textbuffer.cpp)
file(GLOB LIB_HEAD_LIST src/*.h) file(GLOB LIB_HEAD_LIST src/*.h)

9
src/input.cpp
View File

@ -162,14 +162,15 @@ void Input::releaseHeldKeys(sf::Keyboard::Key keycode){
/* mouse-related functions */ /* mouse-related functions */
sf::Vector2i Input::getPosition() const glm::vec2 Input::getPosition() const
{ {
return m_mouse_position; return glm::vec2(m_mouse_position.x,m_mouse_position.y);
} }
sf::Vector2i Input::getDeltaPosition() const glm::vec2 Input::getDeltaPosition() const
{ {
return m_mouse_position - m_last_mouse_position; sf::Vector2i delta = m_mouse_position - m_last_mouse_position;
return glm::vec2(delta.x,delta.y);
} }
float Input::getDeltaVerticalScroll() const float Input::getDeltaVerticalScroll() const

7
src/input.h
View File

@ -9,6 +9,7 @@
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#include "textbuffer.h" #include "textbuffer.h"
#include "glm/vec2.hpp"
class Input{ class Input{
private: private:
@ -62,8 +63,10 @@ public:
bool isKeyPressed(int key) const; bool isKeyPressed(int key) const;
/* mouse-related function */ /* mouse-related function */
sf::Vector2i getPosition() const; //sf::Vector2i getPosition() const;
sf::Vector2i getDeltaPosition() const; glm::vec2 getPosition() const;
//sf::Vector2i getDeltaPosition() const;
glm::vec2 getDeltaPosition() const;
float getDeltaVerticalScroll() const; float getDeltaVerticalScroll() const;
/* Mouse grabbing */ /* Mouse grabbing */

9
src/main.cpp
View File

@ -55,12 +55,3 @@ int main()
cerr << "Successfully ended" << endl; cerr << "Successfully ended" << endl;
return 0; return 0;
} }
/*class MyInput : public Input
{
MyInput(sf::Window *w) : Input(w){
}
};
*/