falso
/
dethrace
mirror of https://github.com/dethrace-labs/dethrace.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix windows chdir behavior (#365) 

* fix windows chdir behavior

* log panics to file and check for gl shading language

---------

Co-authored-by: Jeff Harris <jeff@1amstudios.com>
Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
This commit is contained in:
Dethrace Engineering Department 2024-06-14 10:31:54 +12:00 committed by GitHub
parent 62bbf66deb
commit 3870bf8c8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/harness/harness.c
View File

@ -181,10 +181,13 @@ void Harness_Init(int* argc, char* argv[]) {
} else {
root_dir = OS_Dirname(argv[0]);
}
printf("Using root directory: %s\n", root_dir);
result = chdir(root_dir);
if (result != 0) {
LOG_PANIC("Failed to chdir. Error is %s", strerror(errno));
// if root_dir is null or empty, no need to chdir
if (root_dir != NULL && root_dir[0] != '\0') {
printf("Using root directory: %s\n", root_dir);
result = chdir(root_dir);
if (result != 0) {
LOG_PANIC("Failed to chdir. Error is %s", strerror(errno));
}
}
if (harness_game_info.mode == eGame_none) {

24
src/harness/harness_trace.c
View File

@ -19,6 +19,30 @@ void debug_printf(const char* fmt, const char* fn, const char* fmt2, ...) {
puts("\033[0m");
}
void panic_printf(const char* fmt, const char* fn, const char* fmt2, ...) {
va_list ap;
FILE* fp = fopen("dethrace.log", "w");
puts("\033[0;31m");
printf(fmt, fn);
if (fp != NULL) {
fprintf(fp, fmt, fn);
}
va_start(ap, fmt2);
vprintf(fmt2, ap);
if (fp != NULL) {
vfprintf(fp, fmt2, ap);
}
va_end(ap);
if (fp != NULL) {
fclose(fp);
}
puts("\033[0m");
}
void debug_print_vector3(const char* fmt, const char* fn, char* msg, br_vector3* v) {
printf(fmt, fn);
printf("%s %f, %f, %f\n", msg, v->v[0], v->v[1], v->v[2]);

6
src/harness/include/harness/trace.h
View File

@ -5,9 +5,9 @@
#include <stdlib.h>
extern int harness_debug_level;
extern int OS_IsDebuggerPresent(void);
void debug_printf(const char* fmt, const char* fn, const char* fmt2, ...);
void debug_printf(const char* fmt, const char* fn, const char* fmt2, ...);
void panic_printf(const char* fmt, const char* fn, const char* fmt2, ...);
void debug_print_vector3(const char* fmt, const char* fn, char* msg, br_vector3* v);
void debug_print_matrix34(const char* fmt, const char* fn, char* name, br_matrix34* m);
void debug_print_matrix4(const char* fmt, const char* fn, char* name, br_matrix4* m);
@ -41,7 +41,7 @@ void debug_print_matrix4(const char* fmt, const char* fn, char* name, br_matrix4
#define LOG_WARN(...) debug_printf("\033[0;33m[WARN] %s ", __FUNCTION__, __VA_ARGS__)
#define LOG_PANIC(...) \
do { \
debug_printf("\033[0;31m[PANIC] %s ", __FUNCTION__, __VA_ARGS__); \
panic_printf("[PANIC] %s ", __FUNCTION__, __VA_ARGS__); \
abort(); \
} while (0)

4
src/harness/renderers/gl/gl_renderer.c
View File

@ -220,6 +220,10 @@ void GLRenderer_Init(int pRender_width, int pRender_height) {
LOG_INFO("OpenGL version string: %s", glGetString(GL_VERSION));
LOG_INFO("OpenGL shading language version string: %s", glGetString(GL_SHADING_LANGUAGE_VERSION));
if (glGetString(GL_SHADING_LANGUAGE_VERSION) == NULL) {
LOG_PANIC("GL_SHADING_LANGUAGE_VERSION is null");
}
LoadShaders();
SetupFullScreenRectGeometry();