From: hgn Date: Wed, 19 Oct 2022 02:22:38 +0000 (+0100) Subject: wow X-Git-Url: https://harrygodden.com/git/?p=vg.git;a=commitdiff_plain;h=3206e1d1db56fe2120efe6fbe4aefe85134fb2d5 wow --- diff --git a/src/shader.c b/src/shader.c index 9dee03e..934d30d 100644 --- a/src/shader.c +++ b/src/shader.c @@ -46,6 +46,7 @@ static int compile_subshader( FILE *header, char *name ) { start += 8; struct uniform *uf = &uniform_buffer[ uniform_count ++ ]; + uf->array = 0; for( int i=0;; i++ ) { if( start[i] == '\0' ) diff --git a/src/tools.sh b/src/tools.sh index 9c9fc3a..d7bc893 100644 --- a/src/tools.sh +++ b/src/tools.sh @@ -25,11 +25,11 @@ tool_qoiconv(){ compile_x } -tool_texsheet(){ - _src="vg/src/texsheet.c" - _dst="tools/texsheet" - compile_x -} +#tool_texsheet(){ +# _src="vg/src/texsheet.c" +# _dst="tools/texsheet" +# compile_x +#} tool_shader tool_fontcomp diff --git a/src/vg/vg.h b/src/vg/vg.h index 5d41bcc..e125f26 100644 --- a/src/vg/vg.h +++ b/src/vg/vg.h @@ -330,6 +330,12 @@ static int vg_bake_shaders(void) { vg_acquire_thread_sync(); + vg_function_push( (struct vg_cmd) + { + .name = "shaders", + .function = vg_shaders_live_recompile + }); + if( !vg_shaders_recompile() ) { vg_shaders_free(NULL); diff --git a/src/vg/vg_m.h b/src/vg/vg_m.h index c28e477..03f197f 100644 --- a/src/vg/vg_m.h +++ b/src/vg/vg_m.h @@ -635,6 +635,45 @@ static inline void m4x3_invert_affine( m4x3f a, m4x3f b ) v3_negate( b[3], b[3] ); } +static void m4x3_invert_full( m4x3f src, m4x3f dst ) +{ + float t2, t4, t5, + det, + a = src[0][0], b = src[0][1], c = src[0][2], + e = src[1][0], f = src[1][1], g = src[1][2], + i = src[2][0], j = src[2][1], k = src[2][2], + m = src[3][0], n = src[3][1], o = src[3][2]; + + t2 = j*o - n*k; + t4 = i*o - m*k; + t5 = i*n - m*j; + + dst[0][0] = f*k - g*j; + dst[1][0] =-(e*k - g*i); + dst[2][0] = e*j - f*i; + dst[3][0] =-(e*t2 - f*t4 + g*t5); + + dst[0][1] =-(b*k - c*j); + dst[1][1] = a*k - c*i; + dst[2][1] =-(a*j - b*i); + dst[3][1] = a*t2 - b*t4 + c*t5; + + t2 = f*o - n*g; + t4 = e*o - m*g; + t5 = e*n - m*f; + + dst[0][2] = b*g - c*f ; + dst[1][2] =-(a*g - c*e ); + dst[2][2] = a*f - b*e ; + dst[3][2] =-(a*t2 - b*t4 + c * t5); + + det = 1.0f / (a * dst[0][0] + b * dst[1][0] + c * dst[2][0]); + v3_muls( dst[0], det, dst[0] ); + v3_muls( dst[1], det, dst[1] ); + v3_muls( dst[2], det, dst[2] ); + v3_muls( dst[3], det, dst[3] ); +} + static inline void m4x3_copy( m4x3f a, m4x3f b ) { v3_copy( a[0], b[0] ); diff --git a/src/vg/vg_platform.h b/src/vg/vg_platform.h index ac07582..b71a01d 100644 --- a/src/vg/vg_platform.h +++ b/src/vg/vg_platform.h @@ -65,6 +65,17 @@ struct vg_achievement #endif +static void vg_strncpy( const char *src, char *dst, u32 len ) +{ + for( u32 i=0; i #define VG_ZERO_NEW_MEM @@ -72,10 +83,15 @@ struct vg_achievement static void vg_fatal_exit_loop( const char *error ); static void *vg_alloc( size_t size ) { + if( size == 0 ) + return NULL; + void *ptr = malloc( size ); if( !ptr ) + { vg_fatal_exit_loop( "Out of memory" ); + } #ifdef VG_ZERO_NEW_MEM u8 *bytes = ptr; @@ -93,7 +109,12 @@ static void *vg_realloc( void *orig, size_t size ) void *ptr = realloc( orig, size ); if( !ptr ) + { + if( size == 0 ) + return NULL; + vg_fatal_exit_loop( "Out of memory" ); + } return ptr; } @@ -117,6 +138,17 @@ static void vg_required( void *ptr, const char *path ) TYPE DECL = FN( PATH,##__VA_ARGS__ ); \ vg_required( DECL, "Resource is required but failed to load: '" PATH "'" ); +#if 0 +VG_DEPRECATED +char *strcpy(char* destination, const char* source); +VG_DEPRECATED +char *strncpy(char *restrict dest, const char *restrict src, size_t n); +VG_DEPRECATED +char *strcat(char *restrict dest, const char *restrict src); +VG_DEPRECATED +char *strncat(char *restrict dest, const char *restrict src, size_t n); +#endif + VG_DEPRECATED void *malloc( size_t size ); diff --git a/src/vg/vg_shader.h b/src/vg/vg_shader.h index 2186c9d..06f455d 100644 --- a/src/vg/vg_shader.h +++ b/src/vg/vg_shader.h @@ -197,6 +197,18 @@ static int vg_shaders_recompile(void) return 1; } +static int vg_shaders_live_recompile(int argc, const char *argv[]) +{ + vg_info( "Recompiling shaders\n" ); + for( int i=0; icompiled = 0; diff --git a/src/vg/vg_steam_user_stats.h b/src/vg/vg_steam_user_stats.h new file mode 100644 index 0000000..1b5691f --- /dev/null +++ b/src/vg/vg_steam_user_stats.h @@ -0,0 +1,44 @@ +#ifndef VG_STEAM_USER_STATS_H +#define VG_STEAM_USER_STATS_H + +#include "vg_steam.h" + +#if defined( VALVE_CALLBACK_PACK_SMALL ) + #pragma pack( push, 4 ) +#elif defined( VALVE_CALLBACK_PACK_LARGE ) + #pragma pack( push, 8 ) +#endif + +typedef struct UserStatsReceived_t UserStatsReceived_t; +struct UserStatsReceived_t +{ + u64 m_nGameID; // Game these stats are for + EResult m_eResult; // Success / error fetching the stats + CSteamID m_steamIDUser; // The user for whom the stats are retrieved for +}; +enum { k_iUserStatsReceived = k_iSteamUserStatsCallbacks + 1 }; + +#pragma pack(pop) + +typedef void ISteamUserStats; +ISteamUserStats *SteamAPI_SteamUserStats_v012(void); +ISteamUserStats *SteamAPI_SteamUserStats(void) +{ + return SteamAPI_SteamUserStats_v012(); +} + +int SteamAPI_ISteamUserStats_RequestCurrentStats( ISteamUserStats* self ); + +int SteamAPI_ISteamUserStats_GetAchievement( ISteamUserStats *self, + const char *pchName, + int *pbAchieved ); + +int SteamAPI_ISteamUserStats_SetAchievement( ISteamUserStats *self, + const char *pchName ); + +int SteamAPI_ISteamUserStats_ClearAchievement( ISteamUserStats *self, + const char *pchName ); + +int SteamAPI_ISteamUserStats_StoreStats( ISteamUserStats* self ); + +#endif /* VG_STEAM_USER_STATS_H */