Format code [skip ci]

include/global.h

@@ -106,7 +106,7 @@ typedef enum {
 
 template<typename T, typename U>
 [[noreturn]] void assertEqualImplementation(const char* exp, T a, U b, const char* file, int line,
-                                            bool print = false, const char* str = nullptr) {
+        bool print = false, const char* str = nullptr) {
     const unsigned int maxSize = 128;
     void* callstack[maxSize];
     int frames = backtrace(callstack, maxSize);

include/system/FontTTF.h

@@ -23,7 +23,7 @@ class FontMapTTF {
     int initialize(unsigned char* fontData, int firstChar);
     bool contains(int c);
     int getTexture() { return texture; }
-    void getQuad(int c, float* xpos, float* ypos, stbtt_aligned_quad *quad);
+    void getQuad(int c, float* xpos, float* ypos, stbtt_aligned_quad* quad);
 
   private:
     int begin;
@@ -46,7 +46,7 @@ class FontTTF {
 
   private:
     static int charIsMapped(int c);
-    static int getQuad(int c, float* xpos, float* ypos, stbtt_aligned_quad *quad);
+    static int getQuad(int c, float* xpos, float* ypos, stbtt_aligned_quad* quad);
     static void drawTextInternal(unsigned int x, unsigned int y, float scale,
                                  const unsigned char color[4], unsigned int maxWidth, std::string s,
                                  bool drawWrapped);

include/system/Shader.h

@@ -21,7 +21,7 @@ class ShaderBuffer {
 
     template<typename T>
     void bufferData(std::vector<T> v)
-        { bufferData(v.size(), sizeof(T), &v[0]); }
+    { bufferData(v.size(), sizeof(T), &v[0]); }
 
     void bindBuffer();
     void bindBuffer(int location, int size);

include/utils/Folder.h

@@ -49,7 +49,8 @@ class Folder {
     void executeRemoveRecursiveFiles(std::function<bool (File& f)> func);
     std::string getRecursiveFileName(unsigned long i);
     File& getRecursiveFile(unsigned long i);
-    void findRecursiveFilesEndingWith(std::vector<File>& found, std::string end, bool casesensitive = false);
+    void findRecursiveFilesEndingWith(std::vector<File>& found, std::string end,
+                                      bool casesensitive = false);
 
   private:
     void createFolderItems();

src/Console.cpp

@@ -89,7 +89,7 @@ void Console::display() {
         ImGui::Checkbox("Info##log", &visibleLogs[3]);
         ImGui::SameLine();
         ImGui::Checkbox("Debug##log", &visibleLogs[4]);
-        ImGui::SameLine();
+
         static bool logToTTY = false, logToClipboard = false, logToFile = false;
         if (ImGui::Button("Log to TTY")) { logToTTY = true; }
         ImGui::SameLine();

src/Entity.cpp

@@ -43,11 +43,11 @@ void Entity::move(char movement) {
 
 void Entity::print() {
     Log::get(LOG_INFO) << "Entity " << objectId << ":" << Log::endl
-             << "  Room " << room << " (" << getWorld().getRoom(room).getFlags()
-             << ")" << Log::endl
-             << "  " << pos[0] << "x " << pos[1] << "y " << pos[2] << "z"
-             << Log::endl
-             << "  " << glm::degrees(angles[1]) << " Yaw" << Log::endl;
+                       << "  Room " << room << " (" << getWorld().getRoom(room).getFlags()
+                       << ")" << Log::endl
+                       << "  " << pos[0] << "x " << pos[1] << "y " << pos[2] << "z"
+                       << Log::endl
+                       << "  " << glm::degrees(angles[1]) << " Yaw" << Log::endl;
 }
 
 SkeletalModel& Entity::getModel() {

src/MenuFolder.cpp

@@ -59,7 +59,7 @@ int MenuFolder::init(Folder* folder, bool filter) {
             Loader::LoaderVersion version = Loader::checkFile(f.getPath());
             if (version == Loader::TR_UNKNOWN) {
                 Log::get(LOG_ERROR) << "Error: pak file '" << f.getName().c_str()
-                         << "' invalid" << Log::endl;
+                                    << "' invalid" << Log::endl;
                 return true; // delete file from list
             }
 
@@ -118,7 +118,7 @@ void MenuFolder::loadOrOpen() {
         }
     } else {
         int error = Game::loadLevel(mapFolder->getFile((unsigned long)mCursor
-                                        - 1 - mapFolder->folderCount()).getPath().c_str());
+                                    - 1 - mapFolder->folderCount()).getPath().c_str());
         if (error == 0) {
             visible = false;
         } else {

src/Mesh.cpp

@@ -133,7 +133,7 @@ void Mesh::display(glm::mat4 MVP) {
 
         while ((indexStart != indexPos) && (indexPos < indicesBuff.size())) {
             while ((indexPos < indicesBuff.size())
-                    && (texturesBuff.at(indicesBuff.at(indexPos)) == texture)) {
+                   && (texturesBuff.at(indicesBuff.at(indexPos)) == texture)) {
                 indexPos++;
             }
 

src/Room.cpp

@@ -16,7 +16,7 @@ bool Room::showBoundingBox = false;
 
 Room::Room(glm::vec3 _pos, BoundingBox* _bbox, RoomMesh* _mesh, unsigned int f,
            int a, int x, int z) : pos(_pos), bbox(_bbox), mesh(_mesh), flags(f),
-                                  alternateRoom(a), numXSectors(x), numZSectors(z) {
+    alternateRoom(a), numXSectors(x), numZSectors(z) {
     model = glm::translate(glm::mat4(1.0f), pos);
 }
 

src/RoomMesh.cpp

@@ -77,7 +77,7 @@ void RoomMesh::display(glm::mat4 MVP) {
 
         while ((indexStart != indexPos) && (indexPos < indicesBuff.size())) {
             while ((indexPos < indicesBuff.size())
-                    && (texturesBuff.at(indicesBuff.at(indexPos)) == texture)) {
+                   && (texturesBuff.at(indicesBuff.at(indexPos)) == texture)) {
                 indexPos++;
             }
 

src/TextureManager.cpp

@@ -246,7 +246,7 @@ int TextureManager::loadImage(std::string filename, TextureStorage s, int slot)
         if (data) {
             if ((n < 3) || (n > 4)) {
                 Log::get(LOG_ERROR) << "Image \"" << filename << "\" has unsupported format ("
-                         << n << ")!" << Log::endl;
+                                    << n << ")!" << Log::endl;
                 stbi_image_free(data);
                 return -2;
             }

src/UI.cpp

@@ -92,8 +92,8 @@ int UI::initialize() {
                                            (int)png_size, &tex_x, &tex_y, &tex_comp, 0);
 
     fontTex = TextureManager::loadBufferSlot((unsigned char*)tex_data,
-                                             tex_x, tex_y, ColorMode::RGBA, 32,
-                                             TextureStorage::SYSTEM, -1, false);
+              tex_x, tex_y, ColorMode::RGBA, 32,
+              TextureStorage::SYSTEM, -1, false);
 
     stbi_image_free(tex_data);
 
@@ -175,7 +175,7 @@ void UI::eventsFinished() {
             auto i = motionEvents.front();
             if (!getMenu().isVisible()) {
                 Game::handleMouseMotion(std::get<0>(i), std::get<1>(i),
-                                            std::get<2>(i), std::get<3>(i));
+                                        std::get<2>(i), std::get<3>(i));
             }
             motionEvents.pop_front();
         }
@@ -251,7 +251,7 @@ void UI::eventsFinished() {
 
 void UI::display() {
     if (RunTime::getShowFPS()) {
-        if (ImGui::Begin("Debug Overlay", nullptr, ImVec2(0,0), 0.3f,
+        if (ImGui::Begin("Debug Overlay", nullptr, ImVec2(0, 0), 0.3f,
                          ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize
                          | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings
                          | ImGuiWindowFlags_AlwaysAutoResize)) {

src/commands/CommandSet.cpp

@@ -137,7 +137,8 @@ int CommandSet::execute(std::istream& args) {
         args >> temp;
         int error = Font::initialize(expandNames(temp));
         if (error != 0)
-            Log::get(LOG_USER) << "Error initializing font: " << expandNames(temp) << "(" << error << ")" << Log::endl;
+            Log::get(LOG_USER) << "Error initializing font: " << expandNames(temp) << "(" << error << ")" <<
+                               Log::endl;
     } else {
         Log::get(LOG_USER) << "set-Error: Unknown variable (" << var.c_str() << ")" << Log::endl;
         return -1;

src/loader/LoaderTR2.cpp

@@ -156,7 +156,7 @@ void LoaderTR2::loadAnimatedTextures() {
         int count = animatedTextures.at(pos) + 1;
         if ((pos + count) >= numWords) {
             Log::get(LOG_DEBUG) << "LoaderTR2: Invalid AnimatedTextures ("
-                     << pos + count << " >= " << numWords << ")!" << Log::endl;
+                                << pos + count << " >= " << numWords << ")!" << Log::endl;
             return;
         }
 
@@ -168,7 +168,8 @@ void LoaderTR2::loadAnimatedTextures() {
     }
 
     if ((numAnimatedTextures > 0) || (numWords > 0))
-        Log::get(LOG_INFO) << "LoaderTR2: Found " << numAnimatedTextures << " Animated Textures!" << Log::endl;
+        Log::get(LOG_INFO) << "LoaderTR2: Found " << numAnimatedTextures << " Animated Textures!" <<
+                           Log::endl;
     else
         Log::get(LOG_INFO) << "LoaderTR2: No Animated Textures in this level?!" << Log::endl;
 
@@ -407,8 +408,8 @@ void LoaderTR2::loadRooms() {
         if ((numPortals == 0) && (numVertices == 0)
             && (numRectangles == 0) && (numTriangles == 0))
             Log::get(LOG_DEBUG) << "LoaderTR2: Room " << i << " seems invalid: " << numPortals << "p "
-                     << numRectangles << "r " << numTriangles << "t " << numVertices
-                     << "v" << Log::endl;
+                                << numRectangles << "r " << numTriangles << "t " << numVertices
+                                << "v" << Log::endl;
     }
 
     if (numRooms > 0)
@@ -426,7 +427,8 @@ void LoaderTR2::loadFloorData() {
     }
 
     if (numFloorData > 0)
-        Log::get(LOG_INFO) << "LoaderTR2: Found " << numFloorData << " words FloorData, unimplemented!" << Log::endl;
+        Log::get(LOG_INFO) << "LoaderTR2: Found " << numFloorData << " words FloorData, unimplemented!" <<
+                           Log::endl;
     else
         Log::get(LOG_INFO) << "LoaderTR2: No FloorData in this level?!" << Log::endl;
 }
@@ -468,8 +470,9 @@ void LoaderTR2::loadSprites() {
     }
 
     if ((numSpriteTextures > 0) || (numSpriteSequences > 0))
-        Log::get(LOG_INFO) << "LoaderTR2: Found " << numSpriteTextures << " Sprites in " << numSpriteSequences <<
-                 " Sequences!" << Log::endl;
+        Log::get(LOG_INFO) << "LoaderTR2: Found " << numSpriteTextures << " Sprites in " <<
+                           numSpriteSequences <<
+                           " Sequences!" << Log::endl;
     else
         Log::get(LOG_INFO) << "LoaderTR2: No Sprites in this level?!" << Log::endl;
 }
@@ -494,7 +497,7 @@ void LoaderTR2::loadMeshes() {
 
         if (numMeshData < (meshPointer / 2)) {
             Log::get(LOG_DEBUG) << "LoaderTR2: Invalid Mesh: "
-                     << (meshPointer / 2) << " > " << numMeshData << Log::endl;
+                                << (meshPointer / 2) << " > " << numMeshData << Log::endl;
             continue;
         }
 
@@ -742,7 +745,8 @@ void LoaderTR2::loadMoveables() {
     }
 
     if (numAnimDispatches > 0)
-        Log::get(LOG_INFO) << "LoaderTR2: Found " << numAnimDispatches << " AnimationDispatches!" << Log::endl;
+        Log::get(LOG_INFO) << "LoaderTR2: Found " << numAnimDispatches << " AnimationDispatches!" <<
+                           Log::endl;
     else
         Log::get(LOG_INFO) << "LoaderTR2: No AnimationDispatches in this level?!" << Log::endl;
 
@@ -998,7 +1002,7 @@ void LoaderTR2::loadBoxesOverlapsZones() {
 
     if ((numBoxes > 0) || (numOverlaps > 0))
         Log::get(LOG_INFO) << "LoaderTR2: Found NPC NavigationHints (" << numBoxes
-                 << ", " << numOverlaps << ", " << list << "), unimplemented!" << Log::endl;
+                           << ", " << numOverlaps << ", " << list << "), unimplemented!" << Log::endl;
     else
         Log::get(LOG_INFO) << "LoaderTR2: No NPC NavigationHints in this level?!" << Log::endl;
 }
@@ -1092,7 +1096,7 @@ void LoaderTR2::loadExternalSoundFile(std::string f) {
 
         if (std::string("RIFF") != std::string(test)) {
             Log::get(LOG_DEBUG) << "LoaderTR2: External SFX invalid! (" << riffCount
-                     << ", \"" << test << "\" != \"RIFF\")" << Log::endl;
+                                << ", \"" << test << "\" != \"RIFF\")" << Log::endl;
             return;
         }
 
@@ -1152,7 +1156,7 @@ void LoaderTR2::loadCinematicFrames() {
 
     if (numCinematicFrames > 0)
         Log::get(LOG_INFO) << "LoaderTR2: Found " << numCinematicFrames
-                 << " CinematicFrames, unimplemented!" << Log::endl;
+                           << " CinematicFrames, unimplemented!" << Log::endl;
 }
 
 void LoaderTR2::loadDemoData() {
@@ -1163,6 +1167,6 @@ void LoaderTR2::loadDemoData() {
     // TODO store demo data somewhere, find out meaning
     if (numDemoData > 0)
         Log::get(LOG_INFO) << "LoaderTR2: Found " << numDemoData << " bytes DemoData, unimplemented!" <<
-                 Log::endl;
+                           Log::endl;
 }
 

src/system/FontTRLE.cpp

@@ -47,8 +47,8 @@ int FontTRLE::initialize(std::string font) {
     }
 
     mFontTexture = TextureManager::loadBufferSlot(pixels, 256, 256,
-                                                  ColorMode::BGRA, 32,
-                                                  TextureStorage::SYSTEM);
+                   ColorMode::BGRA, 32,
+                   TextureStorage::SYSTEM);
     delete [] pixels;
 
     // Try to load .lps file or use default glyph positions

src/system/FontTTF.cpp

@@ -67,7 +67,7 @@ int FontMapTTF::initialize(unsigned char* fontData, int firstChar) {
     delete [] pixels;
 
     texture = TextureManager::loadBufferSlot(rgb, MAP_WIDTH, MAP_HEIGHT, ColorMode::RGBA,
-                                             32, TextureStorage::SYSTEM, texture);
+              32, TextureStorage::SYSTEM, texture);
     delete [] rgb;
     if (texture < 0) {
         delete [] charInfo;
@@ -85,7 +85,7 @@ bool FontMapTTF::contains(int c) {
     return (begin >= 0) && (c >= begin) && (c < (begin + MAP_NUM_CHARS));
 }
 
-void FontMapTTF::getQuad(int c, float* xpos, float* ypos, stbtt_aligned_quad *quad) {
+void FontMapTTF::getQuad(int c, float* xpos, float* ypos, stbtt_aligned_quad* quad) {
     assert(contains(c));
     stbtt_GetPackedQuad(charInfo, MAP_WIDTH, MAP_HEIGHT, c - begin, xpos, ypos, quad, 0);
 }
@@ -255,7 +255,7 @@ int FontTTF::charIsMapped(int c) {
         begin -= (MAP_NUM_CHARS / 2);
 
     Log::get(LOG_INFO) << "Unmapped character '" << char(c) << "', new map from " << begin << " to "
-             << begin + MAP_NUM_CHARS - 1 << "..." << Log::endl;
+                       << begin + MAP_NUM_CHARS - 1 << "..." << Log::endl;
 
     int p = maps.size();
     maps.emplace_back();
@@ -266,7 +266,7 @@ int FontTTF::charIsMapped(int c) {
     return p;
 }
 
-int FontTTF::getQuad(int c, float* xpos, float* ypos, stbtt_aligned_quad *quad) {
+int FontTTF::getQuad(int c, float* xpos, float* ypos, stbtt_aligned_quad* quad) {
     if (c < 0) {
         //! \todo This has nothing to do with proper UTF8 support...
         c += 128;

src/system/WindowSDL.cpp

@@ -74,15 +74,15 @@ int WindowSDL::initialize() {
             controller = SDL_GameControllerOpen(i);
             if (controller) {
                 Log::get(LOG_INFO) << "Using controller \"" << SDL_GameControllerName(controller)
-                         << "\"..." << Log::endl;
+                                   << "\"..." << Log::endl;
                 break;
             } else {
                 Log::get(LOG_WARNING) << "Couldn't open controller \"" << SDL_GameControllerNameForIndex(i)
-                         << "\"!" << Log::endl;
+                                      << "\"!" << Log::endl;
             }
         } else {
             Log::get(LOG_WARNING) << "Joystick \"" << SDL_JoystickNameForIndex(i)
-                     << "\" is no compatible controller!" << Log::endl;
+                                  << "\" is no compatible controller!" << Log::endl;
         }
     }
 

src/utils/FolderRecursive.cpp

@@ -63,7 +63,8 @@ File& Folder::getRecursiveFile(unsigned long i) {
     return files.at(0);
 }
 
-void Folder::findRecursiveFilesEndingWith(std::vector<File>& found, std::string end, bool casesensitive) {
+void Folder::findRecursiveFilesEndingWith(std::vector<File>& found, std::string end,
+        bool casesensitive) {
     createFolderItems();
     for (unsigned long i = 0; i < countRecursiveFiles(); i++) {
         if (stringEndsWith(getRecursiveFile(i).getName(), end, casesensitive)) {

src/utils/pcx.cpp

@@ -31,7 +31,8 @@ int pcxCheck(const char* filename) {
     }
 
     if (header[0] != 0x0A) {
-        Log::get(LOG_ERROR) << "Magic number at file start is wrong (" << header[0] << " != 0x0A)" << Log::endl;
+        Log::get(LOG_ERROR) << "Magic number at file start is wrong (" << header[0] << " != 0x0A)" <<
+                            Log::endl;
         delete [] header;
         return -2;
     }
@@ -89,7 +90,8 @@ int pcxLoad(const char* filename, unsigned char** image,
     }
 
     if (header[0] != 0x0A) {
-        Log::get(LOG_ERROR) << "Magic number at file start is wrong (" << header[0] << " != 0x0A)" << Log::endl;
+        Log::get(LOG_ERROR) << "Magic number at file start is wrong (" << header[0] << " != 0x0A)" <<
+                            Log::endl;
         delete [] header;
         return -2;
     }