PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-02-01 02:56:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

make it buildable by clang; adjust function visibility

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2016-07-04 00:06:50 +02:00
parent ffd44df08b
commit c964f72d66
4 changed files with 51 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/libsuperderpy.c
View file

@ -38,7 +38,7 @@
#include "config.h"
#include "libsuperderpy.h"
void DrawGamestates(struct Game *game) {
__attribute__((visibility("hidden"))) void DrawGamestates(struct Game *game) {
al_set_target_backbuffer(game->display);
al_clear_to_color(al_map_rgb(0,0,0));
struct Gamestate *tmp = game->_priv.gamestates;
@ -50,7 +50,7 @@ void DrawGamestates(struct Game *game) {
}
}
void LogicGamestates(struct Game *game) {
__attribute__((visibility("hidden"))) void LogicGamestates(struct Game *game) {
struct Gamestate *tmp = game->_priv.gamestates;
while (tmp) {
if ((tmp->loaded) && (tmp->started) && (!tmp->paused)) {
@ -60,7 +60,7 @@ void LogicGamestates(struct Game *game) {
}
}
void EventGamestates(struct Game *game, ALLEGRO_EVENT *ev) {
__attribute__((visibility("hidden"))) void EventGamestates(struct Game *game, ALLEGRO_EVENT *ev) {
struct Gamestate *tmp = game->_priv.gamestates;
while (tmp) {
if ((tmp->loaded) && (tmp->started) && (!tmp->paused)) {
@ -70,7 +70,7 @@ void EventGamestates(struct Game *game, ALLEGRO_EVENT *ev) {
}
}
void PauseGamestates(struct Game *game) {
__attribute__((visibility("hidden"))) void PauseGamestates(struct Game *game) {
struct Gamestate *tmp = game->_priv.gamestates;
while (tmp) {
if ((tmp->loaded) && (tmp->started)) {
@ -81,7 +81,7 @@ void PauseGamestates(struct Game *game) {
}
void ResumeGamestates(struct Game *game) {
__attribute__((visibility("hidden"))) void ResumeGamestates(struct Game *game) {
struct Gamestate *tmp = game->_priv.gamestates;
while (tmp) {
if ((tmp->loaded) && (tmp->started)) {
@ -91,6 +91,20 @@ void ResumeGamestates(struct Game *game) {
}
}
__attribute__((visibility("hidden"))) void gamestate_progress(struct Game *game) {
struct Gamestate *tmp = game->_priv.cur_gamestate.tmp;
game->_priv.cur_gamestate.p++;
DrawGamestates(game);
float progress = ((game->_priv.cur_gamestate.p / (*(tmp->api.Gamestate_ProgressCount) ? (float)*(tmp->api.Gamestate_ProgressCount) : 1))/(float)game->_priv.cur_gamestate.toLoad)+(game->_priv.cur_gamestate.loaded/(float)game->_priv.cur_gamestate.toLoad);
if (game->config.debug) PrintConsole(game, "[%s] Progress: %d% (%d/%d)", tmp->name, (int)(progress*100), game->_priv.cur_gamestate.p, *(tmp->api.Gamestate_ProgressCount));
if (tmp->showLoading) (*game->_priv.loading.Draw)(game, game->_priv.loading.data, progress);
DrawConsole(game);
if (al_get_time() - game->_priv.cur_gamestate.t >= 1/60.0) {
al_flip_display();
}
game->_priv.cur_gamestate.t = al_get_time();
}
struct Game* libsuperderpy_init(int argc, char** argv, const char* name) {
struct Game *game = malloc(sizeof(struct Game));
@ -225,8 +239,8 @@ struct Game* libsuperderpy_init(int argc, char** argv, const char* name) {
setlocale(LC_NUMERIC, "C");
game->argc = argc;
game->argv = argv;
game->_priv.argc = argc;
game->_priv.argv = argv;
game->data = NULL;
@ -287,7 +301,8 @@ int libsuperderpy_run(struct Game *game) {
if (redraw && al_is_event_queue_empty(game->_priv.event_queue)) {
struct Gamestate *tmp = game->_priv.gamestates;
int toLoad = 0, loaded = 0;
game->_priv.cur_gamestate.toLoad = 0;
game->_priv.cur_gamestate.loaded = 0;
// FIXME: move to function
// TODO: support dependences
@ -299,7 +314,7 @@ int libsuperderpy_run(struct Game *game) {
tmp->pending_start = false;
}
if ((tmp->pending_load) && (!tmp->loaded)) toLoad++;
if ((tmp->pending_load) && (!tmp->loaded)) game->_priv.cur_gamestate.toLoad++;
tmp=tmp->next;
}
@ -307,7 +322,7 @@ int libsuperderpy_run(struct Game *game) {
// FIXME: move to function
// TODO: support dependences
double t = -1;
game->_priv.cur_gamestate.t = -1;
while (tmp) {
if ((tmp->pending_load) && (tmp->loaded)) {
@ -351,35 +366,23 @@ int libsuperderpy_run(struct Game *game) {
if (!(tmp->api.Gamestate_ProgressCount = dlsym(tmp->handle, "Gamestate_ProgressCount"))) { GS_ERROR; }
int p = 0;
game->_priv.cur_gamestate.p = 0;
void progress(struct Game *game) {
p++;
DrawGamestates(game);
float progress = ((p / (*(tmp->api.Gamestate_ProgressCount) ? (float)*(tmp->api.Gamestate_ProgressCount) : 1))/(float)toLoad)+(loaded/(float)toLoad);
if (game->config.debug) PrintConsole(game, "[%s] Progress: %d% (%d/%d)", tmp->name, (int)(progress*100), p, *(tmp->api.Gamestate_ProgressCount));
if (tmp->showLoading) (*game->_priv.loading.Draw)(game, game->_priv.loading.data, progress);
DrawConsole(game);
if (al_get_time() - t >= 1/60.0) {
al_flip_display();
}
t = al_get_time();
}
t = al_get_time();
game->_priv.cur_gamestate.t = al_get_time();
// initially draw loading screen with empty bar
DrawGamestates(game);
if (tmp->showLoading) {
(*game->_priv.loading.Draw)(game, game->_priv.loading.data, loaded/(float)toLoad);
(*game->_priv.loading.Draw)(game, game->_priv.loading.data, game->_priv.cur_gamestate.loaded/(float)game->_priv.cur_gamestate.toLoad);
}
DrawConsole(game);
if (al_get_time() - t >= 1/60.0) {
if (al_get_time() - game->_priv.cur_gamestate.t >= 1/60.0) {
al_flip_display();
}
t = al_get_time();
tmp->data = (*tmp->api.Gamestate_Load)(game, &progress); // feel free to replace "progress" with empty function if you want to compile with clang
loaded++;
game->_priv.cur_gamestate.t = al_get_time();
game->_priv.cur_gamestate.tmp = tmp;
tmp->data = (*tmp->api.Gamestate_Load)(game, &gamestate_progress);
game->_priv.cur_gamestate.loaded++;
tmp->loaded = true;
tmp->pending_load = false;
@ -516,7 +519,7 @@ void libsuperderpy_destroy(struct Game *game) {
al_uninstall_system();
al_shutdown_ttf_addon();
al_shutdown_font_addon();
char** argv = game->argv;
char** argv = game->_priv.argv;
free(game);
if (game->restart) {
execv(argv[0], argv); // FIXME: on OSX there's chdir called which might break it

13
src/libsuperderpy.h
View file

@ -93,14 +93,21 @@ struct Game {
void* data;
} loading; /*!< Interface for accessing loading screen functions. */
int argc;
char** argv;
struct {
int p;
struct Gamestate *tmp;
double t;
int loaded, toLoad;
} cur_gamestate;
} _priv; /*!< Private resources. Do not use in gamestates! */
bool shuttingdown; /*!< If true then shut down of the game is pending. */
bool restart; /*!< If true then restart of the game is pending. */
int argc;
char** argv;
const char* name;
LIBSUPERDERPY_DATA_TYPE *data;

4
src/timeline.c
View file

@ -116,7 +116,7 @@ void TM_Process(struct Timeline* timeline) {
}
}
void PauseTimers(struct Timeline* timeline, bool pause) {
__attribute__((visibility("hidden"))) void PauseTimers(struct Timeline* timeline, bool pause) {
if (timeline->queue) {
if (timeline->queue->timer) {
if (pause) {
@ -262,7 +262,7 @@ struct TM_Action* TM_AddBackgroundAction(struct Timeline* timeline, bool (*func)
}
/*! \brief Predefined action used by TM_AddQueuedBackgroundAction */
bool runinbackground(struct Game* game, struct TM_Action* action, enum TM_ActionState state) {
__attribute__((visibility("hidden"))) bool runinbackground(struct Game* game, struct TM_Action* action, enum TM_ActionState state) {
if (state != TM_ACTIONSTATE_RUNNING) return false;
int* delay = (int*) action->arguments->next->value;
char* name = (char*) action->arguments->next->next->value;

17
src/utils.c
View file

@ -27,13 +27,6 @@
#include "math.h"
#include "utils.h"
char* strdup(const char *str) {
int n = strlen(str) + 1;
char *dup = malloc(n);
if (dup) { strcpy(dup, str); }
return dup;
}
void DrawConsole(struct Game *game) {
if (game->_priv.showconsole) {
al_set_target_backbuffer(game->display);
@ -137,7 +130,7 @@ void DrawTextWithShadow(ALLEGRO_FONT *font, ALLEGRO_COLOR color, float x, float
}
/* linear filtering code written by SiegeLord */
ALLEGRO_COLOR interpolate(ALLEGRO_COLOR c1, ALLEGRO_COLOR c2, float frac) {
ALLEGRO_COLOR InterpolateColor(ALLEGRO_COLOR c1, ALLEGRO_COLOR c2, float frac) {
return al_map_rgba_f(c1.r + frac * (c2.r - c1.r),
c1.g + frac * (c2.g - c1.g),
c1.b + frac * (c2.b - c1.b),
@ -166,9 +159,9 @@ void ScaleBitmap(ALLEGRO_BITMAP* source, int width, int height) {
ALLEGRO_COLOR c = al_get_pixel(source, pixx_f, pixy_f + 1);
ALLEGRO_COLOR d = al_get_pixel(source, pixx_f + 1, pixy_f + 1);
ALLEGRO_COLOR ab = interpolate(a, b, pixx - pixx_f);
ALLEGRO_COLOR cd = interpolate(c, d, pixx - pixx_f);
ALLEGRO_COLOR result = interpolate(ab, cd, pixy - pixy_f);
ALLEGRO_COLOR ab = InterpolateColor(a, b, pixx - pixx_f);
ALLEGRO_COLOR cd = InterpolateColor(c, d, pixx - pixx_f);
ALLEGRO_COLOR result = InterpolateColor(ab, cd, pixy - pixy_f);
al_put_pixel(x, y, result);
}
@ -282,7 +275,7 @@ void FatalError(struct Game *game, bool fatal, char* format, ...) {
al_use_transform(&game->projection);
}
void TestPath(char* filename, char* subpath, char** result) {
__attribute__((visibility("hidden"))) void TestPath(char* filename, char* subpath, char** result) {
if (*result) return; //already found
ALLEGRO_PATH *tail = al_create_path(filename);
ALLEGRO_PATH *path = al_get_standard_path(ALLEGRO_RESOURCES_PATH);