Browse Source

apply format

djeada 1 month ago
parent
commit
30bdf1a7ee
100 changed files with 223 additions and 230 deletions
  1. 1 1
      app/controllers/action_vfx.cpp
  2. 3 3
      app/controllers/action_vfx.h
  3. 1 1
      app/controllers/command_controller.cpp
  4. 4 4
      app/controllers/command_controller.h
  5. 18 17
      app/core/game_engine.cpp
  6. 7 7
      app/core/game_engine.h
  7. 2 2
      app/models/audio_system_proxy.cpp
  8. 2 2
      app/models/audio_system_proxy.h
  9. 1 1
      app/models/cursor_mode.h
  10. 3 3
      app/models/hover_tracker.h
  11. 2 2
      app/utils/engine_view_helpers.h
  12. 2 2
      app/utils/json_vec_utils.cpp
  13. 2 2
      app/utils/json_vec_utils.h
  14. 2 2
      app/utils/movement_utils.h
  15. 2 2
      app/utils/selection_utils.h
  16. 2 2
      render/draw_queue.h
  17. 1 1
      render/draw_queue_soa.h
  18. 1 1
      render/entity/archer_renderer.cpp
  19. 1 1
      render/entity/arrow_vfx_renderer.cpp
  20. 3 3
      render/entity/arrow_vfx_renderer.h
  21. 2 2
      render/entity/barracks_renderer.cpp
  22. 1 1
      render/entity/barracks_renderer.h
  23. 2 2
      render/entity/horse_renderer.cpp
  24. 1 1
      render/entity/horse_renderer.h
  25. 3 2
      render/entity/knight_renderer.cpp
  26. 9 8
      render/entity/mounted_knight_renderer.cpp
  27. 1 1
      render/entity/registry.cpp
  28. 5 5
      render/entity/registry.h
  29. 9 12
      render/entity/renderer_constants.h
  30. 5 5
      render/entity/spearman_renderer.cpp
  31. 3 3
      render/geom/arrow.cpp
  32. 5 5
      render/geom/arrow.h
  33. 2 2
      render/geom/flag.cpp
  34. 2 2
      render/geom/flag.h
  35. 7 6
      render/geom/math_utils.h
  36. 1 1
      render/geom/patrol_flags.cpp
  37. 1 1
      render/geom/patrol_flags.h
  38. 1 1
      render/geom/selection_disc.cpp
  39. 1 1
      render/geom/selection_disc.h
  40. 1 1
      render/geom/selection_ring.cpp
  41. 1 1
      render/geom/selection_ring.h
  42. 2 2
      render/geom/transforms.cpp
  43. 1 1
      render/geom/transforms.h
  44. 1 1
      render/gl/backend.cpp
  45. 1 1
      render/gl/backend.h
  46. 2 2
      render/gl/bootstrap.cpp
  47. 2 2
      render/gl/bootstrap.h
  48. 1 1
      render/gl/buffer.cpp
  49. 1 1
      render/gl/buffer.h
  50. 16 24
      render/gl/camera.cpp
  51. 1 1
      render/gl/camera.h
  52. 1 1
      render/gl/mesh.cpp
  53. 1 1
      render/gl/mesh.h
  54. 1 1
      render/gl/persistent_buffer.h
  55. 2 2
      render/gl/primitives.cpp
  56. 1 1
      render/gl/primitives.h
  57. 1 1
      render/gl/resources.cpp
  58. 1 1
      render/gl/resources.h
  59. 1 1
      render/gl/shader.cpp
  60. 1 1
      render/gl/shader.h
  61. 1 1
      render/gl/shader_cache.h
  62. 1 1
      render/gl/state_scopes.h
  63. 1 1
      render/gl/texture.cpp
  64. 1 1
      render/gl/texture.h
  65. 2 2
      render/ground/biome_renderer.cpp
  66. 2 2
      render/ground/biome_renderer.h
  67. 1 1
      render/ground/bridge_renderer.cpp
  68. 2 2
      render/ground/bridge_renderer.h
  69. 1 1
      render/ground/fog_renderer.cpp
  70. 2 2
      render/ground/fog_renderer.h
  71. 1 1
      render/ground/grass_gpu.h
  72. 3 3
      render/ground/ground_renderer.cpp
  73. 2 2
      render/ground/ground_renderer.h
  74. 1 1
      render/ground/pine_gpu.h
  75. 2 2
      render/ground/pine_renderer.cpp
  76. 2 2
      render/ground/pine_renderer.h
  77. 1 1
      render/ground/plant_gpu.h
  78. 2 2
      render/ground/plant_renderer.cpp
  79. 2 2
      render/ground/plant_renderer.h
  80. 1 1
      render/ground/river_renderer.cpp
  81. 2 2
      render/ground/river_renderer.h
  82. 1 1
      render/ground/riverbank_asset_gpu.h
  83. 2 2
      render/ground/riverbank_asset_renderer.cpp
  84. 2 2
      render/ground/riverbank_asset_renderer.h
  85. 1 1
      render/ground/riverbank_renderer.cpp
  86. 2 2
      render/ground/riverbank_renderer.h
  87. 1 1
      render/ground/stone_gpu.h
  88. 2 2
      render/ground/stone_renderer.cpp
  89. 2 2
      render/ground/stone_renderer.h
  90. 1 1
      render/ground/terrain_gpu.h
  91. 2 2
      render/ground/terrain_renderer.cpp
  92. 2 2
      render/ground/terrain_renderer.h
  93. 1 1
      render/humanoid_base.cpp
  94. 3 3
      render/humanoid_base.h
  95. 1 1
      render/humanoid_math.cpp
  96. 1 1
      render/humanoid_math.h
  97. 1 1
      render/humanoid_specs.h
  98. 2 2
      render/i_render_pass.h
  99. 1 1
      render/math/pod_math.h
  100. 1 1
      render/palette.cpp

+ 1 - 1
app/controllers/action_vfx.cpp

@@ -33,4 +33,4 @@ void ActionVFX::spawnAttackArrow(Engine::Core::World *world,
                           Game::GameConfig::instance().arrow().speedAttack);
 }
 
-} 
+} // namespace App::Controllers

+ 3 - 3
app/controllers/action_vfx.h

@@ -6,8 +6,8 @@ namespace Engine {
 namespace Core {
 class World;
 using EntityID = unsigned int;
-} 
-} 
+} // namespace Core
+} // namespace Engine
 
 namespace App::Controllers {
 
@@ -17,4 +17,4 @@ public:
                                Engine::Core::EntityID targetId);
 };
 
-} 
+} // namespace App::Controllers

+ 1 - 1
app/controllers/command_controller.cpp

@@ -298,4 +298,4 @@ bool CommandController::anySelectedInHoldMode() const {
   return false;
 }
 
-} 
+} // namespace App::Controllers

+ 4 - 4
app/controllers/command_controller.h

@@ -10,13 +10,13 @@ namespace Core {
 class World;
 class Entity;
 using EntityID = unsigned int;
-} 
-} 
+} // namespace Core
+} // namespace Engine
 
 namespace Game::Systems {
 class SelectionSystem;
 class PickingService;
-} 
+} // namespace Game::Systems
 
 namespace App::Controllers {
 
@@ -66,4 +66,4 @@ private:
   void resetMovement(Engine::Core::Entity *entity);
 };
 
-} 
+} // namespace App::Controllers

+ 18 - 17
app/core/game_engine.cpp

@@ -792,7 +792,8 @@ QVariantMap GameEngine::getSelectedProductionState() const {
       st);
   m["hasBarracks"] = st.hasBarracks;
   m["inProgress"] = st.inProgress;
-  m["productType"] = QString::fromStdString(Game::Units::troopTypeToString(st.productType));
+  m["productType"] =
+      QString::fromStdString(Game::Units::troopTypeToString(st.productType));
   m["timeRemaining"] = st.timeRemaining;
   m["buildTime"] = st.buildTime;
   m["producedCount"] = st.producedCount;
@@ -802,7 +803,8 @@ QVariantMap GameEngine::getSelectedProductionState() const {
 
   QVariantList queueList;
   for (const auto &unitType : st.productionQueue) {
-    queueList.append(QString::fromStdString(Game::Units::troopTypeToString(unitType)));
+    queueList.append(
+        QString::fromStdString(Game::Units::troopTypeToString(unitType)));
   }
   m["productionQueue"] = queueList;
 
@@ -1426,7 +1428,7 @@ void GameEngine::restoreEnvironmentFromMetadata(const QJsonObject &metadata) {
       static_cast<float>(metadata.value("tileSize").toDouble(1.0));
 
   auto &terrainService = Game::Map::TerrainService::instance();
-  
+
   bool terrainAlreadyRestored = terrainService.isInitialized();
 
   Game::Map::MapDefinition def;
@@ -1466,8 +1468,10 @@ void GameEngine::restoreEnvironmentFromMetadata(const QJsonObject &metadata) {
   if (terrainService.isInitialized()) {
     const auto *heightMap = terrainService.getHeightMap();
     const int gridWidth = heightMap ? heightMap->getWidth() : fallbackGridWidth;
-    const int gridHeight = heightMap ? heightMap->getHeight() : fallbackGridHeight;
-    const float tileSize = heightMap ? heightMap->getTileSize() : fallbackTileSize;
+    const int gridHeight =
+        heightMap ? heightMap->getHeight() : fallbackGridHeight;
+    const float tileSize =
+        heightMap ? heightMap->getTileSize() : fallbackTileSize;
 
     if (m_ground) {
       m_ground->configure(tileSize, gridWidth, gridHeight);
@@ -1655,28 +1659,25 @@ void GameEngine::loadAudioResources() {
 
   QString basePath = QCoreApplication::applicationDirPath() + "/assets/audio/";
 
-  if (audioSys.loadSound(
-          "archer_voice",
-          (basePath + "voices/archer_voice.wav").toStdString(),
-          AudioCategory::VOICE)) {
+  if (audioSys.loadSound("archer_voice",
+                         (basePath + "voices/archer_voice.wav").toStdString(),
+                         AudioCategory::VOICE)) {
     qInfo() << "Loaded archer voice";
   } else {
     qWarning() << "Failed to load archer voice";
   }
 
-  if (audioSys.loadSound(
-          "knight_voice",
-          (basePath + "voices/knight_voice.wav").toStdString(),
-          AudioCategory::VOICE)) {
+  if (audioSys.loadSound("knight_voice",
+                         (basePath + "voices/knight_voice.wav").toStdString(),
+                         AudioCategory::VOICE)) {
     qInfo() << "Loaded knight voice";
   } else {
     qWarning() << "Failed to load knight voice";
   }
 
-  if (audioSys.loadSound(
-          "spearman_voice",
-          (basePath + "voices/spearman_voice.wav").toStdString(),
-          AudioCategory::VOICE)) {
+  if (audioSys.loadSound("spearman_voice",
+                         (basePath + "voices/spearman_voice.wav").toStdString(),
+                         AudioCategory::VOICE)) {
     qInfo() << "Loaded spearman voice";
   } else {
     qWarning() << "Failed to load spearman voice";

+ 7 - 7
app/core/game_engine.h

@@ -29,8 +29,8 @@ using EntityID = unsigned int;
 struct MovementComponent;
 struct TransformComponent;
 struct RenderableComponent;
-} 
-} 
+} // namespace Core
+} // namespace Engine
 
 namespace Render {
 namespace GL {
@@ -48,8 +48,8 @@ class StoneRenderer;
 class PlantRenderer;
 class PineRenderer;
 struct IRenderPass;
-} 
-} 
+} // namespace GL
+} // namespace Render
 
 namespace Game {
 namespace Systems {
@@ -60,11 +60,11 @@ class PickingService;
 class VictoryService;
 class CameraService;
 class SaveLoadService;
-} 
+} // namespace Systems
 namespace Map {
 class MapCatalog;
 }
-} 
+} // namespace Game
 
 namespace App {
 namespace Controllers {
@@ -73,7 +73,7 @@ class CommandController;
 namespace Models {
 class AudioSystemProxy;
 }
-} 
+} // namespace App
 
 class QQuickWindow;
 

+ 2 - 2
app/models/audio_system_proxy.cpp

@@ -38,5 +38,5 @@ float AudioSystemProxy::getVoiceVolume() const {
   return AudioSystem::getInstance().getVoiceVolume();
 }
 
-} 
-} 
+} // namespace Models
+} // namespace App

+ 2 - 2
app/models/audio_system_proxy.h

@@ -22,5 +22,5 @@ public:
   Q_INVOKABLE float getVoiceVolume() const;
 };
 
-} 
-} 
+} // namespace Models
+} // namespace App

+ 1 - 1
app/models/cursor_mode.h

@@ -41,4 +41,4 @@ inline CursorMode fromInt(int value) {
   }
 }
 
-} 
+} // namespace CursorModeUtils

+ 3 - 3
app/models/hover_tracker.h

@@ -7,14 +7,14 @@ namespace Engine {
 namespace Core {
 class World;
 using EntityID = unsigned int;
-} 
-} 
+} // namespace Core
+} // namespace Engine
 
 namespace Render {
 namespace GL {
 class Camera;
 }
-} 
+} // namespace Render
 
 class HoverTracker {
 public:

+ 2 - 2
app/utils/engine_view_helpers.h

@@ -33,5 +33,5 @@ inline bool worldToScreen(const Game::Systems::PickingService *pickingService,
   return pickingService->worldToScreen(*camera, w, h, world, outScreen);
 }
 
-} 
-} 
+} // namespace Utils
+} // namespace App

+ 2 - 2
app/utils/json_vec_utils.cpp

@@ -24,5 +24,5 @@ QVector3D jsonArrayToVec3(const QJsonValue &value, const QVector3D &fallback) {
                    static_cast<float>(arr.at(2).toDouble(fallback.z())));
 }
 
-} 
-} 
+} // namespace JsonUtils
+} // namespace App

+ 2 - 2
app/utils/json_vec_utils.h

@@ -11,5 +11,5 @@ QJsonArray vec3ToJsonArray(const QVector3D &vec);
 
 QVector3D jsonArrayToVec3(const QJsonValue &value, const QVector3D &fallback);
 
-} 
-} 
+} // namespace JsonUtils
+} // namespace App

+ 2 - 2
app/utils/movement_utils.h

@@ -33,5 +33,5 @@ inline void resetMovement(Engine::Core::Entity *entity) {
   }
 }
 
-} 
-} 
+} // namespace Utils
+} // namespace App

+ 2 - 2
app/utils/selection_utils.h

@@ -33,5 +33,5 @@ inline void sanitizeSelection(Engine::Core::World *world,
   }
 }
 
-} 
-} 
+} // namespace Utils
+} // namespace App

+ 2 - 2
render/draw_queue.h

@@ -18,7 +18,7 @@ class Mesh;
 class Texture;
 class Buffer;
 class Shader;
-} 
+} // namespace Render::GL
 
 namespace Render::GL {
 
@@ -329,4 +329,4 @@ private:
   std::vector<uint32_t> m_tempIndices;
 };
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/draw_queue_soa.h

@@ -191,4 +191,4 @@ private:
   std::vector<TerrainChunkCmd> m_terrainChunkCmds;
 };
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/entity/archer_renderer.cpp

@@ -631,4 +631,4 @@ void registerArcherRenderer(Render::GL::EntityRendererRegistry &registry) {
       });
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/entity/arrow_vfx_renderer.cpp

@@ -433,4 +433,4 @@ void registerArcherRenderer(Render::GL::EntityRendererRegistry &registry) {
       });
 }
 
-} 
+} // namespace Render::GL

+ 3 - 3
render/entity/arrow_vfx_renderer.h

@@ -7,13 +7,13 @@ namespace Render {
 namespace GL {
 class Renderer;
 class ResourceManager;
-} 
-} 
+} // namespace GL
+} // namespace Render
 namespace Game {
 namespace Systems {
 class ArrowSystem;
 }
-} 
+} // namespace Game
 
 namespace Render::GL {
 

+ 2 - 2
render/entity/barracks_renderer.cpp

@@ -683,10 +683,10 @@ static void drawBarracks(const DrawContext &p, ISubmitter &out) {
   drawSelectionFX(p, out);
 }
 
-} 
+} // namespace
 
 void registerBarracksRenderer(Render::GL::EntityRendererRegistry &registry) {
   registry.registerRenderer("barracks", drawBarracks);
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/entity/barracks_renderer.h

@@ -4,7 +4,7 @@ namespace Render {
 namespace GL {
 class EntityRendererRegistry;
 }
-} 
+} // namespace Render
 
 namespace Render::GL {
 

+ 2 - 2
render/entity/horse_renderer.cpp

@@ -72,7 +72,7 @@ inline uint32_t colorHash(const QVector3D &c) {
   return v;
 }
 
-} 
+} // namespace
 
 HorseDimensions makeHorseDimensions(uint32_t seed) {
   HorseDimensions d;
@@ -723,4 +723,4 @@ void HorseRenderer::render(const DrawContext &ctx, const AnimationInputs &anim,
   }
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/entity/horse_renderer.h

@@ -76,4 +76,4 @@ public:
               const HorseProfile &profile, ISubmitter &out) const;
 };
 
-} 
+} // namespace Render::GL

+ 3 - 2
render/entity/knight_renderer.cpp

@@ -79,7 +79,8 @@ public:
     float armAsymmetry = (hash01(seed ^ 0xDEF0u) - 0.5f) * 0.04f;
 
     if (anim.isAttacking && anim.isMelee) {
-      float attackPhase = std::fmod(anim.time * KNIGHT_INV_ATTACK_CYCLE_TIME, 1.0f);
+      float attackPhase =
+          std::fmod(anim.time * KNIGHT_INV_ATTACK_CYCLE_TIME, 1.0f);
 
       QVector3D restPos(0.20f, HP::SHOULDER_Y + 0.05f, 0.15f);
       QVector3D preparePos(0.26f, HP::HEAD_TOP_Y + 0.18f, -0.06f);
@@ -836,4 +837,4 @@ void registerKnightRenderer(Render::GL::EntityRendererRegistry &registry) {
       });
 }
 
-} 
+} // namespace Render::GL

+ 9 - 8
render/entity/mounted_knight_renderer.cpp

@@ -30,7 +30,6 @@
 
 namespace Render::GL {
 
-
 using Render::Geom::clamp01;
 using Render::Geom::clampf;
 using Render::Geom::coneFromTo;
@@ -129,7 +128,8 @@ public:
                             (pose.shoulderR.z() + restHandR.z()) * 0.5f);
 
     if (anim.isAttacking && anim.isMelee) {
-      float attackPhase = std::fmod(anim.time * MOUNTED_KNIGHT_INV_ATTACK_CYCLE_TIME, 1.0f);
+      float attackPhase =
+          std::fmod(anim.time * MOUNTED_KNIGHT_INV_ATTACK_CYCLE_TIME, 1.0f);
 
       QVector3D restPos = restHandR;
       QVector3D windupPos = QVector3D(
@@ -215,7 +215,8 @@ public:
     bool isAttacking = anim.isAttacking && anim.isMelee;
     float attackPhase = 0.0f;
     if (isAttacking) {
-      attackPhase = std::fmod(anim.time * MOUNTED_KNIGHT_INV_ATTACK_CYCLE_TIME, 1.0f);
+      attackPhase =
+          std::fmod(anim.time * MOUNTED_KNIGHT_INV_ATTACK_CYCLE_TIME, 1.0f);
     }
 
     if (extras.hasSword) {
@@ -269,14 +270,14 @@ public:
     QVector3D visorHL(-helmR * 0.35f, visorY, visorZ);
     QVector3D visorHR(helmR * 0.35f, visorY, visorZ);
     out.mesh(getUnitCylinder(),
-             cylinderBetween(ctx.model, visorHL, visorHR, 0.012f),
-             visorColor, nullptr, 1.0f);
+             cylinderBetween(ctx.model, visorHL, visorHR, 0.012f), visorColor,
+             nullptr, 1.0f);
 
     QVector3D visorVT(0, visorY + helmR * 0.25f, visorZ);
     QVector3D visorVB(0, visorY - helmR * 0.25f, visorZ);
     out.mesh(getUnitCylinder(),
-             cylinderBetween(ctx.model, visorVB, visorVT, 0.012f),
-             visorColor, nullptr, 1.0f);
+             cylinderBetween(ctx.model, visorVB, visorVT, 0.012f), visorColor,
+             nullptr, 1.0f);
 
     auto drawBreathingHole = [&](float x, float y) {
       QVector3D pos(x, pose.headPos.y() + y, helmR * 0.70f);
@@ -745,4 +746,4 @@ void registerMountedKnightRenderer(
       });
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/entity/registry.cpp

@@ -30,4 +30,4 @@ void registerBuiltInEntityRenderers(EntityRendererRegistry &registry) {
   registerBarracksRenderer(registry);
 }
 
-} 
+} // namespace Render::GL

+ 5 - 5
render/entity/registry.h

@@ -12,16 +12,16 @@ namespace Engine {
 namespace Core {
 class Entity;
 class World;
-} 
-} 
+} // namespace Core
+} // namespace Engine
 namespace Render {
 namespace GL {
 class ResourceManager;
 class Mesh;
 class Texture;
 class Backend;
-} 
-} 
+} // namespace GL
+} // namespace Render
 
 namespace Render::GL {
 
@@ -49,4 +49,4 @@ private:
 
 void registerBuiltInEntityRenderers(EntityRendererRegistry &registry);
 
-} 
+} // namespace Render::GL

+ 9 - 12
render/entity/renderer_constants.h

@@ -5,35 +5,32 @@
 
 namespace Render::GL {
 
-
 static constexpr std::size_t MAX_EXTRAS_CACHE_SIZE = 10000;
 
-
 static constexpr float MOUNTED_KNIGHT_ATTACK_CYCLE_TIME = 0.70f;
-static constexpr float MOUNTED_KNIGHT_INV_ATTACK_CYCLE_TIME = 1.0f / MOUNTED_KNIGHT_ATTACK_CYCLE_TIME;
+static constexpr float MOUNTED_KNIGHT_INV_ATTACK_CYCLE_TIME =
+    1.0f / MOUNTED_KNIGHT_ATTACK_CYCLE_TIME;
 
 static constexpr float SPEARMAN_ATTACK_CYCLE_TIME = 0.80f;
-static constexpr float SPEARMAN_INV_ATTACK_CYCLE_TIME = 1.0f / SPEARMAN_ATTACK_CYCLE_TIME;
+static constexpr float SPEARMAN_INV_ATTACK_CYCLE_TIME =
+    1.0f / SPEARMAN_ATTACK_CYCLE_TIME;
 
 static constexpr float KNIGHT_ATTACK_CYCLE_TIME = 0.60f;
-static constexpr float KNIGHT_INV_ATTACK_CYCLE_TIME = 1.0f / KNIGHT_ATTACK_CYCLE_TIME;
+static constexpr float KNIGHT_INV_ATTACK_CYCLE_TIME =
+    1.0f / KNIGHT_ATTACK_CYCLE_TIME;
 
 static constexpr float ARCHER_ATTACK_CYCLE_TIME = 1.20f;
-static constexpr float ARCHER_INV_ATTACK_CYCLE_TIME = 1.0f / ARCHER_ATTACK_CYCLE_TIME;
-
-
+static constexpr float ARCHER_INV_ATTACK_CYCLE_TIME =
+    1.0f / ARCHER_ATTACK_CYCLE_TIME;
 
 static const QVector3D STEEL_TINT(0.95f, 0.96f, 1.0f);
 static const QVector3D IRON_TINT(0.88f, 0.90f, 0.92f);
 
-
 static const QVector3D BRASS_TINT(1.3f, 1.1f, 0.7f);
 
-
 static const QVector3D CHAINMAIL_TINT(0.85f, 0.88f, 0.92f);
 
-
 static const QVector3D DARK_METAL(0.15f, 0.15f, 0.15f);
 static const QVector3D VISOR_COLOR(0.1f, 0.1f, 0.1f);
 
-}
+} // namespace Render::GL

+ 5 - 5
render/entity/spearman_renderer.cpp

@@ -29,7 +29,6 @@
 
 namespace Render::GL {
 
-
 using Render::Geom::clamp01;
 using Render::Geom::clampf;
 using Render::Geom::coneFromTo;
@@ -129,7 +128,8 @@ public:
                     QVector3D(-0.08f, -0.12f, 0.05f);
 
     } else if (anim.isAttacking && anim.isMelee && !anim.isInHoldMode) {
-      float attackPhase = std::fmod(anim.time * SPEARMAN_INV_ATTACK_CYCLE_TIME, 1.0f);
+      float attackPhase =
+          std::fmod(anim.time * SPEARMAN_INV_ATTACK_CYCLE_TIME, 1.0f);
 
       QVector3D guardPos(0.28f, HP::SHOULDER_Y + 0.05f, 0.25f);
       QVector3D preparePos(0.35f, HP::SHOULDER_Y + 0.08f, 0.05f);
@@ -262,8 +262,8 @@ public:
       QVector3D visorL(pose.headPos.x() - helmR * 0.30f, y, visorZ);
       QVector3D visorR(pose.headPos.x() + helmR * 0.30f, y, visorZ);
       out.mesh(getUnitCylinder(),
-               cylinderBetween(ctx.model, visorL, visorR, 0.010f),
-               DARK_METAL, nullptr, 1.0f);
+               cylinderBetween(ctx.model, visorL, visorR, 0.010f), DARK_METAL,
+               nullptr, 1.0f);
     }
   }
 
@@ -441,4 +441,4 @@ void registerSpearmanRenderer(Render::GL::EntityRendererRegistry &registry) {
       });
 }
 
-} 
+} // namespace Render::GL

+ 3 - 3
render/geom/arrow.cpp

@@ -82,7 +82,7 @@ GL::Mesh *Arrow::get() {
   return mesh;
 }
 
-} 
+} // namespace Geom
 
 namespace GL {
 
@@ -129,5 +129,5 @@ void renderArrows(Renderer *renderer, ResourceManager *resources,
   }
 }
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 5 - 5
render/geom/arrow.h

@@ -10,23 +10,23 @@ class Arrow {
 public:
   static GL::Mesh *get();
 };
-} 
+} // namespace Geom
 
 namespace GL {
 class Renderer;
 class ResourceManager;
-} 
-} 
+} // namespace GL
+} // namespace Render
 
 namespace Game {
 namespace Systems {
 class ArrowSystem;
 }
-} 
+} // namespace Game
 
 namespace Render {
 namespace GL {
 void renderArrows(Renderer *renderer, ResourceManager *resources,
                   const Game::Systems::ArrowSystem &arrowSystem);
 }
-} 
+} // namespace Render

+ 2 - 2
render/geom/flag.cpp

@@ -30,5 +30,5 @@ Flag::FlagMatrices Flag::create(float worldX, float worldZ,
   return result;
 }
 
-} 
-} 
+} // namespace Geom
+} // namespace Render

+ 2 - 2
render/geom/flag.h

@@ -23,5 +23,5 @@ public:
          float scale = 1.0f);
 };
 
-} 
-} 
+} // namespace Geom
+} // namespace Render

+ 7 - 6
render/geom/math_utils.h

@@ -21,12 +21,12 @@ inline QVector3D clampVec(const QVector3D &c, float minVal, float maxVal) {
                    clampf(c.z(), minVal, maxVal));
 }
 
-
-constexpr inline float lerp(float a, float b, float t) noexcept { 
-  return a * (1.0f - t) + b * t; 
+constexpr inline float lerp(float a, float b, float t) noexcept {
+  return a * (1.0f - t) + b * t;
 }
 
-inline QVector3D lerp(const QVector3D &a, const QVector3D &b, float t) noexcept {
+inline QVector3D lerp(const QVector3D &a, const QVector3D &b,
+                      float t) noexcept {
   return a * (1.0f - t) + b * t;
 }
 
@@ -42,11 +42,12 @@ constexpr inline float smoothstep(float a, float b, float x) noexcept {
   return clamped * clamped * (3.0f - 2.0f * clamped);
 }
 
-inline QVector3D nlerp(const QVector3D &a, const QVector3D &b, float t) noexcept {
+inline QVector3D nlerp(const QVector3D &a, const QVector3D &b,
+                       float t) noexcept {
   QVector3D v = a * (1.0f - t) + b * t;
   if (v.lengthSquared() > 1e-6f)
     v.normalize();
   return v;
 }
 
-} 
+} // namespace Render::Geom

+ 1 - 1
render/geom/patrol_flags.cpp

@@ -71,4 +71,4 @@ void renderPatrolFlags(Renderer *renderer, ResourceManager *resources,
   }
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/geom/patrol_flags.h

@@ -9,7 +9,7 @@ class World;
 namespace Render::GL {
 class Renderer;
 class ResourceManager;
-} 
+} // namespace Render::GL
 
 namespace Render::GL {
 

+ 1 - 1
render/geom/selection_disc.cpp

@@ -35,4 +35,4 @@ Render::GL::Mesh *SelectionDisc::get() {
   return s_mesh.get();
 }
 
-} 
+} // namespace Render::Geom

+ 1 - 1
render/geom/selection_disc.h

@@ -13,4 +13,4 @@ private:
   static std::unique_ptr<Render::GL::Mesh> s_mesh;
 };
 
-} 
+} // namespace Render::Geom

+ 1 - 1
render/geom/selection_ring.cpp

@@ -42,4 +42,4 @@ Render::GL::Mesh *SelectionRing::get() {
   return s_mesh.get();
 }
 
-} 
+} // namespace Render::Geom

+ 1 - 1
render/geom/selection_ring.h

@@ -13,4 +13,4 @@ private:
   static std::unique_ptr<Render::GL::Mesh> s_mesh;
 };
 
-} 
+} // namespace Render::Geom

+ 2 - 2
render/geom/transforms.cpp

@@ -9,7 +9,7 @@ const QVector3D kYAxis(0, 1, 0);
 const float kRadToDeg = 57.2957795131f;
 const float kEpsilon = 1e-6f;
 const float kEpsilonSq = kEpsilon * kEpsilon;
-} 
+} // namespace
 
 QMatrix4x4 cylinderBetween(const QVector3D &a, const QVector3D &b,
                            float radius) {
@@ -136,4 +136,4 @@ QMatrix4x4 capsuleBetween(const QMatrix4x4 &parent, const QVector3D &a,
   return cylinderBetween(parent, a, b, radius);
 }
 
-} 
+} // namespace Render::Geom

+ 1 - 1
render/geom/transforms.h

@@ -57,4 +57,4 @@ inline QVector3D toQVector3D(const Render::Math::Vec3 &v) {
   return QVector3D(v.x, v.y, v.z);
 }
 
-} 
+} // namespace Render::Geom

+ 1 - 1
render/gl/backend.cpp

@@ -1745,4 +1745,4 @@ void Backend::shutdownPinePipeline() {
   m_pineIndexCount = 0;
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/backend.h

@@ -314,4 +314,4 @@ private:
   float m_animationTime = 0.0f;
 };
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/gl/bootstrap.cpp

@@ -22,5 +22,5 @@ bool RenderBootstrap::initialize(Renderer &renderer, Camera &camera) {
   return true;
 }
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 2 - 2
render/gl/bootstrap.h

@@ -15,5 +15,5 @@ public:
   static bool initialize(Renderer &renderer, Camera &camera);
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/gl/buffer.cpp

@@ -92,4 +92,4 @@ void VertexArray::setIndexBuffer(Buffer &buffer) {
   buffer.bind();
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/buffer.h

@@ -47,4 +47,4 @@ private:
   int m_currentAttribIndex = 0;
 };
 
-} 
+} // namespace Render::GL

+ 16 - 24
render/gl/camera.cpp

@@ -87,7 +87,7 @@ inline float smoothApproach(float current, float target, float smoothness) {
          (target - current) * std::clamp(1.0f - smoothness, 0.01f, 0.99f);
 }
 
-} 
+} // namespace
 
 Camera::Camera() { updateVectors(); }
 
@@ -630,51 +630,43 @@ void Camera::computeYawPitchFromOffset(const QVector3D &off, float &yawDeg,
 }
 
 bool Camera::isInFrustum(const QVector3D &center, float radius) const {
-  
-  
+
   QMatrix4x4 vp = getViewProjectionMatrix();
-  
-  
-  
+
   float m[16];
   const float *data = vp.constData();
-  for (int i = 0; i < 16; ++i) m[i] = data[i];
-  
-  
+  for (int i = 0; i < 16; ++i)
+    m[i] = data[i];
+
   QVector3D leftN(m[3] + m[0], m[7] + m[4], m[11] + m[8]);
   float leftD = m[15] + m[12];
-  
-  
+
   QVector3D rightN(m[3] - m[0], m[7] - m[4], m[11] - m[8]);
   float rightD = m[15] - m[12];
-  
-  
+
   QVector3D bottomN(m[3] + m[1], m[7] + m[5], m[11] + m[9]);
   float bottomD = m[15] + m[13];
-  
-  
+
   QVector3D topN(m[3] - m[1], m[7] - m[5], m[11] - m[9]);
   float topD = m[15] - m[13];
-  
-  
+
   QVector3D nearN(m[3] + m[2], m[7] + m[6], m[11] + m[10]);
   float nearD = m[15] + m[14];
-  
-  
+
   QVector3D farN(m[3] - m[2], m[7] - m[6], m[11] - m[10]);
   float farD = m[15] - m[14];
-  
-  
+
   auto testPlane = [&center, radius](const QVector3D &n, float d) -> bool {
     float len = n.length();
-    if (len < 1e-6f) return true;
+    if (len < 1e-6f)
+      return true;
     float dist = QVector3D::dotProduct(center, n) + d;
     return dist >= -radius * len;
   };
-  
+
   return testPlane(leftN, leftD) && testPlane(rightN, rightD) &&
          testPlane(bottomN, bottomD) && testPlane(topN, topD) &&
          testPlane(nearN, nearD) && testPlane(farN, farD);
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/camera.h

@@ -114,4 +114,4 @@ private:
                                  float &pitchDeg) const;
 };
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/mesh.cpp

@@ -122,4 +122,4 @@ Mesh *createPlaneMesh(float width, float height, int subdivisions) {
   return new Mesh(vertices, indices);
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/mesh.h

@@ -39,4 +39,4 @@ Mesh *createQuadMesh();
 Mesh *createCubeMesh();
 Mesh *createPlaneMesh(float width, float height, int subdivisions = 1);
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/persistent_buffer.h

@@ -147,4 +147,4 @@ private:
   int m_currentFrame = 0;
 };
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/gl/primitives.cpp

@@ -466,7 +466,7 @@ Mesh *createUnitTorsoMesh(int radialSegments, int heightSegments) {
   return new Mesh(v, idx);
 }
 
-} 
+} // namespace
 
 Mesh *getUnitCylinder(int radialSegments) {
   static std::unique_ptr<Mesh> s_mesh(createUnitCylinderMesh(radialSegments));
@@ -496,4 +496,4 @@ Mesh *getUnitTorso(int radialSegments, int heightSegments) {
   return s_mesh.get();
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/primitives.h

@@ -15,4 +15,4 @@ Mesh *getUnitCapsule(int radialSegments = 32, int heightSegments = 1);
 
 Mesh *getUnitTorso(int radialSegments = 32, int heightSegments = 8);
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/resources.cpp

@@ -20,4 +20,4 @@ bool ResourceManager::initialize() {
   return true;
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/resources.h

@@ -30,4 +30,4 @@ private:
   std::unique_ptr<Texture> m_whiteTexture;
 };
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/shader.cpp

@@ -214,4 +214,4 @@ bool Shader::linkProgram(GLuint vertexShader, GLuint fragmentShader) {
   return true;
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/shader.h

@@ -55,4 +55,4 @@ private:
   std::unordered_map<std::string, UniformHandle> m_uniformCache;
 };
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/shader_cache.h

@@ -139,4 +139,4 @@ private:
   std::unordered_map<QString, std::unique_ptr<Shader>> m_cache;
 };
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/state_scopes.h

@@ -60,4 +60,4 @@ struct DepthTestScope {
       glDisable(GL_DEPTH_TEST);
   }
 };
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/texture.cpp

@@ -129,4 +129,4 @@ GLenum Texture::getGLWrap(Wrap wrap) const {
   return GL_REPEAT;
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/gl/texture.h

@@ -39,4 +39,4 @@ private:
   GLenum getGLWrap(Wrap wrap) const;
 };
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/biome_renderer.cpp

@@ -66,7 +66,7 @@ inline int sectionFor(Game::Map::TerrainType type) {
   }
 }
 
-} 
+} // namespace
 
 namespace Render::GL {
 
@@ -486,4 +486,4 @@ void BiomeRenderer::generateGrassInstances() {
   }
 }
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/biome_renderer.h

@@ -46,5 +46,5 @@ private:
   bool m_grassInstancesDirty = false;
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/ground/bridge_renderer.cpp

@@ -240,4 +240,4 @@ void BridgeRenderer::submit(Renderer &renderer, ResourceManager *resources) {
   renderer.setCurrentShader(nullptr);
 }
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/bridge_renderer.h

@@ -29,5 +29,5 @@ private:
   std::vector<std::unique_ptr<Mesh>> m_meshes;
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/ground/fog_renderer.cpp

@@ -73,4 +73,4 @@ void FogRenderer::buildChunks() {
   }
 }
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/fog_renderer.h

@@ -41,5 +41,5 @@ private:
   std::vector<FogInstance> m_instances;
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/ground/grass_gpu.h

@@ -22,4 +22,4 @@ struct GrassBatchParams {
   float pad2{0.0f};
 };
 
-} 
+} // namespace Render::GL

+ 3 - 3
render/ground/ground_renderer.cpp

@@ -15,7 +15,7 @@ inline QVector3D saturate(const QVector3D &c) {
   return QVector3D(std::clamp(c.x(), 0.0f, 1.0f), std::clamp(c.y(), 0.0f, 1.0f),
                    std::clamp(c.z(), 0.0f, 1.0f));
 }
-} 
+} // namespace
 
 static QVector3D clamp01(const QVector3D &c) { return saturate(c); }
 
@@ -149,5 +149,5 @@ void GroundRenderer::submit(Renderer &renderer, ResourceManager *resources) {
   renderer.grid(m_model, m_color, cell, 0.06f, extent);
 }
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 2 - 2
render/ground/ground_renderer.h

@@ -79,5 +79,5 @@ private:
   }
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/ground/pine_gpu.h

@@ -19,4 +19,4 @@ struct PineBatchParams {
   float windSpeed = 0.5f;
 };
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/pine_renderer.cpp

@@ -53,7 +53,7 @@ inline float valueNoise(float x, float z, uint32_t seed) {
   return v0 * (1.0f - fz) + v1 * fz;
 }
 
-} 
+} // namespace
 
 namespace Render::GL {
 
@@ -280,4 +280,4 @@ void PineRenderer::generatePineInstances() {
   m_pineInstancesDirty = m_pineInstanceCount > 0;
 }
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/pine_renderer.h

@@ -44,5 +44,5 @@ private:
   bool m_pineInstancesDirty = false;
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/ground/plant_gpu.h

@@ -20,4 +20,4 @@ struct PlantBatchParams {
   float pad1 = 0.0f;
 };
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/plant_renderer.cpp

@@ -53,7 +53,7 @@ inline float valueNoise(float x, float z, uint32_t salt = 0u) {
   return nx0 * (1 - tz) + nx1 * tz;
 }
 
-} 
+} // namespace
 
 namespace Render::GL {
 
@@ -360,4 +360,4 @@ void PlantRenderer::generatePlantInstances() {
   m_plantInstancesDirty = m_plantInstanceCount > 0;
 }
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/plant_renderer.h

@@ -45,5 +45,5 @@ private:
   bool m_plantInstancesDirty = false;
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/ground/river_renderer.cpp

@@ -218,4 +218,4 @@ void RiverRenderer::submit(Renderer &renderer, ResourceManager *resources) {
   renderer.setCurrentShader(nullptr);
 }
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/river_renderer.h

@@ -30,5 +30,5 @@ private:
   std::vector<std::unique_ptr<Mesh>> m_meshes;
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/ground/riverbank_asset_gpu.h

@@ -18,4 +18,4 @@ struct RiverbankAssetBatchParams {
   float time{0.0f};
 };
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/riverbank_asset_renderer.cpp

@@ -47,7 +47,7 @@ inline float valueNoise(float x, float z, uint32_t salt = 0u) {
   return nx0 * (1 - tz) + nx1 * tz;
 }
 
-} 
+} // namespace
 
 namespace Render::GL {
 
@@ -274,4 +274,4 @@ void RiverbankAssetRenderer::generateAssetInstances() {
   qDebug() << "Generated" << m_assetInstanceCount << "riverbank assets";
 }
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/riverbank_asset_renderer.h

@@ -46,5 +46,5 @@ private:
   bool m_assetInstancesDirty = false;
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/ground/riverbank_renderer.cpp

@@ -282,4 +282,4 @@ void RiverbankRenderer::submit(Renderer &renderer, ResourceManager *resources) {
   renderer.setCurrentShader(nullptr);
 }
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/riverbank_renderer.h

@@ -33,5 +33,5 @@ private:
   std::vector<std::unique_ptr<Mesh>> m_meshes;
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/ground/stone_gpu.h

@@ -15,4 +15,4 @@ struct StoneBatchParams {
   float time = 0.0f;
 };
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/stone_renderer.cpp

@@ -54,7 +54,7 @@ inline float valueNoise(float x, float z, uint32_t salt = 0u) {
   return nx0 * (1 - tz) + nx1 * tz;
 }
 
-} 
+} // namespace
 
 namespace Render::GL {
 
@@ -282,4 +282,4 @@ void StoneRenderer::generateStoneInstances() {
   m_stoneInstancesDirty = m_stoneInstanceCount > 0;
 }
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/stone_renderer.h

@@ -44,5 +44,5 @@ private:
   bool m_stoneInstancesDirty = false;
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/ground/terrain_gpu.h

@@ -40,4 +40,4 @@ struct TerrainChunkParams {
   bool isGroundPlane = false;
 };
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/terrain_renderer.cpp

@@ -78,7 +78,7 @@ inline float valueNoise(float x, float z, uint32_t salt = 0u) {
   return nx0 * (1 - tz) + nx1 * tz;
 }
 
-} 
+} // namespace
 
 namespace Render::GL {
 
@@ -704,4 +704,4 @@ QVector3D TerrainRenderer::getTerrainColor(Game::Map::TerrainType type,
   }
 }
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/ground/terrain_renderer.h

@@ -60,5 +60,5 @@ private:
   std::uint32_t m_noiseSeed = 0u;
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/humanoid_base.cpp

@@ -637,4 +637,4 @@ void HumanoidRendererBase::render(const DrawContext &ctx,
   drawSelectionFX(ctx, out);
 }
 
-} 
+} // namespace Render::GL

+ 3 - 3
render/humanoid_base.h

@@ -10,8 +10,8 @@ namespace Engine {
 namespace Core {
 class Entity;
 class World;
-} 
-} 
+} // namespace Core
+} // namespace Engine
 
 namespace Render::GL {
 
@@ -140,4 +140,4 @@ protected:
   static void drawSelectionFX(const DrawContext &ctx, ISubmitter &out);
 };
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/humanoid_math.cpp

@@ -21,4 +21,4 @@ QVector3D elbowBendTorso(const QVector3D &shoulder, const QVector3D &hand,
          lateral * (lateralOffset * outwardSign) + QVector3D(0, yBias, 0);
 }
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/humanoid_math.h

@@ -28,4 +28,4 @@ QVector3D elbowBendTorso(const QVector3D &shoulder, const QVector3D &hand,
                          const QVector3D &outwardDir, float alongFrac,
                          float lateralOffset, float yBias, float outwardSign);
 
-} 
+} // namespace Render::GL

+ 1 - 1
render/humanoid_specs.h

@@ -44,4 +44,4 @@ enum class MaterialType : uint8_t {
   Skin = 4
 };
 
-} 
+} // namespace Render::GL

+ 2 - 2
render/i_render_pass.h

@@ -11,5 +11,5 @@ struct IRenderPass {
   virtual void submit(Renderer &renderer, ResourceManager *resources) = 0;
 };
 
-} 
-} 
+} // namespace GL
+} // namespace Render

+ 1 - 1
render/math/pod_math.h

@@ -294,4 +294,4 @@ inline Mat3x4 sphereAtFast(const Mat3x4 &parent, const Vec3 &pos,
   return parent * local;
 }
 
-} 
+} // namespace Render::Math

+ 1 - 1
render/palette.cpp

@@ -35,4 +35,4 @@ HumanoidPalette makeHumanoidPalette(const QVector3D &teamTint, uint32_t seed) {
   return p;
 }
 
-} 
+} // namespace Render::GL

Some files were not shown because too many files changed in this diff