From 31ce3c5fd0300aac1e86bced1efc5f9ec94bdb6b Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 13 Mar 2014 22:57:24 -0300 Subject: -fix bug in cache for atlas import/export -fix some menus -fixed bug in out transition curves -detect and remove file:/// in collada -remove multiscript for now -remove dependencies on mouse in OS, moved to Input -avoid fscache from screwing up (fix might make it slower, but it works) -funcref was missing, it's there now --- modules/multiscript/SCsub | 7 - modules/multiscript/config.py | 11 - modules/multiscript/multi_script.cpp | 498 --------------------------------- modules/multiscript/multi_script.h | 158 ----------- modules/multiscript/register_types.cpp | 32 --- modules/multiscript/register_types.h | 30 -- 6 files changed, 736 deletions(-) delete mode 100644 modules/multiscript/SCsub delete mode 100644 modules/multiscript/config.py delete mode 100644 modules/multiscript/multi_script.cpp delete mode 100644 modules/multiscript/multi_script.h delete mode 100644 modules/multiscript/register_types.cpp delete mode 100644 modules/multiscript/register_types.h (limited to 'modules/multiscript') diff --git a/modules/multiscript/SCsub b/modules/multiscript/SCsub deleted file mode 100644 index d20da72b72..0000000000 --- a/modules/multiscript/SCsub +++ /dev/null @@ -1,7 +0,0 @@ -Import('env') - -env.add_source_files(env.modules_sources,"*.cpp") - -Export('env') - - diff --git a/modules/multiscript/config.py b/modules/multiscript/config.py deleted file mode 100644 index f9bd7da08d..0000000000 --- a/modules/multiscript/config.py +++ /dev/null @@ -1,11 +0,0 @@ - - -def can_build(platform): - return True - - -def configure(env): - pass - - - diff --git a/modules/multiscript/multi_script.cpp b/modules/multiscript/multi_script.cpp deleted file mode 100644 index 1924cf2a6e..0000000000 --- a/modules/multiscript/multi_script.cpp +++ /dev/null @@ -1,498 +0,0 @@ -/*************************************************************************/ -/* multi_script.cpp */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* http://www.godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ -#include "multi_script.h" - -bool MultiScriptInstance::set(const StringName& p_name, const Variant& p_value) { - - ScriptInstance **sarr = instances.ptr(); - int sc = instances.size(); - - for(int i=0;iset(p_name,p_value); - if (found) - return true; - } - - if (String(p_name).begins_with("script_")) { - bool valid; - owner->set(p_name,p_value,&valid); - return valid; - } - return false; - -} - -bool MultiScriptInstance::get(const StringName& p_name, Variant &r_ret) const{ - - ScriptInstance **sarr = instances.ptr(); - int sc = instances.size(); - - for(int i=0;iget(p_name,r_ret); - if (found) - return true; - } - if (String(p_name).begins_with("script_")) { - bool valid; - r_ret=owner->get(p_name,&valid); - return valid; - } - return false; - -} -void MultiScriptInstance::get_property_list(List *p_properties) const{ - - ScriptInstance **sarr = instances.ptr(); - int sc = instances.size(); - - - Set existing; - - for(int i=0;i pl; - sarr[i]->get_property_list(&pl); - - for(List::Element *E=pl.front();E;E=E->next()) { - - if (existing.has(E->get().name)) - continue; - - p_properties->push_back(E->get()); - existing.insert(E->get().name); - } - } - - p_properties->push_back( PropertyInfo(Variant::NIL,"Scripts",PROPERTY_HINT_NONE,String(),PROPERTY_USAGE_CATEGORY) ); - - for(int i=0;iscripts.size();i++) { - - p_properties->push_back( PropertyInfo(Variant::OBJECT,"script_"+String::chr('a'+i),PROPERTY_HINT_RESOURCE_TYPE,"Script",PROPERTY_USAGE_EDITOR) ); - - } - - if (owner->scripts.size()<25) { - - p_properties->push_back( PropertyInfo(Variant::OBJECT,"script_"+String::chr('a'+(owner->scripts.size())),PROPERTY_HINT_RESOURCE_TYPE,"Script",PROPERTY_USAGE_EDITOR) ); - } - -} - -void MultiScriptInstance::get_method_list(List *p_list) const{ - - ScriptInstance **sarr = instances.ptr(); - int sc = instances.size(); - - - Set existing; - - for(int i=0;i ml; - sarr[i]->get_method_list(&ml); - - for(List::Element *E=ml.front();E;E=E->next()) { - - if (existing.has(E->get().name)) - continue; - - p_list->push_back(E->get()); - existing.insert(E->get().name); - } - } - -} -bool MultiScriptInstance::has_method(const StringName& p_method) const{ - - ScriptInstance **sarr = instances.ptr(); - int sc = instances.size(); - - for(int i=0;ihas_method(p_method)) - return true; - } - - return false; - -} - -Variant MultiScriptInstance::call(const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error) { - - ScriptInstance **sarr = instances.ptr(); - int sc = instances.size(); - - for(int i=0;icall(p_method,p_args,p_argcount,r_error); - if (r_error.error==Variant::CallError::CALL_OK) - return r; - else if (r_error.error!=Variant::CallError::CALL_ERROR_INVALID_METHOD) - return r; - } - - r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD; - return Variant(); - -} - -void MultiScriptInstance::call_multilevel(const StringName& p_method,const Variant** p_args,int p_argcount){ - - ScriptInstance **sarr = instances.ptr(); - int sc = instances.size(); - - for(int i=0;icall_multilevel(p_method,p_args,p_argcount); - } - - -} -void MultiScriptInstance::notification(int p_notification){ - - ScriptInstance **sarr = instances.ptr(); - int sc = instances.size(); - - for(int i=0;inotification(p_notification); - } - -} - - -Ref