godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Re-apply clang-format to all files

Browse Source 
Some badly formatted code has managed to pass through our CI...
This commit is contained in:
Rémi Verschelde
2017-08-27 14:16:32 +02:00
parent 21e53c4267
commit c90bfcb1c6
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/class_db.cpp
View File

@@ -600,9 +600,9 @@ void ClassDB::bind_integer_constant(const StringName &p_class, const StringName
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
String enum_name = p_enum; String enum_name = p_enum;
if (enum_name!=String()) { if (enum_name != String()) {
if (enum_name.find(".")!=-1) { if (enum_name.find(".") != -1) {
enum_name=enum_name.get_slicec('.',1); enum_name = enum_name.get_slicec('.', 1);
} }
List<StringName> *constants_list = type->enum_map.getptr(enum_name); List<StringName> *constants_list = type->enum_map.getptr(enum_name);
@@ -614,7 +614,6 @@ void ClassDB::bind_integer_constant(const StringName &p_class, const StringName
new_list.push_back(p_name); new_list.push_back(p_name);
type->enum_map[enum_name] = new_list; type->enum_map[enum_name] = new_list;
} }
} }
type->constant_order.push_back(p_name); type->constant_order.push_back(p_name);

3
core/class_db.h
View File

@@ -457,7 +457,8 @@ public:
} }
type->method_map[p_name] = bind; type->method_map[p_name] = bind;
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
// bind->set_return_type("Variant"); // FIXME: <reduz> set_return_type is no longer in MethodBind, so I guess it should be moved to vararg method bind
//bind->set_return_type("Variant");
type->method_order.push_back(p_name); type->method_order.push_back(p_name);
#endif #endif

6
platform/uwp/joypad_uwp.cpp
View File

@@ -54,7 +54,7 @@ void JoypadUWP::process_controllers() {
case ControllerType::GAMEPAD_CONTROLLER: { case ControllerType::GAMEPAD_CONTROLLER: {
GamepadReading reading = ((Gamepad ^) joy.controller_reference)->GetCurrentReading(); GamepadReading reading = ((Gamepad ^)joy.controller_reference)->GetCurrentReading();
int button_mask = (int)GamepadButtons::Menu; int button_mask = (int)GamepadButtons::Menu;
for (int j = 0; j < 14; j++) { for (int j = 0; j < 14; j++) {
@@ -161,7 +161,7 @@ void JoypadUWP::joypad_vibration_start(int p_device, float p_weak_magnitude, flo
GamepadVibration vibration; GamepadVibration vibration;
vibration.LeftMotor = p_strong_magnitude; vibration.LeftMotor = p_strong_magnitude;
vibration.RightMotor = p_weak_magnitude; vibration.RightMotor = p_weak_magnitude;
((Gamepad ^) joy.controller_reference)->Vibration = vibration; ((Gamepad ^)joy.controller_reference)->Vibration = vibration;
joy.ff_timestamp = p_timestamp; joy.ff_timestamp = p_timestamp;
joy.ff_end_timestamp = p_duration == 0 ? 0 : p_timestamp + (uint64_t)(p_duration * 1000000.0); joy.ff_end_timestamp = p_duration == 0 ? 0 : p_timestamp + (uint64_t)(p_duration * 1000000.0);
@@ -175,7 +175,7 @@ void JoypadUWP::joypad_vibration_stop(int p_device, uint64_t p_timestamp) {
GamepadVibration vibration; GamepadVibration vibration;
vibration.LeftMotor = 0.0; vibration.LeftMotor = 0.0;
vibration.RightMotor = 0.0; vibration.RightMotor = 0.0;
((Gamepad ^) joy.controller_reference)->Vibration = vibration; ((Gamepad ^)joy.controller_reference)->Vibration = vibration;
joy.ff_timestamp = p_timestamp; joy.ff_timestamp = p_timestamp;
joy.vibrating = false; joy.vibrating = false;