review save method

[carveJwlIkooP6JGAAIwe30JlM.git] / input.h

diff --git a/input.h b/input.h
index 6548eef2c9d163d00a7c99a4b0ef60fcd3b8aef2..c5ce1e44109427b29ab4d0da9243b45c508c2005 100644 (file)
--- a/input.h
+++ b/input.h
@@ -7,7 +7,6 @@
 #include "vg/vg_console.h"
 #include "vg/vg_input.h"
 #include "vg/vg_m.h"
-#include "conf.h"
 #include "font.h"
 
 enum sr_bind{
@@ -26,6 +25,9 @@ enum sr_bind{
    k_srbind_mback, 
    k_srbind_maccept,
    k_srbind_mopen,
+   k_srbind_replay_play,
+   k_srbind_replay_freecam,
+   k_srbind_replay_resume,
    k_srbind_max,
 };
 
@@ -40,6 +42,8 @@ enum sr_axis{
    k_sraxis_grab = 0,
    k_sraxis_mbrowse_h,
    k_sraxis_mbrowse_v,
+   k_sraxis_replay_h,
+
    k_sraxis_max
 };
 
@@ -47,7 +51,7 @@ struct {
    float axis_states[ k_sraxis_max ][2];
    v2f joystick_states[ k_srjoystick_max ][2];
    u8 button_states[ k_srbind_max ][2];
-   u32 ignore_input_frames;
+   u32 enabled;
 }
 static srinput;
 
@@ -68,8 +72,7 @@ static const char *controller_glyphs[ SDL_CONTROLLER_BUTTON_MAX ][2] =
    [ SDL_CONTROLLER_BUTTON_GUIDE ]        = { "\x91",    "\x91" },
 };
 
-static const char *controller_glyph( u32 sdl_index )
-{
+static const char *controller_glyph( u32 sdl_index ){
    if( vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS3 ||
        vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS4 ||
        vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS5 )
@@ -110,7 +113,10 @@ static const char *button_display_string( enum sr_bind button )
     [k_srbind_mdown]  = controller_glyph( SDL_CONTROLLER_BUTTON_DPAD_DOWN ),
     [k_srbind_mback]  = controller_glyph( SDL_CONTROLLER_BUTTON_B ),
     [k_srbind_maccept]= controller_glyph( SDL_CONTROLLER_BUTTON_A ),
-    [k_srbind_mopen]  = controller_glyph( SDL_CONTROLLER_BUTTON_GUIDE )
+    [k_srbind_mopen]  = controller_glyph( SDL_CONTROLLER_BUTTON_GUIDE ),
+[k_srbind_replay_play]= controller_glyph( SDL_CONTROLLER_BUTTON_X ),
+[k_srbind_replay_freecam]=controller_glyph(SDL_CONTROLLER_BUTTON_Y ),
+[k_srbind_replay_resume]=controller_glyph( SDL_CONTROLLER_BUTTON_A )
    };
 
    const char *keyboard_table[ k_srbind_max ] = {
@@ -129,6 +135,9 @@ static const char *button_display_string( enum sr_bind button )
     [k_srbind_mback]  = "\xa3",
     [k_srbind_maccept]= "\xa2",
     [k_srbind_mopen]  = "\xa3" ,
+[k_srbind_replay_play]= KEYBOARD_GLYPH( "G" ),
+[k_srbind_replay_freecam] = KEYBOARD_GLYPH( "F" ),
+[k_srbind_replay_resume]= "\xa1",
    };
 
    if( vg_input.display_input_method == k_input_method_controller )
@@ -142,13 +151,15 @@ static const char *axis_display_string( enum sr_axis axis )
    const char *controller_table[ k_sraxis_max ] = {
     [k_sraxis_grab]      = "\x90",
     [k_sraxis_mbrowse_h] = "\x88",
-    [k_sraxis_mbrowse_v] = "\x89"
+    [k_sraxis_mbrowse_v] = "\x89",
+    [k_sraxis_replay_h]  = "\x8f\x90"
    };
 
    const char *keyboard_table[ k_sraxis_max ] = {
     [k_sraxis_grab]      = "\x9e",
     [k_sraxis_mbrowse_h] = KEYBOARD_GLYPH("\x93")KEYBOARD_GLYPH("\x95"),
-    [k_sraxis_mbrowse_v] = KEYBOARD_GLYPH("\x96")KEYBOARD_GLYPH("\x94")
+    [k_sraxis_mbrowse_v] = KEYBOARD_GLYPH("\x96")KEYBOARD_GLYPH("\x94"),
+    [k_sraxis_replay_h]  = KEYBOARD_GLYPH("Q")KEYBOARD_GLYPH("E"),
    };
 
    if( vg_input.display_input_method == k_input_method_controller )
@@ -183,7 +194,7 @@ static const char *joystick_display_string( enum sr_joystick joystick,
 
 static int buttons_filter_fixed(void)
 {
-   if( srinput.ignore_input_frames ) return 1;
+   if( !srinput.enabled ) return 1;
    if( vg_ui.wants_mouse ) return 1;
 
    if( vg.engine_stage == k_engine_stage_update_fixed )
@@ -232,8 +243,7 @@ static void joystick_state( enum sr_joystick joystick, v2f state )
       v2_copy( srinput.joystick_states[ joystick ][0], state );
 }
 
-static float axis_state( enum sr_axis axis )
-{
+static float axis_state( enum sr_axis axis ){
    if( vg_ui.wants_mouse ) return 0.0f;
    else return srinput.axis_states[axis][0];
 }
@@ -245,9 +255,6 @@ static void setbtn( enum sr_bind button, u8 value )
 
 static void skaterift_preupdate_inputs(void)
 {
-   if( srinput.ignore_input_frames )
-      srinput.ignore_input_frames --;
-
    for( u32 i=0; i<k_srbind_max; i++ ){
       srinput.button_states[i][1] = srinput.button_states[i][0];
       srinput.button_states[i][0] = 0;
@@ -286,14 +293,22 @@ static void skaterift_preupdate_inputs(void)
    setbtn( k_srbind_maccept, vg_getkey(SDLK_e) );
    setbtn( k_srbind_maccept, vg_getkey(SDLK_RETURN));
    setbtn( k_srbind_maccept, vg_getkey(SDLK_RETURN2));
+   setbtn( k_srbind_replay_play, vg_getkey(SDLK_g) );
+   setbtn( k_srbind_replay_freecam, vg_getkey(SDLK_f) );
+   setbtn( k_srbind_replay_resume, vg_getkey(SDLK_SPACE) );
 
    /* axis
     * --------------------------------------------*/
    srinput.axis_states[ k_sraxis_grab ][0] = vg_getkey( SDLK_LSHIFT );
 
-   if( vg_getkey( SDLK_d ) ) 
+   if( vg_getkey( SDLK_e ) )
+      srinput.axis_states[ k_sraxis_replay_h ][0] += 1.0f;
+   if( vg_getkey( SDLK_q ) )
+      srinput.axis_states[ k_sraxis_replay_h ][0] -= 1.0f;
+
+   if( vg_getkey( SDLK_d ) )
       srinput.joystick_states[k_srjoystick_steer][0][0] += 1.0f;
-   if( vg_getkey( SDLK_a ) ) 
+   if( vg_getkey( SDLK_a ) )
       srinput.joystick_states[k_srjoystick_steer][0][0] -= 1.0f;
    if( vg_getkey( SDLK_w ) ) 
       srinput.joystick_states[k_srjoystick_steer][0][1] -= 1.0f;
@@ -304,10 +319,13 @@ static void skaterift_preupdate_inputs(void)
       srinput.axis_states[ k_sraxis_mbrowse_v ][0] -= 1.0f;
    if( vg_getkey( SDLK_UP ) )
       srinput.axis_states[ k_sraxis_mbrowse_v ][0] += 1.0f;
-   if( vg_getkey( SDLK_LEFT ) )
+
+   if( vg_getkey( SDLK_LEFT ) ){
       srinput.axis_states[ k_sraxis_mbrowse_h ][0] -= 1.0f;
-   if( vg_getkey( SDLK_RIGHT ) )
+   }
+   if( vg_getkey( SDLK_RIGHT ) ){
       srinput.axis_states[ k_sraxis_mbrowse_h ][0] += 1.0f;
+   }
 
    if( vg_input.active_controller_index >= 0 ){
       struct vg_controller *controller = 
@@ -330,15 +348,18 @@ static void skaterift_preupdate_inputs(void)
       setbtn( k_srbind_maccept,buttons[ SDL_CONTROLLER_BUTTON_A ] );
       setbtn( k_srbind_mopen,  buttons[ SDL_CONTROLLER_BUTTON_START ] );
       setbtn( k_srbind_mback,  buttons[ SDL_CONTROLLER_BUTTON_START ] );
+      setbtn( k_srbind_replay_resume, buttons[ SDL_CONTROLLER_BUTTON_A ] );
+      setbtn( k_srbind_replay_play, buttons[ SDL_CONTROLLER_BUTTON_X ] );
+      setbtn( k_srbind_replay_freecam, buttons[ SDL_CONTROLLER_BUTTON_Y ] );
 
       float *axis = controller->axises;
-
       float *steer = srinput.joystick_states[ k_srjoystick_steer ][0],
             *look  = srinput.joystick_states[ k_srjoystick_look ][0],
             *grab  = srinput.joystick_states[ k_srjoystick_grab ][0],
             *axisgrab = &srinput.axis_states[ k_sraxis_grab ][0],
             *axisbrowseh = &srinput.axis_states[ k_sraxis_mbrowse_h ][0],
-            *axisbrowsev = &srinput.axis_states[ k_sraxis_mbrowse_v ][0];
+            *axisbrowsev = &srinput.axis_states[ k_sraxis_mbrowse_v ][0],
+            *axisreplayh = &srinput.axis_states[ k_sraxis_replay_h ][0];
       
       steer[0] += axis[ SDL_CONTROLLER_AXIS_LEFTX ];
       steer[1] += axis[ SDL_CONTROLLER_AXIS_LEFTY ];
@@ -349,6 +370,8 @@ static void skaterift_preupdate_inputs(void)
       axisgrab[0] += vg_maxf( 0.0f, axis[ SDL_CONTROLLER_AXIS_TRIGGERRIGHT ] );
       axisbrowseh[0] += axis[ SDL_CONTROLLER_AXIS_LEFTX ];
       axisbrowsev[0] += axis[ SDL_CONTROLLER_AXIS_LEFTY ];
+      axisreplayh[0] += vg_maxf(0.0f,axis[SDL_CONTROLLER_AXIS_TRIGGERRIGHT]);
+      axisreplayh[0] -= vg_maxf(0.0f,axis[SDL_CONTROLLER_AXIS_TRIGGERLEFT]);
 
       float lh = axis[ SDL_CONTROLLER_AXIS_LEFTX ],
             lv = axis[ SDL_CONTROLLER_AXIS_LEFTY ],