godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +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

194
core/script_language.cpp
View File

@@ -29,14 +29,14 @@
#include "script_language.h"
ScriptLanguage *ScriptServer::_languages[MAX_LANGUAGES];
int ScriptServer::_language_count=0;
int ScriptServer::_language_count = 0;
bool ScriptServer::scripting_enabled=true;
bool ScriptServer::reload_scripts_on_save=false;
bool ScriptServer::scripting_enabled = true;
bool ScriptServer::reload_scripts_on_save = false;
void Script::_notification( int p_what) {
void Script::_notification(int p_what) {
if (p_what==NOTIFICATION_POSTINITIALIZE) {
if (p_what == NOTIFICATION_POSTINITIALIZE) {
if (ScriptDebugger::get_singleton())
ScriptDebugger::get_singleton()->set_break_language(get_language());
@@ -45,19 +45,18 @@ void Script::_notification( int p_what) {
void Script::_bind_methods() {
ObjectTypeDB::bind_method(_MD("can_instance"),&Script::can_instance);
ObjectTypeDB::bind_method(_MD("can_instance"), &Script::can_instance);
//ObjectTypeDB::bind_method(_MD("instance_create","base_object"),&Script::instance_create);
ObjectTypeDB::bind_method(_MD("instance_has","base_object"),&Script::instance_has);
ObjectTypeDB::bind_method(_MD("has_source_code"),&Script::has_source_code);
ObjectTypeDB::bind_method(_MD("get_source_code"),&Script::get_source_code);
ObjectTypeDB::bind_method(_MD("set_source_code","source"),&Script::set_source_code);
ObjectTypeDB::bind_method(_MD("reload","keep_state"),&Script::reload,DEFVAL(false));
ObjectTypeDB::bind_method(_MD("instance_has", "base_object"), &Script::instance_has);
ObjectTypeDB::bind_method(_MD("has_source_code"), &Script::has_source_code);
ObjectTypeDB::bind_method(_MD("get_source_code"), &Script::get_source_code);
ObjectTypeDB::bind_method(_MD("set_source_code", "source"), &Script::set_source_code);
ObjectTypeDB::bind_method(_MD("reload", "keep_state"), &Script::reload, DEFVAL(false));
}
void ScriptServer::set_scripting_enabled(bool p_enabled) {
scripting_enabled=p_enabled;
scripting_enabled = p_enabled;
}
bool ScriptServer::is_scripting_enabled() {
@@ -65,34 +64,31 @@ bool ScriptServer::is_scripting_enabled() {
return scripting_enabled;
}
int ScriptServer::get_language_count() {
return _language_count;
}
ScriptLanguage* ScriptServer::get_language(int p_idx) {
ScriptLanguage *ScriptServer::get_language(int p_idx) {
ERR_FAIL_INDEX_V(p_idx,_language_count,NULL);
ERR_FAIL_INDEX_V(p_idx, _language_count, NULL);
return _languages[p_idx];
}
void ScriptServer::register_language(ScriptLanguage *p_language) {
ERR_FAIL_COND( _language_count >= MAX_LANGUAGES );
_languages[_language_count++]=p_language;
ERR_FAIL_COND(_language_count >= MAX_LANGUAGES);
_languages[_language_count++] = p_language;
}
void ScriptServer::unregister_language(ScriptLanguage *p_language) {
for(int i=0;i<_language_count;i++) {
if (_languages[i]==p_language) {
for (int i = 0; i < _language_count; i++) {
if (_languages[i] == p_language) {
_language_count--;
if (i<_language_count) {
SWAP(_languages[i],_languages[_language_count]);
if (i < _language_count) {
SWAP(_languages[i], _languages[_language_count]);
}
return;
}
@@ -101,14 +97,14 @@ void ScriptServer::unregister_language(ScriptLanguage *p_language) {
void ScriptServer::init_languages() {
for(int i=0;i<_language_count;i++) {
for (int i = 0; i < _language_count; i++) {
_languages[i]->init();
}
}
void ScriptServer::set_reload_scripts_on_save(bool p_enable) {
reload_scripts_on_save=p_enable;
reload_scripts_on_save = p_enable;
}
bool ScriptServer::is_reload_scripts_on_save_enabled() {
@@ -118,99 +114,87 @@ bool ScriptServer::is_reload_scripts_on_save_enabled() {
void ScriptServer::thread_enter() {
for(int i=0;i<_language_count;i++) {
for (int i = 0; i < _language_count; i++) {
_languages[i]->thread_enter();
}
}
void ScriptServer::thread_exit() {
for(int i=0;i<_language_count;i++) {
for (int i = 0; i < _language_count; i++) {
_languages[i]->thread_exit();
}
}
void ScriptInstance::get_property_state(List<Pair<StringName, Variant> > &state) {
List<PropertyInfo> pinfo;
get_property_list(&pinfo);
for (List<PropertyInfo>::Element *E=pinfo.front();E;E=E->next()) {
for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
if (E->get().usage&PROPERTY_USAGE_STORAGE) {
Pair<StringName,Variant> p;
p.first=E->get().name;
if (get(p.first,p.second))
if (E->get().usage & PROPERTY_USAGE_STORAGE) {
Pair<StringName, Variant> p;
p.first = E->get().name;
if (get(p.first, p.second))
state.push_back(p);
}
}
}
Variant ScriptInstance::call(const StringName& p_method,VARIANT_ARG_DECLARE) {
Variant ScriptInstance::call(const StringName &p_method, VARIANT_ARG_DECLARE) {
VARIANT_ARGPTRS;
int argc=0;
for(int i=0;i<VARIANT_ARG_MAX;i++) {
if (argptr[i]->get_type()==Variant::NIL)
int argc = 0;
for (int i = 0; i < VARIANT_ARG_MAX; i++) {
if (argptr[i]->get_type() == Variant::NIL)
break;
argc++;
}
Variant::CallError error;
return call(p_method,argptr,argc,error);
return call(p_method, argptr, argc, error);
}
void ScriptInstance::call_multilevel(const StringName& p_method,const Variant** p_args,int p_argcount) {
void ScriptInstance::call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount) {
Variant::CallError ce;
call(p_method,p_args,p_argcount,ce); // script may not support multilevel calls
call(p_method, p_args, p_argcount, ce); // script may not support multilevel calls
}
void ScriptInstance::call_multilevel_reversed(const StringName& p_method,const Variant** p_args,int p_argcount) {
void ScriptInstance::call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount) {
Variant::CallError ce;
call(p_method,p_args,p_argcount,ce); // script may not support multilevel calls
call(p_method, p_args, p_argcount, ce); // script may not support multilevel calls
}
void ScriptInstance::call_multilevel(const StringName& p_method,VARIANT_ARG_DECLARE) {
void ScriptInstance::call_multilevel(const StringName &p_method, VARIANT_ARG_DECLARE) {
VARIANT_ARGPTRS;
int argc=0;
for(int i=0;i<VARIANT_ARG_MAX;i++) {
if (argptr[i]->get_type()==Variant::NIL)
int argc = 0;
for (int i = 0; i < VARIANT_ARG_MAX; i++) {
if (argptr[i]->get_type() == Variant::NIL)
break;
argc++;
}
Variant::CallError error;
call_multilevel(p_method,argptr,argc);
call_multilevel(p_method, argptr, argc);
}
ScriptInstance::~ScriptInstance() {
}
ScriptCodeCompletionCache *ScriptCodeCompletionCache::singleton=NULL;
ScriptCodeCompletionCache *ScriptCodeCompletionCache::singleton = NULL;
ScriptCodeCompletionCache::ScriptCodeCompletionCache() {
singleton=this;
singleton = this;
}
void ScriptLanguage::frame() {
}
ScriptDebugger * ScriptDebugger::singleton=NULL;
ScriptDebugger *ScriptDebugger::singleton = NULL;
void ScriptDebugger::set_lines_left(int p_left) {
lines_left=p_left;
lines_left = p_left;
}
int ScriptDebugger::get_lines_left() const {
@@ -220,7 +204,7 @@ int ScriptDebugger::get_lines_left() const {
void ScriptDebugger::set_depth(int p_depth) {
depth=p_depth;
depth = p_depth;
}
int ScriptDebugger::get_depth() const {
@@ -228,38 +212,34 @@ int ScriptDebugger::get_depth() const {
return depth;
}
void ScriptDebugger::insert_breakpoint(int p_line, const StringName& p_source) {
void ScriptDebugger::insert_breakpoint(int p_line, const StringName &p_source) {
if (!breakpoints.has(p_line))
breakpoints[p_line]=Set<StringName>();
breakpoints[p_line] = Set<StringName>();
breakpoints[p_line].insert(p_source);
}
void ScriptDebugger::remove_breakpoint(int p_line, const StringName& p_source) {
void ScriptDebugger::remove_breakpoint(int p_line, const StringName &p_source) {
if (!breakpoints.has(p_line))
return;
breakpoints[p_line].erase(p_source);
if (breakpoints[p_line].size()==0)
if (breakpoints[p_line].size() == 0)
breakpoints.erase(p_line);
}
bool ScriptDebugger::is_breakpoint(int p_line,const StringName& p_source) const {
bool ScriptDebugger::is_breakpoint(int p_line, const StringName &p_source) const {
if (!breakpoints.has(p_line))
return false;
return breakpoints[p_line].has(p_source);
}
bool ScriptDebugger::is_breakpoint_line(int p_line) const {
return breakpoints.has(p_line);
}
String ScriptDebugger::breakpoint_find_source(const String& p_source) const {
String ScriptDebugger::breakpoint_find_source(const String &p_source) const {
return p_source;
}
@@ -270,116 +250,108 @@ void ScriptDebugger::clear_breakpoints() {
}
void ScriptDebugger::idle_poll() {
}
void ScriptDebugger::line_poll() {
}
void ScriptDebugger::set_break_language(ScriptLanguage *p_lang) {
break_lang=p_lang;
break_lang = p_lang;
}
ScriptLanguage* ScriptDebugger::get_break_language() const{
ScriptLanguage *ScriptDebugger::get_break_language() const {
return break_lang;
}
ScriptDebugger::ScriptDebugger() {
singleton=this;
lines_left=-1;
depth=-1;
break_lang=NULL;
singleton = this;
lines_left = -1;
depth = -1;
break_lang = NULL;
}
bool PlaceHolderScriptInstance::set(const StringName& p_name, const Variant& p_value) {
bool PlaceHolderScriptInstance::set(const StringName &p_name, const Variant &p_value) {
if (values.has(p_name)) {
values[p_name]=p_value;
values[p_name] = p_value;
return true;
}
return false;
}
bool PlaceHolderScriptInstance::get(const StringName& p_name, Variant &r_ret) const {
bool PlaceHolderScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
if (values.has(p_name)) {
r_ret=values[p_name];
r_ret = values[p_name];
return true;
} return false;
}
return false;
}
void PlaceHolderScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const {
for(const List<PropertyInfo>::Element *E=properties.front();E;E=E->next()) {
for (const List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
p_properties->push_back(E->get());
}
}
Variant::Type PlaceHolderScriptInstance::get_property_type(const StringName& p_name,bool *r_is_valid) const {
Variant::Type PlaceHolderScriptInstance::get_property_type(const StringName &p_name, bool *r_is_valid) const {
if (values.has(p_name)) {
if (values.has(p_name)) {
if (r_is_valid)
*r_is_valid=true;
*r_is_valid = true;
return values[p_name].get_type();
}
if (r_is_valid)
*r_is_valid=false;
*r_is_valid = false;
return Variant::NIL;
}
void PlaceHolderScriptInstance::update(const List<PropertyInfo> &p_properties,const Map<StringName,Variant>& p_values) {
void PlaceHolderScriptInstance::update(const List<PropertyInfo> &p_properties, const Map<StringName, Variant> &p_values) {
Set<StringName> new_values;
for(const List<PropertyInfo>::Element *E=p_properties.front();E;E=E->next()) {
for (const List<PropertyInfo>::Element *E = p_properties.front(); E; E = E->next()) {
StringName n = E->get().name;
new_values.insert(n);
if (!values.has(n) || values[n].get_type()!=E->get().type) {
if (!values.has(n) || values[n].get_type() != E->get().type) {
if (p_values.has(n))
values[n]=p_values[n];
values[n] = p_values[n];
}
}
properties=p_properties;
properties = p_properties;
List<StringName> to_remove;
for(Map<StringName,Variant>::Element *E=values.front();E;E=E->next()) {
for (Map<StringName, Variant>::Element *E = values.front(); E; E = E->next()) {
if (!new_values.has(E->key()))
to_remove.push_back(E->key());
}
while(to_remove.size()) {
while (to_remove.size()) {
values.erase(to_remove.front()->get());
to_remove.pop_front();
}
if (owner && owner->get_script_instance()==this) {
if (owner && owner->get_script_instance() == this) {
owner->_change_notify();
}
//change notify
}
PlaceHolderScriptInstance::PlaceHolderScriptInstance(ScriptLanguage *p_language, Ref<Script> p_script,Object *p_owner) {
PlaceHolderScriptInstance::PlaceHolderScriptInstance(ScriptLanguage *p_language, Ref<Script> p_script, Object *p_owner) {
language=p_language;
script=p_script;
owner=p_owner;
language = p_language;
script = p_script;
owner = p_owner;
}
PlaceHolderScriptInstance::~PlaceHolderScriptInstance() {