voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-05 19:11:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

inputtype::button renamed to inputtype::mouse

Browse source
This commit is contained in:
MihailRis 2023-11-20 06:39:42 +03:00
parent 3eb6e82631
commit e04abe79d8
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/frontend/gui/controls.cpp
View file

@ -179,7 +179,7 @@ void InputBindBox::drawBackground(Batch2D* batch, Assets* assets) {
}
void InputBindBox::clicked(GUI*, int button) {
binding.type = inputtype::button;
binding.type = inputtype::mouse;
binding.code = button;
defocus();
}

6
src/voxel_engine.cpp
View file

@ -49,7 +49,7 @@ std::string write_controls() {
json::JObject* jentry = new json::JObject();
switch (binding.type) {
case inputtype::keyboard: jentry->put("type", "keyboard"); break;
case inputtype::button: jentry->put("type", "button"); break;
case inputtype::mouse: jentry->put("type", "mouse"); break;
default: throw std::runtime_error("unsupported control type");
}
jentry->put("code", binding.code);
@ -72,8 +72,8 @@ void load_controls(std::string filename, std::string source) {
if (typestr == "keyboard") {
type = inputtype::keyboard;
} else if (typestr == "button") {
type = inputtype::button;
} else if (typestr == "mouse") {
type = inputtype::mouse;
} else {
std::cerr << "unknown input type '" << typestr << "'" << std::endl;
continue;

2
src/window/Events.cpp
View file

@ -73,7 +73,7 @@ void Events::pullEvents(){
bool newstate = false;
switch (binding.type) {
case inputtype::keyboard: newstate = pressed(binding.code); break;
case inputtype::button: newstate = clicked(binding.code); break;
case inputtype::mouse: newstate = clicked(binding.code); break;
}
if (newstate) {

4
src/window/input.h
View file

@ -80,7 +80,7 @@ namespace mousecode {
enum class inputtype {
keyboard,
button,
mouse,
};
struct Binding {
@ -100,7 +100,7 @@ struct Binding {
const char* text() const {
switch (type) {
case inputtype::keyboard: return keycode::name(code);
case inputtype::button: return mousecode::name(code);
case inputtype::mouse: return mousecode::name(code);
}
return "<unknown input type>";
}