From 0455beb318d8d7ee544de37ba8cf0273a3215b13 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Sun, 27 Oct 2019 23:03:27 -0400 Subject: imporve build for sdl --- frontends/sdl/LICENSE.txt | 202 +++++++++++++++++++++++++++++++++++++ frontends/sdl/OpenSans-Regular.ttf | Bin 0 -> 96932 bytes frontends/sdl/config.ini | 8 +- frontends/sdl/meson.build | 7 +- frontends/sdl/sdl_ui.c | 27 +++-- 5 files changed, 231 insertions(+), 13 deletions(-) create mode 100644 frontends/sdl/LICENSE.txt create mode 100644 frontends/sdl/OpenSans-Regular.ttf (limited to 'frontends/sdl') diff --git a/frontends/sdl/LICENSE.txt b/frontends/sdl/LICENSE.txt new file mode 100644 index 0000000..75b5248 --- /dev/null +++ b/frontends/sdl/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/frontends/sdl/OpenSans-Regular.ttf b/frontends/sdl/OpenSans-Regular.ttf new file mode 100644 index 0000000..29bfd35 Binary files /dev/null and b/frontends/sdl/OpenSans-Regular.ttf differ diff --git a/frontends/sdl/config.ini b/frontends/sdl/config.ini index 5ca9c34..ddc6277 100644 --- a/frontends/sdl/config.ini +++ b/frontends/sdl/config.ini @@ -5,5 +5,11 @@ arr = 15 [game] drop_delay = 20 next_piece_delay = 40 -lock_delay = 30 +lock_delay = 300 +force_lock = 3000 wait_on_clear = 0 +line_clear_delay = 0 + +[ui] +dark_mode = 1 + diff --git a/frontends/sdl/meson.build b/frontends/sdl/meson.build index d3c78c8..c7f67f3 100644 --- a/frontends/sdl/meson.build +++ b/frontends/sdl/meson.build @@ -3,6 +3,7 @@ src = ['sdl_ui.c'] inc = [cetris_inc] threads = dependency('threads') +math = compiler.find_library('m') if host_machine.system() == 'windows' sdl = compiler.find_library('SDL2', dirs: meson.current_source_dir() + '/win/SDL2-2.0.10/lib/x64') ttf = compiler.find_library('SDL2_ttf', dirs: meson.current_source_dir() + '/win/SDL2_ttf-2.0.15/lib/x64') @@ -17,7 +18,11 @@ configure_file(input: 'config.ini', output: 'config.ini', copy: true, install: false) +configure_file(input: 'OpenSans-Regular.tff', + output: 'OpenSans-Regular.ttf', + copy: true, install: false) + executable('cetris', src, - dependencies: [threads, sdl, ttf], + dependencies: [threads, sdl, ttf, math], include_directories: inc, install: false) diff --git a/frontends/sdl/sdl_ui.c b/frontends/sdl/sdl_ui.c index 3dfc93a..f674581 100644 --- a/frontends/sdl/sdl_ui.c +++ b/frontends/sdl/sdl_ui.c @@ -78,10 +78,15 @@ DWORD WINAPI game_loop(void* data) { } #else void *game_loop(void) { - long nsec = (long)(1000000000L/CETRIS_HZ); + timer = 0; + long nsec = 1000; while(1) { + if (timer % 1000 == 0) { + g.tick++; + update_game_tick(&g); + } nanosleep((const struct timespec[]){{0, nsec}}, NULL); - update_game_tick(&g); + timer++; } return 0; } @@ -91,14 +96,14 @@ void setup() { SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO); window = SDL_CreateWindow("cetris", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, W, H, SDL_WINDOW_SHOWN); screen = SDL_GetWindowSurface(window); - SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1"); + //SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1"); render = SDL_CreateRenderer(window, -1, SDL_RENDERER_PRESENTVSYNC|SDL_RENDERER_ACCELERATED); SDL_RenderSetLogicalSize(render, W, H); if (!render) exit(fprintf(stderr, "err: could not create SDL renderer\n")); TTF_Init(); font = TTF_OpenFont("OpenSans-Regular.ttf", 20); - TTF_SetFontHinting(font, TTF_HINTING_MONO); + //TTF_SetFontHinting(font, TTF_HINTING_MONO); } void draw_text(char* string, int x, int y) { @@ -117,15 +122,15 @@ void draw_text(char* string, int x, int y) { void load_colors() { if (dark_mode) { - main_color = (SDL_Color){100, 100, 100, 255}; - off = (SDL_Color){50, 50, 50, 255}; - text = (SDL_Color){240, 240, 240, 255}; - SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_ADD); + main_color = (SDL_Color){100, 100, 100, 255}; + off = (SDL_Color){50, 50, 50, 255}; + text = (SDL_Color){240, 240, 240, 255}; + SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_ADD); } else { main_color = (SDL_Color){255, 255, 255, 255}; off = (SDL_Color){235, 235, 235, 255}; text = (SDL_Color){10, 10, 10, 255}; - SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_BLEND); + SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_BLEND); } } @@ -298,7 +303,7 @@ void draw() { SDL_DestroyTexture(m); if (count_down > 0) { - count_down-=(1.0/144.0); + count_down-=(1.0/60.0); } } @@ -398,7 +403,7 @@ int main(void) { game_running = true; } SDL_RenderPresent(render); - SDL_Delay(1000 / 144); + SDL_Delay(1000 / 60); } } -- cgit v1.2.3-101-g0448