nishi/nishbox
1
Fork 0
mirror of https://github.com/nishiowo/nishbox synced 2025-04-21 12:14:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
NishiOwO 2025-04-11 13:31:16 +09:00
parent a8ed1623c7
commit 402327513d
No known key found for this signature in database
GPG Key ID: 27EF69B208EB9343
16 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/gf_core.c
View File

@ -21,7 +21,7 @@
#include <string.h>
#include <stdio.h>
GF_EXPORT void gf_engine_begin(void) {
void gf_engine_begin(void) {
gf_version_t ver;
#ifdef _WIN32
WSADATA wsa;
@ -40,12 +40,12 @@ GF_EXPORT void gf_engine_begin(void) {
gf_physics_begin();
}
GF_EXPORT void gf_engine_end(void) {
void gf_engine_end(void) {
gf_physics_end();
gf_draw_end();
}
GF_EXPORT gf_engine_t* gf_engine_create(const char* title, int nogui) {
gf_engine_t* gf_engine_create(const char* title, int nogui) {
gf_engine_t* engine = malloc(sizeof(*engine));
memset(engine, 0, sizeof(*engine));
engine->log = stderr;
@ -66,7 +66,7 @@ GF_EXPORT gf_engine_t* gf_engine_create(const char* title, int nogui) {
return engine;
}
GF_EXPORT void gf_engine_set_draw(gf_engine_t* engine, void (*func)(gf_draw_t*)) { gf_draw_set_draw(engine->draw, func); }
void gf_engine_set_draw(gf_engine_t* engine, void (*func)(gf_draw_t*)) { gf_draw_set_draw(engine->draw, func); }
/**
* Writing this so I don't forget
@ -81,7 +81,7 @@ GF_EXPORT void gf_engine_set_draw(gf_engine_t* engine, void (*func)(gf_draw_t*))
* 6. _gf_draw_step swaps buffers
* 7. Comes back here
*/
GF_EXPORT void gf_engine_loop(gf_engine_t* engine) {
void gf_engine_loop(gf_engine_t* engine) {
while(1) {
if(engine->draw != NULL) {
if(gf_draw_step(engine->draw) != 0) break;
@ -89,7 +89,7 @@ GF_EXPORT void gf_engine_loop(gf_engine_t* engine) {
}
}
GF_EXPORT void gf_engine_destroy(gf_engine_t* engine) {
void gf_engine_destroy(gf_engine_t* engine) {
if(engine->physics != NULL) gf_physics_destroy(engine->physics);
if(engine->draw != NULL) gf_draw_destroy(engine->draw);
free(engine);

16
engine/gf_draw_common.c
View File

@ -19,11 +19,11 @@
#include <string.h>
#include <math.h>
GF_EXPORT void gf_draw_begin(void) { gf_draw_platform_begin(); }
void gf_draw_begin(void) { gf_draw_platform_begin(); }
GF_EXPORT void gf_draw_end(void) { gf_draw_platform_end(); }
void gf_draw_end(void) { gf_draw_platform_end(); }
GF_EXPORT gf_draw_t* gf_draw_create(gf_engine_t* engine, const char* title) {
gf_draw_t* gf_draw_create(gf_engine_t* engine, const char* title) {
gf_draw_t* draw = malloc(sizeof(*draw));
memset(draw, 0, sizeof(*draw));
draw->x = 0;
@ -55,16 +55,16 @@ GF_EXPORT gf_draw_t* gf_draw_create(gf_engine_t* engine, const char* title) {
return draw;
}
GF_EXPORT void gf_draw_reshape(gf_draw_t* draw) { gf_draw_driver_reshape(draw); }
void gf_draw_reshape(gf_draw_t* draw) { gf_draw_driver_reshape(draw); }
/* Runs every frame */
GF_EXPORT void gf_draw_frame(gf_draw_t* draw) {
void gf_draw_frame(gf_draw_t* draw) {
if(draw->draw != NULL) draw->draw(draw);
}
GF_EXPORT void gf_draw_set_draw(gf_draw_t* draw, void (*func)(gf_draw_t*)) { draw->draw = func; }
void gf_draw_set_draw(gf_draw_t* draw, void (*func)(gf_draw_t*)) { draw->draw = func; }
GF_EXPORT int gf_draw_step(gf_draw_t* draw) {
int gf_draw_step(gf_draw_t* draw) {
int ret = gf_draw_platform_step(draw);
if(ret != 0) return ret;
draw->close = 0;
@ -72,7 +72,7 @@ GF_EXPORT int gf_draw_step(gf_draw_t* draw) {
return 0;
}
GF_EXPORT void gf_draw_destroy(gf_draw_t* draw) {
void gf_draw_destroy(gf_draw_t* draw) {
int i;
if(draw->running) {
gf_draw_driver_destroy(draw);

2
engine/gf_log.c
View File

@ -15,7 +15,7 @@
#include <stdarg.h>
#include <stddef.h>
GF_EXPORT void gf_log(gf_engine_t* engine, const char* fmt, ...) {
void gf_log(gf_engine_t* engine, const char* fmt, ...) {
va_list va;
FILE* out = stderr;
if(engine != NULL) {

4
engine/gf_math.c
View File

@ -13,9 +13,9 @@
#include <stdlib.h>
#include <math.h>
GF_EXPORT float gf_log2(float x) { return log(x) / log(2); }
float gf_log2(float x) { return log(x) / log(2); }
GF_EXPORT void gf_calculate_normal(gf_vector_t* r, gf_vector_t v0, gf_vector_t v1, gf_vector_t v2) {
void gf_calculate_normal(gf_vector_t* r, gf_vector_t v0, gf_vector_t v1, gf_vector_t v2) {
int i;
dReal length;
gf_vector_t vec;

8
engine/gf_physics.c
View File

@ -14,18 +14,18 @@
/* Standard */
#include <stdlib.h>
GF_EXPORT void gf_physics_begin(void) { dInitODE(); }
void gf_physics_begin(void) { dInitODE(); }
GF_EXPORT void gf_physics_end(void) { dCloseODE(); }
void gf_physics_end(void) { dCloseODE(); }
GF_EXPORT gf_physics_t* gf_physics_create(void) {
gf_physics_t* gf_physics_create(void) {
gf_physics_t* physics = malloc(sizeof(*physics));
physics->id = dWorldCreate();
dWorldSetGravity(physics->id, 0, 0, -9.81);
return physics;
}
GF_EXPORT void gf_physics_destroy(gf_physics_t* physics) {
void gf_physics_destroy(gf_physics_t* physics) {
dWorldDestroy(physics->id);
free(physics);
gf_function_log(NULL, "Destroyed physics", "");

6
engine/gf_texture.c
View File

@ -13,7 +13,7 @@
/* Standard */
#include <stdlib.h>
GF_EXPORT gf_texture_t* gf_register_texture(gf_draw_t* draw, int width, int height, unsigned char* data) {
gf_texture_t* gf_register_texture(gf_draw_t* draw, int width, int height, unsigned char* data) {
gf_texture_t* texture = malloc(sizeof(*texture));
gf_draw_driver_texture_t* ddtexture = gf_draw_driver_register_texture(draw, width, height, data);
if(ddtexture == NULL) {
@ -26,9 +26,9 @@ GF_EXPORT gf_texture_t* gf_register_texture(gf_draw_t* draw, int width, int heig
return texture;
}
GF_EXPORT void gf_destroy_texture(gf_texture_t* texture) {
void gf_destroy_texture(gf_texture_t* texture) {
gf_draw_driver_destroy_texture(texture->draw_driver_texture);
free(texture);
}
GF_EXPORT void gf_draw_texture(gf_draw_t* draw, float x, float y, float w, float h, gf_texture_t* texture, float r, float g, float b, float a) { gf_draw_driver_draw_texture(draw, x, y, w, h, texture->draw_driver_texture, r, g, b, a); }
void gf_draw_texture(gf_draw_t* draw, float x, float y, float w, float h, gf_texture_t* texture, float r, float g, float b, float a) { gf_draw_driver_draw_texture(draw, x, y, w, h, texture->draw_driver_texture, r, g, b, a); }

2
engine/gf_version.c
View File

@ -15,7 +15,7 @@
#define GF_VERSION "1.0.0"
GF_EXPORT void gf_get_version(gf_version_t* version) {
void gf_get_version(gf_version_t* version) {
char* cpstr = malloc(512);
int i;
int incr = 0;

18
engine/graphic/opengl/gf_driver.c
View File

@ -30,7 +30,7 @@ GLfloat lightblk[] = {0.0, 0.0, 0.0, 1.0};
#define NEAREST_POW2(x) pow((2), gf_log2((int)(x) + 1))
GF_EXPORT gf_draw_driver_texture_t* gf_draw_driver_register_texture(gf_draw_t* draw, int width, int height, unsigned char* data) {
gf_draw_driver_texture_t* gf_draw_driver_register_texture(gf_draw_t* draw, int width, int height, unsigned char* data) {
gf_draw_driver_texture_t* r = malloc(sizeof(*r));
int w = NEAREST_POW2(width);
int h = NEAREST_POW2(height);
@ -58,12 +58,12 @@ GF_EXPORT gf_draw_driver_texture_t* gf_draw_driver_register_texture(gf_draw_t* d
return r;
}
GF_EXPORT void gf_draw_driver_destroy_texture(gf_draw_driver_texture_t* t) {
void gf_draw_driver_destroy_texture(gf_draw_driver_texture_t* t) {
glDeleteTextures(1, &t->id);
free(t);
}
GF_EXPORT void gf_draw_driver_init(gf_draw_t* draw) {
void gf_draw_driver_init(gf_draw_t* draw) {
int i;
int w, h, ch;
draw->driver = malloc(sizeof(*draw->driver));
@ -110,7 +110,7 @@ GF_EXPORT void gf_draw_driver_init(gf_draw_t* draw) {
draw->driver->quadric = gluNewQuadric();
}
GF_EXPORT int gf_draw_driver_has_extension(gf_draw_t* draw, const char* query) {
int gf_draw_driver_has_extension(gf_draw_t* draw, const char* query) {
int ret = gf_draw_platform_has_extension(draw, query);
const char* ext = NULL;
const char* ptr;
@ -122,7 +122,7 @@ GF_EXPORT int gf_draw_driver_has_extension(gf_draw_t* draw, const char* query) {
return ((ptr != NULL) && ((ptr[len] == ' ') || (ptr[len] == '\0')));
}
GF_EXPORT void gf_draw_driver_reshape(gf_draw_t* draw) {
void gf_draw_driver_reshape(gf_draw_t* draw) {
glViewport(0, 0, (GLint)draw->width, (GLint)draw->height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
@ -132,7 +132,7 @@ GF_EXPORT void gf_draw_driver_reshape(gf_draw_t* draw) {
glLoadIdentity();
}
GF_EXPORT void gf_draw_driver_draw_texture(gf_draw_t* draw, float x, float y, float w, float h, gf_draw_driver_texture_t* texture, float r, float g, float b, float a) {
void gf_draw_driver_draw_texture(gf_draw_t* draw, float x, float y, float w, float h, gf_draw_driver_texture_t* texture, float r, float g, float b, float a) {
gf_graphic_begin_2d(draw);
glDisable(GL_LIGHTING);
glDisable(GL_DEPTH_TEST);
@ -158,14 +158,14 @@ GF_EXPORT void gf_draw_driver_draw_texture(gf_draw_t* draw, float x, float y, fl
gf_graphic_end_2d(draw);
}
GF_EXPORT void gf_draw_driver_destroy(gf_draw_t* draw) {
void gf_draw_driver_destroy(gf_draw_t* draw) {
int i;
for(i = 0; i < sizeof(gf_font) / sizeof(gf_font[0]); i++) {
gf_destroy_texture(draw->font[i]);
}
}
GF_EXPORT void gf_draw_driver_before(gf_draw_t* draw) {
void gf_draw_driver_before(gf_draw_t* draw) {
GLfloat lightpos[3];
GF_VECTOR_COPY(draw->light, lightpos);
@ -178,7 +178,7 @@ GF_EXPORT void gf_draw_driver_before(gf_draw_t* draw) {
gf_graphic_clear(draw);
}
GF_EXPORT void gf_draw_driver_after(gf_draw_t* draw) {
void gf_draw_driver_after(gf_draw_t* draw) {
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
}

8
engine/graphic/opengl/gf_graphic.c
View File

@ -15,7 +15,7 @@
/* Standard */
GF_EXPORT void gf_graphic_begin_2d(gf_draw_t* draw) {
void gf_graphic_begin_2d(gf_draw_t* draw) {
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
@ -25,7 +25,7 @@ GF_EXPORT void gf_graphic_begin_2d(gf_draw_t* draw) {
glLoadIdentity();
}
GF_EXPORT void gf_graphic_end_2d(gf_draw_t* draw) {
void gf_graphic_end_2d(gf_draw_t* draw) {
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
glMatrixMode(GL_PROJECTION);
@ -33,9 +33,9 @@ GF_EXPORT void gf_graphic_end_2d(gf_draw_t* draw) {
glMatrixMode(GL_MODELVIEW);
}
GF_EXPORT void gf_graphic_clear(gf_draw_t* draw) { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); }
void gf_graphic_clear(gf_draw_t* draw) { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); }
GF_EXPORT void gf_graphic_text(gf_draw_t* draw, float x, float y, float size, const char* text, float r, float g, float b, float a) {
void gf_graphic_text(gf_draw_t* draw, float x, float y, float size, const char* text, float r, float g, float b, float a) {
int i;
for(i = 0; text[i] != 0; i++) {
gf_draw_texture(draw, x + i * (size / 2), y, size / 2, size, draw->font[text[i]], r, g, b, a);

14
engine/graphic/opengl/glfw/gf_draw.c
View File

@ -20,7 +20,7 @@
#include <string.h>
#include <stdlib.h>
GF_EXPORT void gf_draw_platform_begin(void) {
void gf_draw_platform_begin(void) {
glfwInit();
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 1);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
@ -28,9 +28,9 @@ GF_EXPORT void gf_draw_platform_begin(void) {
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_ANY_PROFILE);
}
GF_EXPORT void gf_draw_platform_end(void) {}
void gf_draw_platform_end(void) {}
GF_EXPORT void gf_glfw_size(GLFWwindow* window, int w, int h) {
void gf_glfw_size(GLFWwindow* window, int w, int h) {
gf_draw_t* draw = (gf_draw_t*)glfwGetWindowUserPointer(window);
draw->width = w;
draw->height = h;
@ -38,7 +38,7 @@ GF_EXPORT void gf_glfw_size(GLFWwindow* window, int w, int h) {
gf_draw_reshape(draw);
}
GF_EXPORT int gf_draw_platform_has_extension(gf_draw_t* draw, const char* query) {
int gf_draw_platform_has_extension(gf_draw_t* draw, const char* query) {
const char* ext = NULL;
const char* ptr;
const int len = strlen(query);
@ -48,7 +48,7 @@ GF_EXPORT int gf_draw_platform_has_extension(gf_draw_t* draw, const char* query)
return glfwExtensionSupported(query);
}
GF_EXPORT int gf_draw_platform_step(gf_draw_t* draw) {
int gf_draw_platform_step(gf_draw_t* draw) {
int ret = 0;
int w, h;
glfwMakeContextCurrent(draw->platform->window);
@ -65,7 +65,7 @@ GF_EXPORT int gf_draw_platform_step(gf_draw_t* draw) {
return ret;
}
GF_EXPORT void gf_draw_platform_create(gf_draw_t* draw) {
void gf_draw_platform_create(gf_draw_t* draw) {
draw->platform = malloc(sizeof(*draw->platform));
memset(draw->platform, 0, sizeof(*draw->platform));
@ -85,7 +85,7 @@ GF_EXPORT void gf_draw_platform_create(gf_draw_t* draw) {
#endif
}
GF_EXPORT void gf_draw_platform_destroy(gf_draw_t* draw) {
void gf_draw_platform_destroy(gf_draw_t* draw) {
if(draw->platform->window != NULL) {
glfwDestroyWindow(draw->platform->window);
}

12
engine/graphic/opengl/glx/gf_draw.c
View File

@ -38,10 +38,10 @@ typedef void (*PFNGLXSWAPINTERVALEXTPROC)(Display*, GLXDrawable, int);
typedef void (*PFNGLXSWAPINTERVALSGIPROC)(int);
#endif
GF_EXPORT void gf_draw_platform_begin(void) {}
GF_EXPORT void gf_draw_platform_end(void) {}
void gf_draw_platform_begin(void) {}
void gf_draw_platform_end(void) {}
GF_EXPORT int gf_draw_platform_has_extension(gf_draw_t* draw, const char* query) {
int gf_draw_platform_has_extension(gf_draw_t* draw, const char* query) {
const char* ext = NULL;
const char* ptr;
const int len = strlen(query);
@ -53,7 +53,7 @@ GF_EXPORT int gf_draw_platform_has_extension(gf_draw_t* draw, const char* query)
return ((ptr != NULL) && ((ptr[len] == ' ') || (ptr[len] == '\0')));
}
GF_EXPORT void gf_draw_platform_create(gf_draw_t* draw) {
void gf_draw_platform_create(gf_draw_t* draw) {
int i = 0;
int attribs[64];
int screen;
@ -151,7 +151,7 @@ GF_EXPORT void gf_draw_platform_create(gf_draw_t* draw) {
#endif
}
GF_EXPORT int gf_draw_platform_step(gf_draw_t* draw) {
int gf_draw_platform_step(gf_draw_t* draw) {
int ret = 0;
glXMakeCurrent(draw->platform->display, draw->platform->window, draw->platform->context);
while(XPending(draw->platform->display) > 0) {
@ -183,7 +183,7 @@ GF_EXPORT int gf_draw_platform_step(gf_draw_t* draw) {
return ret;
}
GF_EXPORT void gf_draw_platform_destroy(gf_draw_t* draw) {
void gf_draw_platform_destroy(gf_draw_t* draw) {
if(draw->platform->context != NULL) {
glXMakeCurrent(draw->platform->display, None, NULL);
glXDestroyContext(draw->platform->display, draw->platform->context);

14
engine/graphic/opengl/wgl/gf_draw.c
View File

@ -21,10 +21,10 @@
typedef const char*(APIENTRY* PFNWGLGETEXTENSIONSSTRINGARB)(HDC);
typedef BOOL(APIENTRY* PFNWGLSWAPINTERVALPROC)(int);
GF_EXPORT void gf_draw_platform_begin(void) {}
GF_EXPORT void gf_draw_platform_end(void) {}
void gf_draw_platform_begin(void) {}
void gf_draw_platform_end(void) {}
GF_EXPORT LRESULT CALLBACK gf_draw_platform_proc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
LRESULT CALLBACK gf_draw_platform_proc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
PAINTSTRUCT ps;
RECT rect;
gf_draw_t* draw = (gf_draw_t*)GetWindowLongPtr(hWnd, GWLP_USERDATA);
@ -54,7 +54,7 @@ GF_EXPORT LRESULT CALLBACK gf_draw_platform_proc(HWND hWnd, UINT msg, WPARAM wp,
return 0;
}
GF_EXPORT int gf_draw_platform_has_extension(gf_draw_t* draw, const char* query) {
int gf_draw_platform_has_extension(gf_draw_t* draw, const char* query) {
const char* ext = NULL;
const char* ptr;
const int len = strlen(query);
@ -72,7 +72,7 @@ GF_EXPORT int gf_draw_platform_has_extension(gf_draw_t* draw, const char* query)
return 0;
}
GF_EXPORT int gf_draw_platform_step(gf_draw_t* draw) {
int gf_draw_platform_step(gf_draw_t* draw) {
MSG msg;
int ret = 0;
wglMakeCurrent(draw->platform->dc, draw->platform->glrc);
@ -95,7 +95,7 @@ GF_EXPORT int gf_draw_platform_step(gf_draw_t* draw) {
return ret;
}
GF_EXPORT void gf_draw_platform_create(gf_draw_t* draw) {
void gf_draw_platform_create(gf_draw_t* draw) {
WNDCLASSEX wc;
PIXELFORMATDESCRIPTOR desc;
PFNWGLSWAPINTERVALPROC wglSwapIntervalEXT;
@ -187,7 +187,7 @@ GF_EXPORT void gf_draw_platform_create(gf_draw_t* draw) {
UpdateWindow(draw->platform->window);
}
GF_EXPORT void gf_draw_platform_destroy(gf_draw_t* draw) {
void gf_draw_platform_destroy(gf_draw_t* draw) {
if(draw->platform->glrc != NULL) {
wglMakeCurrent(NULL, NULL);
}

2
engine/include/gf_macro.h
View File

@ -58,7 +58,7 @@
#if defined(_WIN32) && defined(_DLL)
#define GF_EXPORT __declspec(dllexport)
#else
#define GF_EXPORT
#define GF_EXPORT extern
#endif
/* Expose them by default */

8
engine/thread/posix/gf_thread.c
View File

@ -13,13 +13,13 @@
/* Standard */
#include <stdlib.h>
GF_EXPORT void* gf_wrap_thread(void* arg) {
void* gf_wrap_thread(void* arg) {
gf_thread_context_t* ctx = (gf_thread_context_t*)arg;
ctx->func(ctx->data);
return NULL;
}
GF_EXPORT gf_thread_t* gf_create_thread(void (*func)(void*), void* userdata) {
gf_thread_t* gf_create_thread(void (*func)(void*), void* userdata) {
gf_thread_t* thread = malloc(sizeof(*thread));
thread->context.func = func;
thread->context.data = userdata;
@ -28,9 +28,9 @@ GF_EXPORT gf_thread_t* gf_create_thread(void (*func)(void*), void* userdata) {
return NULL;
}
GF_EXPORT void gf_join_thread(gf_thread_t* thread) {
void gf_join_thread(gf_thread_t* thread) {
void* value;
pthread_join(thread->thread, &value);
}
GF_EXPORT void gf_destroy_thread(gf_thread_t* thread) { free(thread); }
void gf_destroy_thread(gf_thread_t* thread) { free(thread); }

8
engine/thread/win32/gf_thread.c
View File

@ -13,13 +13,13 @@
/* Standard */
#include <stdlib.h>
GF_EXPORT DWORD WINAPI gf_wrap_thread(void* arg) {
DWORD WINAPI gf_wrap_thread(void* arg) {
gf_thread_context_t* ctx = (gf_thread_context_t*)arg;
ctx->func(ctx->data);
return 0;
}
GF_EXPORT gf_thread_t* gf_create_thread(void (*func)(void*), void* userdata) {
gf_thread_t* gf_create_thread(void (*func)(void*), void* userdata) {
gf_thread_t* thread = malloc(sizeof(*thread));
thread->context.func = func;
thread->context.data = userdata;
@ -28,9 +28,9 @@ GF_EXPORT gf_thread_t* gf_create_thread(void (*func)(void*), void* userdata) {
return NULL;
}
GF_EXPORT void gf_join_thread(gf_thread_t* thread) { WaitForSingleObject(thread->thread, INFINITE); }
void gf_join_thread(gf_thread_t* thread) { WaitForSingleObject(thread->thread, INFINITE); }
GF_EXPORT void gf_destroy_thread(gf_thread_t* thread) {
void gf_destroy_thread(gf_thread_t* thread) {
CloseHandle(thread->thread);
free(thread);
}

8
src/main.c
View File

@ -16,13 +16,13 @@ gf_engine_t* engine;
void draw_frame(gf_draw_t* draw) {
char d[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
char str[2];
str[1] = 0;
int y, x;
int i = 0;
int s = 8;
int y, x;
int i = 0;
int s = 8;
int r = 0, g = 0, b = 0;
int max = 5;
str[1] = 0;
for(y = 0; y < draw->height; y += s) {
for(x = 0; x < draw->width; x += s / 2) {