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

rumina hacks 2

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2018-02-09 03:34:50 +01:00
parent ae70770f77
commit f0417b09f6
3 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/character.c
View file

@ -22,6 +22,7 @@
#include "utils.h" #include "utils.h"
#include <allegro5/allegro_primitives.h> #include <allegro5/allegro_primitives.h>
#include <allegro5/allegro_ttf.h> #include <allegro5/allegro_ttf.h>
#include <math.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -46,12 +47,14 @@ SYMBOL_EXPORT void SelectSpritesheet(struct Game* game, struct Character* charac
character->repeat = tmp->repeat; character->repeat = tmp->repeat;
character->pos = 0; character->pos = 0;
if (character->bitmap) { if (character->bitmap) {
if ((al_get_bitmap_width(character->bitmap) != tmp->width / tmp->cols) || (al_get_bitmap_height(character->bitmap) != tmp->height / tmp->rows)) { //if ((al_get_bitmap_width(character->bitmap) != tmp->width / tmp->cols) || (al_get_bitmap_height(character->bitmap) != tmp->height / tmp->rows)) {
al_destroy_bitmap(character->bitmap); // al_destroy_bitmap(character->bitmap);
character->bitmap = al_create_bitmap(tmp->width / tmp->cols, tmp->height / tmp->rows); // character->bitmap = al_create_bitmap(tmp->width / tmp->cols, tmp->height / tmp->rows);
} //}
al_reparent_bitmap(character->bitmap, tmp->bitmap, 0, 0, tmp->width / tmp->cols, tmp->height / tmp->rows);
} else { } else {
character->bitmap = al_create_bitmap(tmp->width / tmp->cols, tmp->height / tmp->rows); //character->bitmap = al_create_bitmap(tmp->width / tmp->cols, tmp->height / tmp->rows);
character->bitmap = al_create_sub_bitmap(tmp->bitmap, 0, 0, tmp->width / tmp->cols, tmp->height / tmp->rows);
} }
PrintConsole(game, "SUCCESS: Spritesheet for %s activated: %s (%dx%d)", character->name, character->spritesheet->name, al_get_bitmap_width(character->bitmap), al_get_bitmap_height(character->bitmap)); PrintConsole(game, "SUCCESS: Spritesheet for %s activated: %s (%dx%d)", character->name, character->spritesheet->name, al_get_bitmap_width(character->bitmap), al_get_bitmap_height(character->bitmap));
return; return;
@ -210,6 +213,9 @@ SYMBOL_EXPORT void AnimateCharacter(struct Game* game, struct Character* charact
} }
} }
} }
al_reparent_bitmap(character->bitmap, character->spritesheet->bitmap,
(character->pos % character->spritesheet->cols) * (character->spritesheet->width / character->spritesheet->cols), (character->pos / character->spritesheet->cols) * (character->spritesheet->height / character->spritesheet->rows),
character->spritesheet->width / character->spritesheet->cols, character->spritesheet->height / character->spritesheet->rows);
} }
} }
@ -262,7 +268,8 @@ SYMBOL_EXPORT void DrawCharacter(struct Game* game, struct Character* character,
if (character->spritesheet->flip) { if (character->spritesheet->flip) {
flags = flags | ALLEGRO_FLIP_HORIZONTAL | ALLEGRO_FLIP_VERTICAL; flags = flags | ALLEGRO_FLIP_HORIZONTAL | ALLEGRO_FLIP_VERTICAL;
} }
DrawScaledCharacter(game, character, tint, 1, 1, flags); al_draw_bitmap(character->bitmap, GetCharacterX(game, character), GetCharacterY(game, character), flags);
// DrawScaledCharacter(game, character, tint, 1, 1, flags);
} }
SYMBOL_EXPORT void SetCharacterConfines(struct Game* game, struct Character* character, int x, int y) { SYMBOL_EXPORT void SetCharacterConfines(struct Game* game, struct Character* character, int x, int y) {
@ -290,9 +297,17 @@ SYMBOL_EXPORT float GetCharacterAngle(struct Game* game, struct Character* chara
return character->angle; return character->angle;
} }
SYMBOL_EXPORT bool IsOnCharacter(struct Game* game, struct Character* character, int x, int y) { SYMBOL_EXPORT bool IsOnCharacter(struct Game* game, struct Character* character, int x, int y, bool pixelperfect) {
int x1 = GetCharacterX(game, character), y1 = GetCharacterY(game, character); int x1 = GetCharacterX(game, character), y1 = GetCharacterY(game, character);
int x2 = x1 + al_get_bitmap_width(character->bitmap), y2 = y1 + al_get_bitmap_height(character->bitmap); int x2 = x1 + al_get_bitmap_width(character->bitmap), y2 = y1 + al_get_bitmap_height(character->bitmap);
return ((x >= x1) && (x <= x2) && (y >= y1) && (y <= y2)); bool test = ((x >= x1) && (x <= x2) && (y >= y1) && (y <= y2));
if (test && pixelperfect) {
// TODO: handle being flipped
ALLEGRO_COLOR color = al_get_pixel(character->bitmap, x - x1, y - y1);
return (color.a > 0.0);
}
return test;
} }

8
src/character.h
View file

@ -57,10 +57,10 @@ struct Character {
float angle; /*!< Characters display angle (radians). */ float angle; /*!< Characters display angle (radians). */
float pivotX, pivotY; /*!< Pivot point, relative of character's size. */ float pivotX, pivotY; /*!< Pivot point, relative of character's size. */
int confineX, confineY; /*!< Size of the canvas being drawn to, for correct position calculation; when -1, uses viewport size */ int confineX, confineY; /*!< Size of the canvas being drawn to, for correct position calculation; when -1, uses viewport size */
void* data; /*!< Additional, custom character data (HP etc.). */ int repeat; // TODO: remove
int repeat;
bool shared; bool shared;
bool dead; bool dead; // TODO: remove
void* data; /*!< Additional, custom character data (HP etc.). */
}; };
void SelectSpritesheet(struct Game* game, struct Character* character, char* name); void SelectSpritesheet(struct Game* game, struct Character* character, char* name);
@ -92,6 +92,6 @@ float GetCharacterAngle(struct Game* game, struct Character* character);
int GetCharacterConfineX(struct Game* game, struct Character* character); int GetCharacterConfineX(struct Game* game, struct Character* character);
int GetCharacterConfineY(struct Game* game, struct Character* character); int GetCharacterConfineY(struct Game* game, struct Character* character);
bool IsOnCharacter(struct Game* game, struct Character* character, int x, int y); bool IsOnCharacter(struct Game* game, struct Character* character, int x, int y, bool pixelperfect);
#endif #endif

1
src/internal.c
View file

@ -410,6 +410,7 @@ SYMBOL_INTERNAL void ClearScreen(struct Game* game) {
al_set_target_backbuffer(game->display); al_set_target_backbuffer(game->display);
al_set_clipping_rectangle(0, 0, al_get_display_width(game->display), al_get_display_height(game->display)); al_set_clipping_rectangle(0, 0, al_get_display_width(game->display), al_get_display_height(game->display));
al_clear_to_color(al_map_rgb(0, 0, 0)); al_clear_to_color(al_map_rgb(0, 0, 0));
al_clear_depth_buffer(1.0);
al_set_clipping_rectangle(game->_priv.clip_rect.x, game->_priv.clip_rect.y, game->_priv.clip_rect.w, game->_priv.clip_rect.h); al_set_clipping_rectangle(game->_priv.clip_rect.x, game->_priv.clip_rect.y, game->_priv.clip_rect.w, game->_priv.clip_rect.h);
} }