mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2026-01-29 17:38:16 +03:00
Move from surfaces to the SDL render system
Ever since VVVVVV was initially ported to C++ in 2.0, it has used surfaces from SDL. The downside is, that's all software rendering. This commit moves most things off of surfaces, and all into GPU, by using textures and SDL_Renderer. Pixel-perfect collision has been kept by keeping a copy of sprites as surfaces. There's plans for pixel-perfect collision to use masks instead of reading pixel data directly, but that's out of scope for this commit. - `graphics.reloadresources()` is now called later in `main`, because textures cannot be created without a renderer. - This commit also removes a bunch of surface functions which are no longer needed. - This also recaches target textures in certain places for d3d9. - graphics.images was converted to a fixed-size array. - fillbox and fillboxabs use SDL_RenderDrawRect instead of drawing an outline using four filled rectangles - Update my name in the credits
This commit is contained in:
AllyTally
committed by
Misa Elizabeth Kai
Misa Elizabeth Kai
parent
556e3a110a
commit
19b2a317f1
@@ -21,6 +21,24 @@ enum FadeBars
|
||||
FADE_FADING_IN
|
||||
};
|
||||
|
||||
enum ImageNames
|
||||
{
|
||||
IMAGE_LEVELCOMPLETE,
|
||||
IMAGE_MINIMAP,
|
||||
IMAGE_COVERED,
|
||||
IMAGE_ELEPHANT,
|
||||
IMAGE_GAMECOMPLETE,
|
||||
IMAGE_FLIPLEVELCOMPLETE,
|
||||
IMAGE_FLIPGAMECOMPLETE,
|
||||
IMAGE_SITE,
|
||||
IMAGE_SITE2,
|
||||
IMAGE_SITE3,
|
||||
IMAGE_ENDING,
|
||||
IMAGE_SITE4,
|
||||
IMAGE_CUSTOMMINIMAP,
|
||||
NUM_IMAGES
|
||||
};
|
||||
|
||||
#define FADEMODE_IS_FADING(mode) ((mode) != FADE_NONE && (mode) != FADE_FULLY_BLACK)
|
||||
|
||||
class Graphics
|
||||
@@ -29,7 +47,7 @@ public:
|
||||
void init(void);
|
||||
void destroy(void);
|
||||
|
||||
void create_buffers(const SDL_PixelFormat* fmt);
|
||||
void create_buffers(void);
|
||||
void destroy_buffers(void);
|
||||
|
||||
GraphicsResources grphx;
|
||||
@@ -39,18 +57,13 @@ public:
|
||||
|
||||
bool Makebfont(void);
|
||||
|
||||
void drawhuetile(int x, int y, int t, SDL_Color ct);
|
||||
SDL_Color huetilegetcol(int t);
|
||||
SDL_Color bigchunkygetcol(int t);
|
||||
|
||||
void drawgravityline(int t);
|
||||
|
||||
bool MakeTileArray(void);
|
||||
|
||||
bool MakeSpriteArray(void);
|
||||
|
||||
bool maketelearray(void);
|
||||
|
||||
void drawcoloredtile(int x, int y, int t, int r, int g, int b);
|
||||
|
||||
void drawmenu(int cr, int cg, int cb, enum Menu::MenuName menu);
|
||||
@@ -134,17 +147,63 @@ public:
|
||||
|
||||
void drawimagecol(int t, int xp, int yp, SDL_Color ct, bool cent= false);
|
||||
|
||||
void draw_texture(SDL_Texture* image, int x, int y);
|
||||
|
||||
void draw_texture_part(SDL_Texture* image, int x, int y, int x2, int y2, int w, int h, int scalex, int scaley);
|
||||
|
||||
void draw_grid_tile(SDL_Texture* texture, int t, int x, int y, int width, int height, int scalex, int scaley);
|
||||
void draw_grid_tile(SDL_Texture* texture, int t, int x, int y, int width, int height);
|
||||
void draw_grid_tile(SDL_Texture* texture, int t, int x, int y, int width, int height, int r, int g, int b, int a, int scalex, int scaley);
|
||||
void draw_grid_tile(SDL_Texture* texture, int t, int x, int y, int width, int height, int r, int g, int b, int a);
|
||||
void draw_grid_tile(SDL_Texture* texture, int t, int x, int y, int width, int height, int r, int g, int b, int scalex, int scaley);
|
||||
void draw_grid_tile(SDL_Texture* texture, int t, int x, int y, int width, int height, int r, int g, int b);
|
||||
void draw_grid_tile(SDL_Texture* texture, int t, int x, int y, int width, int height, SDL_Color color, int scalex, int scaley);
|
||||
void draw_grid_tile(SDL_Texture* texture, int t, int x, int y, int width, int height, SDL_Color color);
|
||||
|
||||
void updatetextboxes(void);
|
||||
void drawgui(void);
|
||||
|
||||
void drawsprite(int x, int y, int t, int r, int g, int b);
|
||||
void drawsprite(int x, int y, int t, SDL_Color color);
|
||||
void draw_sprite(int x, int y, int t, int r, int g, int b);
|
||||
void draw_sprite(int x, int y, int t, SDL_Color color);
|
||||
|
||||
void scroll_texture(SDL_Texture* texture, int x, int y);
|
||||
|
||||
void printcrewname(int x, int y, int t);
|
||||
void printcrewnamedark(int x, int y, int t);
|
||||
|
||||
void printcrewnamestatus(int x, int y, int t, bool rescued);
|
||||
|
||||
int set_render_target(SDL_Texture* texture);
|
||||
|
||||
int set_texture_color_mod(SDL_Texture* texture, Uint8 r, Uint8 g, Uint8 b);
|
||||
|
||||
int set_texture_alpha_mod(SDL_Texture* texture, Uint8 alpha);
|
||||
|
||||
int query_texture(SDL_Texture* texture, Uint32* format, int* access, int* w, int* h);
|
||||
|
||||
int set_blendmode(SDL_BlendMode blendmode);
|
||||
int set_blendmode(SDL_Texture* texture, SDL_BlendMode blendmode);
|
||||
|
||||
int clear(int r, int g, int b, int a);
|
||||
int clear();
|
||||
|
||||
int copy_texture(SDL_Texture* texture, const SDL_Rect* src, const SDL_Rect* dest);
|
||||
int copy_texture(SDL_Texture* texture, const SDL_Rect* src, const SDL_Rect* dest, double angle, const SDL_Point* center, SDL_RendererFlip flip);
|
||||
|
||||
int set_color(Uint8 r, Uint8 g, Uint8 b, Uint8 a);
|
||||
int set_color(Uint8 r, Uint8 g, Uint8 b);
|
||||
int set_color(SDL_Color color);
|
||||
|
||||
int fill_rect(const SDL_Rect* rect, int r, int g, int b, int a);
|
||||
int fill_rect(int x, int y, int w, int h, int r, int g, int b, int a);
|
||||
int fill_rect(int x, int y, int w, int h, int r, int g, int b);
|
||||
int fill_rect(int r, int g, int b, int a);
|
||||
int fill_rect(const SDL_Rect* rect, int r, int g, int b);
|
||||
int fill_rect(int r, int g, int b);
|
||||
int fill_rect(const SDL_Rect* rect, SDL_Color color);
|
||||
int fill_rect(int x, int y, int w, int h, SDL_Color color);
|
||||
int fill_rect(SDL_Color color);
|
||||
|
||||
void map_tab(int opt, const char* text, bool selected = false);
|
||||
|
||||
void map_option(int opt, int num_opts, const std::string& text, bool selected = false);
|
||||
@@ -261,28 +320,22 @@ public:
|
||||
|
||||
int m;
|
||||
|
||||
std::vector <SDL_Surface*> images;
|
||||
std::vector <SDL_Surface*> sprites_surf;
|
||||
std::vector <SDL_Surface*> flipsprites_surf;
|
||||
|
||||
std::vector <SDL_Surface*> tele;
|
||||
std::vector <SDL_Surface*> tiles;
|
||||
std::vector <SDL_Surface*> tiles2;
|
||||
std::vector <SDL_Surface*> tiles3;
|
||||
std::vector <SDL_Surface*> entcolours;
|
||||
std::vector <SDL_Surface*> sprites;
|
||||
std::vector <SDL_Surface*> flipsprites;
|
||||
std::vector <SDL_Surface*> bfont;
|
||||
std::vector <SDL_Surface*> flipbfont;
|
||||
SDL_Texture* images[NUM_IMAGES];
|
||||
|
||||
bool flipmode;
|
||||
bool setflipmode;
|
||||
bool notextoutline;
|
||||
//buffer objects. //TODO refactor buffer objects
|
||||
SDL_Surface* backBuffer;
|
||||
SDL_Surface* menubuffer;
|
||||
SDL_Surface* foregroundBuffer;
|
||||
SDL_Surface* menuoffbuffer;
|
||||
SDL_Surface* warpbuffer;
|
||||
SDL_Surface* warpbuffer_lerp;
|
||||
|
||||
SDL_Texture* gameTexture;
|
||||
SDL_Texture* tempTexture;
|
||||
SDL_Texture* gameplayTexture;
|
||||
SDL_Texture* menuTexture;
|
||||
SDL_Texture* ghostTexture;
|
||||
SDL_Texture* backgroundTexture;
|
||||
SDL_Texture* foregroundTexture;
|
||||
|
||||
TowerBG towerbg;
|
||||
TowerBG titlebg;
|
||||
@@ -291,11 +344,9 @@ public:
|
||||
SDL_Rect sprites_rect;
|
||||
SDL_Rect line_rect;
|
||||
SDL_Rect tele_rect;
|
||||
SDL_Rect towerbuffer_rect;
|
||||
|
||||
SDL_Rect prect;
|
||||
SDL_Rect footerrect;
|
||||
SDL_Surface* footerbuffer;
|
||||
|
||||
int linestate, linedelay;
|
||||
int backoffset;
|
||||
@@ -340,8 +391,6 @@ public:
|
||||
|
||||
std::map<int, int> font_positions;
|
||||
|
||||
SDL_Surface* ghostbuffer;
|
||||
|
||||
#ifndef GAME_DEFINITION
|
||||
float inline lerp(const float v0, const float v1)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user