Merge pull request #21 from PottierLoic/format

Format whole project

Author: PottierLoic

.clang-format

@@ -0,0 +1,12 @@
+BasedOnStyle: Google
+ColumnLimit: 100
+
+SortIncludes: false
+
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortBlocksOnASingleLine: Empty
+ReflowComments: false
+
+PenaltyBreakAssignment: 1000
+PenaltyBreakBeforeFirstCallParameter: 1000
+BinPackArguments: false

.github/workflows/format-ci.yml

@@ -0,0 +1,18 @@
+name: Format Check
+
+on:
+  pull_request:
+  push:
+    branches: [ main ]
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install clang-format
+        run: sudo apt install clang-format
+
+      - name: Check formatting
+        run: python3 format.py --check

core/component/audio_source.cpp

@@ -2,18 +2,19 @@
 
 namespace SpaceEngine {
 
-//AudioSource::AudioSource() = default;
+// AudioSource::AudioSource() = default;
 //
-//void AudioSource::setAudio(const std::string& path) {
+// void AudioSource::setAudio(const std::string& path) {
 //  m_audioPath = path;
-////  m_audio = ResourceManager::load<ResAudio>(path, std::dynamic_pointer_cast<IResourceUser>(shared_from_this()));
+////  m_audio = ResourceManager::load<ResAudio>(path,
+/// std::dynamic_pointer_cast<IResourceUser>(shared_from_this()));
 //}
 //
-//void AudioSource::play() const {
+// void AudioSource::play() const {
 //  if (m_audio) {
 //    // TODO: waiting for Audio system
 //    // Audio::playSound(m_audio->getData());
 //  }
 //}
 
-}
+}  // namespace SpaceEngine

core/component/audio_source.hpp

@@ -8,13 +8,13 @@
 namespace SpaceEngine {
 
 struct AudioSource {
-//  explicit AudioSource();
-//
-//  void setAudio(const std::string& path);
-//  void play() const;
-//
-//  std::shared_ptr<ResAudio> m_audio;
-//  std::string m_audioPath;
+  //  explicit AudioSource();
+  //
+  //  void setAudio(const std::string& path);
+  //  void play() const;
+  //
+  //  std::shared_ptr<ResAudio> m_audio;
+  //  std::string m_audioPath;
 };
 
-}
+}  // namespace SpaceEngine

core/component/camera.cpp

@@ -19,27 +19,31 @@ glm::mat4 Camera::getViewMatrix(const World& world, Entity e) const {
 }
 
 glm::mat4 Camera::getProjectionMatrix() const {
-  if (projectionType == ProjectionType::PERSPECTIVE) {
-    glm::mat4 projection = glm::perspective(glm::radians(fieldOfView), aspectRatio, nearPlane, farPlane);
-    projection[1][1] *= -1;
-    return projection;
-  } else {
-    const float width = orthographicSize * aspectRatio;
-    const float height = orthographicSize;
-    glm::mat4 projection = glm::ortho(-width, width, -height, height, nearPlane, farPlane);
-    projection[1][1] *= -1;
-    return projection;
+  glm::mat4 projection;
+  switch (projectionType) {
+    case ProjectionType::PERSPECTIVE:
+      projection = glm::perspective(glm::radians(fieldOfView), aspectRatio, nearPlane, farPlane);
+      break;
+    case ProjectionType::ORTHOGRAPHIC:
+      projection = glm::ortho(-orthographicSize * aspectRatio,
+                              orthographicSize * aspectRatio,
+                              -orthographicSize,
+                              orthographicSize,
+                              nearPlane,
+                              farPlane);
+      break;
   }
+
+  projection[1][1] *= -1;
+  return projection;
 }
 
 void Camera::updateCameraVectors() {
-  front = glm::normalize(glm::vec3(
-    cos(glm::radians(yaw)) * cos(glm::radians(pitch)),
-    sin(glm::radians(pitch)),
-    sin(glm::radians(yaw)) * cos(glm::radians(pitch))
-  ));
+  front = glm::normalize(glm::vec3(cos(glm::radians(yaw)) * cos(glm::radians(pitch)),
+                                   sin(glm::radians(pitch)),
+                                   sin(glm::radians(yaw)) * cos(glm::radians(pitch))));
   right = glm::normalize(glm::cross(front, worldUp));
   up = glm::normalize(glm::cross(right, front));
 }
 
-}
+}  // namespace SpaceEngine

core/component/camera.hpp

@@ -1,21 +1,16 @@
 #pragma once
 
-#include "glm/glm.hpp"
-#include "glm/gtc/matrix_transform.hpp"
-
 #include "../imgui/imgui_impl_opengl3.h"
-
-#include "ecs/world.hpp"
-#include "ecs/entity.hpp"
 #include "component/transform.hpp"
+#include "ecs/entity.hpp"
+#include "ecs/world.hpp"
+#include "glm/glm.hpp"
+#include "glm/gtc/matrix_transform.hpp"
 
 namespace SpaceEngine {
 
 struct Camera {
-  enum class ProjectionType {
-    PERSPECTIVE,
-    ORTHOGRAPHIC
-  };
+  enum class ProjectionType { PERSPECTIVE, ORTHOGRAPHIC };
 
   glm::vec3 front{};
   glm::vec3 up{};
@@ -26,7 +21,7 @@ struct Camera {
 
   ProjectionType projectionType = ProjectionType::PERSPECTIVE;
   float fieldOfView = 45.0f;
-  float aspectRatio = 16.0f/9.0f;
+  float aspectRatio = 16.0f / 9.0f;
   float nearPlane = 0.1f;
   float farPlane = 100.0f;
 
@@ -40,4 +35,4 @@ struct Camera {
   void updateCameraVectors();
 };
 
-}
+}  // namespace SpaceEngine

core/component/light.cpp

@@ -2,8 +2,6 @@
 
 namespace SpaceEngine {
 
-Light::Light() {
+Light::Light() {}
 
-}
-
-}
+}  // namespace SpaceEngine

core/component/light.hpp

@@ -4,11 +4,7 @@
 
 namespace SpaceEngine {
 
-enum LightType {
-  POINT,
-  DIRECTIONAL,
-  SPOT
-};
+enum LightType { POINT, DIRECTIONAL, SPOT };
 
 struct Light {
   float intensity = 1.0f;
@@ -22,4 +18,4 @@ struct Light {
   Light();
 };
 
-}
+}  // namespace SpaceEngine

core/component/model_renderer.cpp

@@ -11,4 +11,4 @@ void ModelRenderer::setModel() {
   model = std::make_shared<Model>(path.c_str());
 }
 
-}
+}  // namespace SpaceEngine

core/component/model_renderer.hpp

@@ -1,16 +1,18 @@
 #pragma once
 
-#include "model/model.hpp"
 #include <memory>
 
+#include "model/model.hpp"
+
 namespace SpaceEngine {
 
 struct ModelRenderer {
   std::shared_ptr<Model> model;
-  std::string path; // TODO this should not be a path
+  std::string path;  // TODO this should not be a path
 
   ModelRenderer();
-  void setModel(); // TODO can't remember why I did it like this, should be refactored
+  void setModel();  // TODO can't remember why I did it like this, should be
+                    // refactored
 };
 
-}
+}  // namespace SpaceEngine