dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed pixel format to RGBA

Browse Source
This commit is contained in:
BADIM-PC\Vadim
2018-02-22 11:38:31 +03:00
parent 840d67f48d
commit 11751e75e7
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/system.c
View File

@@ -14,7 +14,7 @@
#endif #endif
#define STUDIO_UI_SCALE 4 #define STUDIO_UI_SCALE 4
#define STUDIO_PIXEL_FORMAT SDL_PIXELFORMAT_ARGB8888 #define STUDIO_PIXEL_FORMAT SDL_PIXELFORMAT_ABGR8888
#define TEXTURE_SIZE (TIC80_FULLWIDTH) #define TEXTURE_SIZE (TIC80_FULLWIDTH)
#define OFFSET_LEFT ((TIC80_FULLWIDTH-TIC80_WIDTH)/2) #define OFFSET_LEFT ((TIC80_FULLWIDTH-TIC80_WIDTH)/2)
#define OFFSET_TOP ((TIC80_FULLHEIGHT-TIC80_HEIGHT)/2) #define OFFSET_TOP ((TIC80_FULLHEIGHT-TIC80_HEIGHT)/2)
@@ -1101,11 +1101,6 @@ u32 load_shader_program()
} }
} }
void free_shader(Uint32 p)
{
GPU_FreeShaderProgram(p);
}
#include <math.h> #include <math.h>
static s32 start(s32 argc, char **argv, const char* folder) static s32 start(s32 argc, char **argv, const char* folder)
@@ -1133,7 +1128,7 @@ static s32 start(s32 argc, char **argv, const char* folder)
GPU_Target* screen = GPU_Init(Width, Height, GPU_INIT_DISABLE_VSYNC); GPU_Target* screen = GPU_Init(Width, Height, GPU_INIT_DISABLE_VSYNC);
GPU_Image* texture = GPU_CreateImage(TIC80_FULLWIDTH, TIC80_FULLHEIGHT, GPU_FORMAT_RGBA);// GPU_FORMAT_BGRA); GPU_Image* texture = GPU_CreateImage(TIC80_FULLWIDTH, TIC80_FULLHEIGHT, GPU_FORMAT_RGBA);
GPU_SetAnchor(texture, 0, 0); GPU_SetAnchor(texture, 0, 0);
GPU_SetImageFilter(texture, GPU_FILTER_NEAREST); GPU_SetImageFilter(texture, GPU_FILTER_NEAREST);
@@ -1196,10 +1191,8 @@ static s32 start(s32 argc, char **argv, const char* folder)
SDL_CloseAudioDevice(platform.audio.device); SDL_CloseAudioDevice(platform.audio.device);
free_shader(crt_shader); GPU_FreeShaderProgram(crt_shader);
GPU_FreeImage(texture); GPU_FreeImage(texture);
GPU_Quit(); GPU_Quit();
return 0; return 0;

22
src/tools.c
View File

@@ -88,20 +88,20 @@ u32 tic_tool_find_closest_color(const tic_rgb* palette, const tic_rgb* color)
u32* tic_palette_blit(const tic_palette* srcpal) u32* tic_palette_blit(const tic_palette* srcpal)
{ {
static u32 pal[TIC_PALETTE_SIZE] = {0}; static u32 pal[TIC_PALETTE_SIZE];
const u8* src = srcpal->data;
memset(pal, 0xff, sizeof pal);
const tic_rgb* src = srcpal->colors;
const tic_rgb* end = src + TIC_PALETTE_SIZE;
u8* dst = (u8*)pal; u8* dst = (u8*)pal;
const u8* end = src + sizeof(tic_palette);
enum{RGB = sizeof(tic_rgb)}; while(src != end)
{
for(; src != end; dst++, src+=RGB) *dst++ = src->r;
for(s32 j = 0; j < RGB; j++) *dst++ = src->g;
*dst++ = *(src+(RGB-1)-j); *dst++ = src->b;
*dst++ = 0xff;
src++;
}
return pal; return pal;
} }