better physics

[carveJwlIkooP6JGAAIwe30JlM.git] / vg_config.h

diff --git a/vg_config.h b/vg_config.h
index e1784ec1900b06100609e2093ddfca995b5d6b09..08006140c61c2c52b14b69884ab1bc46769c01b1 100644 (file)
--- a/vg_config.h
+++ b/vg_config.h
@@ -5,7 +5,7 @@
 #define VG_CONFIG
 #include "vg/vg.h"
 
-static struct button_binding vg_button_binds[] = 
+VG_STATIC struct button_binding vg_button_binds[] = 
 {
        { .name = "primary", .bind = GLFW_MOUSE_BUTTON_LEFT },
        { .name = "secondary", .bind = GLFW_MOUSE_BUTTON_RIGHT },
@@ -14,31 +14,35 @@ static struct button_binding vg_button_binds[] =
    { .name = "forward", .bind = GLFW_KEY_W },
    { .name = "back", .bind = GLFW_KEY_S },
    { .name = "up", .bind = GLFW_KEY_R },
+   { .name = "reset", .bind = GLFW_KEY_R },
    { .name = "down", .bind = GLFW_KEY_F },
    { .name = "yawl", .bind = GLFW_KEY_Q },
    { .name = "yawr", .bind = GLFW_KEY_E },
-   { .name = "push", .bind = GLFW_KEY_T }
+   { .name = "jump", .bind = GLFW_KEY_SPACE },
+   { .name = "kbdwalk/push", .bind = GLFW_KEY_LEFT_SHIFT },
+   { .name = "switchmode", .bind = GLFW_KEY_E },
+   { .name = "menu", .bind = GLFW_KEY_ESCAPE }
 };
 
-static struct button_binding vg_controller_binds[] = 
+VG_STATIC struct button_binding vg_controller_binds[] = 
 {
-   { "push", GLFW_GAMEPAD_BUTTON_A },
-   { "break", GLFW_GAMEPAD_BUTTON_B },
-   { "switchmode", GLFW_GAMEPAD_BUTTON_Y },
-   { "jump", GLFW_GAMEPAD_BUTTON_X },
-   { "reset", GLFW_GAMEPAD_BUTTON_LEFT_BUMPER }
+   { "jump",         GLFW_GAMEPAD_BUTTON_A },
+   { "break",        GLFW_GAMEPAD_BUTTON_B },
+   { "switchmode",   GLFW_GAMEPAD_BUTTON_Y },
+   { "reset",        GLFW_GAMEPAD_BUTTON_LEFT_BUMPER },
+   { "menu",         GLFW_GAMEPAD_BUTTON_BACK }
 };
 
-static struct axis_binding vg_axis_binds[] = 
+VG_STATIC struct axis_binding vg_axis_binds[] = 
 {
-       { .name = "horizontal", .axis = GLFW_GAMEPAD_AXIS_LEFT_X },
-       { .name = "vertical",   .axis = GLFW_GAMEPAD_AXIS_LEFT_Y },
-   { .name = "grabr",      .axis = GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER },
-   { .name = "grabl",      .axis = GLFW_GAMEPAD_AXIS_LEFT_TRIGGER },
-   { .name = "h1",         .axis = GLFW_GAMEPAD_AXIS_RIGHT_X },
-   { .name = "v1",         .axis = GLFW_GAMEPAD_AXIS_RIGHT_Y }
+       { .name = "lookh",         .axis = GLFW_GAMEPAD_AXIS_LEFT_X },
+       { .name = "lookv",         .axis = GLFW_GAMEPAD_AXIS_LEFT_Y },
+   { .name = "grabh",      .axis = GLFW_GAMEPAD_AXIS_RIGHT_X },
+   { .name = "grabv",      .axis = GLFW_GAMEPAD_AXIS_RIGHT_Y },
+   { .name = "walk/push",  .axis = GLFW_GAMEPAD_AXIS_LEFT_TRIGGER },
+   { .name = "grab",       .axis = GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER },
 };
 
-static struct vg_achievement vg_achievements[] =
+VG_STATIC struct vg_achievement vg_achievements[] =
 {
 };