jaildesigner-jailgames/jail_engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jaildesigner-jailgames:55810344871167da45220f6210ad9bffd935837e
Branches Tags
jaildesigner-jailgames:main
...
compare: jaildesigner-jailgames:51518f3bd855a107531fbbd779280a2d6fc485f7
Branches Tags
jaildesigner-jailgames:main

2 Commits
5581034487 ... 51518f3bd8

Author SHA1 Message Date
Sergio Valor
51518f3bd8 input: añadidas asignaciones por defecto para teclado y mando 2023-05-23 18:24:17 +02:00
Sergio Valor
82b2b8bf57 input: el nombre de los mandos ya no se redimensiona ni se añade el índice 2023-05-23 18:10:22 +02:00
3 changed files with 44 additions and 8 deletions
Expand all files Collapse all files

14
main.cpp
View File

@@ -93,10 +93,14 @@ int main(int argc, char *argv[])
Input *input = new Input(asset->get("gamecontrollerdb.txt"));
input->setVerbose(options->console);
input->discoverGameController();
input->bindKey(INPUT_UP, SDL_SCANCODE_UP);
input->bindKey(INPUT_DOWN, SDL_SCANCODE_DOWN);
input->bindKey(INPUT_LEFT, SDL_SCANCODE_LEFT);
input->bindKey(INPUT_RIGHT, SDL_SCANCODE_RIGHT);
//input->bindKey(INPUT_UP, SDL_SCANCODE_UP);
//input->bindKey(INPUT_DOWN, SDL_SCANCODE_DOWN);
//input->bindKey(INPUT_LEFT, SDL_SCANCODE_LEFT);
//input->bindKey(INPUT_RIGHT, SDL_SCANCODE_RIGHT);
//input->bindGameControllerButton(INPUT_UP, SDL_CONTROLLER_BUTTON_DPAD_UP);
//input->bindGameControllerButton(INPUT_DOWN, SDL_CONTROLLER_BUTTON_DPAD_DOWN);
//input->bindGameControllerButton(INPUT_LEFT, SDL_CONTROLLER_BUTTON_DPAD_LEFT);
//input->bindGameControllerButton(INPUT_RIGHT, SDL_CONTROLLER_BUTTON_DPAD_RIGHT);
string controllerName = "";
int numControllers = input->getNumControllers();
if (numControllers > 0)
@@ -278,7 +282,7 @@ int main(int argc, char *argv[])
text->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, options->screen.nativeWidth / 2, text->getCharacterSize() * 7, "Pulsa 'N' para mostrar", 1, {240, 240, 240}, 1, {0, 0, 192});
text->writeDX(TXT_CENTER | TXT_COLOR | TXT_STROKE, options->screen.nativeWidth / 2, text->getCharacterSize() * 8, "una notificacion", 1, {240, 240, 240}, 1, {0, 0, 192});
debugText->writeCentered(options->screen.nativeWidth / 2, options->screen.nativeHeight / 2, controllerName);
debugText->writeCentered(options->screen.nativeWidth / 2, (options->screen.nativeHeight / 2) + debugText->getCharacterSize(), inputPressed);
debugText->writeCentered(options->screen.nativeWidth / 2, (options->screen.nativeHeight / 2) + (debugText->getCharacterSize()*2), inputPressed);
// Vuelca el buffer en pantalla
screen->blit();

34
units/input.cpp
View File

@@ -20,6 +20,8 @@ Input::Input(string file)
verbose = true;
enabled = true;
setDefaultBindings();
}
// Actualiza el estado del objeto
@@ -236,11 +238,11 @@ bool Input::discoverGameController()
connectedControllers.push_back(pad);
const string separator(" #");
string name = SDL_GameControllerNameForIndex(i);
name.resize(25);
name = name + separator + to_string(i);
// name.resize(25);
// name = name + separator + to_string(i);
if (verbose)
{
cout << name << endl;
cout << " -" << name << endl;
}
controllerNames.push_back(name);
}
@@ -309,4 +311,30 @@ void Input::enable()
{
enabled = true;
disabledUntil = d_notDisabled;
}
// Establece unas teclas y botones del mando por defectp
void Input::setDefaultBindings()
{
// Teclado
bindKey(INPUT_UP, SDL_SCANCODE_UP);
bindKey(INPUT_DOWN, SDL_SCANCODE_DOWN);
bindKey(INPUT_LEFT, SDL_SCANCODE_LEFT);
bindKey(INPUT_RIGHT, SDL_SCANCODE_RIGHT);
bindKey(INPUT_EXIT, SDL_SCANCODE_ESCAPE);
bindKey(INPUT_ACCEPT, SDL_SCANCODE_RETURN);
// Mando
bindGameControllerButton(INPUT_UP, SDL_CONTROLLER_BUTTON_DPAD_UP);
bindGameControllerButton(INPUT_DOWN, SDL_CONTROLLER_BUTTON_DPAD_DOWN);
bindGameControllerButton(INPUT_LEFT, SDL_CONTROLLER_BUTTON_DPAD_LEFT);
bindGameControllerButton(INPUT_RIGHT, SDL_CONTROLLER_BUTTON_DPAD_RIGHT);
bindGameControllerButton(INPUT_BUTTON_1, SDL_CONTROLLER_BUTTON_A);
bindGameControllerButton(INPUT_BUTTON_2, SDL_CONTROLLER_BUTTON_B);
bindGameControllerButton(INPUT_BUTTON_3, SDL_CONTROLLER_BUTTON_X);
bindGameControllerButton(INPUT_BUTTON_4, SDL_CONTROLLER_BUTTON_Y);
bindGameControllerButton(INPUT_BUTTON_5, SDL_CONTROLLER_BUTTON_BACK);
bindGameControllerButton(INPUT_BUTTON_6, SDL_CONTROLLER_BUTTON_START);
bindGameControllerButton(INPUT_BUTTON_7, SDL_CONTROLLER_BUTTON_LEFTSHOULDER);
bindGameControllerButton(INPUT_BUTTON_8, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER);
}

4
units/input.h
View File

@@ -35,6 +35,7 @@ using namespace std;
#define INPUT_BUTTON_18 22
#define INPUT_BUTTON_19 23
#define INPUT_BUTTON_20 24
#define INPUT_PAUSE 25
#define INPUT_EXIT 26
#define INPUT_ACCEPT 27
@@ -125,6 +126,9 @@ public:
// Hablita las entradas
void enable();
// Establece unas teclas y botones del mando por defectp
void setDefaultBindings();
};
#endif