From e366c1d34d214f4a41d5fe82052e67b0a15b5f9c Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Mon, 9 Jan 2023 13:18:34 +0900 Subject: [PATCH] Use google-style formatting, fix CMakeLists.txt --- CMakeLists.txt | 25 ++++++-- src/basic_renderer.cc | 135 ++++++++++++++++++++++-------------------- src/basic_renderer.h | 6 +- src/ems.cc | 1 - src/game_renderer.h | 2 +- src/helpers.h | 2 +- src/main.cc | 2 +- wasm_build/Makefile | 2 +- 8 files changed, 98 insertions(+), 77 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6581efe..6504af5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,10 +15,18 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) endif() set(RPSDuelNative_SOURCES - src/main.cc - src/basic_renderer.cc - src/ems.cc - src/helpers.cc + "${CMAKE_CURRENT_SOURCE_DIR}/src/main.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/basic_renderer.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/ems.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/helpers.cc" +) + +set(RPSDuelNative_HEADERS + "${CMAKE_CURRENT_SOURCE_DIR}/src/ems.h" + "${CMAKE_CURRENT_SOURCE_DIR}/src/constants.h" + "${CMAKE_CURRENT_SOURCE_DIR}/src/helpers.h" + "${CMAKE_CURRENT_SOURCE_DIR}/src/game_renderer.h" + "${CMAKE_CURRENT_SOURCE_DIR}/src/basic_renderer.h" ) add_executable(RPSDuelNative ${RPSDuelNative_SOURCES}) @@ -26,3 +34,12 @@ add_executable(RPSDuelNative ${RPSDuelNative_SOURCES}) target_link_libraries(RPSDuelNative PUBLIC raylib ) + +if(EXISTS /usr/bin/clang-format) + add_custom_target( + ClangFormatTarget + COMMAND clang-format -i --style=google ${RPSDuelNative_SOURCES} ${RPSDuelNative_HEADERS} + ) + add_dependencies(RPSDuelNative ClangFormatTarget) + message(STATUS "Enabled clang-format formatting.") +endif() diff --git a/src/basic_renderer.cc b/src/basic_renderer.cc index 34a30ed..ed805f5 100644 --- a/src/basic_renderer.cc +++ b/src/basic_renderer.cc @@ -13,9 +13,14 @@ #include "helpers.h" BasicRenderer::BasicRenderer() - : spriteSheet(std::nullopt), status("Unknown status"), readyTimer(0.0F), - resultsTimer(RESULTS_TIMER_MAX), scoreChangeTimer(SCORE_CHANGE_TIMER_MAX), - requestTimer(REQUEST_TIMER_MAX), prevPos(0), cachedPos(0), + : spriteSheet(std::nullopt), + status("Unknown status"), + readyTimer(0.0F), + resultsTimer(RESULTS_TIMER_MAX), + scoreChangeTimer(SCORE_CHANGE_TIMER_MAX), + requestTimer(REQUEST_TIMER_MAX), + prevPos(0), + cachedPos(0), statusSize(DEFAULT_STATUS_TEXT_SIZE) { spriteSheet = LoadTexture("resources/rockpaperscissorsSpriteSheet.png"); @@ -131,11 +136,10 @@ void BasicRenderer::update_impl() { if (flags.test(13)) { flags.reset(13); - statusSize = - !status.empty() - ? Helpers::getFitableSize(status.c_str(), DEFAULT_STATUS_TEXT_SIZE, - GetScreenWidth()) - : DEFAULT_STATUS_TEXT_SIZE; + statusSize = !status.empty() ? Helpers::getFitableSize( + status.c_str(), DEFAULT_STATUS_TEXT_SIZE, + GetScreenWidth()) + : DEFAULT_STATUS_TEXT_SIZE; } if (prevPos != cachedPos) { @@ -435,7 +439,7 @@ void BasicRenderer::draw_impl() { draw_choice(1, picked[1], false, triple_single_width * 2.0F, WHITE); draw_choice(2, picked[2], false, triple_single_width * 2.0F, WHITE); draw_reveal_choices(opponentPicked, triple_single_width); - } else { // flags.test(0) + } else { // flags.test(0) unsigned char value = 0; if (flags.test(1)) { // fade ready bg to gray @@ -510,34 +514,35 @@ void BasicRenderer::draw_choice(const unsigned int idx, const char choice, draw_helper_coord(&x, &width, idx, using_triple); switch (choice) { - case 'r': - DrawTexturePro(spriteSheet.value(), - {ROCK_DIMS[0], ROCK_DIMS[1], ROCK_DIMS[2], ROCK_DIMS[3]}, - {x, y, width, width}, {0.0F, 0.0F}, 0.0F, color); - break; - case 'p': - DrawTexturePro(spriteSheet.value(), - {PAPER_DIMS[0], PAPER_DIMS[1], PAPER_DIMS[2], PAPER_DIMS[3]}, - {x, y, width, width}, {0.0F, 0.0F}, 0.0F, color); - break; - case 's': - DrawTexturePro(spriteSheet.value(), - {SCISSORS_DIMS[0], SCISSORS_DIMS[1], SCISSORS_DIMS[2], - SCISSORS_DIMS[3]}, - {x, y, width, width}, {0.0F, 0.0F}, 0.0F, color); - break; - case '?': - DrawTexturePro(spriteSheet.value(), - {QUESTIONMARK_DIMS[0], QUESTIONMARK_DIMS[1], - QUESTIONMARK_DIMS[2], QUESTIONMARK_DIMS[3]}, - {x, y, width, width}, {0.0F, 0.0F}, 0.0F, color); - break; - default: - // Should never happen. - std::cerr << "WARNING: Invalid choice passed to draw_choice()!" - " (value is \"" - << choice << "\" or \"" << (int)choice << "\")" << std::endl; - break; + case 'r': + DrawTexturePro(spriteSheet.value(), + {ROCK_DIMS[0], ROCK_DIMS[1], ROCK_DIMS[2], ROCK_DIMS[3]}, + {x, y, width, width}, {0.0F, 0.0F}, 0.0F, color); + break; + case 'p': + DrawTexturePro( + spriteSheet.value(), + {PAPER_DIMS[0], PAPER_DIMS[1], PAPER_DIMS[2], PAPER_DIMS[3]}, + {x, y, width, width}, {0.0F, 0.0F}, 0.0F, color); + break; + case 's': + DrawTexturePro(spriteSheet.value(), + {SCISSORS_DIMS[0], SCISSORS_DIMS[1], SCISSORS_DIMS[2], + SCISSORS_DIMS[3]}, + {x, y, width, width}, {0.0F, 0.0F}, 0.0F, color); + break; + case '?': + DrawTexturePro(spriteSheet.value(), + {QUESTIONMARK_DIMS[0], QUESTIONMARK_DIMS[1], + QUESTIONMARK_DIMS[2], QUESTIONMARK_DIMS[3]}, + {x, y, width, width}, {0.0F, 0.0F}, 0.0F, color); + break; + default: + // Should never happen. + std::cerr << "WARNING: Invalid choice passed to draw_choice()!" + " (value is \"" + << choice << "\" or \"" << (int)choice << "\")" << std::endl; + break; } } @@ -569,20 +574,20 @@ void BasicRenderer::draw_helper_coord(float *x, float *width, } switch (idx) { - case 0: - *x = 0.0F; - break; - case 1: - *x = (GetScreenWidth() - *width) / 2.0F; - break; - case 2: - *x = GetScreenWidth() - *width; - break; - default: - // Should never happen - std::cerr << "WARNING: Invalid idx passed to draw_helper_coord()!" - << std::endl; - return; + case 0: + *x = 0.0F; + break; + case 1: + *x = (GetScreenWidth() - *width) / 2.0F; + break; + case 2: + *x = GetScreenWidth() - *width; + break; + default: + // Should never happen + std::cerr << "WARNING: Invalid idx passed to draw_helper_coord()!" + << std::endl; + return; } } else { *width = GetScreenWidth() / 5.0F; @@ -591,20 +596,20 @@ void BasicRenderer::draw_helper_coord(float *x, float *width, } switch (idx) { - case 0: - *x = GetScreenWidth() - *width * 4.0F; - break; - case 1: - *x = GetScreenWidth() - *width * 3.0F; - break; - case 2: - *x = GetScreenWidth() - *width * 2.0F; - break; - default: - // Should never happen. - std::cerr << "WARNING: Invalid idx passed to draw_helper_coord()!" - << std::endl; - return; + case 0: + *x = GetScreenWidth() - *width * 4.0F; + break; + case 1: + *x = GetScreenWidth() - *width * 3.0F; + break; + case 2: + *x = GetScreenWidth() - *width * 2.0F; + break; + default: + // Should never happen. + std::cerr << "WARNING: Invalid idx passed to draw_helper_coord()!" + << std::endl; + return; } } } diff --git a/src/basic_renderer.h b/src/basic_renderer.h index f04379f..711674d 100644 --- a/src/basic_renderer.h +++ b/src/basic_renderer.h @@ -13,9 +13,9 @@ #include "game_renderer.h" class BasicRenderer : public GameRenderer { -public: + public: BasicRenderer(); - ~BasicRenderer() override {}; + ~BasicRenderer() override{}; void update_state(const char *playerOne, const char *playerTwo, const char *currentPlayer, char first_first, @@ -27,7 +27,7 @@ public: void screen_size_changed() override; -private: + private: void update_impl(); void draw_impl(); diff --git a/src/ems.cc b/src/ems.cc index ff47b8e..95cf5d8 100644 --- a/src/ems.cc +++ b/src/ems.cc @@ -56,7 +56,6 @@ void call_js_request_update() { } int call_js_get_canvas_width() { - #ifdef __EMSCRIPTEN__ return canvas_get_width(); #else diff --git a/src/game_renderer.h b/src/game_renderer.h index 3ce3c04..0d8f027 100644 --- a/src/game_renderer.h +++ b/src/game_renderer.h @@ -2,7 +2,7 @@ #define ROCK_PAPER_SCISSORS_DUEL_GAME_RENDERER_H_ class GameRenderer { -public: + public: GameRenderer() {} virtual ~GameRenderer() {} diff --git a/src/helpers.h b/src/helpers.h index a98027e..1b73ced 100644 --- a/src/helpers.h +++ b/src/helpers.h @@ -7,6 +7,6 @@ extern bool isValidChoice(char choice); extern int getFitableSize(const char *text, const int default_size, const int width); -} // namespace Helpers +} // namespace Helpers #endif diff --git a/src/main.cc b/src/main.cc index 506e0aa..23e3c64 100644 --- a/src/main.cc +++ b/src/main.cc @@ -37,7 +37,7 @@ int EMSCRIPTEN_KEEPALIVE game_visual_update( return 0; } -} // end em exposed functions +} // end em exposed functions EM_BOOL resize_event_callback(int event_type, const EmscriptenUiEvent *event, void *ud) { diff --git a/wasm_build/Makefile b/wasm_build/Makefile index 40ae8bc..47c052f 100644 --- a/wasm_build/Makefile +++ b/wasm_build/Makefile @@ -51,4 +51,4 @@ clean: rm -rf ${OUTDIR} format: - clang-format -i --style=file ${SOURCES} ${HEADERS} + clang-format -i --style=google ${SOURCES} ${HEADERS} || true -- 2.49.0