From: Alexey Kutepov Date: Sun, 29 Dec 2019 21:35:25 +0000 (+0700) Subject: Merge pull request #1230 from tsoding/optimization X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=3442d0b7eeb989cf9adc3d505e42925f8cbfad0c;hp=a82093673d85b4e696a6ca3d370c8d57cf88dcf2;p=nothing.git Merge pull request #1230 from tsoding/optimization Creative session --- diff --git a/assets/levels/level-02.txt b/assets/levels/level-02.txt index b37fd12a..6ef6ac53 100644 --- a/assets/levels/level-02.txt +++ b/assets/levels/level-02.txt @@ -1,20 +1,28 @@ 2 0a2b2a -21.798889 -133.284241 f2ff80 -6 +12 platform_0 -185.000000 76.041672 519.166626 432.079834 80926d platform_0 -185.000000 569.579895 519.166626 1322.226074 80926d platform_0 -3988.729980 647.916809 3819.860840 432.079773 80926d platform_0 1640.416382 71.875000 519.166626 432.079834 80926d -platform_1 -1308.869141 -1719.616943 519.166626 3611.422852 80926d +platform_1 -1307.827393 -862.996338 519.166626 2753.760742 80926d platform_2 1640.416504 569.579834 519.166626 1322.226074 80926d +platform_0 -789.702515 -182.059967 303.125000 38.541687 80926d +platform_1 -789.702515 -477.268341 303.125000 38.541687 80926d +platform_3 -789.702515 -753.310181 303.125000 38.541687 80926d +platform_4 -789.702515 -1122.060181 303.125000 38.541687 80926d +platform_5 -789.702515 -1534.560303 303.125000 38.541687 80926d +platform_0 -1307.807495 -5332.081543 519.166626 4358.668457 80926d 0 -1 -lava_0 182.002197 589.132202 4415.973633 688.541870 d42b2b 2 +lava_0 182.002197 589.132202 4415.973633 688.541870 d42b2b +lava_0 -8050.391602 730.803101 4415.973633 688.541870 d42b2b +3 back_platform_0 -185.010040 442.315765 519.166626 221.875031 80926d back_platform_0 1640.383789 420.668457 519.166626 221.875031 80926d -14 +back_platform_0 -1307.840332 -1029.460205 519.166626 221.875031 80926d +17 box_0 120.543991 -72.326294 112.500031 107.291695 9aa034 box_1 714.640747 516.840698 112.500031 107.291695 9aa034 box_3 977.140808 521.007324 112.500031 107.291695 9aa034 @@ -29,5 +37,8 @@ box_5 3604.241455 521.679993 112.500000 105.902771 9aa034 box_6 3851.463867 518.902283 112.500000 105.902771 9aa034 box_7 4051.463867 514.735596 112.500000 105.902771 9aa034 box_8 4312.574707 511.957825 112.500000 105.902771 9aa034 +box_0 -603.028076 -354.378082 112.500031 107.291695 9aa034 +box_1 -609.278137 -667.919678 112.500031 107.291695 9aa034 +box_0 -3923.780518 452.429810 112.500031 107.291695 a05034 0 0 diff --git a/src/config.h b/src/config.h index 7a964391..b062ebca 100644 --- a/src/config.h +++ b/src/config.h @@ -28,4 +28,7 @@ #define VERSION "2" +// #define RENDERER_CONFIG SDL_RENDERER_SOFTWARE +#define RENDERER_CONFIG (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC) + #endif // CONFIG_H_ diff --git a/src/game.c b/src/game.c index f9bba030..2dd84e4c 100644 --- a/src/game.c +++ b/src/game.c @@ -105,7 +105,9 @@ Game *create_game(const char *level_folder, SDL_BLENDFACTOR_ONE, SDL_BLENDFACTOR_ZERO, SDL_BLENDOPERATION_ADD)) < 0) { - log_warn("SDL error: %s\n", SDL_GetError()); + log_warn("SDL error while setting blending mode for `%s': %s\n", + cursor_style_tex_files[style], + SDL_GetError()); } } diff --git a/src/main.c b/src/main.c index f53433c8..e4e851e6 100644 --- a/src/main.c +++ b/src/main.c @@ -132,12 +132,17 @@ int main(int argc, char *argv[]) SDL_Renderer *const renderer = PUSH_LT( lt, - SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC), + SDL_CreateRenderer(window, -1, RENDERER_CONFIG), SDL_DestroyRenderer); if (renderer == NULL) { log_fail("Could not create SDL renderer: %s\n", SDL_GetError()); RETURN_LT(lt, -1); } + + SDL_RendererInfo info; + SDL_GetRendererInfo(renderer, &info); + log_info("Using SDL Renderer: %s\n", info.name); + if (SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_BLEND) < 0) { log_fail("Could not set up blending mode for the renderer: %s\n", SDL_GetError()); RETURN_LT(lt, -1);