Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 04:06:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Style: Apply clang-format again on all files

Browse Source 
Fixes issues introduced by newer clang-format versions or commits
pushed directly without using the clang-format pre-commit hook.
This commit is contained in:
Rémi Verschelde 2017-12-06 19:54:22 +01:00
parent 9ff17379c2
commit d5ca9e2f6f
13 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/helper/math_fieldwise.cpp
View File

@ -46,8 +46,8 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
switch (p_source.get_type()) { switch (p_source.get_type()) {
/* clang-format makes a mess of this macro usage */ /* clang-format makes a mess of this macro usage */
/* clang-format off */ /* clang-format off */
case Variant::VECTOR2: { case Variant::VECTOR2: {

4
core/io/marshalls.cpp
View File

@ -159,7 +159,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
r_variant = str; r_variant = str;
} break; } break;
// math types // math types
case Variant::VECTOR2: { case Variant::VECTOR2: {
@ -959,7 +959,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
_encode_string(p_variant, buf, r_len); _encode_string(p_variant, buf, r_len);
} break; } break;
// math types // math types
case Variant::VECTOR2: { case Variant::VECTOR2: {

2
core/math/face3.cpp
View File

@ -195,7 +195,7 @@ bool Face3::intersects_aabb(const AABB &p_aabb) const {
if (!p_aabb.intersects_plane(get_plane())) if (!p_aabb.intersects_plane(get_plane()))
return false; return false;
/** TEST FACE AXIS */ /** TEST FACE AXIS */
#define TEST_AXIS(m_ax) \ #define TEST_AXIS(m_ax) \
{ \ { \

2
core/math/face3.h
View File

@ -256,6 +256,4 @@ bool Face3::intersects_aabb2(const AABB &p_aabb) const {
return true; return true;
} }
//this sucks...
#endif // FACE3_H #endif // FACE3_H

2
core/os/os.h
View File

@ -195,7 +195,7 @@ public:
virtual void set_ime_position(const Point2 &p_pos) {} virtual void set_ime_position(const Point2 &p_pos) {}
virtual void set_ime_intermediate_text_callback(ImeCallback p_callback, void *p_inp) {} virtual void set_ime_intermediate_text_callback(ImeCallback p_callback, void *p_inp) {}
virtual Error open_dynamic_library(const String p_path, void *&p_library_handle,bool p_also_set_library_path=false) { return ERR_UNAVAILABLE; } virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false) { return ERR_UNAVAILABLE; }
virtual Error close_dynamic_library(void *p_library_handle) { return ERR_UNAVAILABLE; } virtual Error close_dynamic_library(void *p_library_handle) { return ERR_UNAVAILABLE; }
virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional = false) { return ERR_UNAVAILABLE; } virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional = false) { return ERR_UNAVAILABLE; }

2
drivers/gles3/rasterizer_scene_gles3.h
View File

@ -817,7 +817,7 @@ public:
void _render_list(RenderList::Element **p_elements, int p_element_count, const Transform &p_view_transform, const CameraMatrix &p_projection, GLuint p_base_env, bool p_reverse_cull, bool p_alpha_pass, bool p_shadow, bool p_directional_add, bool p_directional_shadows); void _render_list(RenderList::Element **p_elements, int p_element_count, const Transform &p_view_transform, const CameraMatrix &p_projection, GLuint p_base_env, bool p_reverse_cull, bool p_alpha_pass, bool p_shadow, bool p_directional_add, bool p_directional_shadows);
_FORCE_INLINE_ void _add_geometry(RasterizerStorageGLES3::Geometry *p_geometry, InstanceBase *p_instance, RasterizerStorageGLES3::GeometryOwner *p_owner, int p_material, bool p_depth_pass,bool p_shadow_pass); _FORCE_INLINE_ void _add_geometry(RasterizerStorageGLES3::Geometry *p_geometry, InstanceBase *p_instance, RasterizerStorageGLES3::GeometryOwner *p_owner, int p_material, bool p_depth_pass, bool p_shadow_pass);
_FORCE_INLINE_ void _add_geometry_with_material(RasterizerStorageGLES3::Geometry *p_geometry, InstanceBase *p_instance, RasterizerStorageGLES3::GeometryOwner *p_owner, RasterizerStorageGLES3::Material *p_material, bool p_depth_pass, bool p_shadow_pass); _FORCE_INLINE_ void _add_geometry_with_material(RasterizerStorageGLES3::Geometry *p_geometry, InstanceBase *p_instance, RasterizerStorageGLES3::GeometryOwner *p_owner, RasterizerStorageGLES3::Material *p_material, bool p_depth_pass, bool p_shadow_pass);

2
drivers/unix/os_unix.cpp
View File

@ -391,7 +391,7 @@ String OS_Unix::get_locale() const {
return locale; return locale;
} }
Error OS_Unix::open_dynamic_library(const String p_path, void *&p_library_handle,bool p_also_set_library_path) { Error OS_Unix::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path) {
p_library_handle = dlopen(p_path.utf8().get_data(), RTLD_NOW); p_library_handle = dlopen(p_path.utf8().get_data(), RTLD_NOW);
if (!p_library_handle) { if (!p_library_handle) {
ERR_EXPLAIN("Can't open dynamic library: " + p_path + ". Error: " + dlerror()); ERR_EXPLAIN("Can't open dynamic library: " + p_path + ". Error: " + dlerror());

2
drivers/unix/os_unix.h
View File

@ -77,7 +77,7 @@ public:
//virtual VideoMode get_video_mode() const; //virtual VideoMode get_video_mode() const;
//virtual void get_fullscreen_mode_list(List<VideoMode> *p_list) const; //virtual void get_fullscreen_mode_list(List<VideoMode> *p_list) const;
virtual Error open_dynamic_library(const String p_path, void *&p_library_handle,bool p_also_set_library_path=false); virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false);
virtual Error close_dynamic_library(void *p_library_handle); virtual Error close_dynamic_library(void *p_library_handle);
virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional = false); virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional = false);

2
editor/project_manager.cpp
View File

@ -508,7 +508,7 @@ public:
} else if (current->has_setting("application/config/name")) { } else if (current->has_setting("application/config/name")) {
project_name->set_text(current->get("application/config/name")); project_name->set_text(current->get("application/config/name"));
} }
project_name->call_deferred("grab_focus"); project_name->call_deferred("grab_focus");
create_dir->hide(); create_dir->hide();

2
modules/gdnative/gdnative.cpp
View File

@ -144,7 +144,7 @@ bool GDNative::initialize() {
} }
} }
Error err = OS::get_singleton()->open_dynamic_library(path, native_handle,true); Error err = OS::get_singleton()->open_dynamic_library(path, native_handle, true);
if (err != OK) { if (err != OK) {
return false; return false;
} }

7
modules/gdscript/gdscript_parser.cpp
View File

@ -2976,10 +2976,9 @@ void GDScriptParser::_parse_extends(ClassNode *p_class) {
case GDScriptTokenizer::TK_IDENTIFIER: { case GDScriptTokenizer::TK_IDENTIFIER: {
StringName identifier = tokenizer->get_token_identifier(); StringName identifier = tokenizer->get_token_identifier();
p_class->extends_class.push_back(identifier); p_class->extends_class.push_back(identifier);
} } break;
break;
case GDScriptTokenizer::TK_PERIOD: case GDScriptTokenizer::TK_PERIOD:
break; break;

8
modules/gdscript/gdscript_tokenizer.cpp
View File

@ -253,9 +253,9 @@ bool GDScriptTokenizer::is_token_literal(int p_offset, bool variable_safe) const
case TK_BUILT_IN_FUNC: case TK_BUILT_IN_FUNC:
case TK_OP_IN: case TK_OP_IN:
//case TK_OP_NOT: //case TK_OP_NOT:
//case TK_OP_OR: //case TK_OP_OR:
//case TK_OP_AND: //case TK_OP_AND:
case TK_PR_CLASS: case TK_PR_CLASS:
case TK_PR_CONST: case TK_PR_CONST:
@ -1125,7 +1125,7 @@ void GDScriptTokenizerText::advance(int p_amount) {
_advance(); _advance();
} }
////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////
#define BYTECODE_VERSION 12 #define BYTECODE_VERSION 12

4
platform/haiku/os_haiku.cpp
View File

@ -106,8 +106,8 @@ void OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p_
context_gl->initialize(); context_gl->initialize();
context_gl->make_current(); context_gl->make_current();
/* Port to GLES 3 rasterizer */ /* Port to GLES 3 rasterizer */
//rasterizer = memnew(RasterizerGLES2); //rasterizer = memnew(RasterizerGLES2);
#endif #endif