josh/treacherous-terrain
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'holtrop/master'

Browse Source
This commit is contained in:
xethm55 2012-10-01 22:34:16 -04:00
commit 0a34f6044f
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/client/Client-gl.cc
View File

@ -75,6 +75,7 @@ bool Client::create_window(bool fullscreen, int width, int height)
OPENGL_CONTEXT_MAJOR, OPENGL_CONTEXT_MINOR); OPENGL_CONTEXT_MAJOR, OPENGL_CONTEXT_MINOR);
m_window = new sf::Window(mode, "Treacherous Terrain", style, cs); m_window = new sf::Window(mode, "Treacherous Terrain", style, cs);
m_window->setMouseCursorVisible(false); m_window->setMouseCursorVisible(false);
grab_mouse(true);
if (!initgl()) if (!initgl())
return false; return false;
resize_window(m_window->getSize().x, m_window->getSize().y); resize_window(m_window->getSize().x, m_window->getSize().y);
@ -235,7 +236,7 @@ void Client::resize_window(int width, int height)
{ {
m_width = width; m_width = width;
m_height = height; m_height = height;
sf::Mouse::setPosition(sf::Vector2i(m_width / 2, m_height / 2), *m_window); recenter_cursor();
glViewport(0, 0, width, height); glViewport(0, 0, width, height);
float aspect = (float)width / (float)height; float aspect = (float)width / (float)height;
m_projection.load_identity(); m_projection.load_identity();

23
src/client/Client.cc
View File

@ -114,6 +114,9 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
case sf::Keyboard::Escape: case sf::Keyboard::Escape:
m_window->close(); m_window->close();
break; break;
case sf::Keyboard::F1:
grab_mouse(!m_mouse_grabbed);
break;
default: default:
break; break;
} }
@ -158,6 +161,19 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
} }
} }
void Client::recenter_cursor()
{
sf::Mouse::setPosition(sf::Vector2i(m_width / 2, m_height / 2), *m_window);
}
void Client::grab_mouse(bool grab)
{
m_mouse_grabbed = grab;
m_window->setMouseCursorVisible(!grab);
if (grab)
recenter_cursor();
}
void Client::update(double elapsed_time) void Client::update(double elapsed_time)
{ {
static bool registered_player = false; static bool registered_player = false;
@ -268,8 +284,11 @@ void Client::update(double elapsed_time)
{ {
s_pressed = KEY_PRESSED; s_pressed = KEY_PRESSED;
} }
rel_mouse_movement = sf::Mouse::getPosition(*m_window).x - m_width / 2; if (m_mouse_grabbed)
sf::Mouse::setPosition(sf::Vector2i(m_width / 2, m_height / 2), *m_window); {
rel_mouse_movement = sf::Mouse::getPosition(*m_window).x - m_width / 2;
recenter_cursor();
}
if (m_left_button_pressed) if (m_left_button_pressed)
{ {

3
src/client/Client.h
View File

@ -24,6 +24,8 @@ class Client
void resize_window(int width, int height); void resize_window(int width, int height);
void update(double elapsed_time); void update(double elapsed_time);
void redraw(); void redraw();
void grab_mouse(bool grab);
void recenter_cursor();
void draw_player(refptr<Player> player); void draw_player(refptr<Player> player);
void draw_map(); void draw_map();
void draw_overlay(); void draw_overlay();
@ -32,6 +34,7 @@ class Client
void draw_shot_ring(); void draw_shot_ring();
void draw_shot_ring_instance(); void draw_shot_ring_instance();
bool m_mouse_grabbed;
double m_player_dir_x; double m_player_dir_x;
double m_player_dir_y; double m_player_dir_y;
refptr<sf::Window> m_window; refptr<sf::Window> m_window;