Compare commits
2 Commits
51518f3bd8
...
92aae07fd1
| Author | SHA1 | Date | |
|---|---|---|---|
| 92aae07fd1 | |||
| bc017c1d55 |
20
main.cpp
20
main.cpp
@@ -90,24 +90,8 @@ int main(int argc, char *argv[])
|
|||||||
screen->addNotifier(asset->get("notify.png"), asset->get("smb2.png"), asset->get("smb2.txt"), asset->get("notify.wav"));
|
screen->addNotifier(asset->get("notify.png"), asset->get("smb2.png"), asset->get("smb2.txt"), asset->get("notify.wav"));
|
||||||
|
|
||||||
// Inicializa el objeto input
|
// Inicializa el objeto input
|
||||||
Input *input = new Input(asset->get("gamecontrollerdb.txt"));
|
Input *input = new Input(asset->get("gamecontrollerdb.txt"), options->console);
|
||||||
input->setVerbose(options->console);
|
string controllerName = input->getControllerName(0);
|
||||||
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->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)
|
|
||||||
{
|
|
||||||
// Obtiene el nombre del primer mando conectado
|
|
||||||
controllerName = input->getControllerName(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Inicializa el texto
|
// Inicializa el texto
|
||||||
Text *text = new Text(asset->get("smb2.txt"), asset->get("smb2.png"), renderer);
|
Text *text = new Text(asset->get("smb2.txt"), asset->get("smb2.png"), renderer);
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
Input::Input(string file)
|
Input::Input(string file, bool verbose)
|
||||||
{
|
{
|
||||||
// Fichero gamecontrollerdb.txt
|
// Fichero gamecontrollerdb.txt
|
||||||
dbPath = file;
|
dbPath = file;
|
||||||
@@ -18,10 +18,11 @@ Input::Input(string file)
|
|||||||
gcb.active = false;
|
gcb.active = false;
|
||||||
gameControllerBindings.resize(INPUT_TOTAL, gcb);
|
gameControllerBindings.resize(INPUT_TOTAL, gcb);
|
||||||
|
|
||||||
verbose = true;
|
this->verbose = verbose;
|
||||||
enabled = true;
|
enabled = true;
|
||||||
|
|
||||||
setDefaultBindings();
|
setDefaultBindings();
|
||||||
|
discoverGameController();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Actualiza el estado del objeto
|
// Actualiza el estado del objeto
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ private:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
// Constructor
|
// Constructor
|
||||||
Input(string file);
|
Input(string file, bool verbose=true);
|
||||||
|
|
||||||
// Actualiza el estado del objeto
|
// Actualiza el estado del objeto
|
||||||
void update();
|
void update();
|
||||||
|
|||||||
Reference in New Issue
Block a user