mirror of
https://github.com/lindbergh-loader/lindbergh-loader.git
synced 2026-10-14 09:59:08 +03:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 dkeruza-neo
|
6e751f16f0 | ||
|
dkeruza-neo
|
03ccfd3449 |
+43
-41
@@ -922,11 +922,11 @@ static ControllerStatus listControllers(Controllers *controllers)
|
|||||||
strcat(controllerInput->inputName, "_");
|
strcat(controllerInput->inputName, "_");
|
||||||
strcat(controllerInput->inputName, codename(EV_KEY, code));
|
strcat(controllerInput->inputName, codename(EV_KEY, code));
|
||||||
normaliseName(controllerInput->inputName);
|
normaliseName(controllerInput->inputName);
|
||||||
// if(snprintf(controllerInput->inputTechName, SIZE, "%s:KEY:%i", controllers->controller[i].path,
|
if (snprintf(controllerInput->inputTechName, SIZE, "%s:KEY:%i", controllers->controller[i].path, code) >= 1024)
|
||||||
// code) >= 1024) {
|
{
|
||||||
// // hum ok, truncated value
|
// hum ok, truncated value
|
||||||
// }
|
}
|
||||||
// strcpy(controllerInput->inputTechNegName, "-"); // unassignable value (not "" while some conf are empty)
|
strcpy(controllerInput->inputTechNegName, "-"); // unassignable value (not "" while some conf are empty)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -948,14 +948,14 @@ static ControllerStatus listControllers(Controllers *controllers)
|
|||||||
strcat(controllerInput->inputName, "_");
|
strcat(controllerInput->inputName, "_");
|
||||||
strcat(controllerInput->inputName, codename(EV_ABS, code));
|
strcat(controllerInput->inputName, codename(EV_ABS, code));
|
||||||
normaliseName(controllerInput->inputName);
|
normaliseName(controllerInput->inputName);
|
||||||
// if(snprintf(controllerInput->inputTechName, SIZE, "%s:ABS:%i", controllers->controller[i].path,
|
if (snprintf(controllerInput->inputTechName, SIZE, "%s:ABS:%i", controllers->controller[i].path, code) >= 1024)
|
||||||
// code) >= 1024) {
|
{
|
||||||
// // hum ok, truncated value
|
// hum ok, truncated value
|
||||||
// }
|
}
|
||||||
// if(snprintf(controllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i",
|
if (snprintf(controllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i", controllers->controller[i].path, code) >= 1024)
|
||||||
// controllers->controller[i].path, code) >= 1024) {
|
{
|
||||||
// // hum ok, truncated value
|
// hum ok, truncated value
|
||||||
// }
|
}
|
||||||
|
|
||||||
ControllerInput *minControllerInput =
|
ControllerInput *minControllerInput =
|
||||||
&controllers->controller[i].inputs[controllers->controller[i].inputCount++];
|
&controllers->controller[i].inputs[controllers->controller[i].inputCount++];
|
||||||
@@ -964,14 +964,15 @@ static ControllerStatus listControllers(Controllers *controllers)
|
|||||||
minControllerInput->specialFunction = ANALOGUE_TO_DIGITAL_MIN;
|
minControllerInput->specialFunction = ANALOGUE_TO_DIGITAL_MIN;
|
||||||
strcpy(minControllerInput->inputName, controllerInput->inputName);
|
strcpy(minControllerInput->inputName, controllerInput->inputName);
|
||||||
strcat(minControllerInput->inputName, "_MIN");
|
strcat(minControllerInput->inputName, "_MIN");
|
||||||
// if(snprintf(minControllerInput->inputTechName, SIZE, "%s:ABS:%i:MIN",
|
if (snprintf(minControllerInput->inputTechName, SIZE, "%s:ABS:%i:MIN", controllers->controller[i].path, code) >= 1024)
|
||||||
// controllers->controller[i].path, code) >= 1024) {
|
{
|
||||||
// // hum ok, truncated value
|
// hum ok, truncated value
|
||||||
// }
|
}
|
||||||
// if(snprintf(minControllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i:MIN",
|
if (snprintf(minControllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i:MIN", controllers->controller[i].path, code) >=
|
||||||
// controllers->controller[i].path, code) >= 1024) {
|
1024)
|
||||||
// // hum ok, truncated value
|
{
|
||||||
// }
|
// hum ok, truncated value
|
||||||
|
}
|
||||||
|
|
||||||
ControllerInput *maxControllerInput =
|
ControllerInput *maxControllerInput =
|
||||||
&controllers->controller[i].inputs[controllers->controller[i].inputCount++];
|
&controllers->controller[i].inputs[controllers->controller[i].inputCount++];
|
||||||
@@ -980,27 +981,28 @@ static ControllerStatus listControllers(Controllers *controllers)
|
|||||||
maxControllerInput->specialFunction = ANALOGUE_TO_DIGITAL_MAX;
|
maxControllerInput->specialFunction = ANALOGUE_TO_DIGITAL_MAX;
|
||||||
strcpy(maxControllerInput->inputName, controllerInput->inputName);
|
strcpy(maxControllerInput->inputName, controllerInput->inputName);
|
||||||
strcat(maxControllerInput->inputName, "_MAX");
|
strcat(maxControllerInput->inputName, "_MAX");
|
||||||
// if(snprintf(maxControllerInput->inputTechName, SIZE, "%s:ABS:%i:MAX",
|
if (snprintf(maxControllerInput->inputTechName, SIZE, "%s:ABS:%i:MAX", controllers->controller[i].path, code) >= 1024)
|
||||||
// controllers->controller[i].path, code) >= 1024) {
|
{
|
||||||
// // hum ok, truncated value
|
// hum ok, truncated value
|
||||||
// }
|
}
|
||||||
// if(snprintf(maxControllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i:MAX",
|
if (snprintf(maxControllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i:MAX", controllers->controller[i].path, code) >=
|
||||||
// controllers->controller[i].path, code) >= 1024) {
|
1024)
|
||||||
// // hum ok, truncated value
|
{
|
||||||
// }
|
// hum ok, truncated value
|
||||||
|
}
|
||||||
|
|
||||||
|
ControllerInput *shakeControllerInput = &controllers->controller[i].inputs[controllers->controller[i].inputCount++];
|
||||||
|
shakeControllerInput->evType = EV_ABS;
|
||||||
|
shakeControllerInput->evCode = code;
|
||||||
|
shakeControllerInput->specialFunction = ANALOGUE_SHAKE;
|
||||||
|
strcpy(shakeControllerInput->inputName, controllerInput->inputName);
|
||||||
|
strcat(shakeControllerInput->inputName, "_SHAKE");
|
||||||
|
if (snprintf(shakeControllerInput->inputTechName, SIZE, "%s:ABS:%i:SHAKE", controllers->controller[i].path, code) >=
|
||||||
|
1024)
|
||||||
|
{
|
||||||
|
// hum ok, truncated value
|
||||||
|
}
|
||||||
|
|
||||||
// ControllerInput *shakeControllerInput =
|
|
||||||
// &controllers->controller[i].inputs[controllers->controller[i].inputCount++];
|
|
||||||
// shakeControllerInput->evType = EV_ABS;
|
|
||||||
// shakeControllerInput->evCode = code;
|
|
||||||
// shakeControllerInput->specialFunction = ANALOGUE_SHAKE;
|
|
||||||
// strcpy(shakeControllerInput->inputName, controllerInput->inputName);
|
|
||||||
// strcat(shakeControllerInput->inputName, "_SHAKE");
|
|
||||||
// if(snprintf(shakeControllerInput->inputTechName, SIZE, "%s:ABS:%i:SHAKE",
|
|
||||||
// controllers->controller[i].path, code) >= 1024) {
|
|
||||||
// // hum ok, truncated value
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
struct input_absinfo absoluteFeatures;
|
struct input_absinfo absoluteFeatures;
|
||||||
ioctl(controller, EVIOCGABS(code), &absoluteFeatures);
|
ioctl(controller, EVIOCGABS(code), &absoluteFeatures);
|
||||||
controllers->controller[i].absMin[code] = absoluteFeatures.minimum;
|
controllers->controller[i].absMin[code] = absoluteFeatures.minimum;
|
||||||
|
|||||||
@@ -621,10 +621,13 @@ void sdlEventShooting(SDL_Event *event)
|
|||||||
setSwitch(PLAYER_2, BUTTON_1, event->type == SDL_KEYDOWN);
|
setSwitch(PLAYER_2, BUTTON_1, event->type == SDL_KEYDOWN);
|
||||||
|
|
||||||
else if (event->key.keysym.sym == SDLK_x)
|
else if (event->key.keysym.sym == SDLK_x)
|
||||||
setSwitch(PLAYER_2, BUTTON_1, event->type == SDL_KEYDOWN);
|
setSwitch(PLAYER_2, BUTTON_2, event->type == SDL_KEYDOWN);
|
||||||
|
|
||||||
else if (event->key.keysym.sym == SDLK_c)
|
else if (event->key.keysym.sym == SDLK_c)
|
||||||
setSwitch(PLAYER_2, BUTTON_1, event->type == SDL_KEYDOWN);
|
setSwitch(PLAYER_2, BUTTON_3, event->type == SDL_KEYDOWN);
|
||||||
|
|
||||||
|
else if (event->key.keysym.sym == SDLK_v)
|
||||||
|
setSwitch(PLAYER_2, BUTTON_4, event->type == SDL_KEYDOWN);
|
||||||
|
|
||||||
else if (event->key.keysym.sym == SDLK_u)
|
else if (event->key.keysym.sym == SDLK_u)
|
||||||
setSwitch(PLAYER_2, BUTTON_UP, event->type == SDL_KEYDOWN);
|
setSwitch(PLAYER_2, BUTTON_UP, event->type == SDL_KEYDOWN);
|
||||||
|
|||||||
@@ -370,8 +370,8 @@ int isTestMode()
|
|||||||
|
|
||||||
void myGlBindTexture(GLenum target, GLuint texture)
|
void myGlBindTexture(GLenum target, GLuint texture)
|
||||||
{
|
{
|
||||||
// const char *targetName = "";
|
curTarget = target;
|
||||||
// switch (target)
|
curTextureID = texture;
|
||||||
|
|
||||||
void (*_glBindTexture)(GLenum, GLuint) = dlsym(RTLD_NEXT, "glBindTexture");
|
void (*_glBindTexture)(GLenum, GLuint) = dlsym(RTLD_NEXT, "glBindTexture");
|
||||||
_glBindTexture(target, texture);
|
_glBindTexture(target, texture);
|
||||||
|
|||||||
Reference in New Issue
Block a user