PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2024-12-05 00:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

character: Add a way to bound character movement

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2022-07-17 23:46:48 +02:00
parent a4a9413134
commit 17d994b817
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
2 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/character.c
View file

@ -539,6 +539,7 @@ SYMBOL_EXPORT struct Character* CreateCharacter(struct Game* game, char* name) {
character->callback_data = NULL; character->callback_data = NULL;
character->destructor = NULL; character->destructor = NULL;
character->detailed_progress = false; character->detailed_progress = false;
character->bounds.enabled = false;
return character; return character;
} }
@ -734,6 +735,25 @@ SYMBOL_EXPORT void AnimateCharacter(struct Game* game, struct Character* charact
} }
} }
static void BoundCharacter(struct Game* game, struct Character* character) {
if (!character->bounds.enabled) {
return;
}
if (character->x < character->bounds.x1) {
character->x = character->bounds.x1;
}
if (character->y < character->bounds.y1) {
character->y = character->bounds.y1;
}
if (character->x > character->bounds.x2) {
character->x = character->bounds.x2;
}
if (character->y > character->bounds.y2) {
character->y = character->bounds.y2;
}
}
SYMBOL_EXPORT void MoveCharacter(struct Game* game, struct Character* character, float x, float y, float angle) { SYMBOL_EXPORT void MoveCharacter(struct Game* game, struct Character* character, float x, float y, float angle) {
MoveCharacterF(game, character, x / (float)GetCharacterConfineX(game, character), y / (float)GetCharacterConfineY(game, character), angle); MoveCharacterF(game, character, x / (float)GetCharacterConfineX(game, character), y / (float)GetCharacterConfineY(game, character), angle);
} }
@ -742,12 +762,14 @@ SYMBOL_EXPORT void MoveCharacterF(struct Game* game, struct Character* character
character->x += x; character->x += x;
character->y += y; character->y += y;
character->angle += angle; character->angle += angle;
BoundCharacter(game, character);
} }
SYMBOL_EXPORT void SetCharacterPositionF(struct Game* game, struct Character* character, float x, float y, float angle) { SYMBOL_EXPORT void SetCharacterPositionF(struct Game* game, struct Character* character, float x, float y, float angle) {
character->x = x; character->x = x;
character->y = y; character->y = y;
character->angle = angle; character->angle = angle;
BoundCharacter(game, character);
} }
SYMBOL_EXPORT void SetCharacterPosition(struct Game* game, struct Character* character, float x, float y, float angle) { SYMBOL_EXPORT void SetCharacterPosition(struct Game* game, struct Character* character, float x, float y, float angle) {
@ -875,6 +897,24 @@ SYMBOL_EXPORT void SetCharacterConfines(struct Game* game, struct Character* cha
character->confineY = y; character->confineY = y;
} }
void SetCharacterBounds(struct Game* game, struct Character* character, float x1, float y1, float x2, float y2) {
SetCharacterBoundsF(game, character,
x1 / GetCharacterConfineX(game, character), y1 / GetCharacterConfineY(game, character),
x2 / GetCharacterConfineX(game, character), y2 / GetCharacterConfineY(game, character));
}
void SetCharacterBoundsF(struct Game* game, struct Character* character, float x1, float y1, float x2, float y2) {
character->bounds.x1 = x1;
character->bounds.y1 = y1;
character->bounds.x2 = x2;
character->bounds.y2 = y2;
character->bounds.enabled = true;
}
void SetCharacterUnbounded(struct Game* game, struct Character* character) {
character->bounds.enabled = false;
}
SYMBOL_EXPORT int GetCharacterConfineX(struct Game* game, struct Character* character) { SYMBOL_EXPORT int GetCharacterConfineX(struct Game* game, struct Character* character) {
return (character->confineX >= 0) ? character->confineX : (character->parent ? GetCharacterConfineX(game, character->parent) : game->viewport.width); return (character->confineX >= 0) ? character->confineX : (character->parent ? GetCharacterConfineX(game, character->parent) : game->viewport.width);
} }

11
src/character.h
View file

@ -137,6 +137,14 @@ struct Character {
CharacterDestructor* destructor; CharacterDestructor* destructor;
bool shared; /*!< Marks the list of spritesheets as shared, so it won't be freed together with the character. */ bool shared; /*!< Marks the list of spritesheets as shared, so it won't be freed together with the character. */
bool detailed_progress; /*!< Reports progress of loading individual frames. */ bool detailed_progress; /*!< Reports progress of loading individual frames. */
struct {
double x1;
double y1;
double x2;
double y2;
bool enabled;
} bounds;
}; };
// TODO: document functions // TODO: document functions
@ -169,6 +177,9 @@ void MoveCharacterF(struct Game* game, struct Character* character, float x, flo
void SetCharacterPosition(struct Game* game, struct Character* character, float x, float y, float angle); void SetCharacterPosition(struct Game* game, struct Character* character, float x, float y, float angle);
void SetCharacterPositionF(struct Game* game, struct Character* character, float x, float y, float angle); void SetCharacterPositionF(struct Game* game, struct Character* character, float x, float y, float angle);
void SetCharacterConfines(struct Game* game, struct Character* character, int x, int y); void SetCharacterConfines(struct Game* game, struct Character* character, int x, int y);
void SetCharacterBounds(struct Game* game, struct Character* character, float x1, float y1, float x2, float y2);
void SetCharacterBoundsF(struct Game* game, struct Character* character, float x1, float y1, float x2, float y2);
void SetCharacterUnbounded(struct Game* game, struct Character* character);
void SetParentCharacter(struct Game* game, struct Character* character, struct Character* parent); void SetParentCharacter(struct Game* game, struct Character* character, struct Character* parent);