mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
input minor refactoring
This commit is contained in:
parent
6bdf7c9719
commit
a16c4fcf8b
3 changed files with 8 additions and 9 deletions
|
|
@ -186,13 +186,12 @@ public:
|
|||
pressedKeys.clear();
|
||||
glfwPollEvents();
|
||||
|
||||
for (auto& entry : bindings.getAll()) {
|
||||
auto& binding = entry.second;
|
||||
for (auto& [_, binding] : bindings.getAll()) {
|
||||
if (!binding.enabled) {
|
||||
binding.state = false;
|
||||
continue;
|
||||
}
|
||||
binding.justChange = false;
|
||||
binding.justChanged = false;
|
||||
|
||||
bool newstate = false;
|
||||
switch (binding.type) {
|
||||
|
|
@ -207,13 +206,13 @@ public:
|
|||
if (newstate) {
|
||||
if (!binding.state) {
|
||||
binding.state = true;
|
||||
binding.justChange = true;
|
||||
binding.justChanged = true;
|
||||
binding.onactived.notify();
|
||||
}
|
||||
} else {
|
||||
if (binding.state) {
|
||||
binding.state = false;
|
||||
binding.justChange = true;
|
||||
binding.justChanged = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ static std::unordered_map<int, std::string> keynames {};
|
|||
static std::unordered_map<int, std::string> buttonsnames{};
|
||||
|
||||
std::string input_util::get_name(Mousecode code) {
|
||||
auto found = buttonsnames.find(static_cast<int>(code));
|
||||
const auto found = buttonsnames.find(static_cast<int>(code));
|
||||
if (found == buttonsnames.end()) {
|
||||
return "unknown";
|
||||
}
|
||||
|
|
@ -65,7 +65,7 @@ std::string input_util::get_name(Mousecode code) {
|
|||
}
|
||||
|
||||
std::string input_util::get_name(Keycode code) {
|
||||
auto found = keynames.find(static_cast<int>(code));
|
||||
const auto found = keynames.find(static_cast<int>(code));
|
||||
if (found == keynames.end()) {
|
||||
return "unknown";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ struct Binding {
|
|||
InputType type;
|
||||
int code;
|
||||
bool state = false;
|
||||
bool justChange = false;
|
||||
bool justChanged = false;
|
||||
bool enabled = true;
|
||||
|
||||
Binding() = default;
|
||||
|
|
@ -170,7 +170,7 @@ struct Binding {
|
|||
}
|
||||
|
||||
bool jactive() const {
|
||||
return state && justChange;
|
||||
return state && justChanged;
|
||||
}
|
||||
|
||||
void reset(InputType, int);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue