From 0fa94a96904a8ff44d1a26fd6b783c2d6a533540 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 7 Oct 2014 01:31:49 -0300 Subject: Build System Changes -=-=-=-=-=-=-=-=-=-= Build System: -Big clean up of SCons, changed how builds are done to a much cleaner method (check the Github Wiki for instructions). -Deactivated BlackBerry10 (sorry), if no mantainer found (or BlackBerry does not send us a Passort ;), platform will be removed as we have no longer devices to test. Engine: -Removed deprecated object and scene format (was in there just for compatibility, not in use since a long time). -Added ability to open scenes even if a node type was removed (will try to guess the closest type). -Removed deprecated node types. --- core/io/object_format_binary.cpp | 1491 ------------------ core/io/object_format_binary.h | 158 -- core/io/object_format_xml.cpp | 3190 -------------------------------------- core/io/object_format_xml.h | 196 --- core/io/object_loader.cpp | 84 - core/io/object_loader.h | 76 - core/io/object_saver.cpp | 157 -- core/io/object_saver.h | 128 -- core/io/object_saver_base.cpp | 150 -- core/io/object_saver_base.h | 76 - 10 files changed, 5706 deletions(-) delete mode 100644 core/io/object_format_binary.cpp delete mode 100644 core/io/object_format_binary.h delete mode 100644 core/io/object_format_xml.cpp delete mode 100644 core/io/object_format_xml.h delete mode 100644 core/io/object_loader.cpp delete mode 100644 core/io/object_loader.h delete mode 100644 core/io/object_saver.cpp delete mode 100644 core/io/object_saver.h delete mode 100644 core/io/object_saver_base.cpp delete mode 100644 core/io/object_saver_base.h (limited to 'core/io') diff --git a/core/io/object_format_binary.cpp b/core/io/object_format_binary.cpp deleted file mode 100644 index c031f6e82b..0000000000 --- a/core/io/object_format_binary.cpp +++ /dev/null @@ -1,1491 +0,0 @@ -/*************************************************************************/ -/* object_format_binary.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 "object_format_binary.h" -#include "resource.h" -#include "io/resource_loader.h" -#include "print_string.h" -#include "object_type_db.h" -#include "globals.h" -#include "os/os.h" -#include "version.h" - - -#define print_bl(m_what) -#ifdef OLD_SCENE_FORMAT_ENABLED - - -enum { - - SECTION_RESOURCE=0, - SECTION_OBJECT=1, - SECTION_META_OBJECT=2, - SECTION_PROPERTY=3, - SECTION_END=4, - - //numbering must be different from variant, in case new variant types are added (variant must be always contiguous for jumptable optimization) - VARIANT_NIL=1, - VARIANT_BOOL=2, - VARIANT_INT=3, - VARIANT_REAL=4, - VARIANT_STRING=5, - VARIANT_VECTOR2=10, - VARIANT_RECT2=11, - VARIANT_VECTOR3=12, - VARIANT_PLANE=13, - VARIANT_QUAT=14, - VARIANT_AABB=15, - VARIANT_MATRIX3=16, - VARIANT_TRANSFORM=17, - VARIANT_MATRIX32=18, - VARIANT_COLOR=20, - VARIANT_IMAGE=21, - VARIANT_NODE_PATH=22, - VARIANT_RID=23, - VARIANT_OBJECT=24, - VARIANT_INPUT_EVENT=25, - VARIANT_DICTIONARY=26, - VARIANT_ARRAY=30, - VARIANT_RAW_ARRAY=31, - VARIANT_INT_ARRAY=32, - VARIANT_REAL_ARRAY=33, - VARIANT_STRING_ARRAY=34, - VARIANT_VECTOR3_ARRAY=35, - VARIANT_COLOR_ARRAY=36, - VARIANT_VECTOR2_ARRAY=37, - - IMAGE_ENCODING_EMPTY=0, - IMAGE_ENCODING_RAW=1, - IMAGE_ENCODING_PNG=2, //not yet - IMAGE_ENCODING_JPG=3, - - IMAGE_FORMAT_GRAYSCALE=0, - IMAGE_FORMAT_INTENSITY=1, - IMAGE_FORMAT_GRAYSCALE_ALPHA=2, - IMAGE_FORMAT_RGB=3, - IMAGE_FORMAT_RGBA=4, - IMAGE_FORMAT_INDEXED=5, - IMAGE_FORMAT_INDEXED_ALPHA=6, - IMAGE_FORMAT_BC1=7, - IMAGE_FORMAT_BC2=8, - IMAGE_FORMAT_BC3=9, - IMAGE_FORMAT_BC4=10, - IMAGE_FORMAT_BC5=11, - IMAGE_FORMAT_CUSTOM=12, - - OBJECT_EMPTY=0, - OBJECT_EXTERNAL_RESOURCE=1, - OBJECT_INTERNAL_RESOURCE=2, - - -}; - - -void ObjectFormatSaverBinary::_pad_buffer(int p_bytes) { - - int extra = 4-(p_bytes%4); - if (extra<4) { - for(int i=0;istore_8(0); //pad to 32 - } - -} - - -void ObjectFormatSaverBinary::write_property(int p_idx,const Variant& p_property) { - - f->store_32(SECTION_PROPERTY); - f->store_32(p_idx); - - switch(p_property.get_type()) { - - case Variant::NIL: { - - f->store_32(VARIANT_NIL); - // don't store anything - } break; - case Variant::BOOL: { - - f->store_32(VARIANT_BOOL); - bool val=p_property; - f->store_32(val); - } break; - case Variant::INT: { - - f->store_32(VARIANT_INT); - int val=p_property; - f->store_32(val); - } break; - case Variant::REAL: { - - f->store_32(VARIANT_REAL); - real_t val=p_property; - f->store_real(val); - - } break; - case Variant::STRING: { - - f->store_32(VARIANT_STRING); - String val=p_property; - save_unicode_string(val); - - } break; - case Variant::VECTOR2: { - - f->store_32(VARIANT_VECTOR2); - Vector2 val=p_property; - f->store_real(val.x); - f->store_real(val.y); - - } break; - case Variant::RECT2: { - - f->store_32(VARIANT_RECT2); - Rect2 val=p_property; - f->store_real(val.pos.x); - f->store_real(val.pos.y); - f->store_real(val.size.x); - f->store_real(val.size.y); - - } break; - case Variant::VECTOR3: { - - f->store_32(VARIANT_VECTOR3); - Vector3 val=p_property; - f->store_real(val.x); - f->store_real(val.y); - f->store_real(val.z); - - } break; - case Variant::PLANE: { - - f->store_32(VARIANT_PLANE); - Plane val=p_property; - f->store_real(val.normal.x); - f->store_real(val.normal.y); - f->store_real(val.normal.z); - f->store_real(val.d); - - } break; - case Variant::QUAT: { - - f->store_32(VARIANT_QUAT); - Quat val=p_property; - f->store_real(val.x); - f->store_real(val.y); - f->store_real(val.z); - f->store_real(val.w); - - } break; - case Variant::_AABB: { - - f->store_32(VARIANT_AABB); - AABB val=p_property; - f->store_real(val.pos.x); - f->store_real(val.pos.y); - f->store_real(val.pos.z); - f->store_real(val.size.x); - f->store_real(val.size.y); - f->store_real(val.size.z); - - } break; - case Variant::MATRIX32: { - - f->store_32(VARIANT_MATRIX32); - Matrix32 val=p_property; - f->store_real(val.elements[0].x); - f->store_real(val.elements[0].y); - f->store_real(val.elements[1].x); - f->store_real(val.elements[1].y); - f->store_real(val.elements[2].x); - f->store_real(val.elements[2].y); - - } break; - case Variant::MATRIX3: { - - f->store_32(VARIANT_MATRIX3); - Matrix3 val=p_property; - f->store_real(val.elements[0].x); - f->store_real(val.elements[0].y); - f->store_real(val.elements[0].z); - f->store_real(val.elements[1].x); - f->store_real(val.elements[1].y); - f->store_real(val.elements[1].z); - f->store_real(val.elements[2].x); - f->store_real(val.elements[2].y); - f->store_real(val.elements[2].z); - - } break; - case Variant::TRANSFORM: { - - f->store_32(VARIANT_TRANSFORM); - Transform val=p_property; - f->store_real(val.basis.elements[0].x); - f->store_real(val.basis.elements[0].y); - f->store_real(val.basis.elements[0].z); - f->store_real(val.basis.elements[1].x); - f->store_real(val.basis.elements[1].y); - f->store_real(val.basis.elements[1].z); - f->store_real(val.basis.elements[2].x); - f->store_real(val.basis.elements[2].y); - f->store_real(val.basis.elements[2].z); - f->store_real(val.origin.x); - f->store_real(val.origin.y); - f->store_real(val.origin.z); - - } break; - case Variant::COLOR: { - - f->store_32(VARIANT_COLOR); - Color val=p_property; - f->store_real(val.r); - f->store_real(val.g); - f->store_real(val.b); - f->store_real(val.a); - - } break; - case Variant::IMAGE: { - - f->store_32(VARIANT_IMAGE); - Image val =p_property; - if (val.empty()) { - f->store_32(IMAGE_ENCODING_EMPTY); - break; - } - f->store_32(IMAGE_ENCODING_RAW); //raw encoding - f->store_32(val.get_width()); - f->store_32(val.get_height()); - f->store_32(val.get_mipmaps()); - switch(val.get_format()) { - - case Image::FORMAT_GRAYSCALE: f->store_32(IMAGE_FORMAT_GRAYSCALE ); break; ///< one byte per pixel: f->store_32(IMAGE_FORMAT_ ); break; 0-255 - case Image::FORMAT_INTENSITY: f->store_32(IMAGE_FORMAT_INTENSITY ); break; ///< one byte per pixel: f->store_32(IMAGE_FORMAT_ ); break; 0-255 - case Image::FORMAT_GRAYSCALE_ALPHA: f->store_32(IMAGE_FORMAT_GRAYSCALE_ALPHA ); break; ///< two bytes per pixel: f->store_32(IMAGE_FORMAT_ ); break; 0-255. alpha 0-255 - case Image::FORMAT_RGB: f->store_32(IMAGE_FORMAT_RGB ); break; ///< one byte R: f->store_32(IMAGE_FORMAT_ ); break; one byte G: f->store_32(IMAGE_FORMAT_ ); break; one byte B - case Image::FORMAT_RGBA: f->store_32(IMAGE_FORMAT_RGBA ); break; ///< one byte R: f->store_32(IMAGE_FORMAT_ ); break; one byte G: f->store_32(IMAGE_FORMAT_ ); break; one byte B: f->store_32(IMAGE_FORMAT_ ); break; one byte A - case Image::FORMAT_INDEXED: f->store_32(IMAGE_FORMAT_INDEXED ); break; ///< index byte 0-256: f->store_32(IMAGE_FORMAT_ ); break; and after image end: f->store_32(IMAGE_FORMAT_ ); break; 256*3 bytes of palette - case Image::FORMAT_INDEXED_ALPHA: f->store_32(IMAGE_FORMAT_INDEXED_ALPHA ); break; ///< index byte 0-256: f->store_32(IMAGE_FORMAT_ ); break; and after image end: f->store_32(IMAGE_FORMAT_ ); break; 256*4 bytes of palette (alpha) - case Image::FORMAT_BC1: f->store_32(IMAGE_FORMAT_BC1 ); break; // DXT1 - case Image::FORMAT_BC2: f->store_32(IMAGE_FORMAT_BC2 ); break; // DXT3 - case Image::FORMAT_BC3: f->store_32(IMAGE_FORMAT_BC3 ); break; // DXT5 - case Image::FORMAT_BC4: f->store_32(IMAGE_FORMAT_BC4 ); break; // ATI1 - case Image::FORMAT_BC5: f->store_32(IMAGE_FORMAT_BC5 ); break; // ATI2 - case Image::FORMAT_CUSTOM: f->store_32(IMAGE_FORMAT_CUSTOM ); break; - default: {} - - } - - int dlen = val.get_data().size(); - f->store_32(dlen); - DVector::Read r = val.get_data().read(); - f->store_buffer(r.ptr(),dlen); - _pad_buffer(dlen); - - } break; - case Variant::NODE_PATH: { - f->store_32(VARIANT_NODE_PATH); - save_unicode_string(p_property); - } break; - case Variant::_RID: { - - f->store_32(VARIANT_RID); - WARN_PRINT("Can't save RIDs"); - RID val = p_property; - f->store_32(val.get_id()); - } break; - case Variant::OBJECT: { - - f->store_32(VARIANT_OBJECT); - RES res = p_property; - if (res.is_null()) { - f->store_32(OBJECT_EMPTY); - return; // don't save it - } - - if (res->get_path().length() && res->get_path().find("::")==-1) { - f->store_32(OBJECT_EXTERNAL_RESOURCE); - save_unicode_string(res->get_type()); - String path=relative_paths?local_path.path_to_file(res->get_path()):res->get_path(); - save_unicode_string(path); - } else { - - if (!resource_map.has(res)) { - f->store_32(OBJECT_EMPTY); - ERR_EXPLAIN("Resource was not pre cached for the resource section, bug?"); - ERR_FAIL(); - } - - f->store_32(OBJECT_INTERNAL_RESOURCE); - f->store_32(resource_map[res]); - //internal resource - } - - - } break; - case Variant::INPUT_EVENT: { - - f->store_32(VARIANT_INPUT_EVENT); - WARN_PRINT("Can't save InputEvent (maybe it could..)"); - } break; - case Variant::DICTIONARY: { - - f->store_32(VARIANT_DICTIONARY); - Dictionary d = p_property; - f->store_32(d.size()); - - List keys; - d.get_key_list(&keys); - - for(List::Element *E=keys.front();E;E=E->next()) { - - //if (!_check_type(dict[E->get()])) - // continue; - - write_property(0,E->get()); - write_property(0,d[E->get()]); - } - - - } break; - case Variant::ARRAY: { - - f->store_32(VARIANT_ARRAY); - Array a=p_property; - f->store_32(a.size()); - for(int i=0;istore_32(VARIANT_RAW_ARRAY); - DVector arr = p_property; - int len=arr.size(); - f->store_32(len); - DVector::Read r = arr.read(); - f->store_buffer(r.ptr(),len); - _pad_buffer(len); - - } break; - case Variant::INT_ARRAY: { - - f->store_32(VARIANT_INT_ARRAY); - DVector arr = p_property; - int len=arr.size(); - f->store_32(len); - DVector::Read r = arr.read(); - for(int i=0;istore_32(r[i]); - - } break; - case Variant::REAL_ARRAY: { - - f->store_32(VARIANT_REAL_ARRAY); - DVector arr = p_property; - int len=arr.size(); - f->store_32(len); - DVector::Read r = arr.read(); - for(int i=0;istore_real(r[i]); - } - - } break; - case Variant::STRING_ARRAY: { - - f->store_32(VARIANT_STRING_ARRAY); - DVector arr = p_property; - int len=arr.size(); - f->store_32(len); - DVector::Read r = arr.read(); - for(int i=0;istore_32(VARIANT_VECTOR3_ARRAY); - DVector arr = p_property; - int len=arr.size(); - f->store_32(len); - DVector::Read r = arr.read(); - for(int i=0;istore_real(r[i].x); - f->store_real(r[i].y); - f->store_real(r[i].z); - } - - } break; - case Variant::VECTOR2_ARRAY: { - - f->store_32(VARIANT_VECTOR2_ARRAY); - DVector arr = p_property; - int len=arr.size(); - f->store_32(len); - DVector::Read r = arr.read(); - for(int i=0;istore_real(r[i].x); - f->store_real(r[i].y); - } - - } break; - case Variant::COLOR_ARRAY: { - - f->store_32(VARIANT_COLOR_ARRAY); - DVector arr = p_property; - int len=arr.size(); - f->store_32(len); - DVector::Read r = arr.read(); - for(int i=0;istore_real(r[i].r); - f->store_real(r[i].g); - f->store_real(r[i].b); - f->store_real(r[i].a); - } - - } break; - default: { - - ERR_EXPLAIN("Invalid variant"); - ERR_FAIL(); - } - } -} - - -void ObjectFormatSaverBinary::_find_resources(const Variant& p_variant) { - - - switch(p_variant.get_type()) { - case Variant::OBJECT: { - - - RES res = p_variant.operator RefPtr(); - - if (res.is_null()) - return; - - if (!bundle_resources && res->get_path().length() && res->get_path().find("::") == -1 ) - return; - - if (resource_map.has(res)) - return; - - List property_list; - - res->get_property_list(&property_list); - - for(List::Element *E=property_list.front();E;E=E->next()) { - - if (E->get().usage&PROPERTY_USAGE_STORAGE || (bundle_resources && E->get().usage&PROPERTY_USAGE_BUNDLE)) { - - _find_resources(res->get(E->get().name)); - } - } - - SavedObject *so = memnew( SavedObject ); - _save_obj(res.ptr(),so); - so->meta=res.get_ref_ptr(); - - resource_map[ res ] = saved_resources.size(); - saved_resources.push_back(so); - - } break; - - case Variant::ARRAY: { - - Array varray=p_variant; - int len=varray.size(); - for(int i=0;i keys; - d.get_key_list(&keys); - for(List::Element *E=keys.front();E;E=E->next()) { - - Variant v = d[E->get()]; - _find_resources(v); - } - } break; - default: {} - } - -} -Error ObjectFormatSaverBinary::_save_obj(const Object *p_object,SavedObject *so) { - - if (optimizer.is_valid()) { - //use optimizer - - List props; - optimizer->get_property_list(p_object,&props); - - for(List::Element *E=props.front();E;E=E->next()) { - - if (skip_editor && String(E->get().name).begins_with("__editor")) - continue; - _find_resources(E->get().value); - SavedObject::SavedProperty sp; - - sp.name_idx=get_string_index(E->get().name); - sp.value=E->get().value; - so->properties.push_back(sp); - } - - } else { - //use classic way - List property_list; - p_object->get_property_list( &property_list ); - - for(List::Element *E=property_list.front();E;E=E->next()) { - - if (skip_editor && E->get().name.begins_with("__editor")) - continue; - if (E->get().usage&PROPERTY_USAGE_STORAGE || (bundle_resources && E->get().usage&PROPERTY_USAGE_BUNDLE)) { - - SavedObject::SavedProperty sp; - sp.name_idx=get_string_index(E->get().name); - sp.value = p_object->get(E->get().name); - _find_resources(sp.value); - so->properties.push_back(sp); - } - } - } - - return OK; - -} - -Error ObjectFormatSaverBinary::save(const Object *p_object,const Variant &p_meta) { - - ERR_FAIL_COND_V(!f,ERR_UNCONFIGURED); - ERR_EXPLAIN("write_object should supply either an object, a meta, or both"); - ERR_FAIL_COND_V(!p_object && p_meta.get_type()==Variant::NIL, ERR_INVALID_PARAMETER); - - SavedObject *so = memnew( SavedObject ); - - if (p_object) - so->type=p_object->get_type(); - - _find_resources(p_meta); - so->meta=p_meta; - Error err = _save_obj(p_object,so); - ERR_FAIL_COND_V( err, ERR_INVALID_DATA ); - - saved_objects.push_back(so); - - return OK; -} - -void ObjectFormatSaverBinary::save_unicode_string(const String& p_string) { - - - CharString utf8 = p_string.utf8(); - f->store_32(utf8.length()+1); - f->store_buffer((const uint8_t*)utf8.get_data(),utf8.length()+1); -} - -ObjectFormatSaverBinary::ObjectFormatSaverBinary(FileAccess *p_file,const String& p_magic,const String& p_local_path,uint32_t p_flags,const Ref& p_optimizer) { - - optimizer=p_optimizer; - relative_paths=p_flags&ObjectSaver::FLAG_RELATIVE_PATHS; - skip_editor=p_flags&ObjectSaver::FLAG_OMIT_EDITOR_PROPERTIES; - bundle_resources=p_flags&ObjectSaver::FLAG_BUNDLE_RESOURCES; - big_endian=p_flags&ObjectSaver::FLAG_SAVE_BIG_ENDIAN; - f=p_file; // should be already opened - local_path=p_local_path; - magic=p_magic; - - bin_meta_idx = get_string_index("__bin_meta__"); //is often used, so create -} - -int ObjectFormatSaverBinary::get_string_index(const String& p_string) { - - StringName s=p_string; - if (string_map.has(s)) - return string_map[s]; - - string_map[s]=strings.size(); - strings.push_back(s); - return strings.size()-1; -} - -ObjectFormatSaverBinary::~ObjectFormatSaverBinary() { - - - static const uint8_t header[4]={'O','B','D','B'}; - f->store_buffer(header,4); - if (big_endian) { - f->store_32(1); - f->set_endian_swap(true); - } else - f->store_32(0); - - f->store_32(0); //64 bits file, false for now - f->store_32(VERSION_MAJOR); - f->store_32(VERSION_MINOR); - save_unicode_string(magic); - for(int i=0;i<16;i++) - f->store_32(0); // reserved - - f->store_32(strings.size()); //string table size - for(int i=0;imeta; - ERR_CONTINUE(!resource_map.has(res)); - - f->store_32(SECTION_RESOURCE); - size_t skip_pos = f->get_pos(); - f->store_64(0); // resource skip seek pos - save_unicode_string(res->get_type()); - - if (res->get_path().length() && res->get_path().find("::") == -1 ) - save_unicode_string(res->get_path()); - else - save_unicode_string("local://"+itos(i)); - - - - List::Element *SE = so->properties.front(); - - while(SE) { - - write_property(SE->get().name_idx,SE->get().value); - SE=SE->next(); - } - - f->store_32(SECTION_END); - - size_t end=f->get_pos(); - f->seek(skip_pos); - f->store_64(end); - f->seek_end(); - - memdelete( so ); - } - - if (!saved_objects.empty()) { - - - for(List::Element *E=saved_objects.front();E;E=E->next()) { - - SavedObject *so = E->get(); - - - size_t section_end; - - if (so->type!="") { - f->store_32(SECTION_OBJECT); - section_end=f->get_pos(); - f->store_64(0); //section end - save_unicode_string(so->type); - } else { - f->store_32(SECTION_META_OBJECT); - section_end=f->get_pos(); - f->store_64(0); //section end - } - - - if (so->meta.get_type()!=Variant::NIL) - write_property(bin_meta_idx,so->meta); - - List::Element *SE = so->properties.front(); - - while(SE) { - - write_property(SE->get().name_idx,SE->get().value); - SE=SE->next(); - } - - f->store_32(SECTION_END); - - size_t end=f->get_pos(); - f->seek(section_end); - f->store_64(end); - f->seek_end(); - - memdelete(so); //no longer needed - } - - - } - - f->store_32(SECTION_END); - - f->close(); - memdelete(f); -} - - -ObjectFormatSaver* ObjectFormatSaverInstancerBinary::instance(const String& p_file,const String& p_magic,uint32_t p_flags,const Ref& p_optimizer) { - - FileAccess *f = FileAccess::open(p_file, FileAccess::WRITE); - - ERR_FAIL_COND_V( !f, NULL ); - String local_path = Globals::get_singleton()->localize_path(p_file); - - return memnew( ObjectFormatSaverBinary( f, p_magic,local_path,p_flags,p_optimizer ) ); -} - -void ObjectFormatSaverInstancerBinary::get_recognized_extensions(List *p_extensions) const { - - p_extensions->push_back("bin"); -} - - -ObjectFormatSaverInstancerBinary::~ObjectFormatSaverInstancerBinary() { - - -} - - - -/************************************************/ -/************************************************/ -/************************************************/ -/************************************************/ -/************************************************/ - - -void ObjectFormatLoaderBinary::_advance_padding(uint32_t p_len) { - - uint32_t extra = 4-(p_len%4); - if (extra<4) { - for(uint32_t i=0;iget_8(); //pad to 32 - } - -} - -Error ObjectFormatLoaderBinary::parse_property(Variant& r_v, int &r_index) { - - - uint32_t prop = f->get_32(); - if (prop==SECTION_END) - return ERR_FILE_EOF; - ERR_FAIL_COND_V(prop!=SECTION_PROPERTY,ERR_FILE_CORRUPT); - - r_index = f->get_32(); - - uint32_t type = f->get_32(); - print_bl("find property of type: "+itos(type)); - - - switch(type) { - - case VARIANT_NIL: { - - r_v=Variant(); - } break; - case VARIANT_BOOL: { - - r_v=bool(f->get_32()); - } break; - case VARIANT_INT: { - - r_v=int(f->get_32()); - } break; - case VARIANT_REAL: { - - r_v=f->get_real(); - } break; - case VARIANT_STRING: { - - r_v=get_unicode_string(); - } break; - case VARIANT_VECTOR2: { - - Vector2 v; - v.x=f->get_real(); - v.y=f->get_real(); - r_v=v; - - } break; - case VARIANT_RECT2: { - - Rect2 v; - v.pos.x=f->get_real(); - v.pos.y=f->get_real(); - v.size.x=f->get_real(); - v.size.y=f->get_real(); - r_v=v; - - } break; - case VARIANT_VECTOR3: { - - Vector3 v; - v.x=f->get_real(); - v.y=f->get_real(); - v.z=f->get_real(); - r_v=v; - } break; - case VARIANT_PLANE: { - - Plane v; - v.normal.x=f->get_real(); - v.normal.y=f->get_real(); - v.normal.z=f->get_real(); - v.d=f->get_real(); - r_v=v; - } break; - case VARIANT_QUAT: { - Quat v; - v.x=f->get_real(); - v.y=f->get_real(); - v.z=f->get_real(); - v.w=f->get_real(); - r_v=v; - - } break; - case VARIANT_AABB: { - - AABB v; - v.pos.x=f->get_real(); - v.pos.y=f->get_real(); - v.pos.z=f->get_real(); - v.size.x=f->get_real(); - v.size.y=f->get_real(); - v.size.z=f->get_real(); - r_v=v; - - } break; - case VARIANT_MATRIX32: { - - Matrix32 v; - v.elements[0].x=f->get_real(); - v.elements[0].y=f->get_real(); - v.elements[1].x=f->get_real(); - v.elements[1].y=f->get_real(); - v.elements[2].x=f->get_real(); - v.elements[2].y=f->get_real(); - r_v=v; - - } break; - case VARIANT_MATRIX3: { - - Matrix3 v; - v.elements[0].x=f->get_real(); - v.elements[0].y=f->get_real(); - v.elements[0].z=f->get_real(); - v.elements[1].x=f->get_real(); - v.elements[1].y=f->get_real(); - v.elements[1].z=f->get_real(); - v.elements[2].x=f->get_real(); - v.elements[2].y=f->get_real(); - v.elements[2].z=f->get_real(); - r_v=v; - - } break; - case VARIANT_TRANSFORM: { - - Transform v; - v.basis.elements[0].x=f->get_real(); - v.basis.elements[0].y=f->get_real(); - v.basis.elements[0].z=f->get_real(); - v.basis.elements[1].x=f->get_real(); - v.basis.elements[1].y=f->get_real(); - v.basis.elements[1].z=f->get_real(); - v.basis.elements[2].x=f->get_real(); - v.basis.elements[2].y=f->get_real(); - v.basis.elements[2].z=f->get_real(); - v.origin.x=f->get_real(); - v.origin.y=f->get_real(); - v.origin.z=f->get_real(); - r_v=v; - } break; - case VARIANT_COLOR: { - - Color v; - v.r=f->get_real(); - v.g=f->get_real(); - v.b=f->get_real(); - v.a=f->get_real(); - r_v=v; - - } break; - case VARIANT_IMAGE: { - - - uint32_t encoding = f->get_32(); - if (encoding==IMAGE_ENCODING_EMPTY) { - r_v=Variant(); - break; - } - - if (encoding==IMAGE_ENCODING_RAW) { - uint32_t width = f->get_32(); - uint32_t height = f->get_32(); - uint32_t mipmaps = f->get_32(); - uint32_t format = f->get_32(); - Image::Format fmt; - switch(format) { - - case IMAGE_FORMAT_GRAYSCALE: { fmt=Image::FORMAT_GRAYSCALE; } break; - case IMAGE_FORMAT_INTENSITY: { fmt=Image::FORMAT_INTENSITY; } break; - case IMAGE_FORMAT_GRAYSCALE_ALPHA: { fmt=Image::FORMAT_GRAYSCALE_ALPHA; } break; - case IMAGE_FORMAT_RGB: { fmt=Image::FORMAT_RGB; } break; - case IMAGE_FORMAT_RGBA: { fmt=Image::FORMAT_RGBA; } break; - case IMAGE_FORMAT_INDEXED: { fmt=Image::FORMAT_INDEXED; } break; - case IMAGE_FORMAT_INDEXED_ALPHA: { fmt=Image::FORMAT_INDEXED_ALPHA; } break; - case IMAGE_FORMAT_BC1: { fmt=Image::FORMAT_BC1; } break; - case IMAGE_FORMAT_BC2: { fmt=Image::FORMAT_BC2; } break; - case IMAGE_FORMAT_BC3: { fmt=Image::FORMAT_BC3; } break; - case IMAGE_FORMAT_BC4: { fmt=Image::FORMAT_BC4; } break; - case IMAGE_FORMAT_BC5: { fmt=Image::FORMAT_BC5; } break; - case IMAGE_FORMAT_CUSTOM: { fmt=Image::FORMAT_CUSTOM; } break; - default: { - - ERR_FAIL_V(ERR_FILE_CORRUPT); - } - - } - - - uint32_t datalen = f->get_32(); - - print_bl("width: "+itos(width)); - print_bl("height: "+itos(height)); - print_bl("mipmaps: "+itos(mipmaps)); - print_bl("format: "+itos(format)); - print_bl("datalen: "+itos(datalen)); - - DVector imgdata; - imgdata.resize(datalen); - DVector::Write w = imgdata.write(); - f->get_buffer(w.ptr(),datalen); - _advance_padding(datalen); - w=DVector::Write(); - - r_v=Image(width,height,mipmaps,fmt,imgdata); - } - - - } break; - case VARIANT_NODE_PATH: { - - r_v=NodePath(get_unicode_string()); - } break; - case VARIANT_RID: { - - r_v=f->get_32(); - } break; - case VARIANT_OBJECT: { - - uint32_t type=f->get_32(); - - switch(type) { - - case OBJECT_EMPTY: { - //do none - - } break; - case OBJECT_INTERNAL_RESOURCE: { - uint32_t index=f->get_32(); - String path = local_path+"::"+itos(index); - RES res = ResourceLoader::load(path); - if (res.is_null()) { - WARN_PRINT(String("Couldn't load resource: "+path).utf8().get_data()); - } - r_v=res; - - } break; - case OBJECT_EXTERNAL_RESOURCE: { - - String type = get_unicode_string(); - String path = get_unicode_string(); - - if (path.find("://")==-1 && path.is_rel_path()) { - // path is relative to file being loaded, so convert to a resource path - path=Globals::get_singleton()->localize_path(local_path.get_base_dir()+"/"+path); - - } - - RES res=ResourceLoader::load(path,type); - - if (res.is_null()) { - WARN_PRINT(String("Couldn't load resource: "+path).utf8().get_data()); - } - r_v=res; - - } break; - default: { - - ERR_FAIL_V(ERR_FILE_CORRUPT); - } break; - } - - } break; - case VARIANT_INPUT_EVENT: { - - } break; - case VARIANT_DICTIONARY: { - - int len=f->get_32(); - Dictionary d; - for(int i=0;iget_32(); - Array a; - a.resize(len); - for(int i=0;iget_32(); - - DVector array; - array.resize(len); - DVector::Write w = array.write(); - f->get_buffer(w.ptr(),len); - _advance_padding(len); - w=DVector::Write(); - r_v=array; - - } break; - case VARIANT_INT_ARRAY: { - - uint32_t len = f->get_32(); - - DVector array; - array.resize(len); - DVector::Write w = array.write(); - f->get_buffer((uint8_t*)w.ptr(),len*4); - w=DVector::Write(); - r_v=array; - } break; - case VARIANT_REAL_ARRAY: { - - uint32_t len = f->get_32(); - - DVector array; - array.resize(len); - DVector::Write w = array.write(); - f->get_buffer((uint8_t*)w.ptr(),len*sizeof(real_t)); - w=DVector::Write(); - r_v=array; - } break; - case VARIANT_STRING_ARRAY: { - - uint32_t len = f->get_32(); - DVector array; - array.resize(len); - DVector::Write w = array.write(); - for(int i=0;i::Write(); - r_v=array; - - - } break; - case VARIANT_VECTOR2_ARRAY: { - - uint32_t len = f->get_32(); - - DVector array; - array.resize(len); - DVector::Write w = array.write(); - if (sizeof(Vector2)==8) { - f->get_buffer((uint8_t*)w.ptr(),len*sizeof(real_t)*2); - } else { - ERR_EXPLAIN("Vector2 size is NOT 8!"); - ERR_FAIL_V(ERR_UNAVAILABLE); - } - w=DVector::Write(); - r_v=array; - - } break; - case VARIANT_VECTOR3_ARRAY: { - - uint32_t len = f->get_32(); - - DVector array; - array.resize(len); - DVector::Write w = array.write(); - if (sizeof(Vector3)==12) { - f->get_buffer((uint8_t*)w.ptr(),len*sizeof(real_t)*3); - } else { - ERR_EXPLAIN("Vector3 size is NOT 12!"); - ERR_FAIL_V(ERR_UNAVAILABLE); - } - w=DVector::Write(); - r_v=array; - - } break; - case VARIANT_COLOR_ARRAY: { - - uint32_t len = f->get_32(); - - DVector array; - array.resize(len); - DVector::Write w = array.write(); - if (sizeof(Color)==16) { - f->get_buffer((uint8_t*)w.ptr(),len*sizeof(real_t)*4); - } else { - ERR_EXPLAIN("Color size is NOT 16!"); - ERR_FAIL_V(ERR_UNAVAILABLE); - } - w=DVector::Write(); - r_v=array; - } break; - - default: { - ERR_FAIL_V(ERR_FILE_CORRUPT); - } break; - } - - - - return OK; //never reach anyway - -} - -Error ObjectFormatLoaderBinary::load(Object **p_object,Variant &p_meta) { - - - - while(true) { - - if (f->eof_reached()) { - ERR_EXPLAIN("Premature end of file at: "+local_path); - ERR_FAIL_V(ERR_FILE_CORRUPT); - } - - RES resource; - Object *obj=NULL; - bool meta=false; - - uint32_t section = f->get_32(); - - switch(section) { - - - case SECTION_RESOURCE: { - - print_bl("resource found"); - - size_t section_end = f->get_64(); - print_bl("section end: "+itos(section_end)); - String type = get_unicode_string(); - String path = get_unicode_string(); - print_bl("path: "+path); - - if (path.begins_with("local://")) { - //built-in resource (but really external) - path=path.replace("local://",local_path+"::"); - } - - if (ResourceCache::has(path)) { - f->seek(section_end); - continue; - } - - //load properties - - - obj = ObjectTypeDB::instance(type); - if (!obj) { - ERR_EXPLAIN("Object of unrecognized type '"+type+"' in file: "+type); - } - - ERR_FAIL_COND_V(!obj,ERR_FILE_CORRUPT); - - Resource *r = obj->cast_to(); - if (!r) { - memdelete(obj); //bye - ERR_EXPLAIN("Object type in resource field not a resource, type is: "+obj->get_type()); - ERR_FAIL_COND_V(!obj->cast_to(),ERR_FILE_CORRUPT); - } - - resource = RES( r ); - r->set_path(path); - } break; - case SECTION_META_OBJECT: - meta=true; - print_bl("meta found"); - - case SECTION_OBJECT: { - - uint64_t section_end = f->get_64(); - - if (!meta) { - print_bl("object"); - - String type = get_unicode_string(); - if (ObjectTypeDB::can_instance(type)) { - obj = ObjectTypeDB::instance(type); - if (!obj) { - ERR_EXPLAIN("Object of unrecognized type in file: "+type); - } - ERR_FAIL_COND_V(!obj,ERR_FILE_CORRUPT); - } else { - - f->seek(section_end); - return ERR_SKIP; - }; - - - } - - - } break; - case SECTION_END: { - - - return ERR_FILE_EOF; - } break; - - default: { - - ERR_EXPLAIN("Invalid Section ID '"+itos(section)+"' in file: "+local_path); - ERR_FAIL_V(ERR_FILE_CORRUPT); - - } - - } - - - //load properties - - while(true) { - - int name_idx; - Variant v; - Error err; - err = parse_property(v,name_idx); - - print_bl("prop idx "+itos(name_idx)+" value: "+String(v)); - - if (err==ERR_FILE_EOF) - break; - - if (err!=OK) { - ERR_EXPLAIN("File Corrupted"); - ERR_FAIL_COND_V(err!=OK,ERR_FILE_CORRUPT); - } - - - if (resource.is_null() && name_idx==0) { //0 is __bin_meta__ - - p_meta=v; - continue; - } else if (!obj) { - - ERR_EXPLAIN("Normal property found in meta object."); - ERR_FAIL_V(ERR_FILE_CORRUPT); - } - - Map::Element *E=string_map.find(name_idx); - if (!E) { - ERR_EXPLAIN("Property ID has no matching name: "+itos(name_idx)); - ERR_FAIL_V(ERR_FILE_CORRUPT); - } - - obj->set(E->get(),v); - } - - if (!obj) { - *p_object=NULL; - return OK; // it was a meta object - } - - if (resource.is_null()) { - - //regular object - *p_object=obj; - return OK; - } else { - - resource_cache.push_back(resource); //keep it in mem until finished loading - } - - } -} - - -ObjectFormatLoaderBinary::~ObjectFormatLoaderBinary() { - - if (f) { - if (f->is_open()) - f->close(); - memdelete(f); - } -} - - -String ObjectFormatLoaderBinary::get_unicode_string() { - - uint32_t len = f->get_32(); - if (len>str_buf.size()) { - str_buf.resize(len); - } - f->get_buffer((uint8_t*)&str_buf[0],len); - String s; - s.parse_utf8(&str_buf[0]); - return s; -} - -ObjectFormatLoaderBinary::ObjectFormatLoaderBinary(FileAccess *p_f,bool p_endian_swap,bool p_use64) { - - f=p_f; - endian_swap=p_endian_swap; - use_real64=p_use64; - - //load string table - uint32_t string_table_size = f->get_32(); - print_bl("string table size: "+itos(string_table_size)); - for(int i=0;iget_buffer(header,4); - if (header[0]!='O' || header[1]!='B' || header[2]!='D' || header[3]!='B') { - - ERR_EXPLAIN("File not in valid binary format: "+p_file); - ERR_FAIL_V(NULL); - } - - uint32_t big_endian = f->get_32(); -#ifdef BIG_ENDIAN_ENABLED - bool endian_swap = !big_endian; -#else - bool endian_swap = big_endian; -#endif - - bool use_real64 = f->get_32(); - - f->set_endian_swap(big_endian!=0); //read big endian if saved as big endian - - uint32_t ver_major=f->get_32(); - uint32_t ver_minor=f->get_32(); - - print_bl("big endian: "+itos(big_endian)); - print_bl("endian swap: "+itos(endian_swap)); - print_bl("real64: "+itos(use_real64)); - print_bl("major: "+itos(ver_major)); - print_bl("minor: "+itos(ver_minor)); - - if (ver_major>VERSION_MAJOR || (ver_major==VERSION_MAJOR && ver_minor>VERSION_MINOR)) { - - f->close(); - memdelete(f); - ERR_EXPLAIN("File Format '"+itos(ver_major)+"."+itos(ver_minor)+"' is too new! Please upgrade to a a new engine version: "+p_file); - ERR_FAIL_V(NULL); - - } - - uint32_t magic_len = f->get_32(); - Vector magic; - magic.resize(magic_len); - f->get_buffer((uint8_t*)&magic[0],magic_len); - String magic_str; - magic_str.parse_utf8(&magic[0]); - - print_bl("magic: "+magic_str); - if (magic_str!=p_magic) { - - f->close(); - memdelete(f); - ERR_EXPLAIN("File magic mismatch, found '"+magic_str+"' in : "+p_file); - ERR_FAIL_V(NULL); - } - - print_bl("skipping 32"); - for(int i=0;i<16;i++) - f->get_32(); //skip a few reserved fields - - if (f->eof_reached()) { - - f->close(); - memdelete(f); - ERR_EXPLAIN("Premature End Of File: "+p_file); - ERR_FAIL_V(NULL); - - } - - print_bl("creating loader"); - ObjectFormatLoaderBinary *loader = memnew( ObjectFormatLoaderBinary(f,endian_swap,use_real64) ); - loader->local_path=p_file; - - return loader; -} - -void ObjectFormatLoaderInstancerBinary::get_recognized_extensions(List *p_extensions) const { - - p_extensions->push_back("bin"); -} - - -#endif diff --git a/core/io/object_format_binary.h b/core/io/object_format_binary.h deleted file mode 100644 index aaf6bf357a..0000000000 --- a/core/io/object_format_binary.h +++ /dev/null @@ -1,158 +0,0 @@ -/*************************************************************************/ -/* object_format_binary.h */ -/*************************************************************************/ -/* 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. */ -/*************************************************************************/ -#ifndef OBJECT_FORMAT_BINARY_H -#define OBJECT_FORMAT_BINARY_H - -#include "object_loader.h" -#include "object_saver_base.h" -#include "dvector.h" -#include "core/os/file_access.h" - -#ifdef OLD_SCENE_FORMAT_ENABLED -/** - @author Juan Linietsky -*/ - - -class ObjectFormatSaverBinary : public ObjectFormatSaver { - - String local_path; - - - Ref optimizer; - - bool relative_paths; - bool bundle_resources; - bool skip_editor; - bool big_endian; - int bin_meta_idx; - FileAccess *f; - String magic; - Map resource_map; - Map string_map; - Vector strings; - - struct SavedObject { - - Variant meta; - String type; - - - struct SavedProperty { - - int name_idx; - Variant value; - }; - - List properties; - }; - - - int get_string_index(const String& p_string); - void save_unicode_string(const String& p_string); - - List saved_objects; - List saved_resources; - - void _pad_buffer(int p_bytes); - Error _save_obj(const Object *p_object,SavedObject *so); - void _find_resources(const Variant& p_variant); - void write_property(int p_idx,const Variant& p_property); - - -public: - - virtual Error save(const Object *p_object,const Variant &p_meta); - - ObjectFormatSaverBinary(FileAccess *p_file,const String& p_magic,const String& p_local_path,uint32_t p_flags,const Ref& p_optimizer); - ~ObjectFormatSaverBinary(); -}; - -class ObjectFormatSaverInstancerBinary : public ObjectFormatSaverInstancer { -public: - - virtual ObjectFormatSaver* instance(const String& p_file,const String& p_magic,uint32_t p_flags=0,const Ref& p_optimizer=Ref()); - virtual void get_recognized_extensions(List *p_extensions) const; - - virtual ~ObjectFormatSaverInstancerBinary(); -}; - - - - -/***********************************/ -/***********************************/ -/***********************************/ -/***********************************/ - -class ObjectFormatLoaderBinary : public ObjectFormatLoader { - - String local_path; - - FileAccess *f; - - bool endian_swap; - bool use_real64; - - Vector str_buf; - List resource_cache; - - Map string_map; - - String get_unicode_string(); - void _advance_padding(uint32_t p_len); - -friend class ObjectFormatLoaderInstancerBinary; - - - Error parse_property(Variant& r_v, int& r_index); - -public: - - - virtual Error load(Object **p_object,Variant &p_meta); - - ObjectFormatLoaderBinary(FileAccess *f,bool p_endian_swap,bool p_use64); - virtual ~ObjectFormatLoaderBinary(); -}; - -class ObjectFormatLoaderInstancerBinary : public ObjectFormatLoaderInstancer { -public: - - virtual ObjectFormatLoaderBinary* instance(const String& p_file,const String& p_magic); - virtual void get_recognized_extensions(List *p_extensions) const; - - - -}; - - - -#endif // OBJECT_FORMAT_BINARY_H -#endif diff --git a/core/io/object_format_xml.cpp b/core/io/object_format_xml.cpp deleted file mode 100644 index 0a8ce70d5e..0000000000 --- a/core/io/object_format_xml.cpp +++ /dev/null @@ -1,3190 +0,0 @@ -/*************************************************************************/ -/* object_format_xml.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. */ -/*************************************************************************/ -#ifdef XML_ENABLED -#ifdef OLD_SCENE_FORMAT_ENABLED -#include "object_format_xml.h" -#include "resource.h" -#include "io/resource_loader.h" -#include "print_string.h" -#include "object_type_db.h" -#include "globals.h" -#include "os/os.h" -#include "version.h" - -void ObjectFormatSaverXML::escape(String& p_str) { - - p_str=p_str.replace("&","&"); - p_str=p_str.replace("<",">"); - p_str=p_str.replace(">","<"); - p_str=p_str.replace("'","'"); - p_str=p_str.replace("\"","""); - for (int i=1;i<32;i++) { - - char chr[2]={i,0}; - p_str=p_str.replace(chr,"&#"+String::num(i)+";"); - } - - -} -void ObjectFormatSaverXML::write_tabs(int p_diff) { - - for (int i=0;istore_8('\t'); - } -} - -void ObjectFormatSaverXML::write_string(String p_str,bool p_escape) { - - /* write an UTF8 string */ - if (p_escape) - escape(p_str); - - f->store_string(p_str);; - /* - CharString cs=p_str.utf8(); - const char *data=cs.get_data(); - - while (*data) { - f->store_8(*data); - data++; - }*/ - - -} - -void ObjectFormatSaverXML::enter_tag(const String& p_section,const String& p_args) { - - if (p_args.length()) - write_string("<"+p_section+" "+p_args+">",false); - else - write_string("<"+p_section+">",false); - depth++; -} -void ObjectFormatSaverXML::exit_tag(const String& p_section) { - - depth--; - write_string("",false); - -} - -/* -static bool _check_type(const Variant& p_property) { - - if (p_property.get_type()==Variant::_RID) - return false; - if (p_property.get_type()==Variant::OBJECT) { - RES res = p_property; - if (res.is_null()) - return false; - } - - return true; -}*/ - -void ObjectFormatSaverXML::write_property(const String& p_name,const Variant& p_property,bool *r_ok) { - - if (r_ok) - *r_ok=false; - - String type; - String params; - bool oneliner=true; - - switch( p_property.get_type() ) { - - case Variant::NIL: type="nil"; break; - case Variant::BOOL: type="bool"; break; - case Variant::INT: type="int"; break; - case Variant::REAL: type="real"; break; - case Variant::STRING: type="string"; break; - case Variant::VECTOR2: type="vector2"; break; - case Variant::RECT2: type="rect2"; break; - case Variant::VECTOR3: type="vector3"; break; - case Variant::PLANE: type="plane"; break; - case Variant::_AABB: type="aabb"; break; - case Variant::QUAT: type="quaternion"; break; - case Variant::MATRIX32: type="matrix32"; break; - case Variant::MATRIX3: type="matrix3"; break; - case Variant::TRANSFORM: type="transform"; break; - case Variant::COLOR: type="color"; break; - case Variant::IMAGE: { - type="image"; - Image img=p_property; - if (img.empty()) { - enter_tag(type,"name=\""+p_name+"\""); - exit_tag(type); - if (r_ok) - *r_ok=true; - return; - } - params+="encoding=\"raw\""; - params+=" width=\""+itos(img.get_width())+"\""; - params+=" height=\""+itos(img.get_height())+"\""; - params+=" mipmaps=\""+itos(img.get_mipmaps())+"\""; - - switch(img.get_format()) { - - case Image::FORMAT_GRAYSCALE: params+=" format=\"grayscale\""; break; - case Image::FORMAT_INTENSITY: params+=" format=\"intensity\""; break; - case Image::FORMAT_GRAYSCALE_ALPHA: params+=" format=\"grayscale_alpha\""; break; - case Image::FORMAT_RGB: params+=" format=\"rgb\""; break; - case Image::FORMAT_RGBA: params+=" format=\"rgba\""; break; - case Image::FORMAT_INDEXED : params+=" format=\"indexed\""; break; - case Image::FORMAT_INDEXED_ALPHA: params+=" format=\"indexed_alpha\""; break; - case Image::FORMAT_BC1: params+=" format=\"bc1\""; break; - case Image::FORMAT_BC2: params+=" format=\"bc2\""; break; - case Image::FORMAT_BC3: params+=" format=\"bc3\""; break; - case Image::FORMAT_BC4: params+=" format=\"bc4\""; break; - case Image::FORMAT_BC5: params+=" format=\"bc5\""; break; - case Image::FORMAT_CUSTOM: params+=" format=\"custom\" custom_size=\""+itos(img.get_data().size())+"\""; break; - default: {} - } - } break; - case Variant::NODE_PATH: type="node_path"; break; - case Variant::OBJECT: { - type="resource"; - RES res = p_property; - if (res.is_null()) { - enter_tag(type,"name=\""+p_name+"\""); - exit_tag(type); - if (r_ok) - *r_ok=true; - - return; // don't save it - } - - params="resource_type=\""+res->get_type()+"\""; - - if (res->get_path().length() && res->get_path().find("::")==-1) { - //external resource - String path=relative_paths?local_path.path_to_file(res->get_path()):res->get_path(); - escape(path); - params+=" path=\""+path+"\""; - } else { - - //internal resource - ERR_EXPLAIN("Resource was not pre cached for the resource section, bug?"); - ERR_FAIL_COND(!resource_map.has(res)); - - params+=" path=\"local://"+itos(resource_map[res])+"\""; - } - - } break; - case Variant::INPUT_EVENT: type="input_event"; break; - case Variant::DICTIONARY: type="dictionary" ; oneliner=false; break; - case Variant::ARRAY: type="array"; params="len=\""+itos(p_property.operator Array().size())+"\""; oneliner=false; break; - - case Variant::RAW_ARRAY: type="raw_array"; params="len=\""+itos(p_property.operator DVector < uint8_t >().size())+"\""; break; - case Variant::INT_ARRAY: type="int_array"; params="len=\""+itos(p_property.operator DVector < int >().size())+"\""; break; - case Variant::REAL_ARRAY: type="real_array"; params="len=\""+itos(p_property.operator DVector < real_t >().size())+"\""; break; - case Variant::STRING_ARRAY: type="string_array"; params="len=\""+itos(p_property.operator DVector < String >().size())+"\""; break; - case Variant::VECTOR2_ARRAY: type="vector2_array"; params="len=\""+itos(p_property.operator DVector < Vector2 >().size())+"\""; break; - case Variant::VECTOR3_ARRAY: type="vector3_array"; params="len=\""+itos(p_property.operator DVector < Vector3 >().size())+"\""; break; - case Variant::COLOR_ARRAY: type="color_array"; params="len=\""+itos(p_property.operator DVector < Color >().size())+"\""; break; - default: { - - ERR_PRINT("Unknown Variant type."); - ERR_FAIL(); - } - - } - - write_tabs(); - - if (p_name!="") { - if (params.length()) - enter_tag(type,"name=\""+p_name+"\" "+params); - else - enter_tag(type,"name=\""+p_name+"\""); - } else { - if (params.length()) - enter_tag(type," "+params); - else - enter_tag(type,""); - } - - if (!oneliner) - write_string("\n",false); - else - write_string(" ",false); - - - switch( p_property.get_type() ) { - - case Variant::NIL: { - - } break; - case Variant::BOOL: { - - write_string( p_property.operator bool() ? "True":"False" ); - } break; - case Variant::INT: { - - write_string( itos(p_property.operator int()) ); - } break; - case Variant::REAL: { - - write_string( rtos(p_property.operator real_t()) ); - } break; - case Variant::STRING: { - - String str=p_property; - escape(str); - str="\""+str+"\""; - write_string( str,false ); - } break; - case Variant::VECTOR2: { - - Vector2 v = p_property; - write_string( rtoss(v.x) +", "+rtoss(v.y) ); - } break; - case Variant::RECT2: { - - Rect2 aabb = p_property; - write_string( rtoss(aabb.pos.x) +", "+rtoss(aabb.pos.y) +", "+rtoss(aabb.size.x) +", "+rtoss(aabb.size.y) ); - - } break; - case Variant::VECTOR3: { - - Vector3 v = p_property; - write_string( rtoss(v.x) +", "+rtoss(v.y)+", "+rtoss(v.z) ); - } break; - case Variant::PLANE: { - - Plane p = p_property; - write_string( rtoss(p.normal.x) +", "+rtoss(p.normal.y)+", "+rtoss(p.normal.z)+", "+rtoss(p.d) ); - - } break; - case Variant::_AABB: { - - AABB aabb = p_property; - write_string( rtoss(aabb.pos.x) +", "+rtoss(aabb.pos.y) +", "+rtoss(aabb.pos.z) +", "+rtoss(aabb.size.x) +", "+rtoss(aabb.size.y) +", "+rtoss(aabb.size.z) ); - - } break; - case Variant::QUAT: { - - Quat quat = p_property; - write_string( rtoss(quat.x)+", "+rtoss(quat.y)+", "+rtoss(quat.z)+", "+rtoss(quat.w)+", "); - - } break; - case Variant::MATRIX32: { - - String s; - Matrix32 m3 = p_property; - for (int i=0;i<3;i++) { - for (int j=0;j<2;j++) { - - if (i!=0 || j!=0) - s+=", "; - s+=rtoss( m3.elements[i][j] ); - } - } - - write_string(s); - - } break; - case Variant::MATRIX3: { - - String s; - Matrix3 m3 = p_property; - for (int i=0;i<3;i++) { - for (int j=0;j<3;j++) { - - if (i!=0 || j!=0) - s+=", "; - s+=rtoss( m3.elements[i][j] ); - } - } - - write_string(s); - - } break; - case Variant::TRANSFORM: { - - String s; - Transform t = p_property; - Matrix3 &m3 = t.basis; - for (int i=0;i<3;i++) { - for (int j=0;j<3;j++) { - - if (i!=0 || j!=0) - s+=", "; - s+=rtoss( m3.elements[i][j] ); - } - } - - s=s+", "+rtoss(t.origin.x) +", "+rtoss(t.origin.y)+", "+rtoss(t.origin.z); - - write_string(s); - } break; - - // misc types - case Variant::COLOR: { - - Color c = p_property; - write_string( rtoss(c.r) +", "+rtoss(c.g)+", "+rtoss(c.b)+", "+rtoss(c.a) ); - - } break; - case Variant::IMAGE: { - - String s; - Image img = p_property; - DVector data = img.get_data(); - int len = data.size(); - DVector::Read r = data.read(); - const uint8_t *ptr=r.ptr();; - for (int i=0;i>4], hex[byte&0xF], 0}; - s+=str; - } - - write_string(s); - } break; - case Variant::NODE_PATH: { - - String str=p_property; - escape(str); - str="\""+str+"\""; - write_string( str,false); - - } break; - - case Variant::OBJECT: { - /* this saver does not save resources in here - RES res = p_property; - - if (!res.is_null()) { - - String path=res->get_path(); - if (!res->is_shared() || !path.length()) { - // if no path, or path is from inside a scene - write_object( *res ); - } - - } - */ - - } break; - case Variant::INPUT_EVENT: { - - write_string( p_property.operator String() ); - } break; - case Variant::DICTIONARY: { - - Dictionary dict = p_property; - - - List keys; - dict.get_key_list(&keys); - - for(List::Element *E=keys.front();E;E=E->next()) { - - //if (!_check_type(dict[E->get()])) - // continue; - - bool ok; - write_property("",E->get(),&ok); - ERR_CONTINUE(!ok); - - write_property("",dict[E->get()],&ok); - if (!ok) - write_property("",Variant()); //at least make the file consistent.. - } - - - - - } break; - case Variant::ARRAY: { - - Array array = p_property; - int len=array.size(); - for (int i=0;i data = p_property; - int len = data.size(); - DVector::Read r = data.read(); - const uint8_t *ptr=r.ptr();; - for (int i=0;i>4], hex[byte&0xF], 0}; - s+=str; - } - - write_string(s,false); - - } break; - case Variant::INT_ARRAY: { - - DVector data = p_property; - int len = data.size(); - DVector::Read r = data.read(); - const int *ptr=r.ptr();; - write_tabs(); - - for (int i=0;i0) - write_string(", ",false); - - write_string(itos(ptr[i]),false); - } - - - - } break; - case Variant::REAL_ARRAY: { - - DVector data = p_property; - int len = data.size(); - DVector::Read r = data.read(); - const real_t *ptr=r.ptr();; - write_tabs(); - - for (int i=0;i0) - write_string(", ",false); - write_string(rtoss(ptr[i]),false); - } - - - } break; - case Variant::STRING_ARRAY: { - - DVector data = p_property; - int len = data.size(); - DVector::Read r = data.read(); - const String *ptr=r.ptr();; - String s; - - for (int i=0;i0) - s+=", "; - String str=ptr[i]; - escape(str); - s=s+"\""+str+"\""; - } - - write_string(s,false); - - } break; - case Variant::VECTOR2_ARRAY: { - - DVector data = p_property; - int len = data.size(); - DVector::Read r = data.read(); - const Vector2 *ptr=r.ptr();; - write_tabs(); - - for (int i=0;i0) - write_string(", ",false); - write_string(rtoss(ptr[i].x),false); - write_string(", "+rtoss(ptr[i].y),false); - - } - - - } break; - case Variant::VECTOR3_ARRAY: { - - DVector data = p_property; - int len = data.size(); - DVector::Read r = data.read(); - const Vector3 *ptr=r.ptr();; - write_tabs(); - - for (int i=0;i0) - write_string(", ",false); - write_string(rtoss(ptr[i].x),false); - write_string(", "+rtoss(ptr[i].y),false); - write_string(", "+rtoss(ptr[i].z),false); - - } - - - } break; - case Variant::COLOR_ARRAY: { - - DVector data = p_property; - int len = data.size(); - DVector::Read r = data.read(); - const Color *ptr=r.ptr();; - write_tabs(); - - for (int i=0;i0) - write_string(", ",false); - - write_string(rtoss(ptr[i].r),false); - write_string(", "+rtoss(ptr[i].g),false); - write_string(", "+rtoss(ptr[i].b),false); - write_string(", "+rtoss(ptr[i].a),false); - - } - - } break; - default: {} - - } - if (oneliner) - write_string(" "); - else - write_tabs(-1); - exit_tag(type); - - write_string("\n",false); - - if (r_ok) - *r_ok=true; - -} - - -void ObjectFormatSaverXML::_find_resources(const Variant& p_variant) { - - - switch(p_variant.get_type()) { - case Variant::OBJECT: { - - - - RES res = p_variant.operator RefPtr(); - - if (res.is_null()) - return; - - if (!bundle_resources && res->get_path().length() && res->get_path().find("::") == -1 ) - return; - - if (resource_map.has(res)) - return; - - List property_list; - - res->get_property_list( &property_list ); - - List::Element *I=property_list.front(); - - while(I) { - - PropertyInfo pi=I->get(); - - if (pi.usage&PROPERTY_USAGE_STORAGE || (bundle_resources && pi.usage&PROPERTY_USAGE_BUNDLE)) { - - Variant v=res->get(I->get().name); - _find_resources(v); - } - - I=I->next(); - } - - resource_map[ res ] = resource_map.size(); //saved after, so the childs it needs are available when loaded - saved_resources.push_back(res); - - } break; - - case Variant::ARRAY: { - - Array varray=p_variant; - int len=varray.size(); - for(int i=0;i keys; - d.get_key_list(&keys); - for(List::Element *E=keys.front();E;E=E->next()) { - - Variant v = d[E->get()]; - _find_resources(v); - } - } break; - default: {} - } - -} - - - -Error ObjectFormatSaverXML::save(const Object *p_object,const Variant &p_meta) { - - ERR_FAIL_COND_V(!f,ERR_UNCONFIGURED); - ERR_EXPLAIN("write_object should supply either an object, a meta, or both"); - ERR_FAIL_COND_V(!p_object && p_meta.get_type()==Variant::NIL, ERR_INVALID_PARAMETER); - - SavedObject *so = memnew( SavedObject ); - - if (p_object) - so->type=p_object->get_type(); - - _find_resources(p_meta); - so->meta=p_meta; - - if (p_object) { - - - if (optimizer.is_valid()) { - //use optimizer - - List props; - optimizer->get_property_list(p_object,&props); - - for(List::Element *E=props.front();E;E=E->next()) { - - if (skip_editor && String(E->get().name).begins_with("__editor")) - continue; - _find_resources(E->get().value); - SavedObject::SavedProperty sp; - sp.name=E->get().name; - sp.value=E->get().value; - so->properties.push_back(sp); - } - - } else { - //use classic way - List property_list; - p_object->get_property_list( &property_list ); - - for(List::Element *E=property_list.front();E;E=E->next()) { - - if (skip_editor && E->get().name.begins_with("__editor")) - continue; - if (E->get().usage&PROPERTY_USAGE_STORAGE || (bundle_resources && E->get().usage&PROPERTY_USAGE_BUNDLE)) { - - SavedObject::SavedProperty sp; - sp.name=E->get().name; - sp.value = p_object->get(E->get().name); - _find_resources(sp.value); - so->properties.push_back(sp); - } - } - } - - } - - saved_objects.push_back(so); - - return OK; -} - -ObjectFormatSaverXML::ObjectFormatSaverXML(FileAccess *p_file,const String& p_magic,const String& p_local_path,uint32_t p_flags,const Ref& p_optimizer) { - - optimizer=p_optimizer; - relative_paths=p_flags&ObjectSaver::FLAG_RELATIVE_PATHS; - skip_editor=p_flags&ObjectSaver::FLAG_OMIT_EDITOR_PROPERTIES; - bundle_resources=p_flags&ObjectSaver::FLAG_BUNDLE_RESOURCES; - f=p_file; // should be already opened - depth=0; - local_path=p_local_path; - magic=p_magic; -} -ObjectFormatSaverXML::~ObjectFormatSaverXML() { - - write_string("",false); //no escape - write_string("\n",false); - enter_tag("object_file","magic=\""+magic+"\" "+"version=\""+itos(VERSION_MAJOR)+"."+itos(VERSION_MINOR)+"\" version_name=\""+VERSION_FULL_NAME+"\""); - write_string("\n",false); - - // save resources - - for(List::Element *E=saved_resources.front();E;E=E->next()) { - - RES res = E->get(); - ERR_CONTINUE(!resource_map.has(res)); - - write_tabs(); - if (res->get_path().length() && res->get_path().find("::") == -1 ) - enter_tag("resource","type=\""+res->get_type()+"\" path=\""+res->get_path()+"\""); //bundled - else - enter_tag("resource","type=\""+res->get_type()+"\" path=\"local://"+itos(resource_map[res])+"\""); - - if (optimizer.is_valid()) { - - List props; - optimizer->get_property_list(res.ptr(),&props); - - for(List::Element *E=props.front();E;E=E->next()) { - - if (skip_editor && String(E->get().name).begins_with("__editor")) - continue; - - write_property(E->get().name,E->get().value); - } - - - } else { - - List property_list; - res->get_property_list(&property_list); - for(List::Element *PE = property_list.front();PE;PE=PE->next()) { - - - if (skip_editor && PE->get().name.begins_with("__editor")) - continue; - - if (PE->get().usage&PROPERTY_USAGE_STORAGE || (bundle_resources && PE->get().usage&PROPERTY_USAGE_BUNDLE)) { - - String name = PE->get().name; - Variant value = res->get(name); - write_property(name,value); - } - - - } - - } - write_tabs(-1); - exit_tag("resource"); - write_string("\n",false); - } - - if (!saved_objects.empty()) { - - - for(List::Element *E=saved_objects.front();E;E=E->next()) { - - SavedObject *so = E->get(); - - - - write_tabs(); - if (so->type!="") - enter_tag("object","type=\""+so->type+"\""); - else - enter_tag("object"); - write_string("\n",false); - - if (so->meta.get_type()!=Variant::NIL) { - - write_property("__xml_meta__",so->meta); - - } - - List::Element *SE = so->properties.front(); - - while(SE) { - - write_property(SE->get().name,SE->get().value); - SE=SE->next(); - } - - - write_tabs(-1); - exit_tag("object"); - write_string("\n",false); - memdelete(so); //no longer needed - } - - - } else { - - WARN_PRINT("File contains no saved objects."); - } - - exit_tag("object_file"); - f->close(); - memdelete(f); -} - - -ObjectFormatSaver* ObjectFormatSaverInstancerXML::instance(const String& p_file,const String& p_magic,uint32_t p_flags,const Ref& p_optimizer) { - - Error err; - FileAccess *f = FileAccess::open(p_file, FileAccess::WRITE,&err); - - ERR_FAIL_COND_V( err, NULL ); - String local_path = Globals::get_singleton()->localize_path(p_file); - - return memnew( ObjectFormatSaverXML( f, p_magic,local_path,p_flags,p_optimizer ) ); -} - -void ObjectFormatSaverInstancerXML::get_recognized_extensions(List *p_extensions) const { - - p_extensions->push_back("xml"); -} - - -ObjectFormatSaverInstancerXML::~ObjectFormatSaverInstancerXML() { - - -} - -/************************************************/ -/************************************************/ -/************************************************/ -/************************************************/ -/************************************************/ - - - -#ifdef OPTIMIZED_XML_LOADER - -#define IS_FLOAT_CHAR(m_c) \ - ((m_c>='0' && m_c<='9') || m_c=='e' || m_c=='-' || m_c=='+' || m_c=='.') - -#define XML_FAIL(m_cond,m_err) \ - if (m_cond) {\ - ERR_EXPLAIN(local_path+":"+itos(parser->get_current_line())+": "+String(m_err));\ - ERR_FAIL_COND_V( m_cond, ERR_FILE_CORRUPT );\ - } - - -Error ObjectFormatLoaderXML::_parse_property(Variant& r_v,String& r_name) { - - XML_FAIL( parser->is_empty(), "unexpected empty tag"); - - String type=parser->get_node_name(); - String name=parser->get_attribute_value_safe("name"); - - r_v=Variant(); - r_name=name; - - if (type=="dictionary") { - - Dictionary d; - int reading=0; - Variant key; - while(parser->read()==OK) { - - if (parser->get_node_type()==XMLParser::NODE_ELEMENT) { - Error err; - String tagname; - - if (reading==0) { - - err=_parse_property(key,tagname); - XML_FAIL( err,"error parsing dictionary key: "+name); - reading++; - } else { - - reading=0; - Variant value; - err=_parse_property(value,tagname); - XML_FAIL( err,"error parsing dictionary value: "+name); - d[key]=value; - } - - } else if (parser->get_node_type()==XMLParser::NODE_ELEMENT_END && parser->get_node_name()=="dictionary") { - r_v=d; - return OK; - } - } - - - XML_FAIL( true, "unexpected end of file while reading dictionary: "+name); - - } else if (type=="array") { - - XML_FAIL( !parser->has_attribute("len"), "array missing 'len' attribute"); - - int len=parser->get_attribute_value("len").to_int(); - - Array array; - array.resize(len); - - - Variant v; - String tagname; - int idx=0; - - - while(parser->read()==OK) { - - if (parser->get_node_type()==XMLParser::NODE_ELEMENT) { - - XML_FAIL( idx >= len, "array size mismatch (too many elements)"); - Error err; - String tagname; - Variant key; - - err=_parse_property(key,tagname); - XML_FAIL( err,"error parsing element of array: "+name); - array[idx]=key; - idx++; - - - } else if (parser->get_node_type()==XMLParser::NODE_ELEMENT_END && parser->get_node_name()=="array") { - - XML_FAIL( idx != len, "array size mismatch (not "+itos(len)+"):"+name); - r_v=array; - return OK; - } - } - - XML_FAIL( true, "unexpected end of file while reading dictionary: "+name); - - } else if (type=="resource") { - - - XML_FAIL(!parser->has_attribute("path"),"resource property has no 'path' set (embedding not supported).") - - String path=parser->get_attribute_value("path"); - String hint = parser->get_attribute_value_safe("resource_type"); - - if (path.begins_with("local://")) - path=path.replace("local://",local_path+"::"); - else if (path.find("://")==-1 && path.is_rel_path()) { - // path is relative to file being loaded, so convert to a resource path - path=Globals::get_singleton()->localize_path(local_path.get_base_dir()+"/"+path); - - } - - //take advantage of the resource loader cache. The resource is cached on it, even if - RES res=ResourceLoader::load(path,hint); - - - if (res.is_null()) { - - WARN_PRINT(String("Couldn't load resource: "+path).ascii().get_data()); - } - - r_v=res.get_ref_ptr(); - - } else if (type=="image") { - - if (parser->has_attribute("encoding")) { //there is image data - - String encoding=parser->get_attribute_value("encoding"); - - if (encoding=="raw") { - - //raw image (bytes) - - XML_FAIL( !parser->has_attribute("width"), "missing attribute in raw encoding: 'width'."); - XML_FAIL( !parser->has_attribute("height"), "missing attribute in raw encoding: 'height'."); - XML_FAIL( !parser->has_attribute("format"), "missing attribute in raw encoding: 'format'."); - - String format = parser->get_attribute_value("format"); - String width = parser->get_attribute_value("width"); - String height = parser->get_attribute_value("height"); - - Image::Format imgformat; - int chans=0; - int pal=0; - - if (format=="grayscale") { - imgformat=Image::FORMAT_GRAYSCALE; - chans=1; - } else if (format=="intensity") { - imgformat=Image::FORMAT_INTENSITY; - chans=1; - } else if (format=="grayscale_alpha") { - imgformat=Image::FORMAT_GRAYSCALE_ALPHA; - chans=2; - } else if (format=="rgb") { - imgformat=Image::FORMAT_RGB; - chans=3; - } else if (format=="rgba") { - imgformat=Image::FORMAT_RGBA; - chans=4; - } else if (format=="indexed") { - imgformat=Image::FORMAT_INDEXED; - chans=1; - pal=256*3; - } else if (format=="indexed_alpha") { - imgformat=Image::FORMAT_INDEXED_ALPHA; - chans=1; - pal=256*4; - } else { - - XML_FAIL(true, "invalid format for image: "+format); - - } - - XML_FAIL( chans==0, "invalid number of color channels in image (0)."); - - int w=width.to_int(); - int h=height.to_int(); - - if (w == 0 && w == 0) { //epmty, don't even bother - //r_v = Image(w, h, imgformat); - r_v=Image(); - return OK; - } else { - - //decode hexa - - DVector pixels; - pixels.resize(chans*w*h+pal); - int pixels_size=pixels.size(); - XML_FAIL( pixels_size==0, "corrupt"); - - ERR_FAIL_COND_V(pixels_size==0,ERR_FILE_CORRUPT); - DVector::Write wr=pixels.write(); - uint8_t *bytes=wr.ptr(); - - XML_FAIL( parser->read()!=OK, "error reading" ); - XML_FAIL( parser->get_node_type()!=XMLParser::NODE_TEXT, "expected text!"); - - String text = parser->get_node_data().strip_edges(); - XML_FAIL( text.length()/2 != pixels_size, "unexpected image data size" ); - - for(int i=0;i='0' && c<='9') || (c>='A' && c<='F') || (c>='a' && c<='f') ) { - - if (i&1) { - - byte|=HEX2CHR(c); - bytes[i>>1]=byte; - } else { - - byte=HEX2CHR(c)<<4; - } - - - } - } - - wr=DVector::Write(); - r_v=Image(w,h,imgformat,pixels); - } - } - - } else { - r_v=Image(); // empty image, since no encoding defined - } - - } else if (type=="raw_array") { - - XML_FAIL( !parser->has_attribute("len"), "array missing 'len' attribute"); - - int len=parser->get_attribute_value("len").to_int(); - if (len>0) { - - XML_FAIL( parser->read()!=OK, "error reading" ); - XML_FAIL( parser->get_node_type()!=XMLParser::NODE_TEXT, "expected text!"); - String text = parser->get_node_data(); - - XML_FAIL( text.length() != len*2, "raw array length mismatch" ); - - DVector bytes; - bytes.resize(len); - DVector::Write w=bytes.write(); - uint8_t *bytesptr=w.ptr(); - - - for(int i=0;i='0' && c<='9') || (c>='A' && c<='F') || (c>='a' && c<='f') ) { - - if (i&1) { - - byte|=HEX2CHR(c); - bytesptr[i>>1]=byte; - } else { - - byte=HEX2CHR(c)<<4; - } - } - } - - w=DVector::Write(); - r_v=bytes; - } - - } else if (type=="int_array") { - - int len=parser->get_attribute_value("len").to_int(); - - if (len>0) { - - XML_FAIL( parser->read()!=OK, "error reading" ); - XML_FAIL( parser->get_node_type()!=XMLParser::NODE_TEXT, "expected text!"); - String text = parser->get_node_data(); - - const CharType *c=text.c_str(); - DVector varray; - varray.resize(len); - DVector::Write w = varray.write(); - - int idx=0; - const CharType *from=c-1; - - while(*c) { - - bool ischar = (*c >='0' && *c<='9') || *c=='+' || *c=='-'; - if (!ischar) { - - if (int64_t(c-from)>1) { - - int i = String::to_int(from+1,int64_t(c-from)); - w[idx++]=i; - } - - from=c; - } else { - - XML_FAIL( idx >= len, "array too big"); - } - - c++; - } - - XML_FAIL( idx != len, "array size mismatch"); - - w = varray.write(); - r_v=varray; - } - - - - } else if (type=="real_array") { - - int len=parser->get_attribute_value("len").to_int(); - - if (len>0) { - - XML_FAIL( parser->read()!=OK, "error reading" ); - XML_FAIL( parser->get_node_type()!=XMLParser::NODE_TEXT, "expected text!"); - String text = parser->get_node_data(); - - const CharType *c=text.c_str(); - DVector varray; - varray.resize(len); - DVector::Write w = varray.write(); - - int idx=0; - const CharType *from=c-1; - - while(*c) { - - bool ischar = IS_FLOAT_CHAR((*c)); - if (!ischar) { - - if (int64_t(c-from)>1) { - - real_t f = String::to_double(from+1,int64_t(c-from)); - w[idx++]=f; - } - - from=c; - } else { - - XML_FAIL( idx >= len, "array too big"); - } - - c++; - } - - XML_FAIL( idx != len, "array size mismatch"); - - w = varray.write(); - r_v=varray; - } - - } else if (type=="string_array") { - - - // this is invalid xml, and will have to be fixed at some point.. - - int len=parser->get_attribute_value("len").to_int(); - - if (len>0) { - - XML_FAIL( parser->read()!=OK, "error reading" ); - XML_FAIL( parser->get_node_type()!=XMLParser::NODE_TEXT, "expected text!"); - String text = parser->get_node_data(); - - const CharType *c=text.c_str(); - DVector sarray; - sarray.resize(len); - DVector::Write w = sarray.write(); - - - bool inside=false; - const CharType *from=c; - int idx=0; - - while(*c) { - - if (inside) { - - if (*c == '"') { - inside=false; - String s = String(from,int64_t(c-from)); - w[idx]=s; - idx++; - } - } else { - - if (*c == '"') { - inside=true; - from=c+1; - XML_FAIL( idx>=len, "string array is too big!!: "+name); - } - } - - c++; - } - - XML_FAIL( inside, "unterminated string array: "+name); - XML_FAIL( len != idx, "string array size mismatch: "+name); - - w = DVector::Write(); - - r_v=sarray; - - } - } else if (type=="vector3_array") { - - int len=parser->get_attribute_value("len").to_int(); - - if (len>0) { - - XML_FAIL( parser->read()!=OK, "error reading" ); - XML_FAIL( parser->get_node_type()!=XMLParser::NODE_TEXT, "expected text!"); - String text = parser->get_node_data(); - - const CharType *c=text.c_str(); - DVector varray; - varray.resize(len); - DVector::Write w = varray.write(); - - int idx=0; - int sidx=0; - Vector3 v; - const CharType *from=c-1; - - while(*c) { - - bool ischar = IS_FLOAT_CHAR((*c)); - if (!ischar) { - - if (int64_t(c-from)>1) { - - real_t f = String::to_double(from+1,int64_t(c-from)); - v[sidx++]=f; - if (sidx==3) { - w[idx++]=v; - sidx=0; - - } - } - - from=c; - } else { - - XML_FAIL( idx >= len, "array too big"); - } - - c++; - } - - XML_FAIL( idx != len, "array size mismatch"); - - w = varray.write(); - r_v=varray; - } - - } else if (type=="color_array") { - - int len=parser->get_attribute_value("len").to_int(); - - if (len>0) { - - XML_FAIL( parser->read()!=OK, "error reading" ); - XML_FAIL( parser->get_node_type()!=XMLParser::NODE_TEXT, "expected text!"); - String text = parser->get_node_data(); - - const CharType *c=text.c_str(); - DVector carray; - carray.resize(len); - DVector::Write w = carray.write(); - - int idx=0; - int sidx=0; - Color v; - const CharType *from=c-1; - - while(*c) { - - bool ischar = IS_FLOAT_CHAR((*c)); - if (!ischar) { - - if (int64_t(c-from)>1) { - - real_t f = String::to_double(from+1,int64_t(c-from)); - v[sidx++]=f; - if (sidx==4) { - w[idx++]=v; - sidx=0; - - } - } - - from=c; - } else { - - XML_FAIL( idx >= len, "array too big"); - } - - c++; - } - - XML_FAIL( idx != len, "array size mismatch"); - - w = carray.write(); - r_v=carray; - } - } else { - // simple string parsing code - XML_FAIL( parser->read()!=OK, "can't read data" ); - - String data=parser->get_node_data(); - data=data.strip_edges(); - - if (type=="nil") { - // uh do nothing - - } else if (type=="bool") { - // uh do nothing - if (data.nocasecmp_to("true")==0 || data.to_int()!=0) - r_v=true; - else - r_v=false; - - } else if (type=="int") { - - r_v=data.to_int(); - } else if (type=="real") { - - r_v=data.to_double(); - } else if (type=="string") { - - String str=data; - str=str.substr(1,str.length()-2); - r_v=str; - } else if (type=="vector3") { - - r_v=Vector3( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double(), - data.get_slice(",",2).to_double() - ); - - } else if (type=="vector2") { - - - r_v=Vector2( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double() - ); - - } else if (type=="plane") { - - r_v=Plane( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double(), - data.get_slice(",",2).to_double(), - data.get_slice(",",3).to_double() - ); - - } else if (type=="quaternion") { - - r_v=Quat( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double(), - data.get_slice(",",2).to_double(), - data.get_slice(",",3).to_double() - ); - - } else if (type=="rect2") { - - r_v=Rect2( - Vector2( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double() - ), - Vector2( - data.get_slice(",",2).to_double(), - data.get_slice(",",3).to_double() - ) - ); - - - } else if (type=="aabb") { - - r_v=AABB( - Vector3( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double(), - data.get_slice(",",2).to_double() - ), - Vector3( - data.get_slice(",",3).to_double(), - data.get_slice(",",4).to_double(), - data.get_slice(",",5).to_double() - ) - ); - - - } else if (type=="matrix3") { - - Matrix3 m3; - for (int i=0;i<3;i++) { - for (int j=0;j<3;j++) { - m3.elements[i][j]=data.get_slice(",",i*3+j).to_double(); - } - } - r_v=m3; - - } else if (type=="transform") { - - Transform tr; - for (int i=0;i<3;i++) { - for (int j=0;j<3;j++) { - tr.basis.elements[i][j]=data.get_slice(",",i*3+j).to_double(); - } - - } - tr.origin=Vector3( - data.get_slice(",",9).to_double(), - data.get_slice(",",10).to_double(), - data.get_slice(",",11).to_double() - ); - r_v=tr; - - } else if (type=="color") { - - r_v=Color( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double(), - data.get_slice(",",2).to_double(), - data.get_slice(",",3).to_double() - ); - - } else if (type=="node_path") { - - String str=data; - str=str.substr(1,str.length()-2); - r_v=NodePath( str ); - - } else if (type=="input_event") { - - // ? - } else { - - XML_FAIL(true,"unrecognized property tag: "+type); - } - } - - _close_tag(type); - - return OK; -} - - - - -Error ObjectFormatLoaderXML::_close_tag(const String& p_tag) { - - int c=1; - - while(parser->read()==OK) { - - - if (parser->get_node_type()==XMLParser::NODE_ELEMENT && parser->get_node_name()==p_tag) { - c++; - } else if (parser->get_node_type()==XMLParser::NODE_ELEMENT_END && parser->get_node_name()==p_tag) { - c--; - - if (c==0) - return OK; - } - - } - - return ERR_FILE_CORRUPT; -} - -Error ObjectFormatLoaderXML::load(Object **p_object,Variant &p_meta) { - - *p_object=NULL; - p_meta=Variant(); - - while(parser->read()==OK) { - - if (parser->get_node_type()==XMLParser::NODE_ELEMENT) { - - String name = parser->get_node_name(); - - - XML_FAIL( !parser->has_attribute("type"), "'type' attribute missing." ); - String type = parser->get_attribute_value("type"); - - - Object *obj=NULL; - Ref resource; - if (name=="resource") { - - XML_FAIL( !parser->has_attribute("path"), "'path' attribute missing." ); - String path = parser->get_attribute_value("path"); - - XML_FAIL(!path.begins_with("local://"),"path does not begin with 'local://'"); - - - path=path.replace("local://",local_path+"::"); - - if (ResourceCache::has(path)) { - Error err = _close_tag(name); - XML_FAIL( err, "error skipping resource."); - continue; //it's a resource, and it's already loaded - - } - - obj = ObjectTypeDB::instance(type); - XML_FAIL(!obj,"couldn't instance object of type: '"+type+"'"); - - Resource *r = obj->cast_to(); - XML_FAIL(!obj,"object isn't of type Resource: '"+type+"'"); - - resource = RES( r ); - r->set_path(path); - - - } else if (name=="object") { - - - if (ObjectTypeDB::can_instance(type)) { - obj = ObjectTypeDB::instance(type); - XML_FAIL(!obj,"couldn't instance object of type: '"+type+"'"); - } else { - - _close_tag(name); - return ERR_SKIP; - }; - } else { - XML_FAIL(true,"Unknown main tag: "+parser->get_node_name()); - } - - //load properties - - while (parser->read()==OK) { - - if (parser->get_node_type()==XMLParser::NODE_ELEMENT_END && parser->get_node_name()==name) - break; - else if (parser->get_node_type()==XMLParser::NODE_ELEMENT) { - - String name; - Variant v; - Error err; - err = _parse_property(v,name); - XML_FAIL(err,"Error parsing property: "+name); - - if (resource.is_null() && name=="__xml_meta__") { - - p_meta=v; - continue; - } else { - - XML_FAIL( !obj, "Normal property found in meta object"); - - } - - obj->set(name,v); - - - } - } - - - if (!obj) { - *p_object=NULL; - return OK; // it was a meta object - } - - if (resource.is_null()) { - //regular object - *p_object=obj; - return OK; - } else { - - resource_cache.push_back(resource); //keep it in mem until finished loading and load next - } - - - } else if (parser->get_node_type()==XMLParser::NODE_ELEMENT_END && parser->get_node_name()=="object_file") - return ERR_FILE_EOF; - } - - return OK; //never reach anyway -} - -ObjectFormatLoaderXML* ObjectFormatLoaderInstancerXML::instance(const String& p_file,const String& p_magic) { - - Ref parser = memnew( XMLParser ); - - Error err = parser->open(p_file); - ERR_FAIL_COND_V(err,NULL); - - ObjectFormatLoaderXML *loader = memnew( ObjectFormatLoaderXML ); - - loader->parser=parser; - loader->local_path = Globals::get_singleton()->localize_path(p_file); - - while(parser->read()==OK) { - - if (parser->get_node_type()==XMLParser::NODE_ELEMENT && parser->get_node_name()=="object_file") { - - ERR_FAIL_COND_V( parser->is_empty(), NULL ); - - String version = parser->get_attribute_value_safe("version"); - String magic = parser->get_attribute_value_safe("MAGIC"); - - if (version.get_slice_count(".")!=2) { - - ERR_EXPLAIN("Invalid Version String '"+version+"'' in file: "+p_file); - ERR_FAIL_V(NULL); - } - - int major = version.get_slice(".",0).to_int(); - int minor = version.get_slice(".",1).to_int(); - - if (major>VERSION_MAJOR || (major==VERSION_MAJOR && minor>VERSION_MINOR)) { - - ERR_EXPLAIN("File Format '"+version+"' is too new! Please upgrade to a a new engine version: "+p_file); - ERR_FAIL_V(NULL); - - } - - return loader; - } - - } - - ERR_EXPLAIN("No data found in file!"); - ERR_FAIL_V(NULL); -} - -void ObjectFormatLoaderInstancerXML::get_recognized_extensions(List *p_extensions) const { - - p_extensions->push_back("xml"); -} - - - -#else - -ObjectFormatLoaderXML::Tag* ObjectFormatLoaderXML::parse_tag(bool *r_exit) { - - - while(get_char()!='<' && !f->eof_reached()) {} - if (f->eof_reached()) - return NULL; - - Tag tag; - bool exit=false; - if (r_exit) - *r_exit=false; - - bool complete=false; - while(!f->eof_reached()) { - - CharType c=get_char(); - if (c<33 && tag.name.length() && !exit) { - break; - } else if (c=='>') { - complete=true; - break; - } else if (c=='/') { - exit=true; - } else { - tag.name+=c; - } - } - - if (f->eof_reached()) - return NULL; - - if (exit) { - if (!tag_stack.size()) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Unmatched exit tag "); - ERR_FAIL_COND_V(!tag_stack.size(),NULL); - } - - if (tag_stack.back()->get().name!=tag.name) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Mismatched exit tag. Got , expected get().name+">"); - ERR_FAIL_COND_V(tag_stack.back()->get().name!=tag.name,NULL); - } - - if (!complete) { - while(get_char()!='>' && !f->eof_reached()) {} - if (f->eof_reached()) - return NULL; - } - - if (r_exit) - *r_exit=true; - - tag_stack.pop_back(); - return NULL; - - } - - if (!complete) { - String name; - String value; - bool reading_value=false; - - while(!f->eof_reached()) { - - CharType c=get_char(); - if (c=='>') { - if (value.length()) { - - tag.args[name]=value; - } - break; - - } else if ( ((!reading_value && (c<33)) || c=='=' || c=='"') && tag.name.length()) { - - if (!reading_value && name.length()) { - - reading_value=true; - } else if (reading_value && value.length()) { - - tag.args[name]=value; - name=""; - value=""; - reading_value=false; - } - - } else if (reading_value) { - - value+=c; - } else { - - name+=c; - } - } - - if (f->eof_reached()) - return NULL; - } - - tag_stack.push_back(tag); - - return &tag_stack.back()->get(); -} - - -Error ObjectFormatLoaderXML::close_tag(const String& p_name) { - - int level=0; - bool inside_tag=false; - - while(true) { - - if (f->eof_reached()) { - - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": EOF found while attempting to find "); - ERR_FAIL_COND_V( f->eof_reached(), ERR_FILE_CORRUPT ); - } - - uint8_t c = get_char(); - - if (c == '<') { - - if (inside_tag) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Malformed XML. Already inside Tag."); - ERR_FAIL_COND_V(inside_tag,ERR_FILE_CORRUPT); - } - inside_tag=true; - c = get_char(); - if (c == '/') { - - --level; - } else { - - ++level; - }; - } else if (c == '>') { - - if (!inside_tag) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Malformed XML. Already outside Tag"); - ERR_FAIL_COND_V(!inside_tag,ERR_FILE_CORRUPT); - } - inside_tag=false; - if (level == -1) { - tag_stack.pop_back(); - return OK; - }; - }; - } - - return OK; -} - -void ObjectFormatLoaderXML::unquote(String& p_str) { - - p_str=p_str.strip_edges(); - p_str=p_str.replace("\"",""); - p_str=p_str.replace(">","<"); - p_str=p_str.replace("<",">"); - p_str=p_str.replace("'","'"); - p_str=p_str.replace(""","\""); - for (int i=1;i<32;i++) { - - char chr[2]={i,0}; - p_str=p_str.replace("&#"+String::num(i)+";",chr); - } - p_str=p_str.replace("&","&"); - - //p_str.parse_utf8( p_str.ascii(true).get_data() ); - -} - -Error ObjectFormatLoaderXML::goto_end_of_tag() { - - uint8_t c; - while(true) { - - c=get_char(); - if (c=='>') //closetag - break; - if (f->eof_reached()) { - - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": EOF found while attempting to find close tag."); - ERR_FAIL_COND_V( f->eof_reached(), ERR_FILE_CORRUPT ); - } - - } - tag_stack.pop_back(); - - return OK; -} - - -Error ObjectFormatLoaderXML::parse_property_data(String &r_data) { - - r_data=""; - CharString cs; - while(true) { - - CharType c=get_char(); - if (c=='<') - break; - ERR_FAIL_COND_V(f->eof_reached(),ERR_FILE_CORRUPT); - cs.push_back(c); - } - - cs.push_back(0); - - r_data.parse_utf8(cs.get_data()); - - while(get_char()!='>' && !f->eof_reached()) {} - if (f->eof_reached()) { - - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Malformed XML."); - ERR_FAIL_COND_V( f->eof_reached(), ERR_FILE_CORRUPT ); - } - - r_data=r_data.strip_edges(); - tag_stack.pop_back(); - - return OK; -} - - -Error ObjectFormatLoaderXML::_parse_array_element(Vector &buff,bool p_number_only,FileAccess *f,bool *end) { - - if (buff.empty()) - buff.resize(32); // optimize - - int buff_max=buff.size(); - int buff_size=0; - *end=false; - char *buffptr=&buff[0]; - bool found=false; - bool quoted=false; - - while(true) { - - char c=get_char(); - - if (c==0) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": File corrupt (zero found)."); - ERR_FAIL_V(ERR_FILE_CORRUPT); - } else if (c=='"') { - quoted=!quoted; - } else if ((!quoted && ((p_number_only && c<33) || c==',')) || c=='<') { - - - if (c=='<') { - *end=true; - break; - } - if (c<32 && f->eof_reached()) { - *end=true; - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": File corrupt (unexpected EOF)."); - ERR_FAIL_V(ERR_FILE_CORRUPT); - } - - if (found) - break; - - } else { - - found=true; - if (buff_size>=buff_max) { - - buff_max++; - buff.resize(buff_max); - - } - - buffptr[buff_size]=c; - buff_size++; - } - } - - if (buff_size>=buff_max) { - - buff_max++; - buff.resize(buff_max); - - } - - buff[buff_size]=0; - buff_size++; - - return OK; -} - -Error ObjectFormatLoaderXML::parse_property(Variant& r_v, String &r_name) { - - bool exit; - Tag *tag = parse_tag(&exit); - - if (!tag) { - if (exit) // shouldn't have exited - return ERR_FILE_EOF; - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": File corrupt (No Property Tag)."); - ERR_FAIL_V(ERR_FILE_CORRUPT); - } - - r_v=Variant(); - r_name=""; - - - //ERR_FAIL_COND_V(tag->name!="property",ERR_FILE_CORRUPT); - //ERR_FAIL_COND_V(!tag->args.has("name"),ERR_FILE_CORRUPT); -// ERR_FAIL_COND_V(!tag->args.has("type"),ERR_FILE_CORRUPT); - - //String name=tag->args["name"]; - //ERR_FAIL_COND_V(name=="",ERR_FILE_CORRUPT); - String type=tag->name; - String name=tag->args["name"]; - - if (type=="") { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": 'type' field is empty."); - ERR_FAIL_COND_V(type=="",ERR_FILE_CORRUPT); - } - - if (type=="dictionary") { - - Dictionary d; - - while(true) { - - Error err; - String tagname; - Variant key; - - int dictline = get_current_line(); - - - err=parse_property(key,tagname); - - if (err && err!=ERR_FILE_EOF) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Error parsing dictionary: "+name+" (from line "+itos(dictline)+")"); - ERR_FAIL_COND_V(err && err!=ERR_FILE_EOF,err); - } - //ERR_FAIL_COND_V(tagname!="key",ERR_FILE_CORRUPT); - if (err) - break; - Variant value; - err=parse_property(value,tagname); - if (err) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Error parsing dictionary: "+name+" (from line "+itos(dictline)+")"); - } - - ERR_FAIL_COND_V(err,err); - //ERR_FAIL_COND_V(tagname!="value",ERR_FILE_CORRUPT); - - d[key]=value; - } - - - //err=parse_property_data(name); // skip the rest - //ERR_FAIL_COND_V(err,err); - - r_name=name; - r_v=d; - return OK; - - } else if (type=="array") { - - if (!tag->args.has("len")) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Array missing 'len' field: "+name); - ERR_FAIL_COND_V(!tag->args.has("len"),ERR_FILE_CORRUPT); - } - - - int len=tag->args["len"].to_int(); - - Array array; - array.resize(len); - - Error err; - Variant v; - String tagname; - int idx=0; - while( (err=parse_property(v,tagname))==OK ) { - - ERR_CONTINUE( idx <0 || idx >=len ); - - array.set(idx,v); - idx++; - } - - if (idx!=len) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Error loading array (size mismatch): "+name); - ERR_FAIL_COND_V(idx!=len,err); - } - - if (err!=ERR_FILE_EOF) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Error loading array: "+name); - ERR_FAIL_COND_V(err!=ERR_FILE_EOF,err); - } - - //err=parse_property_data(name); // skip the rest - //ERR_FAIL_COND_V(err,err); - - r_name=name; - r_v=array; - return OK; - - } else if (type=="resource") { - - if (tag->args.has("path")) { - - String path=tag->args["path"]; - String hint; - if (tag->args.has("resource_type")) - hint=tag->args["resource_type"]; - - if (path.begins_with("local://")) - path=path.replace("local://",local_path+"::"); - else if (path.find("://")==-1 && path.is_rel_path()) { - // path is relative to file being loaded, so convert to a resource path - path=Globals::get_singleton()->localize_path(local_path.get_base_dir()+"/"+path); - - } - - //take advantage of the resource loader cache. The resource is cached on it, even if - RES res=ResourceLoader::load(path,hint); - - - if (res.is_null()) { - - WARN_PRINT(String("Couldn't load resource: "+path).ascii().get_data()); - } - - r_v=res.get_ref_ptr(); - } - - - - Error err=goto_end_of_tag(); - if (err) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Error closing tag."); - ERR_FAIL_COND_V(err,err); - } - - - r_name=name; - - return OK; - - } else if (type=="image") { - - if (!tag->args.has("encoding")) { - //empty image - r_v=Image(); - String sdfsdfg; - Error err=parse_property_data(sdfsdfg); - return OK; - } - - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Image missing 'encoding' field."); - ERR_FAIL_COND_V( !tag->args.has("encoding"), ERR_FILE_CORRUPT ); - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Image missing 'width' field."); - ERR_FAIL_COND_V( !tag->args.has("width"), ERR_FILE_CORRUPT ); - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Image missing 'height' field."); - ERR_FAIL_COND_V( !tag->args.has("height"), ERR_FILE_CORRUPT ); - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Image missing 'format' field."); - ERR_FAIL_COND_V( !tag->args.has("format"), ERR_FILE_CORRUPT ); - - String encoding=tag->args["encoding"]; - - if (encoding=="raw") { - String width=tag->args["width"]; - String height=tag->args["height"]; - String format=tag->args["format"]; - int mipmaps=tag->args.has("mipmaps")?int(tag->args["mipmaps"].to_int()):int(0); - int custom_size = tag->args.has("custom_size")?int(tag->args["custom_size"].to_int()):int(0); - - r_name=name; - - Image::Format imgformat; - - - if (format=="grayscale") { - imgformat=Image::FORMAT_GRAYSCALE; - } else if (format=="intensity") { - imgformat=Image::FORMAT_INTENSITY; - } else if (format=="grayscale_alpha") { - imgformat=Image::FORMAT_GRAYSCALE_ALPHA; - } else if (format=="rgb") { - imgformat=Image::FORMAT_RGB; - } else if (format=="rgba") { - imgformat=Image::FORMAT_RGBA; - } else if (format=="indexed") { - imgformat=Image::FORMAT_INDEXED; - } else if (format=="indexed_alpha") { - imgformat=Image::FORMAT_INDEXED_ALPHA; - } else if (format=="bc1") { - imgformat=Image::FORMAT_BC1; - } else if (format=="bc2") { - imgformat=Image::FORMAT_BC2; - } else if (format=="bc3") { - imgformat=Image::FORMAT_BC3; - } else if (format=="bc4") { - imgformat=Image::FORMAT_BC4; - } else if (format=="bc5") { - imgformat=Image::FORMAT_BC5; - } else if (format=="custom") { - imgformat=Image::FORMAT_CUSTOM; - } else { - - ERR_FAIL_V( ERR_FILE_CORRUPT ); - } - - - int datasize; - int w=width.to_int(); - int h=height.to_int(); - - if (w == 0 && w == 0) { - //r_v = Image(w, h, imgformat); - r_v=Image(); - String sdfsdfg; - Error err=parse_property_data(sdfsdfg); - return OK; - }; - - if (imgformat==Image::FORMAT_CUSTOM) { - - datasize=custom_size; - } else { - - datasize = Image::get_image_data_size(h,w,imgformat,mipmaps); - } - - if (datasize==0) { - //r_v = Image(w, h, imgformat); - r_v=Image(); - String sdfsdfg; - Error err=parse_property_data(sdfsdfg); - return OK; - }; - - DVector pixels; - pixels.resize(datasize); - DVector::Write wb = pixels.write(); - - int idx=0; - uint8_t byte; - while( idx='0' && c<='9') || (c>='A' && c<='F') || (c>='a' && c<='f') ) { - - if (idx&1) { - - byte|=HEX2CHR(c); - wb[idx>>1]=byte; - } else { - - byte=HEX2CHR(c)<<4; - } - - idx++; - } - - } - ERR_FAIL_COND_V(f->eof_reached(),ERR_FILE_CORRUPT); - - wb=DVector::Write(); - - r_v=Image(w,h,mipmaps,imgformat,pixels); - String sdfsdfg; - Error err=parse_property_data(sdfsdfg); - ERR_FAIL_COND_V(err,err); - - return OK; - } - - ERR_FAIL_V(ERR_FILE_CORRUPT); - - } else if (type=="raw_array") { - - if (!tag->args.has("len")) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": RawArray missing 'len' field: "+name); - ERR_FAIL_COND_V(!tag->args.has("len"),ERR_FILE_CORRUPT); - } - int len=tag->args["len"].to_int(); - - DVector bytes; - bytes.resize(len); - DVector::Write w=bytes.write(); - uint8_t *bytesptr=w.ptr(); - int idx=0; - uint8_t byte; - while( idx>1]=byte; - } else { - - byte=HEX2CHR(c)<<4; - } - - idx++; - } - - ERR_FAIL_COND_V(f->eof_reached(),ERR_FILE_CORRUPT); - - w=DVector::Write(); - r_v=bytes; - String sdfsdfg; - Error err=parse_property_data(sdfsdfg); - ERR_FAIL_COND_V(err,err); - r_name=name; - - return OK; - - } else if (type=="int_array") { - - if (!tag->args.has("len")) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Array missing 'len' field: "+name); - ERR_FAIL_COND_V(!tag->args.has("len"),ERR_FILE_CORRUPT); - } - int len=tag->args["len"].to_int(); - - DVector ints; - ints.resize(len); - DVector::Write w=ints.write(); - int *intsptr=w.ptr(); - int idx=0; - String str; -#if 0 - while( idxeof_reached(),ERR_FILE_CORRUPT); - - if (c<33 || c==',' || c=='<') { - - if (str.length()) { - - intsptr[idx]=str.to_int(); - str=""; - idx++; - } - - if (c=='<') { - - while(get_char()!='>' && !f->eof_reached()) {} - ERR_FAIL_COND_V(f->eof_reached(),ERR_FILE_CORRUPT); - break; - } - - } else { - - str+=c; - } - } - -#else - - Vector tmpdata; - - while( idx::Write(); - - r_v=ints; - Error err=goto_end_of_tag(); - ERR_FAIL_COND_V(err,err); - r_name=name; - - return OK; - } else if (type=="real_array") { - - if (!tag->args.has("len")) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Array missing 'len' field: "+name); - ERR_FAIL_COND_V(!tag->args.has("len"),ERR_FILE_CORRUPT); - } - int len=tag->args["len"].to_int();; - - DVector reals; - reals.resize(len); - DVector::Write w=reals.write(); - real_t *realsptr=w.ptr(); - int idx=0; - String str; - - -#if 0 - while( idxeof_reached(),ERR_FILE_CORRUPT); - - - if (c<33 || c==',' || c=='<') { - - if (str.length()) { - - realsptr[idx]=str.to_double(); - str=""; - idx++; - } - - if (c=='<') { - - while(get_char()!='>' && !f->eof_reached()) {} - ERR_FAIL_COND_V(f->eof_reached(),ERR_FILE_CORRUPT); - break; - } - - } else { - - str+=c; - } - } - -#else - - - - Vector tmpdata; - - while( idx::Write(); - r_v=reals; - - Error err=goto_end_of_tag(); - ERR_FAIL_COND_V(err,err); - r_name=name; - - return OK; - } else if (type=="string_array") { - - if (!tag->args.has("len")) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Array missing 'len' field: "+name); - ERR_FAIL_COND_V(!tag->args.has("len"),ERR_FILE_CORRUPT); - } - int len=tag->args["len"].to_int(); - - DVector strings; - strings.resize(len); - DVector::Write w=strings.write(); - String *stringsptr=w.ptr(); - int idx=0; - String str; - - bool inside_str=false; - CharString cs; - while( idxeof_reached(),ERR_FILE_CORRUPT); - - - if (c=='"') { - if (inside_str) { - - cs.push_back(0); - String str; - str.parse_utf8(cs.get_data()); - unquote(str); - stringsptr[idx]=str; - cs.clear(); - idx++; - inside_str=false; - } else { - inside_str=true; - } - } else if (c=='<') { - - while(get_char()!='>' && !f->eof_reached()) {} - ERR_FAIL_COND_V(f->eof_reached(),ERR_FILE_CORRUPT); - break; - - - } else if (inside_str){ - - cs.push_back(c); - } - } - w=DVector::Write(); - r_v=strings; - String sdfsdfg; - Error err=parse_property_data(sdfsdfg); - ERR_FAIL_COND_V(err,err); - - r_name=name; - - return OK; - } else if (type=="vector3_array") { - - if (!tag->args.has("len")) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Array missing 'len' field: "+name); - ERR_FAIL_COND_V(!tag->args.has("len"),ERR_FILE_CORRUPT); - } - int len=tag->args["len"].to_int();; - - DVector vectors; - vectors.resize(len); - DVector::Write w=vectors.write(); - Vector3 *vectorsptr=w.ptr(); - int idx=0; - int subidx=0; - Vector3 auxvec; - String str; - -// uint64_t tbegin = OS::get_singleton()->get_ticks_usec(); -#if 0 - while( idxeof_reached(),ERR_FILE_CORRUPT); - - - if (c<33 || c==',' || c=='<') { - - if (str.length()) { - - auxvec[subidx]=str.to_double(); - subidx++; - str=""; - if (subidx==3) { - vectorsptr[idx]=auxvec; - - idx++; - subidx=0; - } - } - - if (c=='<') { - - while(get_char()!='>' && !f->eof_reached()) {} - ERR_FAIL_COND_V(f->eof_reached(),ERR_FILE_CORRUPT); - break; - } - - } else { - - str+=c; - } - } -#else - - Vector tmpdata; - - while( idxget_ticks_usec() - tbegin)/1000000.0; - - - w=DVector::Write(); - r_v=vectors; - String sdfsdfg; - Error err=goto_end_of_tag(); - ERR_FAIL_COND_V(err,err); - r_name=name; - - return OK; - - } else if (type=="vector2_array") { - - if (!tag->args.has("len")) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Array missing 'len' field: "+name); - ERR_FAIL_COND_V(!tag->args.has("len"),ERR_FILE_CORRUPT); - } - int len=tag->args["len"].to_int();; - - DVector vectors; - vectors.resize(len); - DVector::Write w=vectors.write(); - Vector2 *vectorsptr=w.ptr(); - int idx=0; - int subidx=0; - Vector2 auxvec; - String str; - -// uint64_t tbegin = OS::get_singleton()->get_ticks_usec(); -#if 0 - while( idxeof_reached(),ERR_FILE_CORRUPT); - - - if (c<22 || c==',' || c=='<') { - - if (str.length()) { - - auxvec[subidx]=str.to_double(); - subidx++; - str=""; - if (subidx==2) { - vectorsptr[idx]=auxvec; - - idx++; - subidx=0; - } - } - - if (c=='<') { - - while(get_char()!='>' && !f->eof_reached()) {} - ERR_FAIL_COND_V(f->eof_reached(),ERR_FILE_CORRUPT); - break; - } - - } else { - - str+=c; - } - } -#else - - Vector tmpdata; - - while( idxget_ticks_usec() - tbegin)/1000000.0; - - - w=DVector::Write(); - r_v=vectors; - String sdfsdfg; - Error err=goto_end_of_tag(); - ERR_FAIL_COND_V(err,err); - r_name=name; - - return OK; - - } else if (type=="color_array") { - - if (!tag->args.has("len")) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Array missing 'len' field: "+name); - ERR_FAIL_COND_V(!tag->args.has("len"),ERR_FILE_CORRUPT); - } - int len=tag->args["len"].to_int();; - - DVector colors; - colors.resize(len); - DVector::Write w=colors.write(); - Color *colorsptr=w.ptr(); - int idx=0; - int subidx=0; - Color auxcol; - String str; - - while( idxeof_reached(),ERR_FILE_CORRUPT); - - - if (c<33 || c==',' || c=='<') { - - if (str.length()) { - - auxcol[subidx]=str.to_double(); - subidx++; - str=""; - if (subidx==4) { - colorsptr[idx]=auxcol; - idx++; - subidx=0; - } - } - - if (c=='<') { - - while(get_char()!='>' && !f->eof_reached()) {} - ERR_FAIL_COND_V(f->eof_reached(),ERR_FILE_CORRUPT); - break; - } - - } else { - - str+=c; - } - } - w=DVector::Write(); - r_v=colors; - String sdfsdfg; - Error err=parse_property_data(sdfsdfg); - ERR_FAIL_COND_V(err,err); - r_name=name; - - return OK; - } - - - String data; - Error err = parse_property_data(data); - ERR_FAIL_COND_V(err!=OK,err); - - if (type=="nil") { - // uh do nothing - - } else if (type=="bool") { - // uh do nothing - if (data.nocasecmp_to("true")==0 || data.to_int()!=0) - r_v=true; - else - r_v=false; - } else if (type=="int") { - - r_v=data.to_int(); - } else if (type=="real") { - - r_v=data.to_double(); - } else if (type=="string") { - - String str=data; - unquote(str); - r_v=str; - } else if (type=="vector3") { - - - r_v=Vector3( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double(), - data.get_slice(",",2).to_double() - ); - - } else if (type=="vector2") { - - - r_v=Vector2( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double() - ); - - } else if (type=="plane") { - - r_v=Plane( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double(), - data.get_slice(",",2).to_double(), - data.get_slice(",",3).to_double() - ); - - } else if (type=="quaternion") { - - r_v=Quat( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double(), - data.get_slice(",",2).to_double(), - data.get_slice(",",3).to_double() - ); - - } else if (type=="rect2") { - - r_v=Rect2( - Vector2( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double() - ), - Vector2( - data.get_slice(",",2).to_double(), - data.get_slice(",",3).to_double() - ) - ); - - - } else if (type=="aabb") { - - r_v=AABB( - Vector3( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double(), - data.get_slice(",",2).to_double() - ), - Vector3( - data.get_slice(",",3).to_double(), - data.get_slice(",",4).to_double(), - data.get_slice(",",5).to_double() - ) - ); - - } else if (type=="matrix32") { - - Matrix32 m3; - for (int i=0;i<3;i++) { - for (int j=0;j<2;j++) { - m3.elements[i][j]=data.get_slice(",",i*2+j).to_double(); - } - } - r_v=m3; - - } else if (type=="matrix3") { - - Matrix3 m3; - for (int i=0;i<3;i++) { - for (int j=0;j<3;j++) { - m3.elements[i][j]=data.get_slice(",",i*3+j).to_double(); - } - } - r_v=m3; - - } else if (type=="transform") { - - Transform tr; - for (int i=0;i<3;i++) { - for (int j=0;j<3;j++) { - tr.basis.elements[i][j]=data.get_slice(",",i*3+j).to_double(); - } - - } - tr.origin=Vector3( - data.get_slice(",",9).to_double(), - data.get_slice(",",10).to_double(), - data.get_slice(",",11).to_double() - ); - r_v=tr; - - } else if (type=="color") { - - r_v=Color( - data.get_slice(",",0).to_double(), - data.get_slice(",",1).to_double(), - data.get_slice(",",2).to_double(), - data.get_slice(",",3).to_double() - ); - - } else if (type=="node_path") { - - String str=data; - unquote(str); - r_v=NodePath( str ); - } else if (type=="input_event") { - - // ? - } else { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Unrecognized tag in file: "+type); - ERR_FAIL_V(ERR_FILE_CORRUPT); - } - r_name=name; - return OK; -} - - -Error ObjectFormatLoaderXML::load(Object **p_object,Variant &p_meta) { - - *p_object=NULL; - p_meta=Variant(); - - - - while(true) { - - - bool exit; - Tag *tag = parse_tag(&exit); - - - if (!tag) { - if (!exit) // shouldn't have exited - ERR_FAIL_V(ERR_FILE_CORRUPT); - *p_object=NULL; - return ERR_FILE_EOF; - } - - RES resource; - Object *obj=NULL; - - if (tag->name=="resource") { - //loading resource - - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": missing 'len' field."); - ERR_FAIL_COND_V(!tag->args.has("path"),ERR_FILE_CORRUPT); - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": missing 'type' field."); - ERR_FAIL_COND_V(!tag->args.has("type"),ERR_FILE_CORRUPT); - String path=tag->args["path"]; - - if (path.begins_with("local://")) { - //built-in resource (but really external) - path=path.replace("local://",local_path+"::"); - } - - - if (ResourceCache::has(path)) { - Error err = close_tag(tag->name); - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Unable to close tag."); - ERR_FAIL_COND_V( err, err ); - continue; //it's a resource, and it's already loaded - - } - - String type = tag->args["type"]; - - obj = ObjectTypeDB::instance(type); - if (!obj) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Object of unrecognized type in file: "+type); - } - ERR_FAIL_COND_V(!obj,ERR_FILE_CORRUPT); - - Resource *r = obj->cast_to(); - if (!r) { - memdelete(obj); //bye - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Object type in resource field not a resource, type is: "+obj->get_type()); - ERR_FAIL_COND_V(!obj->cast_to(),ERR_FILE_CORRUPT); - } - - resource = RES( r ); - r->set_path(path); - - - - } else if (tag->name=="object") { - - if ( tag->args.has("type") ) { - - ERR_FAIL_COND_V(!ObjectTypeDB::type_exists(tag->args["type"]), ERR_FILE_CORRUPT); - - if (ObjectTypeDB::can_instance(tag->args["type"])) { - obj = ObjectTypeDB::instance(tag->args["type"]); - if (!obj) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Object of unrecognized type in file: "+tag->args["type"]); - } - ERR_FAIL_COND_V(!obj,ERR_FILE_CORRUPT); - } else { - - close_tag(tag->name); - return ERR_SKIP; - }; - } else { - //otherwise it's a meta object - } - - } else { - - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Unknown main tag: "+tag->name); - ERR_FAIL_V( ERR_FILE_CORRUPT ); - } - - //load properties - - while(true) { - - String name; - Variant v; - Error err; - err = parse_property(v,name); - if (err==ERR_FILE_EOF) //tag closed - break; - if (err!=OK) { - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": XML Parsing aborted."); - ERR_FAIL_COND_V(err!=OK,ERR_FILE_CORRUPT); - } - if (resource.is_null() && name=="__xml_meta__") { - - p_meta=v; - continue; - } else if (!obj) { - - ERR_EXPLAIN(local_path+":"+itos(get_current_line())+": Normal property found in meta object."); - ERR_FAIL_V(ERR_FILE_CORRUPT); - } - - obj->set(name,v); - } - - if (!obj) { - *p_object=NULL; - return OK; // it was a meta object - } - - if (resource.is_null()) { - - //regular object - *p_object=obj; - return OK; - } else { - - - resource_cache.push_back(resource); //keep it in mem until finished loading - } - - // a resource.. continue! - - } - - - - return OK; //never reach anyway - -} - -int ObjectFormatLoaderXML::get_current_line() const { - - return lines; -} - - -uint8_t ObjectFormatLoaderXML::get_char() const { - - uint8_t c = f->get_8(); - if (c=='\n') - lines++; - return c; - -} - -ObjectFormatLoaderXML::~ObjectFormatLoaderXML() { - - if (f) { - if (f->is_open()) - f->close(); - memdelete(f); - } -} - - - -ObjectFormatLoaderXML* ObjectFormatLoaderInstancerXML::instance(const String& p_file,const String& p_magic) { - - Error err; - FileAccess *f=FileAccess::open(p_file,FileAccess::READ,&err); - if (err!=OK) { - - ERR_FAIL_COND_V(err!=OK,NULL); - } - - ObjectFormatLoaderXML *loader = memnew( ObjectFormatLoaderXML ); - - loader->lines=1; - loader->f=f; - loader->local_path = Globals::get_singleton()->localize_path(p_file); - - ObjectFormatLoaderXML::Tag *tag = loader->parse_tag(); - if (!tag || tag->name!="?xml" || !tag->args.has("version") || !tag->args.has("encoding") || tag->args["encoding"]!="UTF-8") { - - f->close(); - memdelete(loader); - ERR_EXPLAIN("Not a XML:UTF-8 File: "+p_file); - ERR_FAIL_V(NULL); - } - - loader->tag_stack.clear(); - - tag = loader->parse_tag(); - - if (!tag || tag->name!="object_file" || !tag->args.has("magic") || !tag->args.has("version") || tag->args["magic"]!=p_magic) { - - f->close(); - memdelete(loader); - ERR_EXPLAIN("Unrecognized XML File: "+p_file); - ERR_FAIL_V(NULL); - } - - String version = tag->args["version"]; - if (version.get_slice_count(".")!=2) { - - f->close(); - memdelete(loader); - ERR_EXPLAIN("Invalid Version String '"+version+"'' in file: "+p_file); - ERR_FAIL_V(NULL); - } - - int major = version.get_slice(".",0).to_int(); - int minor = version.get_slice(".",1).to_int(); - - if (major>VERSION_MAJOR || (major==VERSION_MAJOR && minor>VERSION_MINOR)) { - - f->close(); - memdelete(loader); - ERR_EXPLAIN("File Format '"+version+"' is too new! Please upgrade to a a new engine version: "+p_file); - ERR_FAIL_V(NULL); - - } - - return loader; -} - -void ObjectFormatLoaderInstancerXML::get_recognized_extensions(List *p_extensions) const { - - p_extensions->push_back("xml"); -} - - -#endif -#endif -#endif diff --git a/core/io/object_format_xml.h b/core/io/object_format_xml.h deleted file mode 100644 index 1169a1de58..0000000000 --- a/core/io/object_format_xml.h +++ /dev/null @@ -1,196 +0,0 @@ -/*************************************************************************/ -/* object_format_xml.h */ -/*************************************************************************/ -/* 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. */ -/*************************************************************************/ -#ifndef OBJECT_FORMAT_XML_H -#define OBJECT_FORMAT_XML_H - -#ifdef XML_ENABLED -#ifdef OLD_SCENE_FORMAT_ENABLED -#include "io/object_loader.h" -#include "io/object_saver.h" -#include "os/file_access.h" -#include "map.h" -#include "resource.h" -#include "xml_parser.h" - -/** - @author Juan Linietsky -*/ - -class ObjectFormatSaverXML : public ObjectFormatSaver { - - String local_path; - - - Ref optimizer; - - bool relative_paths; - bool bundle_resources; - bool skip_editor; - FileAccess *f; - String magic; - int depth; - Map resource_map; - - struct SavedObject { - - Variant meta; - String type; - - - struct SavedProperty { - - String name; - Variant value; - }; - - List properties; - }; - - List saved_resources; - - List saved_objects; - - void enter_tag(const String& p_section,const String& p_args=""); - void exit_tag(const String& p_section); - - void _find_resources(const Variant& p_variant); - void write_property(const String& p_name,const Variant& p_property,bool *r_ok=NULL); - - - void escape(String& p_str); - void write_tabs(int p_diff=0); - void write_string(String p_str,bool p_escape=true); - -public: - - virtual Error save(const Object *p_object,const Variant &p_meta); - - ObjectFormatSaverXML(FileAccess *p_file,const String& p_magic,const String& p_local_path,uint32_t p_flags,const Ref& p_optimizer); - ~ObjectFormatSaverXML(); -}; - -class ObjectFormatSaverInstancerXML : public ObjectFormatSaverInstancer { -public: - - virtual ObjectFormatSaver* instance(const String& p_file,const String& p_magic,uint32_t p_flags=0,const Ref& p_optimizer=Ref()); - virtual void get_recognized_extensions(List *p_extensions) const; - - virtual ~ObjectFormatSaverInstancerXML(); -}; - -/***********************************/ -/***********************************/ -/***********************************/ -/***********************************/ - -//#define OPTIMIZED_XML_LOADER - -#ifdef OPTIMIZED_XML_LOADER - -class ObjectFormatLoaderXML : public ObjectFormatLoader { - - Ref parser; - String local_path; - - Error _close_tag(const String& p_tag); - Error _parse_property(Variant& r_property,String& r_name); - -friend class ObjectFormatLoaderInstancerXML; - - List resource_cache; -public: - - - virtual Error load(Object **p_object,Variant &p_meta); - - -}; - -class ObjectFormatLoaderInstancerXML : public ObjectFormatLoaderInstancer { -public: - - virtual ObjectFormatLoaderXML* instance(const String& p_file,const String& p_magic); - virtual void get_recognized_extensions(List *p_extensions) const; - -}; - -#else - - -class ObjectFormatLoaderXML : public ObjectFormatLoader { - - String local_path; - - FileAccess *f; - - struct Tag { - - String name; - HashMap args; - }; - - _FORCE_INLINE_ Error _parse_array_element(Vector &buff,bool p_number_only,FileAccess *f,bool *end); - - mutable int lines; - uint8_t get_char() const; - int get_current_line() const; - -friend class ObjectFormatLoaderInstancerXML; - List tag_stack; - - List resource_cache; - Tag* parse_tag(bool* r_exit=NULL); - Error close_tag(const String& p_name); - void unquote(String& p_str); - Error goto_end_of_tag(); - Error parse_property_data(String &r_data); - Error parse_property(Variant& r_v, String &r_name); - -public: - - - virtual Error load(Object **p_object,Variant &p_meta); - - virtual ~ObjectFormatLoaderXML(); -}; - -class ObjectFormatLoaderInstancerXML : public ObjectFormatLoaderInstancer { -public: - - virtual ObjectFormatLoaderXML* instance(const String& p_file,const String& p_magic); - virtual void get_recognized_extensions(List *p_extensions) const; - - - -}; - -#endif -#endif -#endif -#endif diff --git a/core/io/object_loader.cpp b/core/io/object_loader.cpp deleted file mode 100644 index bb42cf7338..0000000000 --- a/core/io/object_loader.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/*************************************************************************/ -/* object_loader.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 "object_loader.h" - -#ifdef OLD_SCENE_FORMAT_ENABLED - -bool ObjectFormatLoaderInstancer::recognize(const String& p_extension) const { - - - List extensions; - get_recognized_extensions(&extensions); - for (List::Element *E=extensions.front();E;E=E->next()) { - - if (E->get().nocasecmp_to(p_extension)==0) - return true; - } - - return false; -} - -ObjectFormatLoaderInstancer *ObjectLoader::loader[MAX_LOADERS]; -int ObjectLoader::loader_count=0; - - -ObjectFormatLoader *ObjectLoader::instance_format_loader(const String& p_path,const String& p_magic,String p_force_extension) { - - String extension=p_force_extension.length()?p_force_extension:p_path.extension(); - - for (int i=0;irecognize(extension)) - continue; - ObjectFormatLoader *format_loader = loader[i]->instance(p_path,p_magic); - if (format_loader) - return format_loader; - } - - return NULL; -} - -void ObjectLoader::get_recognized_extensions(List *p_extensions) { - - for (int i=0;iget_recognized_extensions(p_extensions); - } -} - - - -void ObjectLoader::add_object_format_loader_instancer(ObjectFormatLoaderInstancer *p_format_loader_instancer) { - - ERR_FAIL_COND(loader_count>=MAX_LOADERS ); - loader[loader_count++]=p_format_loader_instancer; -} - - -#endif diff --git a/core/io/object_loader.h b/core/io/object_loader.h deleted file mode 100644 index 9199313f04..0000000000 --- a/core/io/object_loader.h +++ /dev/null @@ -1,76 +0,0 @@ -/*************************************************************************/ -/* object_loader.h */ -/*************************************************************************/ -/* 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. */ -/*************************************************************************/ -#ifndef OBJECT_LOADER_H -#define OBJECT_LOADER_H - -#include "object.h" - -/** - @author Juan Linietsky -*/ -#ifdef OLD_SCENE_FORMAT_ENABLED -class ObjectFormatLoader { -public: - - virtual Error load(Object **p_object,Variant &p_meta)=0; - - virtual ~ObjectFormatLoader() {} -}; - -class ObjectFormatLoaderInstancer { -public: - - virtual ObjectFormatLoader* instance(const String& p_file,const String& p_magic)=0; - virtual void get_recognized_extensions(List *p_extensions) const=0; - bool recognize(const String& p_extension) const; - - virtual ~ObjectFormatLoaderInstancer() {} -}; - -class ObjectLoader { - - enum { - MAX_LOADERS=64 - }; - - static ObjectFormatLoaderInstancer *loader[MAX_LOADERS]; - static int loader_count; - -public: - - static ObjectFormatLoader *instance_format_loader(const String& p_path,const String& p_magic,String p_force_extension=""); - static void add_object_format_loader_instancer(ObjectFormatLoaderInstancer *p_format_loader_instancer); - static void get_recognized_extensions(List *p_extensions); - - - -}; - -#endif -#endif diff --git a/core/io/object_saver.cpp b/core/io/object_saver.cpp deleted file mode 100644 index cff2e836a7..0000000000 --- a/core/io/object_saver.cpp +++ /dev/null @@ -1,157 +0,0 @@ -/*************************************************************************/ -/* object_saver.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 "object_saver.h" -#ifdef OLD_SCENE_FORMAT_ENABLED - -void OptimizedSaver::add_property(const StringName& p_name, const Variant& p_value) { - - ERR_FAIL_COND(!_list); - Property p; - p.name=p_name; - p.value=p_value; - _list->push_back(p); -} - -bool OptimizedSaver::optimize_object(const Object *p_object) { - - return false; //not optimize -} - -void OptimizedSaver::get_property_list(const Object* p_object,List *p_properties) { - - - _list=p_properties; - - bool res = call("optimize_object",p_object); - - if (!res) { - - List plist; - p_object->get_property_list(&plist); - for(List::Element *E=plist.front();E;E=E->next()) { - - PropertyInfo pinfo=E->get(); - if ((pinfo.usage&PROPERTY_USAGE_STORAGE) || (is_bundle_resources_enabled() && pinfo.usage&PROPERTY_USAGE_BUNDLE)) { - - add_property(pinfo.name,p_object->get(pinfo.name)); - } - } - - } - - _list=NULL; -} - -void OptimizedSaver::set_target_platform(const String& p_platform) { - - ERR_FAIL_COND(p_platform!="" && !p_platform.is_valid_identifier()); - platform=p_platform; -} - -String OptimizedSaver::get_target_platform() const { - - return platform; -} - -void OptimizedSaver::set_target_name(const String& p_name) { - - name=p_name; -} - -String OptimizedSaver::get_target_name() const { - - return name; -} - -void OptimizedSaver::_bind_methods() { - - ObjectTypeDB::bind_method(_MD("set_target_platform","name"),&OptimizedSaver::set_target_platform); - ObjectTypeDB::bind_method(_MD("get_target_platform"),&OptimizedSaver::get_target_platform); - ObjectTypeDB::bind_method(_MD("set_target_name","name"),&OptimizedSaver::set_target_name); - ObjectTypeDB::bind_method(_MD("add_property","name","value"),&OptimizedSaver::add_property); - ObjectTypeDB::bind_method(_MD("optimize_object","obj"),&OptimizedSaver::optimize_object); -} - -OptimizedSaver::OptimizedSaver() { - - _list=NULL; -} - -ObjectFormatSaverInstancer *ObjectSaver::saver[MAX_LOADERS]; -int ObjectSaver::saver_count=0; - -bool ObjectFormatSaverInstancer::recognize(const String& p_extension) const { - - - List extensions; - get_recognized_extensions(&extensions); - for (List::Element *E=extensions.front();E;E=E->next()) { - - if (E->get().nocasecmp_to(p_extension.extension())==0) - return true; - } - - return false; -} - -ObjectFormatSaver *ObjectSaver::instance_format_saver(const String& p_path,const String& p_magic,String p_force_extension,uint32_t p_flags,const Ref& p_optimizer) { - - String extension=p_force_extension.length()?p_force_extension:p_path.extension(); - - for (int i=0;irecognize(extension)) - continue; - ObjectFormatSaver *format_saver = saver[i]->instance(p_path,p_magic,p_flags,p_optimizer); - if (format_saver) - return format_saver; - } - - return NULL; -} - -void ObjectSaver::get_recognized_extensions(List *p_extensions) { - - for (int i=0;iget_recognized_extensions(p_extensions); - } -} - - - -void ObjectSaver::add_object_format_saver_instancer(ObjectFormatSaverInstancer *p_format_saver_instancer) { - - ERR_FAIL_COND(saver_count>=MAX_LOADERS ); - saver[saver_count++]=p_format_saver_instancer; -} - - - -#endif diff --git a/core/io/object_saver.h b/core/io/object_saver.h deleted file mode 100644 index b22f7e05bb..0000000000 --- a/core/io/object_saver.h +++ /dev/null @@ -1,128 +0,0 @@ -/*************************************************************************/ -/* object_saver.h */ -/*************************************************************************/ -/* 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. */ -/*************************************************************************/ -#ifndef OBJECT_SAVER_H -#define OBJECT_SAVER_H - -#include "object.h" -#include "resource.h" -/** - @author Juan Linietsky -*/ - -#ifdef OLD_SCENE_FORMAT_ENABLED - -class OptimizedSaver : public Reference { - - OBJ_TYPE(OptimizedSaver,Reference); -public: - - struct Property { - - StringName name; - Variant value; - }; - -private: - - String name; - String platform; - List *_list; -protected: - - - void set_target_platform(const String& p_platform); - void set_target_name(const String& p_name); - void add_property(const StringName& p_name, const Variant& p_value); - static void _bind_methods(); - - virtual bool optimize_object(const Object *p_object); - -public: - - - virtual bool is_bundle_resources_enabled() const { return false; } - - String get_target_platform() const; - String get_target_name() const; - void get_property_list(const Object* p_object, List *p_properties); - - - OptimizedSaver(); - -}; - - -class ObjectFormatSaver { -public: - - virtual Error save(const Object *p_object,const Variant &p_meta=Variant())=0; - - virtual ~ObjectFormatSaver() {} -}; - -class ObjectFormatSaverInstancer { -public: - - virtual void get_recognized_extensions(List *p_extensions) const=0; - virtual ObjectFormatSaver* instance(const String& p_file,const String& p_magic="",uint32_t p_flags=0,const Ref& p_optimizer=Ref())=0; - bool recognize(const String& p_extension) const; - - virtual ~ObjectFormatSaverInstancer() {} -}; - -class ObjectSaver { - - enum { - MAX_LOADERS=64 - }; - - static ObjectFormatSaverInstancer *saver[MAX_LOADERS]; - static int saver_count; - -public: - - enum SaverFlags { - - FLAG_RELATIVE_PATHS=1, - FLAG_BUNDLE_RESOURCES=2, - FLAG_OMIT_EDITOR_PROPERTIES=4, - FLAG_SAVE_BIG_ENDIAN=8 - }; - - - static ObjectFormatSaver *instance_format_saver(const String& p_path,const String& p_magic,String p_force_extension="",uint32_t p_flags=0,const Ref& p_optimizer=Ref()); - static void get_recognized_extensions(List *p_extensions); - - static void add_object_format_saver_instancer(ObjectFormatSaverInstancer *p_format_saver_instancer); - - -}; - -#endif -#endif diff --git a/core/io/object_saver_base.cpp b/core/io/object_saver_base.cpp deleted file mode 100644 index 94d715de28..0000000000 --- a/core/io/object_saver_base.cpp +++ /dev/null @@ -1,150 +0,0 @@ -/*************************************************************************/ -/* object_saver_base.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 "object_saver_base.h" -#ifdef OLD_SCENE_FORMAT_ENABLED -void ObjectSaverBase::_find_resources(const Variant& p_variant) { - - switch(p_variant.get_type()) { - case Variant::OBJECT: { - - - RES res = p_variant.operator RefPtr(); - - if (res.is_null() || (res->get_path().length() && res->get_path().find("::") == -1 )) - return; - - if (resource_map.has(res)) - return; - - List property_list; - - res->get_property_list( &property_list ); - - List::Element *I=property_list.front(); - - while(I) { - - PropertyInfo pi=I->get(); - - if (pi.usage&PROPERTY_USAGE_STORAGE) { - - if (pi.type==Variant::OBJECT) { - - Variant v=res->get(I->get().name); - _find_resources(v); - } - } - - I=I->next(); - } - - resource_map[ res ] = resource_map.size(); //saved after, so the childs it needs are available when loaded - saved_resources.push_back(res); - - } break; - - case Variant::ARRAY: { - - Array varray=p_variant; - int len=varray.size(); - for(int i=0;i keys; - d.get_key_list(&keys); - for(List::Element *E=keys.front();E;E=E->next()) { - - Variant v = d[E->get()]; - _find_resources(v); - } - } break; - default: {} - } - -} - - -Error ObjectSaverBase::save(const Object *p_object,const Variant &p_meta) { - - ERR_EXPLAIN("write_object should supply either an object, a meta, or both"); - ERR_FAIL_COND_V(!p_object && p_meta.get_type()==Variant::NIL, ERR_INVALID_PARAMETER); - - SavedObject *so = memnew( SavedObject ); - - if (p_object) { - so->type=p_object->get_type(); - }; - - _find_resources(p_meta); - so->meta=p_meta; - - if (p_object) { - - List property_list; - p_object->get_property_list( &property_list ); - - List::Element *I=property_list.front(); - - while(I) { - - if (I->get().usage&PROPERTY_USAGE_STORAGE) { - - SavedObject::SavedProperty sp; - sp.name=I->get().name; - sp.value = p_object->get(I->get().name); - _find_resources(sp.value); - so->properties.push_back(sp); - } - - I=I->next(); - } - - } - - saved_objects.push_back(so); - - return OK; -} - -ObjectSaverBase::ObjectSaverBase() { - -}; - -ObjectSaverBase::~ObjectSaverBase() { - -}; -#endif diff --git a/core/io/object_saver_base.h b/core/io/object_saver_base.h deleted file mode 100644 index d9ec4a3aba..0000000000 --- a/core/io/object_saver_base.h +++ /dev/null @@ -1,76 +0,0 @@ -/*************************************************************************/ -/* object_saver_base.h */ -/*************************************************************************/ -/* 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. */ -/*************************************************************************/ -#ifndef OBJECT_SAVER_BASE_H -#define OBJECT_SAVER_BASE_H - - -#ifdef OLD_SCENE_FORMAT_ENABLED -#include "object_saver.h" - -#include "map.h" -#include "resource.h" - -class ObjectSaverBase : public ObjectFormatSaver { - -protected: - - Map resource_map; - - struct SavedObject { - - Variant meta; - String type; - - - struct SavedProperty { - - String name; - Variant value; - }; - - List properties; - }; - - List saved_resources; - - List saved_objects; - - void _find_resources(const Variant& p_variant); - - virtual Error write()=0; -public: - - virtual Error save(const Object *p_object,const Variant &p_meta); - - ObjectSaverBase(); - ~ObjectSaverBase(); -}; - -#endif -#endif // OBJECT_SAVER_BASE_H -- cgit v1.2.3