X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=steam.h;h=969f632aadeb0500de27fe474f72ee63efb03794;hb=be8ea6efdbfd9c0fdad97401ed7d92041d8c8778;hp=a417622c5a17e246a0fe4e456924dd38dbab448a;hpb=a1741ec4aed057cbafff2d6bc9e5cf8a15ae322b;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/steam.h b/steam.h index a417622..969f632 100644 --- a/steam.h +++ b/steam.h @@ -1,11 +1,12 @@ /* - * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved + * Copyright (C) 2021-2023 Mt.ZERO Software, Harry Godden - All Rights Reserved * All trademarks are property of their respective owners */ #ifndef STEAM_H #define STEAM_H +#define VG_GAME #include "vg/vg_steam.h" #include "vg/vg_steam_utils.h" #include "vg/vg_steam_networking.h" @@ -13,6 +14,17 @@ #include "vg/vg_steam_http.h" #include "vg/vg_steam_friends.h" #include "vg/vg_steam_user_stats.h" +#include "submodules/anyascii/impl/c/anyascii.c" + +enum steam_controller_type{ + k_steam_controller_type_keyboard, + k_steam_controller_type_xbox, + k_steam_controller_type_playstation, + k_steam_controller_type_steam, + k_steam_controller_type_steam_deck +}; + +VG_STATIC enum steam_controller_type steam_display_controller; /* * We only want to use steamworks if building for the networked version, @@ -53,46 +65,37 @@ VG_STATIC const char *steam_achievement_names[] = VG_STATIC void steam_store_achievements(void) { - if( steam_ready && steam_stats_ready ) - { + if( steam_ready && steam_stats_ready ){ SteamAPI_ISteamUserStats_StoreStats( hSteamUserStats ); } } VG_STATIC void steam_set_achievement( const char *name ) { - if( steam_ready && steam_stats_ready ) - { - if( SteamAPI_ISteamUserStats_SetAchievement( hSteamUserStats, name ) ) - { + if( steam_ready && steam_stats_ready ){ + if( SteamAPI_ISteamUserStats_SetAchievement( hSteamUserStats, name ) ){ vg_success( "Achievement set! '%s'\n", name ); } - else - { + else{ vg_warn( "Failed to set achievement: %s\n", name ); } } - else - { + else{ vg_warn( "Failed to set achievement (steam not ready): %s\n", name ); } } VG_STATIC void steam_clear_achievement( const char *name ) { - if( steam_ready && steam_stats_ready ) - { - if( SteamAPI_ISteamUserStats_ClearAchievement( hSteamUserStats, name ) ) - { + if( steam_ready && steam_stats_ready ){ + if( SteamAPI_ISteamUserStats_ClearAchievement( hSteamUserStats, name ) ){ vg_info( "Achievement cleared: '%s'\n", name ); } - else - { + else{ vg_warn( "Failed to clear achievement: %s\n", name ); } } - else - { + else{ vg_warn( "Failed to clear achievement (steam not ready): %s\n", name ); } } @@ -102,10 +105,8 @@ VG_STATIC int steam_list_achievements( int argc, char const *argv[] ) { vg_info( "Achievements: \n" ); - if( steam_ready && steam_stats_ready ) - { - for( int i=0; im_pubParam; - if( rec->m_eResult == k_EResultOK ) - { + if( rec->m_eResult == k_EResultOK ){ vg_info( "Recieved stats for: %lu (user: %lu)\n", rec->m_nGameID, rec->m_steamIDUser ); steam_stats_ready = 1; } - else - { + else{ vg_error( "Error recieveing stats for user (%u)\n", rec->m_eResult ); } } +VG_STATIC ISteamInput *steam_hInput; + +VG_STATIC u32 utf8_byte0_byte_count( u8 char0 ) +{ + for( u32 k=2; k<4; k++ ){ + if( !(char0 & (0x80 >> k)) ) + return k; + } + + return 0; +} + +VG_STATIC void str_utf8_collapse( const char *str, char *buf, u32 length ) +{ + u8 *ustr = (u8 *)str; + u32 utf32_code = 0x00000000; + u32 i=0, j=0, utf32_byte_ct=0; + + for(;i < length-1;){ + if( ustr[i] == 0x00 ) + break; + + if( ustr[i] & 0x80 ){ + if( utf32_byte_ct ){ + utf32_byte_ct --; + utf32_code |= (ustr[i] & 0x3F) << (utf32_byte_ct*6); + + if( !utf32_byte_ct ){ + const char *match; + size_t chars = anyascii( utf32_code, &match ); + + for( u32 k=0; k> utf32_byte_ct); + utf32_code <<= utf32_byte_ct*6; + } + } + else{ + utf32_byte_ct = 0x00; + buf[j ++] = str[i]; + } + + i++; + } + + buf[j] = 0x00; +} + VG_STATIC int steam_init(void) { const char *username = NULL; @@ -184,8 +231,7 @@ VG_STATIC int steam_init(void) #ifdef SR_NETWORKED vg_info( "Initializing steamworks\n" ); - if( !SteamAPI_Init() ) - { + if( !SteamAPI_Init() ){ printf("\n"); vg_error( "Steamworks failed to initialize\n" ); return 1; @@ -222,46 +268,13 @@ VG_STATIC int steam_init(void) vg_warn( "No Steam Logon: Cannot request stats\n" ); - vg_function_push( (struct vg_cmd) - { - .name = "ach_list", - .function = steam_list_achievements - }); - - vg_function_push( (struct vg_cmd) - { - .name = "ach_clear_all", - .function = steam_clear_all_achievements - }); - - vg_function_push( (struct vg_cmd) - { - .name = "ach_set", - .function = steam_set_achievemnt_test - }); - - vg_info( "Checking controller type\n" ); - - ISteamInput *hInput = SteamAPI_SteamInput(); - SteamAPI_ISteamInput_Init( hInput, 0 ); - SteamAPI_ISteamInput_RunFrame( hInput, 0 ); - InputHandle_t joy0 = SteamAPI_ISteamInput_GetControllerForGamepadIndex( - hInput, 0 ); + vg_console_reg_cmd( "ach_list", steam_list_achievements, NULL ); + vg_console_reg_cmd( "ach_clear_all", steam_clear_all_achievements, NULL ); + vg_console_reg_cmd( "ach_set", steam_set_achievemnt_test, NULL ); - if( joy0 != 0 ) - { - ESteamInputType type = SteamAPI_ISteamInput_GetInputTypeForHandle( - hInput, joy0 ); - - if( type == k_ESteamInputType_SteamController ) - vg.gamepad_use_trackpad_look = 1; - - vg_info( "Type: %d\n", type ); - } - else - { - vg_warn( "none found\n" ); - } + steam_hInput = SteamAPI_SteamInput(); + SteamAPI_ISteamInput_Init( steam_hInput, 0 ); + SteamAPI_ISteamInput_RunFrame( steam_hInput, 0 ); #endif @@ -274,14 +287,55 @@ VG_STATIC int steam_init(void) VG_STATIC void steam_update(void) { - if( steam_ready ) + if( steam_ready ){ steamworks_event_loop( hSteamClientPipe ); + + /* TODO + * We can probably request this from SDL too + */ + if( steam_hInput ){ + SteamAPI_ISteamInput_RunFrame( steam_hInput, 0 ); + + InputHandle_t joy0 = SteamAPI_ISteamInput_GetControllerForGamepadIndex( + steam_hInput, 0 ); + + vg_input.controller_should_use_trackpad_look = 0; + if( joy0 != 0 ){ + ESteamInputType type = SteamAPI_ISteamInput_GetInputTypeForHandle( + steam_hInput, joy0 ); + + if( type == k_ESteamInputType_SteamController ){ + vg_input.controller_should_use_trackpad_look = 1; + steam_display_controller = k_steam_controller_type_steam; + } + else if( type == k_ESteamInputType_SteamDeckController ){ + steam_display_controller = k_steam_controller_type_steam_deck; + } + else if( type == k_ESteamInputType_PS3Controller || + type == k_ESteamInputType_PS4Controller || + type == k_ESteamInputType_PS5Controller ) + { + steam_display_controller = k_steam_controller_type_playstation; + } + else if( type == k_ESteamInputType_XBox360Controller || + type == k_ESteamInputType_XBoxOneController ) + { + steam_display_controller = k_steam_controller_type_xbox; + } + else{ + /* currently unsupported controller */ + steam_display_controller = k_steam_controller_type_xbox; + } + } + else + steam_display_controller = k_steam_controller_type_keyboard; + } + } } -VG_STATIC void steam_end(void *nothing) +VG_STATIC void steam_end(void) { - if( steam_ready ) - { + if( steam_ready ){ vg_info( "Shutting down\n..." ); SteamAPI_Shutdown(); }