eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

restored keyboard controls for events; tweaks to intensity of vehicle spotlights, minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2017-03-06 03:27:52 +01:00
parent d920644af8
commit 89fe4e7f7c
8 changed files with 88 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
EvLaunch.cpp
View File

@@ -55,6 +55,25 @@ void TEventLauncher::Init()
{
}
// encodes expected key in a short, where low byte represents the actual key,
// and the high byte holds modifiers: 0x1 = shift, 0x2 = ctrl, 0x4 = alt
int vk_to_glfw_key( int const Keycode ) {
#ifdef _WINDOWS
auto const code = VkKeyScan( Keycode );
char key = code & 0xff;
char shiftstate = ( code & 0xff00 ) >> 8;
if( (key >= 'A') && (key <= 'Z') ) {
key = GLFW_KEY_A + key - 'A';
}
else if( key >= '0' ) {
key = GLFW_KEY_0 + key - '0';
}
return key + ( shiftstate << 8 );
#endif
}
bool TEventLauncher::Load(cParser *parser)
{ // wczytanie wyzwalacza zdarzeń
std::string token;
@@ -66,10 +85,10 @@ bool TEventLauncher::Load(cParser *parser)
*parser >> token;
if (token != "none")
{
if (token.size() == 1)
iKey = VkKeyScan(token[0]); // jeden znak jest konwertowany na kod klawisza
if( token.size() == 1 )
iKey = vk_to_glfw_key( token[ 0 ] );
else
iKey = stol_def(token,0); // a jak więcej, to jakby numer klawisza jest
iKey = vk_to_glfw_key(stol_def( token, 0 )); // a jak więcej, to jakby numer klawisza jest
}
parser->getTokens();
*parser >> DeltaTime;
@@ -145,8 +164,20 @@ bool TEventLauncher::Render()
bool bCond = false;
if (iKey != 0)
{
if (Global::bActive) // tylko jeśli okno jest aktywne
bCond = (Console::Pressed(iKey)); // czy klawisz wciśnięty
if( Global::bActive ) {
// tylko jeśli okno jest aktywne
if( iKey > 255 ) {
// key and modifier
auto const modifier = ( iKey & 0xff00 ) >> 8;
bCond = ( Console::Pressed( iKey & 0xff ) )
&& ( modifier & 1 ? Global::shiftState : true )
&& ( modifier & 2 ? Global::ctrlState : true );
}
else {
// just key
bCond = ( Console::Pressed( iKey & 0xff ) ); // czy klawisz wciśnięty
}
}
}
if (DeltaTime > 0)
{