Use google-style formatting, fix CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6581efee1eff29e55166ae31451ccb8ade89a227..6504af55e6daac70bc2a1e308b365fbb27c0e413 100644 (file)
--- 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 34a30ed796fc8b271b3d76e874dac2de076f1c1d..ed805f57ea0217d6058f78f7ccae193e086123d7 100644 (file)
--- 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 f04379fc8c377970587956ee0a665e0570a8bd5d..711674d4a9293b2b3f2e46a277a9a7ec0b9e0325 100644 (file)
--- 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 ff47b8e1983c9188157a7a77a8cffc35129e6c84..95cf5d862a08d7ee7e83d8d98ac3015e7d5b3e8f 100644 (file)
--- 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 3ce3c04ff9abb48b3b32651641fbb0c428b9c5cb..0d8f027a8dd07da53e2f6a6a94041cb94f32f767 100644 (file)
--- 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 a98027e487714e53d157b42fc53e5fc883565234..1b73ced6801087edc6ec9abddc31ce3ed27dec35 100644 (file)
--- 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 506e0aa580acd70c002f919c32f6c8e4c6af01c4..23e3c6431361bf0f4079994331a37af5c76bbd16 100644 (file)
--- 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 40ae8bcce82ede2338729b36313d46036d50626c..47c052f0033b700da016afa3e8ec48fd7ac02e27 100644 (file)
--- 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