eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 12:49:18 +02:00
Code Issues 123 Wiki Activity

fix fast mouse button depress

Browse Source
This commit is contained in:
milek7
2018-10-24 18:30:42 +02:00
parent 56e9fa537b
commit 9f1f67288b
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivermouseinput.cpp
View File

@@ -319,6 +319,7 @@ drivermouse_input::button( int const Button, int const Action ) {
mousecommand = user_command::none; mousecommand = user_command::none;
} }
else { else {
m_pickwaiting = false;
if( Button == GLFW_MOUSE_BUTTON_LEFT ) { if( Button == GLFW_MOUSE_BUTTON_LEFT ) {
if( m_slider.command() != user_command::none ) { if( m_slider.command() != user_command::none ) {
m_slider.release(); m_slider.release();
@@ -334,9 +335,12 @@ drivermouse_input::button( int const Button, int const Action ) {
} }
else { else {
// if not release then it's press // if not release then it's press
m_pickwaiting = true;
GfxRenderer.pick_control([this, Button, Action, &mousecommand](TSubModel const *control) GfxRenderer.pick_control([this, Button, Action, &mousecommand](TSubModel const *control)
{ {
bool pickwaiting = m_pickwaiting;
m_pickwaiting = false;
auto const lookup = m_buttonbindings.find( simulation::Train->GetLabel( control ) ); auto const lookup = m_buttonbindings.find( simulation::Train->GetLabel( control ) );
if( lookup != m_buttonbindings.end() ) { if( lookup != m_buttonbindings.end() ) {
// if the recognized element under the cursor has a command associated with the pressed button, notify the recipient // if the recognized element under the cursor has a command associated with the pressed button, notify the recipient
@@ -390,6 +394,8 @@ drivermouse_input::button( int const Button, int const Action ) {
// NOTE: as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // NOTE: as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0
// TODO: pass correct entity id once the missing systems are in place // TODO: pass correct entity id once the missing systems are in place
m_relay.post( mousecommand, 0, 0, Action, 0 ); m_relay.post( mousecommand, 0, 0, Action, 0 );
if (!pickwaiting) // already depressed
m_relay.post( mousecommand, 0, 0, GLFW_RELEASE, 0 );
m_updateaccumulator = -0.25; // prevent potential command repeat right after issuing one m_updateaccumulator = -0.25; // prevent potential command repeat right after issuing one
} }
else { else {

1
drivermouseinput.h
View File

@@ -104,6 +104,7 @@ private:
bool m_varyingpollrate { false }; // indicates rate of command repeats is affected by the cursor position bool m_varyingpollrate { false }; // indicates rate of command repeats is affected by the cursor position
glm::dvec2 m_varyingpollrateorigin; // helper, cursor position when the command was initiated glm::dvec2 m_varyingpollrateorigin; // helper, cursor position when the command was initiated
std::array<int, GLFW_MOUSE_BUTTON_LAST> m_buttons; std::array<int, GLFW_MOUSE_BUTTON_LAST> m_buttons;
bool m_pickwaiting;
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------