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

Style: Apply clang-format on all files

Browse Source 
Thus fixing some invalid changes that had still made it to the 2.1 branch.
This commit is contained in:
Rémi Verschelde
2017-07-30 23:00:25 +02:00
parent 6d3fea6864
commit c1f54e1a45
17 changed files with 280 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/image.cpp
View File

@@ -2398,7 +2398,6 @@ void Image::fill(const Color &p_color) {
_put_pixel(j, i, c, dst_data_ptr); _put_pixel(j, i, c, dst_data_ptr);
} }
} }
} }
Image (*Image::_png_mem_loader_func)(const uint8_t *, int) = NULL; Image (*Image::_png_mem_loader_func)(const uint8_t *, int) = NULL;

1
editor/io_plugins/editor_mesh_import_plugin.cpp
View File

@@ -512,7 +512,6 @@ Error EditorMeshImportPlugin::import(const String &p_path, const Ref<ResourceImp
surf_tool->add_smooth_group(true); surf_tool->add_smooth_group(true);
has_index_data = false; has_index_data = false;
} }
if (l.begins_with("o ")) //name if (l.begins_with("o ")) //name

12
editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -1041,8 +1041,7 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent &p_event) {
v_scroll->set_val(v_scroll->get_val() + int(EditorSettings::get_singleton()->get("2d_editor/pan_speed")) / zoom * b.factor); v_scroll->set_val(v_scroll->get_val() + int(EditorSettings::get_singleton()->get("2d_editor/pan_speed")) / zoom * b.factor);
} } else {
else {
if (zoom < MIN_ZOOM) if (zoom < MIN_ZOOM)
return; return;
@@ -1055,7 +1054,6 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent &p_event) {
h_scroll->set_val(h_scroll->get_val() + ofs.x); h_scroll->set_val(h_scroll->get_val() + ofs.x);
v_scroll->set_val(v_scroll->get_val() + ofs.y); v_scroll->set_val(v_scroll->get_val() + ofs.y);
} }
} }
_update_scroll(0); _update_scroll(0);
@@ -1069,8 +1067,7 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent &p_event) {
v_scroll->set_val(v_scroll->get_val() - int(EditorSettings::get_singleton()->get("2d_editor/pan_speed")) / zoom * b.factor); v_scroll->set_val(v_scroll->get_val() - int(EditorSettings::get_singleton()->get("2d_editor/pan_speed")) / zoom * b.factor);
} } else {
else {
if (zoom > MAX_ZOOM) if (zoom > MAX_ZOOM)
return; return;
@@ -1083,7 +1080,6 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent &p_event) {
h_scroll->set_val(h_scroll->get_val() + ofs.x); h_scroll->set_val(h_scroll->get_val() + ofs.x);
v_scroll->set_val(v_scroll->get_val() + ofs.y); v_scroll->set_val(v_scroll->get_val() + ofs.y);
} }
} }
_update_scroll(0); _update_scroll(0);
@@ -1099,9 +1095,7 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent &p_event) {
_update_scroll(0); _update_scroll(0);
viewport->update(); viewport->update();
} }
} }
if (b.button_index == BUTTON_WHEEL_RIGHT) { if (b.button_index == BUTTON_WHEEL_RIGHT) {
@@ -1112,9 +1106,7 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent &p_event) {
_update_scroll(0); _update_scroll(0);
viewport->update(); viewport->update();
} }
} }
if (b.button_index == BUTTON_RIGHT) { if (b.button_index == BUTTON_RIGHT) {

5
platform/iphone/app_delegate.mm
View File

@@ -29,11 +29,11 @@
/*************************************************************************/ /*************************************************************************/
#import "app_delegate.h" #import "app_delegate.h"
#include "audio_driver_iphone.h"
#include "core/globals.h" #include "core/globals.h"
#import "gl_view.h" #import "gl_view.h"
#include "main/main.h" #include "main/main.h"
#include "os_iphone.h" #include "os_iphone.h"
#include "audio_driver_iphone.h"
#ifdef MODULE_FACEBOOKSCORER_IOS_ENABLED #ifdef MODULE_FACEBOOKSCORER_IOS_ENABLED
#include "modules/FacebookScorer_ios/FacebookScorer.h" #include "modules/FacebookScorer_ios/FacebookScorer.h"
@@ -605,8 +605,7 @@ static int frame_count = 0;
view_controller.view = glView; view_controller.view = glView;
window.rootViewController = view_controller; window.rootViewController = view_controller;
_set_keep_screen_on(bool(GLOBAL_DEF("display/keep_screen_on", true)) ? YES _set_keep_screen_on(bool(GLOBAL_DEF("display/keep_screen_on", true)) ? YES : NO);
: NO);
glView.useCADisplayLink = glView.useCADisplayLink =
bool(GLOBAL_DEF("display.iOS/use_cadisplaylink", true)) ? YES : NO; bool(GLOBAL_DEF("display.iOS/use_cadisplaylink", true)) ? YES : NO;
printf("cadisaplylink: %d", glView.useCADisplayLink); printf("cadisaplylink: %d", glView.useCADisplayLink);

3
platform/osx/audio_driver_osx.cpp
View File

@@ -257,7 +257,6 @@ AudioDriverOSX::AudioDriverOSX() {
samples_in = NULL; samples_in = NULL;
}; };
AudioDriverOSX::~AudioDriverOSX() { AudioDriverOSX::~AudioDriverOSX(){};
};
#endif #endif

5
platform/winrt/app.h
View File

@@ -35,6 +35,9 @@
#include "GLES2/gl2.h" #include "GLES2/gl2.h"
#include "os_winrt.h" #include "os_winrt.h"
/** clang-format does not play nice with this C++/CX hybrid, needs investigation. */
/* clang-format off */
namespace GodotWinRT namespace GodotWinRT
{ {
ref class App sealed : public Windows::ApplicationModel::Core::IFrameworkView ref class App sealed : public Windows::ApplicationModel::Core::IFrameworkView
@@ -106,3 +109,5 @@ namespace GodotWinRT
}; };
} }
/* clang-format on */

13
platform/winrt/audio_driver_winrt.cpp
View File

@@ -37,8 +37,7 @@ using namespace Windows::Media::MediaProperties;
using namespace Windows::Media::Editing; using namespace Windows::Media::Editing;
using namespace Windows::Foundation; using namespace Windows::Foundation;
const char * AudioDriverWinRT::get_name() const const char *AudioDriverWinRT::get_name() const {
{
return "WinRT"; return "WinRT";
} }
@@ -50,7 +49,6 @@ Error AudioDriverWinRT::init() {
pcm_open = false; pcm_open = false;
samples_in = NULL; samples_in = NULL;
mix_rate = 48000; mix_rate = 48000;
output_format = OUTPUT_STEREO; output_format = OUTPUT_STEREO;
channels = 2; channels = 2;
@@ -108,7 +106,6 @@ void AudioDriverWinRT::thread_func(void* p_udata) {
while (!ad->exit_thread) { while (!ad->exit_thread) {
if (!ad->active) { if (!ad->active) {
for (int i = 0; i < AUDIO_BUFFERS; i++) { for (int i = 0; i < AUDIO_BUFFERS; i++) {
@@ -137,16 +134,13 @@ void AudioDriverWinRT::thread_func(void* p_udata) {
ad->current_buffer = (ad->current_buffer + 1) % AUDIO_BUFFERS; ad->current_buffer = (ad->current_buffer + 1) % AUDIO_BUFFERS;
XAUDIO2_VOICE_STATE state; XAUDIO2_VOICE_STATE state;
while (ad->source_voice->GetState(&state), state.BuffersQueued > AUDIO_BUFFERS - 1) while (ad->source_voice->GetState(&state), state.BuffersQueued > AUDIO_BUFFERS - 1) {
{
WaitForSingleObject(ad->voice_callback->buffer_end_event, INFINITE); WaitForSingleObject(ad->voice_callback->buffer_end_event, INFINITE);
} }
} }
}; };
ad->thread_exited = true; ad->thread_exited = true;
}; };
void AudioDriverWinRT::start() { void AudioDriverWinRT::start() {
@@ -238,7 +232,4 @@ AudioDriverWinRT::AudioDriverWinRT() {
AudioDriverWinRT::~AudioDriverWinRT(){ AudioDriverWinRT::~AudioDriverWinRT(){
}; };

17
platform/winrt/audio_driver_winrt.h
View File

@@ -31,14 +31,14 @@
#include "servers/audio/audio_server_sw.h" #include "servers/audio/audio_server_sw.h"
#include "core/os/thread.h"
#include "core/os/mutex.h" #include "core/os/mutex.h"
#include "core/os/thread.h"
#include <windows.h>
#include <mmsystem.h>
#include <mmreg.h> #include <mmreg.h>
#include <xaudio2.h> #include <mmsystem.h>
#include <windows.h>
#include <wrl/client.h> #include <wrl/client.h>
#include <xaudio2.h>
class AudioDriverWinRT : public AudioDriverSW { class AudioDriverWinRT : public AudioDriverSW {
@@ -49,8 +49,11 @@ class AudioDriverWinRT : public AudioDriverSW {
struct XAudio2DriverVoiceCallback : public IXAudio2VoiceCallback { struct XAudio2DriverVoiceCallback : public IXAudio2VoiceCallback {
HANDLE buffer_end_event; HANDLE buffer_end_event;
XAudio2DriverVoiceCallback() : buffer_end_event(CreateEvent(NULL, FALSE, FALSE, NULL)) {} XAudio2DriverVoiceCallback()
void STDMETHODCALLTYPE OnBufferEnd(void* pBufferContext) { /*print_line("buffer ended");*/ SetEvent(buffer_end_event); } : buffer_end_event(CreateEvent(NULL, FALSE, FALSE, NULL)) {}
void STDMETHODCALLTYPE OnBufferEnd(void *pBufferContext) { /*print_line("buffer ended");*/
SetEvent(buffer_end_event);
}
//Unused methods are stubs //Unused methods are stubs
void STDMETHODCALLTYPE OnStreamEnd() {} void STDMETHODCALLTYPE OnStreamEnd() {}
@@ -59,7 +62,6 @@ class AudioDriverWinRT : public AudioDriverSW {
void STDMETHODCALLTYPE OnBufferStart(void *pBufferContext) {} void STDMETHODCALLTYPE OnBufferStart(void *pBufferContext) {}
void STDMETHODCALLTYPE OnLoopEnd(void *pBufferContext) {} void STDMETHODCALLTYPE OnLoopEnd(void *pBufferContext) {}
void STDMETHODCALLTYPE OnVoiceError(void *pBufferContext, HRESULT Error) {} void STDMETHODCALLTYPE OnVoiceError(void *pBufferContext, HRESULT Error) {}
}; };
Thread *thread; Thread *thread;
@@ -90,7 +92,6 @@ class AudioDriverWinRT : public AudioDriverSW {
XAudio2DriverVoiceCallback *voice_callback; XAudio2DriverVoiceCallback *voice_callback;
public: public:
const char *get_name() const; const char *get_name() const;
virtual Error init(); virtual Error init();

3
platform/winrt/gl_context_egl.cpp
View File

@@ -101,8 +101,7 @@ Error ContextEGL::initialize() {
try { try {
const EGLint displayAttributes[] = const EGLint displayAttributes[] = {
{
/*EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, /*EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, 9, EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, 9,
EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE, 3, EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE, 3,

4
platform/winrt/joystick_winrt.h
View File

@@ -33,10 +33,12 @@
ref class JoystickWinrt sealed { ref class JoystickWinrt sealed {
/** clang-format breaks this, it does not understand this token. */
/* clang-format off */
internal: internal:
void register_events(); void register_events();
uint32_t process_controllers(uint32_t p_last_id); uint32_t process_controllers(uint32_t p_last_id);
/* clang-format on */
JoystickWinrt(); JoystickWinrt();
JoystickWinrt(InputDefault *p_input); JoystickWinrt(InputDefault *p_input);

2
scene/gui/item_list.cpp
View File

@@ -520,12 +520,10 @@ void ItemList::_input_event(const InputEvent &p_event) {
if (p_event.type == InputEvent::MOUSE_BUTTON && p_event.mouse_button.button_index == BUTTON_WHEEL_UP && p_event.mouse_button.pressed) { if (p_event.type == InputEvent::MOUSE_BUTTON && p_event.mouse_button.button_index == BUTTON_WHEEL_UP && p_event.mouse_button.pressed) {
scroll_bar->set_val(scroll_bar->get_val() - scroll_bar->get_page() * p_event.mouse_button.factor / 8); scroll_bar->set_val(scroll_bar->get_val() - scroll_bar->get_page() * p_event.mouse_button.factor / 8);
} }
if (p_event.type == InputEvent::MOUSE_BUTTON && p_event.mouse_button.button_index == BUTTON_WHEEL_DOWN && p_event.mouse_button.pressed) { if (p_event.type == InputEvent::MOUSE_BUTTON && p_event.mouse_button.button_index == BUTTON_WHEEL_DOWN && p_event.mouse_button.pressed) {
scroll_bar->set_val(scroll_bar->get_val() + scroll_bar->get_page() * p_event.mouse_button.factor / 8); scroll_bar->set_val(scroll_bar->get_val() + scroll_bar->get_page() * p_event.mouse_button.factor / 8);
} }
if (p_event.is_pressed() && items.size() > 0) { if (p_event.is_pressed() && items.size() > 0) {