nick/godot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A Whole New World (clang-format edition)

Browse Source 
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?

I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon

A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format

A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
This commit is contained in:
Rémi Verschelde
2017-03-05 16:44:50 +01:00
parent 45438e9918
commit 5dbf1809c6
1318 changed files with 140051 additions and 166004 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/editor_run_script.cpp
+13 -19
View File
@@ -30,16 +30,15 @@
#include "editor_node.h"
void EditorScript::add_root_node(Node *p_node) {
if (!editor) {
EditorNode::add_io_error("EditorScript::add_root_node: "+TTR("Write your logic in the _run() method."));
EditorNode::add_io_error("EditorScript::add_root_node: " + TTR("Write your logic in the _run() method."));
return;
}
if (editor->get_edited_scene()) {
EditorNode::add_io_error("EditorScript::add_root_node: "+TTR("There is an edited scene already."));
EditorNode::add_io_error("EditorScript::add_root_node: " + TTR("There is an edited scene already."));
return;
}
@@ -49,7 +48,7 @@ void EditorScript::add_root_node(Node *p_node) {
Node *EditorScript::get_scene() {
if (!editor) {
EditorNode::add_io_error("EditorScript::get_scene: "+TTR("Write your logic in the _run() method."));
EditorNode::add_io_error("EditorScript::get_scene: " + TTR("Write your logic in the _run() method."));
return NULL;
}
@@ -61,37 +60,32 @@ void EditorScript::_run() {
Ref<Script> s = get_script();
ERR_FAIL_COND(!s.is_valid());
if (!get_script_instance()) {
EditorNode::add_io_error(TTR("Couldn't instance script:")+"\n "+s->get_path()+"\n"+TTR("Did you forget the 'tool' keyword?"));
EditorNode::add_io_error(TTR("Couldn't instance script:") + "\n " + s->get_path() + "\n" + TTR("Did you forget the 'tool' keyword?"));
return;
}
Variant::CallError ce;
ce.error=Variant::CallError::CALL_OK;
get_script_instance()->call("_run",NULL,0,ce);
if (ce.error!=Variant::CallError::CALL_OK) {
ce.error = Variant::CallError::CALL_OK;
get_script_instance()->call("_run", NULL, 0, ce);
if (ce.error != Variant::CallError::CALL_OK) {
EditorNode::add_io_error(TTR("Couldn't run script:")+"\n "+s->get_path()+"\n"+TTR("Did you forget the '_run' method?"));
EditorNode::add_io_error(TTR("Couldn't run script:") + "\n " + s->get_path() + "\n" + TTR("Did you forget the '_run' method?"));
}
}
void EditorScript::set_editor(EditorNode *p_editor) {
editor=p_editor;
editor = p_editor;
}
void EditorScript::_bind_methods() {
ClassDB::bind_method(D_METHOD("add_root_node","node"),&EditorScript::add_root_node);
ClassDB::bind_method(D_METHOD("get_scene"),&EditorScript::get_scene);
BIND_VMETHOD( MethodInfo("_run") );
ClassDB::bind_method(D_METHOD("add_root_node", "node"), &EditorScript::add_root_node);
ClassDB::bind_method(D_METHOD("get_scene"), &EditorScript::get_scene);
BIND_VMETHOD(MethodInfo("_run"));
}
EditorScript::EditorScript() {
editor=NULL;
editor = NULL;
}