Clang-format continuation indent fixes + .gitignore additions

* Proper support for continuation indents in clang format
* make src/wieldmesh.h proper and remove it from whitelist
* Add CLion default build directories in .gitignore

diff --git a/.clang-format b/.clang-format
index 63d884a0952ef61b940c36fc099444a7a9edc57a..05a6b3385725603a0508671f4405cb2a8687d6b2 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -21,3 +21,5 @@ IncludeCategories:
     Priority:        2
   - Regex:           '^<.*'
     Priority:        1
+AlignAfterOpenBracket: DontAlign
+ContinuationIndentWidth: 16

diff --git a/.gitignore b/.gitignore
index c2600afeba0ff805da2ffbe5d09a499fce42de78..c51cced035fe4ad601f5b90a4fffcab42e98e36e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -75,6 +75,8 @@ locale/
 *.ninja
 .ninja*
 *.gch
+cmake-build-debug/
+cmake-build-release/
 
 ## Android build files
 build/android/src/main/assets

diff --git a/src/wieldmesh.h b/src/wieldmesh.h
index 2e78232ae68daa322bf10e770ea455b3ae80b83f..200587058cad9315ccac19b09b14fc37acd96f19 100644 (file)
--- a/src/wieldmesh.h
+++ b/src/wieldmesh.h
@@ -20,8 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef WIELDMESH_HEADER
 #define WIELDMESH_HEADER
 
-#include "irrlichttypes_extrabloated.h"
 #include <string>
+#include "irrlichttypes_extrabloated.h"
 
 struct ItemStack;
 class Client;
@@ -31,30 +31,27 @@ struct TileSpec;
 /*
        Wield item scene node, renders the wield mesh of some item
 */
-class WieldMeshSceneNode: public scene::ISceneNode
+class WieldMeshSceneNode : public scene::ISceneNode
 {
 public:
        WieldMeshSceneNode(scene::ISceneNode *parent, scene::ISceneManager *mgr,
                        s32 id = -1, bool lighting = false);
        virtual ~WieldMeshSceneNode();
 
-       void setCube(const TileSpec tiles[6],
-                       v3f wield_scale, ITextureSource *tsrc);
-       void setExtruded(const std::string &imagename,
-                       v3f wield_scale, ITextureSource *tsrc, u8 num_frames);
+       void setCube(const TileSpec tiles[6], v3f wield_scale, ITextureSource *tsrc);
+       void setExtruded(const std::string &imagename, v3f wield_scale,
+                       ITextureSource *tsrc, u8 num_frames);
        void setItem(const ItemStack &item, Client *client);
 
        // Sets the vertex color of the wield mesh.
        // Must only be used if the constructor was called with lighting = false
        void setColor(video::SColor color);
 
-       scene::IMesh *getMesh()
-       { return m_meshnode->getMesh(); }
+       scene::IMesh *getMesh() { return m_meshnode->getMesh(); }
 
        virtual void render();
 
-       virtual const aabb3f &getBoundingBox() const
-       { return m_bounding_box; }
+       virtual const aabb3f &getBoundingBox() const { return m_bounding_box; }
 
 private:
        void changeToMesh(scene::IMesh *mesh);
@@ -84,6 +81,5 @@ private:
 
 scene::IMesh *getItemMesh(Client *client, const ItemStack &item);
 
-scene::IMesh *getExtrudedMesh(ITextureSource *tsrc,
-               const std::string &imagename);
+scene::IMesh *getExtrudedMesh(ITextureSource *tsrc, const std::string &imagename);
 #endif

diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
index 352fe29734ed0deec7ba3a616db77e39514cf8f7..0dcc7713d3624c6c1d80279d0989bf6393fe125f 100644 (file)
--- a/util/travis/clang-format-whitelist.txt
+++ b/util/travis/clang-format-whitelist.txt
@@ -438,4 +438,3 @@ src/voxelalgorithms.h
 src/voxel.cpp
 src/voxel.h
 src/wieldmesh.cpp
-src/wieldmesh.h