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

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
editor/editor_run_native.cpp
View File

@@ -29,16 +29,14 @@
#include "editor_run_native.h"
#include "editor_import_export.h"
void EditorRunNative::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_TREE) {
if (p_what == NOTIFICATION_ENTER_TREE) {
List<StringName> ep;
EditorImportExport::get_singleton()->get_export_platforms(&ep);
ep.sort_custom<StringName::AlphCompare>();
for(List<StringName>::Element *E=ep.front();E;E=E->next()) {
for (List<StringName>::Element *E = ep.front(); E; E = E->next()) {
Ref<EditorExportPlatform> eep = EditorImportExport::get_singleton()->get_export_platform(E->get());
if (eep.is_null())
@@ -49,35 +47,34 @@ void EditorRunNative::_notification(int p_what) {
im.clear_mipmaps();
if (!im.empty()) {
im.resize(16,16);
im.resize(16, 16);
Ref<ImageTexture> small_icon = memnew( ImageTexture);
Ref<ImageTexture> small_icon = memnew(ImageTexture);
small_icon->create_from_image(im);
MenuButton *mb = memnew( MenuButton );
mb->get_popup()->connect("item_pressed",this,"_run_native",varray(E->get()));
mb->connect("pressed",this,"_run_native",varray(-1, E->get()));
MenuButton *mb = memnew(MenuButton);
mb->get_popup()->connect("item_pressed", this, "_run_native", varray(E->get()));
mb->connect("pressed", this, "_run_native", varray(-1, E->get()));
mb->set_icon(small_icon);
add_child(mb);
menus[E->get()]=mb;
menus[E->get()] = mb;
}
}
}
}
if (p_what==NOTIFICATION_PROCESS) {
if (p_what == NOTIFICATION_PROCESS) {
bool changed = EditorImportExport::get_singleton()->poll_export_platforms() || first;
if (changed) {
for(Map<StringName,MenuButton*>::Element *E=menus.front();E;E=E->next()) {
for (Map<StringName, MenuButton *>::Element *E = menus.front(); E; E = E->next()) {
Ref<EditorExportPlatform> eep = EditorImportExport::get_singleton()->get_export_platform(E->key());
MenuButton *mb = E->get();
int dc = eep->get_device_count();
if (dc==0) {
if (dc == 0) {
mb->hide();
} else {
mb->get_popup()->clear();
@@ -86,21 +83,20 @@ void EditorRunNative::_notification(int p_what) {
mb->set_tooltip(eep->get_device_name(0) + "\n\n" + eep->get_device_info(0).strip_edges());
} else {
mb->set_tooltip("Select device from the list");
for(int i=0;i<dc;i++) {
mb->get_popup()->add_icon_item(get_icon("Play","EditorIcons"),eep->get_device_name(i));
mb->get_popup()->set_item_tooltip(mb->get_popup()->get_item_count() -1,eep->get_device_info(i).strip_edges());
for (int i = 0; i < dc; i++) {
mb->get_popup()->add_icon_item(get_icon("Play", "EditorIcons"), eep->get_device_name(i));
mb->get_popup()->set_item_tooltip(mb->get_popup()->get_item_count() - 1, eep->get_device_info(i).strip_edges());
}
}
}
}
first=false;
first = false;
}
}
}
void EditorRunNative::_run_native(int p_idx,const String& p_platform) {
void EditorRunNative::_run_native(int p_idx, const String &p_platform) {
Ref<EditorExportPlatform> eep = EditorImportExport::get_singleton()->get_export_platform(p_platform);
ERR_FAIL_COND(eep.is_null());
@@ -114,73 +110,71 @@ void EditorRunNative::_run_native(int p_idx,const String& p_platform) {
}
emit_signal("native_run");
int flags=0;
int flags = 0;
if (deploy_debug_remote)
flags|=EditorExportPlatform::EXPORT_REMOTE_DEBUG;
flags |= EditorExportPlatform::EXPORT_REMOTE_DEBUG;
if (deploy_dumb)
flags|=EditorExportPlatform::EXPORT_DUMB_CLIENT;
flags |= EditorExportPlatform::EXPORT_DUMB_CLIENT;
if (debug_collisions)
flags|=EditorExportPlatform::EXPORT_VIEW_COLLISONS;
flags |= EditorExportPlatform::EXPORT_VIEW_COLLISONS;
if (debug_navigation)
flags|=EditorExportPlatform::EXPORT_VIEW_NAVIGATION;
flags |= EditorExportPlatform::EXPORT_VIEW_NAVIGATION;
eep->run(p_idx,flags);
eep->run(p_idx, flags);
}
void EditorRunNative::_bind_methods() {
ObjectTypeDB::bind_method("_run_native",&EditorRunNative::_run_native);
ObjectTypeDB::bind_method("_run_native", &EditorRunNative::_run_native);
ADD_SIGNAL(MethodInfo("native_run"));
}
void EditorRunNative::set_deploy_dumb(bool p_enabled) {
deploy_dumb=p_enabled;
deploy_dumb = p_enabled;
}
bool EditorRunNative::is_deploy_dumb_enabled() const{
bool EditorRunNative::is_deploy_dumb_enabled() const {
return deploy_dumb;
}
void EditorRunNative::set_deploy_debug_remote(bool p_enabled) {
deploy_debug_remote=p_enabled;
deploy_debug_remote = p_enabled;
}
bool EditorRunNative::is_deploy_debug_remote_enabled() const{
bool EditorRunNative::is_deploy_debug_remote_enabled() const {
return deploy_debug_remote;
}
void EditorRunNative::set_debug_collisions(bool p_debug) {
debug_collisions=p_debug;
debug_collisions = p_debug;
}
bool EditorRunNative::get_debug_collisions() const{
bool EditorRunNative::get_debug_collisions() const {
return debug_collisions;
}
void EditorRunNative::set_debug_navigation(bool p_debug) {
debug_navigation=p_debug;
debug_navigation = p_debug;
}
bool EditorRunNative::get_debug_navigation() const{
bool EditorRunNative::get_debug_navigation() const {
return debug_navigation;
}
EditorRunNative::EditorRunNative()
{
EditorRunNative::EditorRunNative() {
set_process(true);
first=true;
deploy_dumb=false;
deploy_debug_remote=false;
debug_collisions=false;
debug_navigation=false;
first = true;
deploy_dumb = false;
deploy_debug_remote = false;
debug_collisions = false;
debug_navigation = false;
}