Style: Format code with clang-format 6.0.1

(cherry picked from commit 7c9f7452f4)

Travis: Update style checks to clang-format 6.0.1

(cherry picked from commit 003ac67df1)

.clang-format

@@ -1,6 +1,6 @@
 # Commented out parameters are those with the same value as base LLVM style
 # We can uncomment them if we want to change their value, or enforce the
-# chosen value in case the base style changes (last sync: Clang 5.0.0).
+# chosen value in case the base style changes (last sync: Clang 6.0.1).
 ---
 ### General config, applies to all languages ###
 BasedOnStyle:  LLVM
@@ -32,6 +32,7 @@ AllowShortIfStatementsOnASingleLine: true
 #   AfterObjCDeclaration: false
 #   AfterStruct:     false
 #   AfterUnion:      false
+#   AfterExternBlock: false
 #   BeforeCatch:     false
 #   BeforeElse:      false
 #   IndentBraces:    false
@@ -60,6 +61,7 @@ Cpp11BracedListStyle: false
 #   - foreach
 #   - Q_FOREACH
 #   - BOOST_FOREACH
+# IncludeBlocks:   Preserve
 IncludeCategories:
   - Regex:           '".*"'
     Priority:        1
@@ -69,6 +71,7 @@ IncludeCategories:
     Priority:        3
 # IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: true
+# IndentPPDirectives: None
 IndentWidth:     4
 # IndentWrappedFunctionNames: false
 # JavaScriptQuotes: Leave
@@ -86,6 +89,10 @@ IndentWidth:     4
 # PenaltyExcessCharacter: 1000000
 # PenaltyReturnTypeOnItsOwnLine: 60
 # PointerAlignment: Right
+# RawStringFormats:
+#   - Delimiter:       pb
+#     Language:        TextProto
+#     BasedOnStyle:    google
 # ReflowComments:  true
 # SortIncludes:    true
 # SortUsingDeclarations: true

.travis.yml

@@ -44,7 +44,7 @@ addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-5.0
+      - llvm-toolchain-trusty-6.0
     packages:
       - build-essential
       - scons
@@ -70,7 +70,7 @@ addons:
       #- mingw-w64
 
       # For style checks.
-      - clang-format-5.0
+      - clang-format-6.0
 
 install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$GODOT_TARGET" = "android" ]; then

core/dvector.h

@@ -150,7 +150,7 @@ class PoolVector {
 		}
 
 		if (old_alloc->refcount.unref() == true) {
-		//this should never happen but..
+			//this should never happen but..
 
 #ifdef DEBUG_ENABLED
 			MemoryPool::alloc_mutex->lock();

core/typedefs.h

@@ -74,7 +74,7 @@ T *_nullptr() {
 
 #define OFFSET_OF(st, m) \
 	((size_t)((char *)&(_nullptr<st>()->m) - (char *)0))
-	/**
+/**
  * Some platforms (devices) not define NULL
  */
 
@@ -82,7 +82,7 @@ T *_nullptr() {
 #define NULL 0
 #endif
 
-	/**
+/**
  * Windows defines a lot of badly stuff we'll never ever use. undefine it.
  */
 
@@ -104,7 +104,7 @@ T *_nullptr() {
 #include "error_list.h"
 #include "error_macros.h"
 
-	/** Generic ABS function, for math uses please use Math::abs */
+/** Generic ABS function, for math uses please use Math::abs */
 
 #ifndef ABS
 #define ABS(m_v) ((m_v < 0) ? (-(m_v)) : (m_v))

drivers/windows/file_access_windows.cpp

@@ -120,9 +120,9 @@ void FileAccessWindows::close() {
 		bool rename_error = true;
 		int attempts = 4;
 		while (rename_error && attempts) {
-		// This workaround of trying multiple times is added to deal with paranoid Windows
-		// antiviruses that love reading just written files even if they are not executable, thus
-		// locking the file and preventing renaming from happening.
+			// This workaround of trying multiple times is added to deal with paranoid Windows
+			// antiviruses that love reading just written files even if they are not executable, thus
+			// locking the file and preventing renaming from happening.
 
 #ifdef UWP_ENABLED
 			// UWP has no PathFileExists, so we check attributes instead

editor/spatial_editor_gizmos.cpp

@@ -2957,10 +2957,10 @@ NavigationMeshSpatialGizmo::NavigationMeshSpatialGizmo(NavigationMeshInstance *p
 	navmesh = p_navmesh;
 }
 
-	//////
-	///
-	///
-	///
+//////
+///
+///
+///
 
 #define BODY_A_RADIUS 0.25
 #define BODY_B_RADIUS 0.27

modules/gdscript/gdscript_compiler.cpp

@@ -813,7 +813,7 @@ int GDScriptCompiler::_parse_expression(CodeGen &codegen, const GDScriptParser::
 
 					if (on->arguments[0]->type == GDScriptParser::Node::TYPE_OPERATOR && (static_cast<GDScriptParser::OperatorNode *>(on->arguments[0])->op == GDScriptParser::OperatorNode::OP_INDEX || static_cast<GDScriptParser::OperatorNode *>(on->arguments[0])->op == GDScriptParser::OperatorNode::OP_INDEX_NAMED)) {
 
-					// SET (chained) MODE!
+						// SET (chained) MODE!
 #ifdef DEBUG_ENABLED
 						if (static_cast<GDScriptParser::OperatorNode *>(on->arguments[0])->op == GDScriptParser::OperatorNode::OP_INDEX_NAMED) {
 							const GDScriptParser::OperatorNode *inon = static_cast<GDScriptParser::OperatorNode *>(on->arguments[0]);

modules/gdscript/gdscript_editor.cpp

@@ -1812,7 +1812,7 @@ static void _find_type_arguments(GDScriptCompletionContext &context, const GDScr
 
 		} else {
 
-		//regular method
+			//regular method
 #if defined(DEBUG_METHODS_ENABLED) && defined(TOOLS_ENABLED)
 			if (p_argidx < m->get_argument_count()) {
 				PropertyInfo pi = m->get_argument_info(p_argidx);

modules/gdscript/gdscript_tokenizer.cpp

@@ -1126,7 +1126,7 @@ void GDScriptTokenizerText::advance(int p_amount) {
 		_advance();
 }
 
-	//////////////////////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #define BYTECODE_VERSION 12
 

modules/mono/mono_gd/gd_mono_marshal.cpp

@@ -880,4 +880,4 @@ Dictionary mono_object_to_Dictionary(MonoObject *p_dict) {
 
 	return ret;
 }
-}
+} // namespace GDMonoMarshal

modules/pvr/texture_loader_pvr.cpp

@@ -240,11 +240,11 @@ ResourceFormatPVR::ResourceFormatPVR() {
 	Image::_image_compress_pvrtc2_func = _compress_pvrtc4;
 }
 
-	/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
 
-	//PVRTC decompressor, Based on PVRTC decompressor by IMGTEC.
+//PVRTC decompressor, Based on PVRTC decompressor by IMGTEC.
 
-	/////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////
 
 #define PT_INDEX 2
 #define BLK_Y_SIZE 4

modules/vorbis/audio_stream_ogg_vorbis.cpp

@@ -48,7 +48,7 @@ size_t AudioStreamPlaybackOGGVorbis::_ov_read_func(void *p_dst, size_t p_data, s
 
 int AudioStreamPlaybackOGGVorbis::_ov_seek_func(void *_f, ogg_int64_t offs, int whence) {
 
-//printf("seek to %p, offs %i, whence %i\n",_f,(int)offs,whence);
+	//printf("seek to %p, offs %i, whence %i\n",_f,(int)offs,whence);
 
 #ifdef SEEK_SET
 	//printf("seek set defined\n");

platform/android/audio_driver_opensl.cpp

@@ -42,7 +42,8 @@ void AudioDriverOpenSL::_buffer_callback(
 		/*   SLuint32 eventFlags,
     const void * pBuffer,
     SLuint32 bufferSize,
-    SLuint32 dataUsed*/) {
+    SLuint32 dataUsed*/
+) {
 
 	bool mix = true;
 

platform/android/audio_driver_opensl.h

@@ -74,7 +74,8 @@ class AudioDriverOpenSL : public AudioDriver {
 			/*   SLuint32 eventFlags,
 	    const void * pBuffer,
 	    SLuint32 bufferSize,
-	    SLuint32 dataUsed*/);
+	    SLuint32 dataUsed*/
+	);
 
 	static void _buffer_callbacks(
 			SLAndroidSimpleBufferQueueItf queueItf,

platform/android/java/src/org/godotengine/godot/payments/ConsumeTask.java

@@ -66,7 +66,6 @@ abstract public class ConsumeTask {
 		}
 		final String token = _token;
 		new AsyncTask<String, String, String>() {
-
 			@Override
 			protected String doInBackground(String... params) {
 				try {
@@ -89,7 +88,6 @@ abstract public class ConsumeTask {
 					error(param);
 				}
 			}
-
 		}
 				.execute();
 	}

platform/android/java/src/org/godotengine/godot/payments/PaymentsManager.java

@@ -103,7 +103,6 @@ public class PaymentsManager {
 
 	public void requestPurchase(final String sku, String transactionId) {
 		new PurchaseTask(mService, Godot.getInstance()) {
-
 			@Override
 			protected void error(String message) {
 				godotPaymentV3.callbackFail();
@@ -118,14 +117,12 @@ public class PaymentsManager {
 			protected void alreadyOwned() {
 				godotPaymentV3.callbackAlreadyOwned(sku);
 			}
-
 		}
 				.purchase(sku, transactionId);
 	}
 
 	public void consumeUnconsumedPurchases() {
 		new ReleaseAllConsumablesTask(mService, activity) {
-
 			@Override
 			protected void success(String sku, String receipt, String signature, String token) {
 				godotPaymentV3.callbackSuccessProductMassConsumed(receipt, signature, sku);
@@ -194,14 +191,12 @@ public class PaymentsManager {
 
 	public void processPurchaseResponse(int resultCode, Intent data) {
 		new HandlePurchaseTask(activity) {
-
 			@Override
 			protected void success(final String sku, final String signature, final String ticket) {
 				godotPaymentV3.callbackSuccess(ticket, signature, sku);
 
 				if (auto_consume) {
 					new ConsumeTask(mService, activity) {
-
 						@Override
 						protected void success(String ticket) {
 						}
@@ -231,12 +226,10 @@ public class PaymentsManager {
 	public void validatePurchase(String purchaseToken, final String sku) {
 
 		new ValidateTask(activity, godotPaymentV3) {
-
 			@Override
 			protected void success() {
 
 				new ConsumeTask(mService, activity) {
-
 					@Override
 					protected void success(String ticket) {
 						godotPaymentV3.callbackSuccess(ticket, null, sku);
@@ -269,7 +262,6 @@ public class PaymentsManager {
 
 	public void consume(final String sku) {
 		new ConsumeTask(mService, activity) {
-
 			@Override
 			protected void success(String ticket) {
 				godotPaymentV3.callbackSuccessProductMassConsumed(ticket, "", sku);

platform/android/java/src/org/godotengine/godot/payments/ReleaseAllConsumablesTask.java

@@ -88,7 +88,6 @@ abstract public class ReleaseAllConsumablesTask {
 						String signature = mySignatures.get(i);
 						//Log.d("godot", "A punto de consumir un item con token:" + token + "\n" + receipt);
 						new GenericConsumeTask(context, mService, sku, receipt, signature, token) {
-
 							@Override
 							public void onSuccess(String sku, String receipt, String signature, String token) {
 								ReleaseAllConsumablesTask.this.success(sku, receipt, signature, token);

platform/android/java/src/org/godotengine/godot/payments/ValidateTask.java

@@ -63,7 +63,6 @@ abstract public class ValidateTask {
 
 	public void validatePurchase(final String sku) {
 		new AsyncTask<String, String, String>() {
-
 			private ProgressDialog dialog;
 
 			@Override
@@ -113,7 +112,6 @@ abstract public class ValidateTask {
 					error(e.getMessage());
 				}
 			}
-
 		}
 				.execute();
 	}

platform/iphone/game_center.mm

@@ -139,7 +139,6 @@ Error GameCenter::post_score(Variant p_score) {
 
 	[GKScore reportScores:@[ reporter ]
 			withCompletionHandler:^(NSError *error) {
-
 				Dictionary ret;
 				ret["type"] = "post_score";
 				if (error == nil) {
@@ -177,7 +176,6 @@ Error GameCenter::award_achievement(Variant p_params) {
 
 	[GKAchievement reportAchievements:@[ achievement ]
 				withCompletionHandler:^(NSError *error) {
-
 					Dictionary ret;
 					ret["type"] = "award_achievement";
 					if (error == nil) {
@@ -196,7 +194,6 @@ Error GameCenter::award_achievement(Variant p_params) {
 void GameCenter::request_achievement_descriptions() {
 
 	[GKAchievementDescription loadAchievementDescriptionsWithCompletionHandler:^(NSArray *descriptions, NSError *error) {
-
 		Dictionary ret;
 		ret["type"] = "achievement_descriptions";
 		if (error == nil) {
@@ -252,7 +249,6 @@ void GameCenter::request_achievement_descriptions() {
 void GameCenter::request_achievements() {
 
 	[GKAchievement loadAchievementsWithCompletionHandler:^(NSArray *achievements, NSError *error) {
-
 		Dictionary ret;
 		ret["type"] = "achievements";
 		if (error == nil) {
@@ -347,7 +343,6 @@ Error GameCenter::request_identity_verification_signature() {
 
 	GKLocalPlayer *player = [GKLocalPlayer localPlayer];
 	[player generateIdentityVerificationSignatureWithCompletionHandler:^(NSURL *publicKeyUrl, NSData *signature, NSData *salt, uint64_t timestamp, NSError *error) {
-
 		Dictionary ret;
 		ret["type"] = "identity_verification_signature";
 		if (error == nil) {

platform/uwp/os_uwp.cpp

@@ -392,7 +392,6 @@ void OSUWP::ManagedType::update_clipboard() {
 	if (data->Contains(StandardDataFormats::Text)) {
 
 		create_task(data->GetTextAsync()).then([this](Platform::String ^ clipboard_content) {
-
 			this->clipboard = clipboard_content;
 		});
 	}

platform/windows/godot_win.cpp

@@ -176,8 +176,8 @@ int _main() {
 }
 
 int main(int _argc, char **_argv) {
-// _argc and _argv are ignored
-// we are going to use the WideChar version of them instead
+	// _argc and _argv are ignored
+	// we are going to use the WideChar version of them instead
 
 #ifdef CRASH_HANDLER_EXCEPTION
 	__try {

platform/x11/os_x11.cpp

@@ -1762,8 +1762,8 @@ void OS_X11::process_xevents() {
 							GrabModeAsync, GrabModeAsync, x11_window, None, CurrentTime);
 				}
 #ifdef TOUCH_ENABLED
-					// Grab touch devices to avoid OS gesture interference
-					/*for (int i = 0; i < touch.devices.size(); ++i) {
+				// Grab touch devices to avoid OS gesture interference
+				/*for (int i = 0; i < touch.devices.size(); ++i) {
 					XIGrabDevice(x11_display, touch.devices[i], x11_window, CurrentTime, None, XIGrabModeAsync, XIGrabModeAsync, False, &touch.event_mask);
 				}*/
 #endif

scene/3d/voxel_light_baker.cpp

@@ -113,7 +113,7 @@ static bool planeBoxOverlap(Vector3 normal, float d, Vector3 maxbox) {
 	rad = fa * boxhalfsize.x + fb * boxhalfsize.z; \
 	if (min > rad || max < -rad) return false;
 
-	/*======================== Z-tests ========================*/
+/*======================== Z-tests ========================*/
 
 #define AXISTEST_Z12(a, b, fa, fb)                 \
 	p1 = a * v1.x - b * v1.y;                      \
@@ -1961,7 +1961,7 @@ Error VoxelLightBaker::make_lightmap(const Transform &p_xform, Ref<Mesh> &p_mesh
 #endif
 			for (int i = 0; i < height; i++) {
 
-			//print_line("bake line " + itos(i) + " / " + itos(height));
+				//print_line("bake line " + itos(i) + " / " + itos(height));
 #ifdef _OPENMP
 #pragma omp parallel for schedule(dynamic, 1)
 #endif

scene/main/node.cpp

@@ -238,7 +238,7 @@ void Node::_propagate_enter_tree() {
 
 void Node::_propagate_exit_tree() {
 
-//block while removing children
+	//block while removing children
 
 #ifdef DEBUG_ENABLED