change code formatting

Author: ichinii

.clang-format

@@ -10,6 +10,14 @@ PointerAlignment: Left
 UseTab: Never
 TabWidth: 4
 # extra
-# AlignConsecutiveAssignments: true
 ColumnLimit: 150
-# AlignConsecutiveMacros : true
+AlignConsecutiveAssignments: Consecutive
+AlignConsecutiveMacros: Consecutive
+AlignConsecutiveBitFields: Consecutive
+# AlignConsecutiveDeclarations: AcrossEmptyLinesAndComments
+# AlignConsecutiveShortCaseStatements:
+# AlignEscapedNewlines: ENAS_LeftWithLastLine
+# AlignOperands: True
+# AlignTrailingComments: TCAS_Always
+AllowShortBlocksOnASingleLine: Always
+AllowShortIfStatementsOnASingleLine: WithoutElse

Intern/rayx-core/src/Beamline/Beamline.cpp

@@ -23,21 +23,17 @@ Group::Group(std::string name) : m_name(std::move(name)) {}
 // Move constructor
 Group::Group(Group&& other) noexcept
     : m_position(std::move(other.m_position)), m_orientation(std::move(other.m_orientation)), m_children(std::move(other.m_children)) {
-    for (auto& child : m_children) {
-        child->m_parent = this;
-    }
+    for (auto& child : m_children) { child->m_parent = this; }
 }
 
 // Move assignment operator
 Group& Group::operator=(Group&& other) noexcept {
     if (this != &other) {
-        m_position = std::move(other.m_position);
+        m_position    = std::move(other.m_position);
         m_orientation = std::move(other.m_orientation);
-        m_children = std::move(other.m_children);
+        m_children    = std::move(other.m_children);
 
-        for (auto& child : m_children) {
-            child->m_parent = this;
-        }
+        for (auto& child : m_children) { child->m_parent = this; }
     }
     return *this;
 }
@@ -204,9 +200,7 @@ void Group::ctraverse(const std::function<bool(const BeamlineNode&)>& callback)
 
     for (const auto& child : m_children) {
         if (!child) RAYX_EXIT << "m_children contains a nullptr! This should never happen.";
-        if (callback(*child)) {
-            return;
-        }
+        if (callback(*child)) { return; }
         if (child->isGroup()) {
             auto groupPtr = static_cast<Group*>(child.get());
             groupPtr->ctraverse(callback);
@@ -219,9 +213,7 @@ void Group::traverse(const std::function<bool(BeamlineNode&)>& callback) {
 
     for (auto& child : m_children) {
         if (!child) RAYX_EXIT << "m_children contains a nullptr! This should never happen.";
-        if (callback(*child)) {
-            return;
-        }
+        if (callback(*child)) { return; }
         if (child->isGroup()) {
             auto groupPtr = static_cast<Group*>(child.get());
             groupPtr->traverse(callback);
@@ -241,7 +233,7 @@ std::unique_ptr<BeamlineNode> Group::releaseNodeFromChildren(const BeamlineNode*
     for (auto it = m_children.begin(); it != m_children.end(); ++it) {
         if (it->get() == node) {
             std::unique_ptr<BeamlineNode> releasedNode = std::move(*it);
-            releasedNode->m_parent = nullptr;
+            releasedNode->m_parent                     = nullptr;
             m_children.erase(it);
             return releasedNode;
         }
@@ -254,7 +246,7 @@ std::unique_ptr<BeamlineNode> Group::releaseNodeFromTree(const BeamlineNode* nod
     for (auto it = m_children.begin(); it != m_children.end(); ++it) {
         if (it->get() == node) {
             std::unique_ptr<BeamlineNode> releasedNode = std::move(*it);
-            releasedNode->m_parent = nullptr;
+            releasedNode->m_parent                     = nullptr;
             m_children.erase(it);
             return releasedNode;
         } else if ((*it)->isGroup()) {
@@ -272,9 +264,7 @@ MaterialTables Group::calcMinimalMaterialTables() const {
     relevantMaterials.fill(false);
     for (const auto& elemPtr : elements) {
         int material = static_cast<int>(elemPtr->getMaterial());  // assuming getMaterial() exists
-        if (material >= 1 && material <= 92) {
-            relevantMaterials[material - 1] = true;
-        }
+        if (material >= 1 && material <= 92) { relevantMaterials[material - 1] = true; }
     }
     return loadMaterialTables(relevantMaterials);
 }
@@ -288,13 +278,11 @@ void Group::accumulateLightSourcesWorldPositions(const Group& group, const glm::
         assert(child && "m_children contains a nullptr!");
         if (child->isSource()) {
             DesignSource* srcPtr = static_cast<DesignSource*>(child.get());
-            glm::dvec4 worldPos = currentOri * srcPtr->getPosition() + currentPos;
+            glm::dvec4 worldPos  = currentOri * srcPtr->getPosition() + currentPos;
             positions.push_back(worldPos);
         } else if (child->isGroup()) {
             Group* grpPtr = static_cast<Group*>(child.get());
-            if (grpPtr) {
-                accumulateLightSourcesWorldPositions(*grpPtr, currentPos, currentOri, positions);
-            }
+            if (grpPtr) { accumulateLightSourcesWorldPositions(*grpPtr, currentPos, currentOri, positions); }
         }
     }
 }
@@ -326,9 +314,7 @@ std::vector<OpticalElementAndTransform> Group::compileElements() const {
 std::vector<const DesignElement*> Group::getElements() const {
     std::vector<const DesignElement*> elements;
     ctraverse([&elements](const BeamlineNode& node) -> bool {
-        if (node.isElement()) {
-            elements.push_back(static_cast<const DesignElement*>(&node));
-        }
+        if (node.isElement()) { elements.push_back(static_cast<const DesignElement*>(&node)); }
         return false;
     });
     return elements;
@@ -337,9 +323,7 @@ std::vector<const DesignElement*> Group::getElements() const {
 std::vector<const DesignSource*> Group::getSources() const {
     std::vector<const DesignSource*> sources;
     ctraverse([&sources](const BeamlineNode& node) -> bool {
-        if (node.isSource()) {
-            sources.push_back(static_cast<const DesignSource*>(&node));
-        }
+        if (node.isSource()) { sources.push_back(static_cast<const DesignSource*>(&node)); }
         return false;
     });
     return sources;
@@ -386,9 +370,7 @@ std::vector<std::string> Group::getObjectNames() const {
 size_t Group::numElements() const {
     size_t count = 0;
     ctraverse([&count](const BeamlineNode& node) -> bool {
-        if (node.isElement()) {
-            ++count;
-        }
+        if (node.isElement()) { ++count; }
         return false;
     });
     return count;
@@ -397,9 +379,7 @@ size_t Group::numElements() const {
 size_t Group::numSources() const {
     size_t count = 0;
     ctraverse([&count](const BeamlineNode& node) -> bool {
-        if (node.isSource()) {
-            ++count;
-        }
+        if (node.isSource()) { ++count; }
         return false;
     });
     return count;
@@ -408,9 +388,7 @@ size_t Group::numSources() const {
 size_t Group::numObjects() const {
     size_t count = 0;
     ctraverse([&count](const BeamlineNode& node) -> bool {
-        if (node.isSource() || node.isElement()) {
-            ++count;
-        }
+        if (node.isSource() || node.isElement()) { ++count; }
         return false;
     });
     return count;

Intern/rayx-core/src/Beamline/Beamline.h

@@ -23,7 +23,7 @@ class RAYX_API Group : public BeamlineNode {
     Group(std::string name);
     ~Group() = default;
 
-    Group(const Group&) = delete;
+    Group(const Group&)            = delete;
     Group& operator=(const Group&) = delete;
 
     Group(Group&& other) noexcept;
@@ -171,7 +171,7 @@ class RAYX_API Group : public BeamlineNode {
 
   private:
     // Position and orientation could in theory be put into one transform matrix but this follows the rml style
-    glm::dvec4 m_position = glm::dvec4(0, 0, 0, 1);
+    glm::dvec4 m_position    = glm::dvec4(0, 0, 0, 1);
     glm::dmat4 m_orientation = glm::dmat4(1);
     // m_children vec is not checked for dangling or nullptrs anywhere, changes to the Group interface/implementation are to be made with care
     std::vector<std::unique_ptr<BeamlineNode>> m_children;

Intern/rayx-core/src/Beamline/DatFile.cpp

@@ -32,9 +32,7 @@ bool DatFile::load(const std::filesystem::path& filename, DatFile* out) {
         // line 3..EOF
         out->m_weightSum = 0;
         for (uint32_t lineidx = 3; std::getline(s, line); lineidx++) {
-            if (line.empty()) {
-                continue;
-            }
+            if (line.empty()) { continue; }
 
             DatEntry e{};
 #if defined(WIN32)
@@ -60,9 +58,7 @@ bool DatFile::load(const std::filesystem::path& filename, DatFile* out) {
     std::stringstream s;
     s << m_title << '\n';
     s << m_lineCount << ' ' << m_start << ' ' << m_end << ' ' << m_step << '\n';
-    for (auto line : m_Lines) {
-        s << line.m_energy << ' ' << line.m_weight << "\n";
-    }
+    for (auto line : m_Lines) { s << line.m_energy << ' ' << line.m_weight << "\n"; }
 
     return s.str();
 }

Intern/rayx-core/src/Beamline/Node.h

@@ -75,7 +75,7 @@ class RAYX_API BeamlineNode {
      */
     glm::dmat4 getWorldOrientation() const;
 
-    virtual std::string getName() const = 0;
+    virtual std::string getName() const    = 0;
     virtual void setName(std::string name) = 0;
 
     bool hasParent() const { return m_parent != nullptr; }

Intern/rayx-core/src/CanonicalizePath.cpp

@@ -9,13 +9,9 @@ namespace RAYX {
 
 /// this function assumes that `base` is already an absolute path
 std::filesystem::path canonicalize(const std::filesystem::path& relPath, const std::filesystem::path& base) {
-    if (!base.is_absolute()) {
-        RAYX_EXIT << "canonicalize called with non-absolute base path: \"" << base << "\"";
-    }
+    if (!base.is_absolute()) { RAYX_EXIT << "canonicalize called with non-absolute base path: \"" << base << "\""; }
     // absolute paths will stay unchanged
-    if (relPath.is_absolute()) {
-        return relPath;
-    }
+    if (relPath.is_absolute()) { return relPath; }
     // relative paths will be joined onto the base:
     // canonicalize("../foo/bar", "/home/username/RAY-X") =
     // "/home/username/RAY-X/../foo/bar" = "/home/username/foo/bar"

Intern/rayx-core/src/Core.h

@@ -45,7 +45,7 @@
 // not #if defined(_WIN32) || defined(_WIN64) because we have strncasecmp in mingw
 #ifdef _MSC_VER
 #define strncasecmp _strnicmp
-#define strcasecmp _stricmp
+#define strcasecmp  _stricmp
 #endif
 
 #ifdef RAYX_BUILD_DLL

Intern/rayx-core/src/Debug/Debug.cpp

@@ -20,26 +20,22 @@ constexpr int PREFIX_LEN = 30;
  * */
 void formatDebugMsg(std::string filename, int line, std::ostream& o) {
     size_t idx = filename.find_last_of("/\\");
-    if (idx != std::string::npos) {
-        filename = filename.substr(idx + 1);
-    }
+    if (idx != std::string::npos) { filename = filename.substr(idx + 1); }
 
     std::stringstream strm;
     strm << line;
     std::string line_string = strm.str();
 
     // this shortens filenames which are too long
     if (filename.size() + line_string.size() + 4 > PREFIX_LEN) {
-        filename = filename.substr(0, PREFIX_LEN - 4 - line_string.size());
+        filename                      = filename.substr(0, PREFIX_LEN - 4 - line_string.size());
         filename[filename.size() - 1] = '.';
         filename[filename.size() - 2] = '.';
         filename[filename.size() - 3] = '.';
     }
 
     std::string pad;
-    while (4 + line_string.size() + filename.size() + pad.size() < PREFIX_LEN) {
-        pad += " ";
-    }
+    while (4 + line_string.size() + filename.size() + pad.size() < PREFIX_LEN) { pad += " "; }
     o.precision(17);
     o << "[" << pad << filename << ":" << line_string << "] ";
 }
@@ -75,15 +71,11 @@ Exit::~Exit() {
 
 Verb::Verb(std::string filename, int line) {
     // only print if the verbose flag it set!
-    if (getDebugVerbose()) {
-        formatDebugMsg(std::move(filename), line, std::cout);
-    }
+    if (getDebugVerbose()) { formatDebugMsg(std::move(filename), line, std::cout); }
 }
 
 Verb::~Verb() {
-    if (getDebugVerbose()) {
-        std::cout << std::endl;
-    }
+    if (getDebugVerbose()) { std::cout << std::endl; }
 }
 
 // The default error_fn value. Exit with an error code of 1.
@@ -100,9 +92,7 @@ void dbg(const std::string& filename, int line, std::string name, std::vector<do
     int counter = 0;  // stores the number of elements in the stringstream
     std::stringstream s;
     for (size_t i = 0; i < v.size(); i++) {
-        if (counter != 0) {
-            s << " ";
-        }
+        if (counter != 0) { s << " "; }
         s << std::setprecision(PREC) << v[i];
 
         counter++;
@@ -112,9 +102,7 @@ void dbg(const std::string& filename, int line, std::string name, std::vector<do
             s = std::stringstream();
         }
     }
-    if (counter > 0) {
-        RAYX::Log(filename, line) << s.str();
-    }
+    if (counter > 0) { RAYX::Log(filename, line) << s.str(); }
 }
 
 // The verbose flag used for RAYX_VERB printing.

Intern/rayx-core/src/Debug/Debug.h

@@ -132,9 +132,7 @@ struct RAYX_API Verb {
 
     template <typename T>
     Verb& operator<<(T t) {
-        if (getDebugVerbose()) {
-            std::cout << t;
-        }
+        if (getDebugVerbose()) { std::cout << t; }
         return *this;
     }
 };
@@ -152,23 +150,23 @@ extern void RAYX_API (*error_fn)();
 // Defines the actual RAYX logging macros using the structs defined above.
 // The __FILE__ and __LINE__ macros contain the current filename and linenumber.
 // They are defined for us by c++ https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html
-#define RAYX_LOG RAYX::Log(__FILE__, __LINE__)
+#define RAYX_LOG  RAYX::Log(__FILE__, __LINE__)
 #define RAYX_WARN RAYX::Warn(__FILE__, __LINE__)
 #define RAYX_EXIT RAYX::Exit(__FILE__, __LINE__)
 #define RAYX_VERB RAYX::Verb(__FILE__, __LINE__)
 
 #ifdef RAYX_DEBUG_MODE
 // In debug mode, RAYX_D_LOG is just the same as RAYX_LOG.
-#define RAYX_D_LOG RAYX_LOG
+#define RAYX_D_LOG  RAYX_LOG
 #define RAYX_D_WARN RAYX_WARN
-#define RAYX_D_ERR RAYX_EXIT
+#define RAYX_D_ERR  RAYX_EXIT
 #define RAYX_D_VERB RAYX_VERB
 
 #else
 // In release mode, RAYX_D_LOG instead calls the IgnoreLog, hence discarding the print.
-#define RAYX_D_LOG RAYX::IgnoreLog()
+#define RAYX_D_LOG  RAYX::IgnoreLog()
 #define RAYX_D_WARN RAYX::IgnoreLog()
-#define RAYX_D_ERR RAYX::IgnoreLog()
+#define RAYX_D_ERR  RAYX::IgnoreLog()
 #define RAYX_D_VERB RAYX::IgnoreLog()
 #endif
 

Intern/rayx-core/src/Debug/Instrumentor.h

@@ -30,11 +30,11 @@ class RAYX_API InstrumentationTimer {
             auto endTimepoint = std::chrono::high_resolution_clock::now();
 
             long long start = std::chrono::time_point_cast<std::chrono::microseconds>(m_StartTimepoint).time_since_epoch().count();
-            long long end = std::chrono::time_point_cast<std::chrono::microseconds>(endTimepoint).time_since_epoch().count();
+            long long end   = std::chrono::time_point_cast<std::chrono::microseconds>(endTimepoint).time_since_epoch().count();
 
             if (m_canPrint) {
                 long long duration = end - start;
-                double seconds = duration * 0.000001;
+                double seconds     = duration * 0.000001;
                 std::cout << "BENCH: " << m_Name << ":" << std::endl << seconds << "s" << std::endl;
             }