From e8b03afa12054e671bb7881802b88c95a3b6e322 Mon Sep 17 00:00:00 2001 From: hgn Date: Sat, 24 Feb 2024 04:39:35 +0000 Subject: [PATCH] misc. remove dead code, assert macro --- vg_audio.h | 1 + vg_build.h | 5 +---- vg_platform.h | 35 ++++++----------------------------- vg_rigidbody.h | 2 ++ vg_rigidbody_collision.h | 2 ++ 5 files changed, 12 insertions(+), 33 deletions(-) diff --git a/vg_audio.h b/vg_audio.h index 6272caf..66a4fdb 100644 --- a/vg_audio.h +++ b/vg_audio.h @@ -3,6 +3,7 @@ #pragma once #include "vg_platform.h" +#include "vg_engine.h" #include "vg_string.h" #include "vg_vorbis.h" diff --git a/vg_build.h b/vg_build.h index b582d0f..7dd34b9 100644 --- a/vg_build.h +++ b/vg_build.h @@ -433,7 +433,7 @@ struct vg_engine_config { bool use_3d, legacy_support_vg_msg1, log_source_info, steam_api, custom_game_settings, - release_mode, custom_shaders; + custom_shaders; i32 fixed_update_hz; } vg_engine_default_config = { @@ -443,7 +443,6 @@ vg_engine_default_config = { .log_source_info = 1, .steam_api = 0, .custom_game_settings = 0, - .release_mode = 0, .custom_shaders = 0 }; @@ -462,8 +461,6 @@ void vg_add_engine( struct vg_project *proj, struct vg_engine_config *config ) vg_strcat( &config_string, "-DVG_LOG_SOURCE_INFO \\\n" ); if( config->custom_game_settings ) vg_strcat( &config_string, "-DVG_GAME_SETTINGS \\\n" ); - if( config->custom_game_settings ) - vg_strcat( &config_string, "-DVG_RELEASE \\\n" ); if( config->custom_shaders ) vg_strcat( &config_string, "-DVG_CUSTOM_SHADERS \\\n" ); diff --git a/vg_platform.h b/vg_platform.h index 5ec7287..b846b06 100644 --- a/vg_platform.h +++ b/vg_platform.h @@ -1,34 +1,5 @@ #pragma once -#if 0 -#include "vg_stdint.h" -// Resource types -typedef struct vg_tex2d vg_tex2d; - -struct vg_achievement -{ - int is_set; - const char *name; -}; - -#define vg_static_assert _Static_assert -#define VG_MUST_USE_RESULT __attribute__((warn_unused_result)) - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif - #include #include @@ -60,6 +31,12 @@ typedef v3f boxf[2]; /* anything compiled against VG shall implement this function somewhere. */ void vg_fatal_error( const char *fmt, ... ); +#define VG_ASSERT( ITEM, ... ) \ + if( !( ITEM ) ) { \ + vg_fatal_error( "Assertion failed: " VG_LOG_MCSTR(ITEM) "\n" \ + VG_LOG_WHERE ); \ + } + #define VG_MIN( A, B ) ((A)<(B)?(A):(B)) #define VG_MAX( A, B ) ((A)>(B)?(A):(B)) #define vg_list_size( A ) (sizeof(A)/sizeof(A[0])) diff --git a/vg_rigidbody.h b/vg_rigidbody.h index 70be483..bf7fdb3 100644 --- a/vg_rigidbody.h +++ b/vg_rigidbody.h @@ -1,4 +1,6 @@ #pragma once +#include "vg/vg_platform.h" + /* * Copyright (C) 2021-2024 Mt.ZERO Software - All Rights Reserved * diff --git a/vg_rigidbody_collision.h b/vg_rigidbody_collision.h index e0cf3e3..9a1957d 100644 --- a/vg_rigidbody_collision.h +++ b/vg_rigidbody_collision.h @@ -1,4 +1,6 @@ #pragma once +#include "vg_m.h" +#include "vg_rigidbody.h" /* TODO: Get rid of this! */ #define VG_MAX_CONTACTS 256 -- 2.25.1