Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated compatibility wrapper #795

Merged
merged 3 commits into from
Feb 23, 2023
Merged

Remove deprecated compatibility wrapper #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8aa796
Remove 32blit.cmake
Daft-Freak Feb 22, 2023
22ba40d
Remove graphics/sprite.hpp
Daft-Freak Feb 22, 2023
a1013a3
Remove deprecated blit wrappers
Daft-Freak Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions 32blit.cmake
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion 32blit/32blit.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "graphics/font.hpp"
#include "graphics/jpeg.hpp"
#include "graphics/mode7.hpp"
#include "graphics/sprite.hpp"
#include "graphics/surface.hpp"
#include "graphics/tilemap.hpp"
#include "math/constants.hpp"
Expand Down
1 change: 0 additions & 1 deletion 32blit/graphics/sprite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <cstring>

#include "surface.hpp"
#include "sprite.hpp"

#include "../engine/file.hpp"

Expand Down
7 changes: 0 additions & 7 deletions 32blit/graphics/sprite.hpp
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion 32blit/graphics/surface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <string>

#include "font.hpp"
#include "sprite.hpp"
#include "surface.hpp"

#include "../engine/file.hpp"
Expand Down
15 changes: 0 additions & 15 deletions 32blit/graphics/surface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,6 @@ namespace blit {

void stretch_blit_vspan(Surface *src, Point uv, uint16_t sc, Point p, int16_t dc);

[[deprecated]]
void blit(Surface *src, Rect r, Point p, bool hflip) {
blit(src, r, p, hflip ? SpriteTransform::HORIZONTAL : 0);
}

void custom_blend(Surface *src, Rect r, Point p, std::function<void(uint8_t *psrc, uint8_t *pdest, int16_t c)> f);
void custom_modify(Rect r, std::function<void(uint8_t *p, int16_t c)> f);
void watermark();
Expand All @@ -212,16 +207,6 @@ namespace blit {
Rect sprite_bounds(const Point &p);
Rect sprite_bounds(const Rect &r);

[[deprecated]]
void blit_sprite(const Rect &src, const Point &p, uint8_t t = 0) {
blit(sprites, src, p, t);
}

[[deprecated]]
void stretch_blit_sprite(const Rect &src, const Rect &r, uint8_t t = 0) {
stretch_blit(sprites, src, r, t);
}

void sprite(const Rect &sprite, const Point &position, uint8_t transform = 0);
void sprite(const Point &sprite, const Point &position, uint8_t transform = 0);
void sprite(uint16_t sprite, const Point &position, uint8_t transform = 0);
Expand Down
1 change: 0 additions & 1 deletion 32blit/graphics/tilemap.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "../types/size.hpp"
#include "../types/point.hpp"
#include "../types/mat3.hpp"
#include "../graphics/sprite.hpp"

namespace blit {

Expand Down
2 changes: 1 addition & 1 deletion launcher-shared/metadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <cstring>

#include "graphics/sprite.hpp"
#include "graphics/surface.hpp"

#include "metadata.hpp"
#include "executable.hpp"
Expand Down