godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Style: Apply clang-format on all files 

Thus fixing some invalid changes that had still made it to the master branch.
This commit is contained in:
Rémi Verschelde 2017-07-30 22:53:40 +02:00
parent 5549407308
commit 76005a8e75
45 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/input_map.cpp
View File

@ -29,8 +29,8 @@
/*************************************************************************/
#include "input_map.h"
#include "project_settings.h"
#include "os/keyboard.h"
#include "project_settings.h"
InputMap *InputMap::singleton = NULL;

2
core/io/compression.cpp
View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "compression.h"
#include "project_settings.h"
#include "os/copymem.h"
#include "project_settings.h"
#include "zip_io.h"
#include "thirdparty/misc/fastlz.h"

2
core/io/file_access_memory.cpp
View File

@ -29,10 +29,10 @@
/*************************************************************************/
#include "file_access_memory.h"
#include "project_settings.h"
#include "map.h"
#include "os/copymem.h"
#include "os/dir_access.h"
#include "project_settings.h"
static Map<String, Vector<uint8_t> > *files = NULL;

2
core/io/file_access_network.cpp
View File

@ -28,10 +28,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "file_access_network.h"
#include "project_settings.h"
#include "io/ip.h"
#include "marshalls.h"
#include "os/os.h"
#include "project_settings.h"
//#define DEBUG_PRINT(m_p) print_line(m_p)
//#define DEBUG_TIME(m_what) printf("MS: %s - %lli\n",m_what,OS::get_singleton()->get_ticks_usec());

2
core/io/packet_peer.cpp
View File

@ -29,8 +29,8 @@
/*************************************************************************/
#include "packet_peer.h"
#include "project_settings.h"
#include "io/marshalls.h"
#include "project_settings.h"
/* helpers / binders */
PacketPeer::PacketPeer() {

2
core/io/resource_format_binary.cpp
View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "resource_format_binary.h"
#include "project_settings.h"
#include "image.h"
#include "io/file_access_compressed.h"
#include "io/marshalls.h"
#include "os/dir_access.h"
#include "project_settings.h"
#include "version.h"
//#define print_bl(m_what) print_line(m_what)
#define print_bl(m_what)

2
core/io/resource_saver.cpp
View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "resource_saver.h"
#include "project_settings.h"
#include "os/file_access.h"
#include "project_settings.h"
#include "resource_loader.h"
#include "script_language.h"

24
core/math/face3.h
View File

@ -115,20 +115,20 @@ bool Face3::intersects_aabb2(const Rect3 &p_aabb) const {
if (dist_a * dist_b > 0)
return false; //does not intersect the plane
#define TEST_AXIS(m_ax) \
{ \
#define TEST_AXIS(m_ax) \
{ \
real_t aabb_min = p_aabb.position.m_ax; \
real_t aabb_max = p_aabb.position.m_ax + p_aabb.size.m_ax; \
real_t tri_min, tri_max; \
for (int i = 0; i < 3; i++) { \
if (i == 0 || vertex[i].m_ax > tri_max) \
tri_max = vertex[i].m_ax; \
if (i == 0 || vertex[i].m_ax < tri_min) \
tri_min = vertex[i].m_ax; \
} \
\
if (tri_max < aabb_min || aabb_max < tri_min) \
return false; \
real_t tri_min, tri_max; \
for (int i = 0; i < 3; i++) { \
if (i == 0 || vertex[i].m_ax > tri_max) \
tri_max = vertex[i].m_ax; \
if (i == 0 || vertex[i].m_ax < tri_min) \
tri_min = vertex[i].m_ax; \
} \
\
if (tri_max < aabb_min || aabb_max < tri_min) \
return false; \
}
TEST_AXIS(x);

2
core/os/dir_access.cpp
View File

@ -28,10 +28,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "dir_access.h"
#include "project_settings.h"
#include "os/file_access.h"
#include "os/memory.h"
#include "os/os.h"
#include "project_settings.h"
String DirAccess::_get_root_path() const {

2
core/os/file_access.cpp
View File

@ -31,8 +31,8 @@
#include "core/io/file_access_pack.h"
#include "core/io/marshalls.h"
#include "project_settings.h"
#include "os/os.h"
#include "project_settings.h"
#include "thirdparty/misc/md5.h"
#include "thirdparty/misc/sha256.h"

2
core/os/input.cpp
View File

@ -28,9 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "input.h"
#include "project_settings.h"
#include "input_map.h"
#include "os/os.h"
#include "project_settings.h"
Input *Input::singleton = NULL;
Input *Input::get_singleton() {

2
core/register_core_types.cpp
View File

@ -36,7 +36,6 @@
#include "core_string_names.h"
#include "func_ref.h"
#include "geometry.h"
#include "project_settings.h"
#include "input_map.h"
#include "io/config_file.h"
#include "io/http_client.h"
@ -54,6 +53,7 @@
#include "os/main_loop.h"
#include "packed_data_container.h"
#include "path_remap.h"
#include "project_settings.h"
#include "translation.h"
#include "undo_redo.h"

2
core/script_debugger_remote.cpp
View File

@ -29,10 +29,10 @@
/*************************************************************************/
#include "script_debugger_remote.h"
#include "project_settings.h"
#include "io/ip.h"
#include "os/input.h"
#include "os/os.h"
#include "project_settings.h"
void ScriptDebuggerRemote::_send_video_memory() {

2
core/translation.cpp
View File

@ -29,9 +29,9 @@
/*************************************************************************/
#include "translation.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "os/os.h"
#include "project_settings.h"
static const char *locale_list[] = {
"aa", // Afar

2
editor/collada/collada.h
View File

@ -32,9 +32,9 @@
#ifndef COLLADA_H
#define COLLADA_H
#include "project_settings.h"
#include "io/xml_parser.h"
#include "map.h"
#include "project_settings.h"
#include "scene/resources/material.h"
class Collada {

2
editor/doc/doc_data.cpp
View File

@ -29,10 +29,10 @@
/*************************************************************************/
#include "doc_data.h"
#include "project_settings.h"
#include "global_constants.h"
#include "io/compression.h"
#include "io/marshalls.h"
#include "project_settings.h"
#include "scene/resources/theme.h"
#include "script_language.h"
#include "version.h"

2
editor/editor_autoload_settings.cpp
View File

@ -30,8 +30,8 @@
#include "editor_autoload_settings.h"
#include "editor_node.h"
#include "project_settings.h"
#include "global_constants.h"
#include "project_settings.h"
#define PREVIEW_LIST_MAX_SIZE 10

2
editor/editor_data.cpp
View File

@ -31,10 +31,10 @@
#include "editor_node.h"
#include "editor_settings.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "os/dir_access.h"
#include "os/file_access.h"
#include "project_settings.h"
#include "scene/resources/packed_scene.h"
void EditorHistory::_cleanup_history() {

2
editor/editor_plugin_settings.cpp
View File

@ -30,10 +30,10 @@
#include "editor_plugin_settings.h"
#include "editor_node.h"
#include "project_settings.h"
#include "io/config_file.h"
#include "os/file_access.h"
#include "os/main_loop.h"
#include "project_settings.h"
#include "scene/gui/margin_container.h"
void EditorPluginSettings::_notification(int p_what) {

2
editor/editor_resource_preview.cpp
View File

@ -31,11 +31,11 @@
#include "editor_scale.h"
#include "editor_settings.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "io/resource_saver.h"
#include "message_queue.h"
#include "os/file_access.h"
#include "project_settings.h"
bool EditorResourcePreviewGenerator::handles(const String &p_type) const {

2
editor/file_type_cache.cpp
View File

@ -29,8 +29,8 @@
/*************************************************************************/
#include "file_type_cache.h"
#include "project_settings.h"
#include "os/file_access.h"
#include "project_settings.h"
FileTypeCache *FileTypeCache::singleton = NULL;

2
editor/filesystem_dock.cpp
View File

@ -31,11 +31,11 @@
#include "editor_node.h"
#include "editor_settings.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "os/dir_access.h"
#include "os/file_access.h"
#include "os/os.h"
#include "project_settings.h"
#include "scene/main/viewport.h"
bool FileSystemDock::_create_tree(TreeItem *p_parent, EditorFileSystemDirectory *p_dir) {

4
editor/import/editor_import_collada.cpp
View File

@ -554,10 +554,10 @@ static void _generate_tangents_and_binormals(const PoolVector<int> &p_indices, c
tangent = Vector3();
} else {
tangent = Vector3((t2 * x1 - t1 * x2) * r, (t2 * y1 - t1 * y2) * r,
(t2 * z1 - t1 * z2) * r)
(t2 * z1 - t1 * z2) * r)
.normalized();
binormal = Vector3((s1 * x2 - s2 * x1) * r, (s1 * y2 - s2 * y1) * r,
(s1 * z2 - s2 * z1) * r)
(s1 * z2 - s2 * z1) * r)
.normalized();
}

2
editor/io_plugins/editor_export_scene.cpp
View File

@ -30,11 +30,11 @@
#include "editor_export_scene.h"
#if 0
#include "editor/editor_settings.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "io/resource_saver.h"
#include "os/dir_access.h"
#include "os/file_access.h"
#include "project_settings.h"
#include "scene/resources/packed_scene.h"
Vector<uint8_t> EditorSceneExportPlugin::custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform) {

2
editor/io_plugins/editor_scene_import_plugin.cpp
View File

@ -31,10 +31,10 @@
#if 0
#include "editor/create_dialog.h"
#include "editor/editor_node.h"
#include "project_settings.h"
#include "io/resource_saver.h"
#include "os/file_access.h"
#include "os/os.h"
#include "project_settings.h"
#include "scene/3d/body_shape.h"
#include "scene/3d/mesh_instance.h"
#include "scene/3d/navigation.h"

2
editor/io_plugins/editor_texture_import_plugin.cpp
View File

@ -33,10 +33,10 @@
#include "editor/editor_node.h"
#include "editor/editor_settings.h"
#include "editor_atlas.h"
#include "project_settings.h"
#include "io/image_loader.h"
#include "io/marshalls.h"
#include "io/resource_saver.h"
#include "project_settings.h"
#include "scene/gui/button_group.h"
#include "scene/gui/check_button.h"
#include "scene/gui/margin_container.h"

2
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -31,10 +31,10 @@
#include "editor/animation_editor.h"
#include "editor/editor_settings.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "io/resource_saver.h"
#include "os/keyboard.h"
#include "project_settings.h"
void AnimationPlayerEditor::_node_removed(Node *p_node) {

2
editor/plugins/resource_preloader_editor_plugin.cpp
View File

@ -30,8 +30,8 @@
#include "resource_preloader_editor_plugin.h"
#include "editor/editor_settings.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "project_settings.h"
void ResourcePreloaderEditor::_gui_input(Ref<InputEvent> p_event) {
}

2
editor/plugins/sample_editor_plugin.cpp
View File

@ -31,8 +31,8 @@
#if 0
#include "editor/editor_settings.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "project_settings.h"

2
editor/plugins/sample_library_editor_plugin.cpp
View File

@ -32,8 +32,8 @@
#include "sample_library_editor_plugin.h"
#include "editor/editor_settings.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "project_settings.h"
#include "sample_editor_plugin.h"
#include "scene/main/viewport.h"

2
editor/plugins/sprite_frames_editor_plugin.cpp
View File

@ -30,8 +30,8 @@
#include "sprite_frames_editor_plugin.h"
#include "editor/editor_settings.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "project_settings.h"
#include "scene/3d/sprite_3d.h"
void SpriteFramesEditor::_gui_input(Ref<InputEvent> p_event) {

2
editor/plugins/texture_editor_plugin.cpp
View File

@ -30,8 +30,8 @@
#include "texture_editor_plugin.h"
#include "editor/editor_settings.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "project_settings.h"
void TextureEditor::_gui_input(Ref<InputEvent> p_event) {
}

2
editor/project_export.cpp
View File

@ -32,7 +32,6 @@
#include "editor_data.h"
#include "editor_node.h"
#include "editor_settings.h"
#include "project_settings.h"
#include "io/image_loader.h"
#include "io/resource_loader.h"
#include "io/resource_saver.h"
@ -40,6 +39,7 @@
#include "os/dir_access.h"
#include "os/file_access.h"
#include "os/os.h"
#include "project_settings.h"
#include "scene/gui/box_container.h"
#include "scene/gui/margin_container.h"
#include "scene/gui/scroll_container.h"

2
editor/script_create_dialog.cpp
View File

@ -31,9 +31,9 @@
#include "editor/editor_scale.h"
#include "editor_file_system.h"
#include "project_settings.h"
#include "io/resource_saver.h"
#include "os/file_access.h"
#include "project_settings.h"
#include "script_language.h"
void ScriptCreateDialog::_notification(int p_what) {

2
editor/script_editor_debugger.cpp
View File

@ -32,8 +32,8 @@
#include "editor_node.h"
#include "editor_profiler.h"
#include "editor_settings.h"
#include "project_settings.h"
#include "main/performance.h"
#include "project_settings.h"
#include "property_editor.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/label.h"

2
editor/settings_config_dialog.cpp
View File

@ -32,8 +32,8 @@
#include "editor_file_system.h"
#include "editor_node.h"
#include "editor_settings.h"
#include "project_settings.h"
#include "os/keyboard.h"
#include "project_settings.h"
#include "scene/gui/margin_container.h"
void EditorSettingsDialog::ok_pressed() {

2
platform/iphone/gl_view.mm
View File

@ -29,8 +29,8 @@
/*************************************************************************/
#import "gl_view.h"
#include "core/project_settings.h"
#include "core/os/keyboard.h"
#include "core/project_settings.h"
#include "os_iphone.h"
#include "servers/audio_server.h"

2
platform/iphone/ios.mm
View File

@ -36,7 +36,7 @@ void iOS::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_rate_url", "app_id"), &iOS::get_rate_url);
};
void iOS::alert(const char* p_alert, const char* p_title) {
void iOS::alert(const char *p_alert, const char *p_title) {
UIAlertView *alert = [[[UIAlertView alloc] initWithTitle:[NSString stringWithUTF8String:p_title] message:[NSString stringWithUTF8String:p_alert] delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil, nil] autorelease];
[alert show];
}

3
platform/osx/audio_driver_osx.cpp
View File

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

2
scene/io/resource_format_image.cpp
View File

@ -30,9 +30,9 @@
#include "resource_format_image.h"
#if 0
#include "project_settings.h"
#include "io/image_loader.h"
#include "os/os.h"
#include "project_settings.h"
#include "scene/resources/texture.h"
RES ResourceFormatLoaderImage::load(const String &p_path, const String& p_original_path, Error *r_error) {

2
scene/main/node.h
View File

@ -31,10 +31,10 @@
#define NODE_H
#include "class_db.h"
#include "project_settings.h"
#include "map.h"
#include "object.h"
#include "path_db.h"
#include "project_settings.h"
#include "scene/main/scene_tree.h"
#include "script_language.h"

2
scene/register_scene_types.cpp
View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "register_scene_types.h"
#include "project_settings.h"
#include "os/os.h"
#include "project_settings.h"
#include "scene/io/resource_format_image.h"
#include "scene/io/resource_format_wav.h"

2
scene/resources/packed_scene.cpp
View File

@ -29,8 +29,8 @@
/*************************************************************************/
#include "packed_scene.h"
#include "core/core_string_names.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "project_settings.h"
#include "scene/2d/node_2d.h"
#include "scene/3d/spatial.h"
#include "scene/gui/control.h"

2
scene/resources/scene_format_text.cpp
View File

@ -29,8 +29,8 @@
/*************************************************************************/
#include "scene_format_text.h"
#include "project_settings.h"
#include "os/dir_access.h"
#include "project_settings.h"
#include "version.h"
//version 2: changed names for basis, rect3, poolvectors, etc.

2
scene/resources/texture.h
View File

@ -414,7 +414,7 @@ public:
void set_width(int p_width);
int get_width() const;
void ensure_default_setup(float p_min=0, float p_max=1);
void ensure_default_setup(float p_min = 0, float p_max = 1);
void set_curve(Ref<Curve> p_curve);
Ref<Curve> get_curve() const;