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

no message

Browse Source
This commit is contained in:
BADIM-PC\Vadim
2018-02-26 09:24:28 +03:00
parent 0224cfb54b
commit 0c6d4c5440
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/system.c
View File

@@ -23,7 +23,6 @@ static struct
{ {
Studio* studio; Studio* studio;
bool useShader;
SDL_Window* window; SDL_Window* window;
SDL_Renderer* renderer; SDL_Renderer* renderer;
@@ -34,6 +33,7 @@ static struct
GPU_Target* screen; GPU_Target* screen;
GPU_Image* texture; GPU_Image* texture;
u32 crt_shader; u32 crt_shader;
bool useShader;
} gpu; } gpu;
struct struct
@@ -218,7 +218,7 @@ static void calcTextureRect(SDL_Rect* rect)
{ {
SDL_GetWindowSize(platform.window, &rect->w, &rect->h); SDL_GetWindowSize(platform.window, &rect->w, &rect->h);
if(platform.useShader) if(platform.gpu.useShader)
{ {
enum{Width = TIC80_FULLWIDTH, Height = TIC80_FULLHEIGHT}; enum{Width = TIC80_FULLWIDTH, Height = TIC80_FULLHEIGHT};
@@ -285,7 +285,7 @@ static void processMouse()
SDL_Rect rect = {0, 0, 0, 0}; SDL_Rect rect = {0, 0, 0, 0};
calcTextureRect(&rect); calcTextureRect(&rect);
if(platform.useShader) if(platform.gpu.useShader)
{ {
if(rect.w) input->mouse.x = (mx - rect.x) * TIC80_FULLWIDTH / rect.w - OFFSET_LEFT; if(rect.w) input->mouse.x = (mx - rect.x) * TIC80_FULLWIDTH / rect.w - OFFSET_LEFT;
if(rect.h) input->mouse.y = (my - rect.y) * TIC80_FULLHEIGHT / rect.h - OFFSET_TOP; if(rect.h) input->mouse.y = (my - rect.y) * TIC80_FULLHEIGHT / rect.h - OFFSET_TOP;
@@ -1083,7 +1083,7 @@ static void gpuTick()
{ {
if(platform.useShader) if(platform.gpu.useShader)
{ {
SDL_Rect rect = {0, 0, 0, 0}; SDL_Rect rect = {0, 0, 0, 0};
calcTextureRect(&rect); calcTextureRect(&rect);
@@ -1104,7 +1104,7 @@ static void gpuTick()
} }
else else
{ {
blitGpuTexture(platform.gpu.screen, platform.gpu.texture); blitGpuTexture(platform.gpu.screen, platform.gpu.texture);
} }
} }
@@ -1230,9 +1230,9 @@ static s32 start(s32 argc, char **argv, const char* folder)
GPU_SetAnchor(platform.gpu.texture, 0, 0); GPU_SetAnchor(platform.gpu.texture, 0, 0);
GPU_SetImageFilter(platform.gpu.texture, GPU_FILTER_NEAREST); GPU_SetImageFilter(platform.gpu.texture, GPU_FILTER_NEAREST);
platform.useShader = true; platform.gpu.useShader = true;
if(platform.useShader) if(platform.gpu.useShader)
platform.gpu.crt_shader = load_shader_program(); platform.gpu.crt_shader = load_shader_program();
#if defined(__EMSCRIPTEN__) #if defined(__EMSCRIPTEN__)