16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 02:29:17 +02:00

build 200124. scenario parameters control sliders, material reload support, material opacity driven translucent geometry alpha test, command keyboard mapping tooltip hints, camshaft logic tweak, motor connector logic tweak, ai power use logic tweak, ai pantograph control logic tweak, converter sound pitch fix. additional cab control localization

This commit is contained in:
tmj-fstate
2020-01-24 17:25:57 +01:00
parent a501c09b0f
commit f14b2c1343
32 changed files with 709 additions and 279 deletions

View File

@@ -45,6 +45,8 @@ public:
user_command const
command() const {
return m_command; }
std::string
mapping( user_command const Command ) const;
protected:
// types
@@ -77,6 +79,7 @@ protected:
private:
// types
using usercommand_map = std::unordered_map<int, user_command>;
using binding_map = std::unordered_map<user_command, int>;
struct bindings_cache {
@@ -96,7 +99,8 @@ private:
// members
user_command m_command { user_command::none }; // last, if any, issued command
usercommand_map m_bindings;
usercommand_map m_commands;
binding_map m_bindings;
command_relay m_relay;
bindings_cache m_bindingscache;
glm::vec2 m_movementhorizontal { 0.f };