summaryrefslogtreecommitdiff
path: root/scene/resources/scene_format_text.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/resources/scene_format_text.cpp')
-rw-r--r--scene/resources/scene_format_text.cpp644
1 files changed, 111 insertions, 533 deletions
diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp
index 5f41dc2ce8..2f18e70d7f 100644
--- a/scene/resources/scene_format_text.cpp
+++ b/scene/resources/scene_format_text.cpp
@@ -12,12 +12,6 @@
#define _printerr() ERR_PRINT(String(res_path+":"+itos(lines)+" - Parse Error: "+error_text).utf8().get_data());
-Error ResourceInteractiveLoaderText::parse_property(Variant& r_v, String &r_name) {
-
- return OK;
-}
-
-
///
@@ -308,6 +302,10 @@ Error ResourceInteractiveLoaderText::poll() {
if (error) {
if (error!=ERR_FILE_EOF) {
_printerr();
+ } else {
+ if (!ResourceCache::has(res_path)) {
+ resource->set_path(res_path);
+ }
}
return error;
}
@@ -358,7 +356,7 @@ Error ResourceInteractiveLoaderText::poll() {
int type=-1;
int name=-1;
int instance=-1;
- int base_scene=-1;
+// int base_scene=-1;
if (next_tag.fields.has("name")) {
name=packed_scene->get_state()->add_name(next_tag.fields["name"]);
@@ -368,18 +366,15 @@ Error ResourceInteractiveLoaderText::poll() {
parent=packed_scene->get_state()->add_node_path(next_tag.fields["parent"]);
}
- if (next_tag.fields.has("owner")) {
- owner=packed_scene->get_state()->add_node_path(next_tag.fields["owner"]);
- } else {
- if (parent!=-1)
- owner=0; //if no owner, owner is root
- }
if (next_tag.fields.has("type")) {
type=packed_scene->get_state()->add_name(next_tag.fields["type"]);
+ } else {
+ type=SceneState::TYPE_INSTANCED; //no type? assume this was instanced
}
+
if (next_tag.fields.has("instance")) {
instance=packed_scene->get_state()->add_value(next_tag.fields["instance"]);
@@ -390,6 +385,13 @@ Error ResourceInteractiveLoaderText::poll() {
}
}
+ if (next_tag.fields.has("owner")) {
+ owner=packed_scene->get_state()->add_node_path(next_tag.fields["owner"]);
+ } else {
+ if (parent!=-1 && !(type==SceneState::TYPE_INSTANCED && instance==-1))
+ owner=0; //if no owner, owner is root
+ }
+
int node_id = packed_scene->get_state()->add_node(parent,owner,type,name,instance);
@@ -405,6 +407,9 @@ Error ResourceInteractiveLoaderText::poll() {
_printerr();
} else {
resource=packed_scene;
+ if (!ResourceCache::has(res_path)) {
+ packed_scene->set_path(res_path);
+ }
}
return error;
}
@@ -479,8 +484,8 @@ Error ResourceInteractiveLoaderText::poll() {
}
Vector<int> bind_ints;
- for(int i=9;i<binds.size();i++) {
- bind_ints.push_back( packed_scene->get_state()->add_value( bind_ints[i] ) );
+ for(int i=0;i<binds.size();i++) {
+ bind_ints.push_back( packed_scene->get_state()->add_value( binds[i] ) );
}
packed_scene->get_state()->add_connection(
@@ -614,57 +619,63 @@ void ResourceInteractiveLoaderText::get_dependencies(FileAccess *f,List<String>
Error ResourceInteractiveLoaderText::rename_dependencies(FileAccess *p_f, const String &p_path,const Map<String,String>& p_map) {
-
-
-#if 0
- open(p_f);
+ open(p_f,true);
ERR_FAIL_COND_V(error!=OK,error);
//FileAccess
- bool old_format=false;
-
FileAccess *fw = NULL;
String base_path=local_path.get_base_dir();
+
+ uint64_t tag_end = f->get_pos();
+
+
while(true) {
- bool exit;
- List<String> order;
- Tag *tag = parse_tag(&exit,true,&order);
- bool done=false;
- if (!tag) {
+ Error err = VariantParser::parse_tag(&stream,lines,error_text,next_tag,&rp);
+
+ if (err!=OK) {
if (fw) {
memdelete(fw);
}
error=ERR_FILE_CORRUPT;
- ERR_FAIL_COND_V(!exit,error);
- error=ERR_FILE_EOF;
-
- return error;
+ ERR_FAIL_V(error);
}
- if (tag->name=="ext_resource") {
+ if (next_tag.name!="ext_resource") {
- if (!tag->args.has("index") || !tag->args.has("path") || !tag->args.has("type")) {
- old_format=true;
- break;
- }
+ //nothing was done
+ if (!fw)
+ return OK;
+
+ break;
+
+
+ } else {
if (!fw) {
fw=FileAccess::open(p_path+".depren",FileAccess::WRITE);
- fw->store_line("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"); //no escape
- fw->store_line("<resource_file type=\""+resource_type+"\" subresource_count=\""+itos(resources_total)+"\" version=\""+itos(VERSION_MAJOR)+"."+itos(VERSION_MINOR)+"\" version_name=\""+VERSION_FULL_NAME+"\">");
+ if (is_scene) {
+ fw->store_line("[gd_scene load_steps="+itos(resources_total)+" format="+itos(FORMAT_VERSION)+"]\n");
+ } else {
+ fw->store_line("[gd_resource type=\""+res_type+"\" load_steps="+itos(resources_total)+" format="+itos(FORMAT_VERSION)+"]\n");
+ }
+ }
+ if (!next_tag.fields.has("path") || !next_tag.fields.has("id") || !next_tag.fields.has("type")) {
+ memdelete(fw);
+ error=ERR_FILE_CORRUPT;
+ ERR_FAIL_V(error);
}
- String path = tag->args["path"];
- String index = tag->args["index"];
- String type = tag->args["type"];
+ String path = next_tag.fields["path"];
+ int index = next_tag.fields["id"];
+ String type = next_tag.fields["type"];
bool relative=false;
@@ -673,7 +684,6 @@ Error ResourceInteractiveLoaderText::rename_dependencies(FileAccess *p_f, const
relative=true;
}
-
if (p_map.has(path)) {
String np=p_map[path];
path=np;
@@ -684,74 +694,15 @@ Error ResourceInteractiveLoaderText::rename_dependencies(FileAccess *p_f, const
path=base_path.path_to_file(path);
}
- tag->args["path"]=path;
- tag->args["index"]=index;
- tag->args["type"]=type;
-
- } else {
-
- done=true;
- }
+ fw->store_line("[ext_resource path=\""+path+"\" type=\""+type+"\" id="+itos(index)+"]");
- String tagt="\t<";
- if (exit)
- tagt+="/";
- tagt+=tag->name;
+ tag_end = f->get_pos();
- for(List<String>::Element *E=order.front();E;E=E->next()) {
- tagt+=" "+E->get()+"=\""+tag->args[E->get()]+"\"";
}
- tagt+=">";
- fw->store_line(tagt);
- if (done)
- break;
- close_tag("ext_resource");
- fw->store_line("\t</ext_resource>");
}
-
- if (old_format) {
- if (fw)
- memdelete(fw);
-
- DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
- da->remove(p_path+".depren");
- memdelete(da);
- //fuck it, use the old approach;
-
- WARN_PRINT(("This file is old, so it can't refactor dependencies, opening and resaving: "+p_path).utf8().get_data());
-
- Error err;
- FileAccess *f2 = FileAccess::open(p_path,FileAccess::READ,&err);
- if (err!=OK) {
- ERR_FAIL_COND_V(err!=OK,ERR_FILE_CANT_OPEN);
- }
-
- Ref<ResourceInteractiveLoaderText> ria = memnew( ResourceInteractiveLoaderText );
- ria->local_path=Globals::get_singleton()->localize_path(p_path);
- ria->res_path=ria->local_path;
- ria->remaps=p_map;
- // ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
- ria->open(f2);
-
- err = ria->poll();
-
- while(err==OK) {
- err=ria->poll();
- }
-
- ERR_FAIL_COND_V(err!=ERR_FILE_EOF,ERR_FILE_CORRUPT);
- RES res = ria->get_resource();
- ERR_FAIL_COND_V(!res.is_valid(),ERR_FILE_CORRUPT);
-
- return ResourceFormatSaverText::singleton->save(p_path,res);
- }
-
- if (!fw) {
-
- return OK; //nothing to rename, do nothing
- }
+ f->seek(tag_end);
uint8_t c=f->get_8();
while(!f->eof_reached()) {
@@ -771,13 +722,13 @@ Error ResourceInteractiveLoaderText::rename_dependencies(FileAccess *p_f, const
da->remove(p_path);
da->rename(p_path+".depren",p_path);
memdelete(da);
-#endif
+
return OK;
}
-void ResourceInteractiveLoaderText::open(FileAccess *p_f) {
+void ResourceInteractiveLoaderText::open(FileAccess *p_f,bool p_skip_first_tag) {
error=OK;
@@ -840,13 +791,15 @@ void ResourceInteractiveLoaderText::open(FileAccess *p_f) {
resources_total=0;
}
+ if (!p_skip_first_tag) {
- err = VariantParser::parse_tag(&stream,lines,error_text,next_tag,&rp);
+ err = VariantParser::parse_tag(&stream,lines,error_text,next_tag,&rp);
- if (err) {
- error_text="Unexpected end of file";
- _printerr();
- error=ERR_FILE_CORRUPT;
+ if (err) {
+ error_text="Unexpected end of file";
+ _printerr();
+ error=ERR_FILE_CORRUPT;
+ }
}
rp.ext_func=_parse_ext_resources;
@@ -932,6 +885,10 @@ Ref<ResourceInteractiveLoader> ResourceFormatLoaderText::load_interactive(const
void ResourceFormatLoaderText::get_recognized_extensions_for_type(const String& p_type,List<String> *p_extensions) const {
+ if (p_type=="") {
+ get_recognized_extensions(p_extensions);
+ return;
+ }
if (p_type=="PackedScene")
p_extensions->push_back("tscn");
@@ -1022,431 +979,37 @@ Error ResourceFormatLoaderText::rename_dependencies(const String &p_path,const M
/*****************************************************************************************************/
-void ResourceFormatSaverTextInstance::write_property(const String& p_name,const Variant& p_property,bool *r_ok) {
-
- if (r_ok)
- *r_ok=false;
-
- if (p_name!=String()) {
- f->store_string(p_name+" = ");
- }
-
- switch( p_property.get_type() ) {
-
- case Variant::NIL: {
- f->store_string("null");
- } break;
- case Variant::BOOL: {
-
- f->store_string(p_property.operator bool() ? "true":"false" );
- } break;
- case Variant::INT: {
-
- f->store_string( itos(p_property.operator int()) );
- } break;
- case Variant::REAL: {
-
- f->store_string( rtoss(p_property.operator real_t()) );
- } break;
- case Variant::STRING: {
-
- String str=p_property;
-
- str="\""+str.c_escape()+"\"";
- f->store_string( str );
- } break;
- case Variant::VECTOR2: {
-
- Vector2 v = p_property;
- f->store_string("Vector2( "+rtoss(v.x) +", "+rtoss(v.y)+" )" );
- } break;
- case Variant::RECT2: {
-
- Rect2 aabb = p_property;
- f->store_string("Rect2( "+rtoss(aabb.pos.x) +", "+rtoss(aabb.pos.y) +", "+rtoss(aabb.size.x) +", "+rtoss(aabb.size.y)+" )" );
-
- } break;
- case Variant::VECTOR3: {
-
- Vector3 v = p_property;
- f->store_string("Vector3( "+rtoss(v.x) +", "+rtoss(v.y)+", "+rtoss(v.z)+" )");
- } break;
- case Variant::PLANE: {
-
- Plane p = p_property;
- f->store_string("Plane( "+rtoss(p.normal.x) +", "+rtoss(p.normal.y)+", "+rtoss(p.normal.z)+", "+rtoss(p.d)+" )" );
-
- } break;
- case Variant::_AABB: {
-
- AABB aabb = p_property;
- f->store_string("AABB( "+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;
- f->store_string("Quat( "+rtoss(quat.x)+", "+rtoss(quat.y)+", "+rtoss(quat.z)+", "+rtoss(quat.w)+" )");
-
- } break;
- case Variant::MATRIX32: {
-
- String s="Matrix32( ";
- 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] );
- }
- }
-
- f->store_string(s+" )");
-
- } break;
- case Variant::MATRIX3: {
-
- String s="Matrix3( ";
- 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] );
- }
- }
-
- f->store_string(s+" )");
-
- } break;
- case Variant::TRANSFORM: {
-
- String s="Transform( ";
- 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);
-
- f->store_string(s+" )");
- } break;
-
- // misc types
- case Variant::COLOR: {
-
- Color c = p_property;
- f->store_string("Color( "+rtoss(c.r) +", "+rtoss(c.g)+", "+rtoss(c.b)+", "+rtoss(c.a)+" )");
-
- } break;
- case Variant::IMAGE: {
-
-
- Image img=p_property;
-
- if (img.empty()) {
- f->store_string("Image()");
- break;
- }
-
- String imgstr="Image( ";
- imgstr+=itos(img.get_width());
- imgstr+=", "+itos(img.get_height());
- imgstr+=", "+itos(img.get_mipmaps());
- imgstr+=", ";
-
- switch(img.get_format()) {
-
- case Image::FORMAT_GRAYSCALE: imgstr+="GRAYSCALE"; break;
- case Image::FORMAT_INTENSITY: imgstr+="INTENSITY"; break;
- case Image::FORMAT_GRAYSCALE_ALPHA: imgstr+="GRAYSCALE_ALPHA"; break;
- case Image::FORMAT_RGB: imgstr+="RGB"; break;
- case Image::FORMAT_RGBA: imgstr+="RGBA"; break;
- case Image::FORMAT_INDEXED : imgstr+="INDEXED"; break;
- case Image::FORMAT_INDEXED_ALPHA: imgstr+="INDEXED_ALPHA"; break;
- case Image::FORMAT_BC1: imgstr+="BC1"; break;
- case Image::FORMAT_BC2: imgstr+="BC2"; break;
- case Image::FORMAT_BC3: imgstr+="BC3"; break;
- case Image::FORMAT_BC4: imgstr+="BC4"; break;
- case Image::FORMAT_BC5: imgstr+="BC5"; break;
- case Image::FORMAT_PVRTC2: imgstr+="PVRTC2"; break;
- case Image::FORMAT_PVRTC2_ALPHA: imgstr+="PVRTC2_ALPHA"; break;
- case Image::FORMAT_PVRTC4: imgstr+="PVRTC4"; break;
- case Image::FORMAT_PVRTC4_ALPHA: imgstr+="PVRTC4_ALPHA"; break;
- case Image::FORMAT_ETC: imgstr+="ETC"; break;
- case Image::FORMAT_ATC: imgstr+="ATC"; break;
- case Image::FORMAT_ATC_ALPHA_EXPLICIT: imgstr+="ATC_ALPHA_EXPLICIT"; break;
- case Image::FORMAT_ATC_ALPHA_INTERPOLATED: imgstr+="ATC_ALPHA_INTERPOLATED"; break;
- case Image::FORMAT_CUSTOM: imgstr+="CUSTOM"; break;
- default: {}
- }
-
-
- String s;
-
- DVector<uint8_t> data = img.get_data();
- int len = data.size();
- DVector<uint8_t>::Read r = data.read();
- const uint8_t *ptr=r.ptr();;
- for (int i=0;i<len;i++) {
-
- if (i>0)
- s+=", ";
- s+=itos(ptr[i]);
- }
-
- imgstr+=", ";
- f->store_string(imgstr);
- f->store_string(s);
- f->store_string(" )");
- } break;
- case Variant::NODE_PATH: {
-
- String str=p_property;
-
- str="NodePath(\""+str.c_escape()+"\")";
- f->store_string(str);
-
- } break;
-
- case Variant::OBJECT: {
-
- RES res = p_property;
- if (res.is_null()) {
- f->store_string("null");
- if (r_ok)
- *r_ok=true;
-
- break; // don't save it
- }
-
- if (external_resources.has(res)) {
-
- f->store_string("ExtResource( "+itos(external_resources[res]+1)+" )");
- } else {
-
- if (internal_resources.has(res)) {
- f->store_string("SubResource( "+itos(internal_resources[res])+" )");
- } else 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();
- f->store_string("Resource( \""+path+"\" )");
- } else {
- f->store_string("null");
- ERR_EXPLAIN("Resource was not pre cached for the resource section, bug?");
- ERR_BREAK(true);
- //internal resource
- }
- }
-
- } break;
- case Variant::INPUT_EVENT: {
-
- f->store_string("InputEvent()"); //will be added later
- } break;
- case Variant::DICTIONARY: {
-
- Dictionary dict = p_property;
-
- List<Variant> keys;
- dict.get_key_list(&keys);
- keys.sort();
-
- f->store_string("{ ");
- for(List<Variant>::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);
-
- f->store_string(":");
- write_property("",dict[E->get()],&ok);
- if (!ok)
- write_property("",Variant()); //at least make the file consistent..
- if (E->next())
- f->store_string(", ");
- }
-
-
- f->store_string(" }");
-
-
- } break;
- case Variant::ARRAY: {
-
- f->store_string("[ ");
- Array array = p_property;
- int len=array.size();
- for (int i=0;i<len;i++) {
-
- if (i>0)
- f->store_string(", ");
- write_property("",array[i]);
-
-
- }
- f->store_string(" ]");
-
- } break;
-
- case Variant::RAW_ARRAY: {
-
- f->store_string("ByteArray( ");
- String s;
- DVector<uint8_t> data = p_property;
- int len = data.size();
- DVector<uint8_t>::Read r = data.read();
- const uint8_t *ptr=r.ptr();;
- for (int i=0;i<len;i++) {
+String ResourceFormatSaverTextInstance::_write_resources(void *ud,const RES& p_resource) {
- if (i>0)
- f->store_string(", ");
+ ResourceFormatSaverTextInstance *rsi=(ResourceFormatSaverTextInstance*)ud;
+ return rsi->_write_resource(p_resource);
- f->store_string(itos(ptr[i]));
-
- }
-
- f->store_string(" )");
-
- } break;
- case Variant::INT_ARRAY: {
-
- f->store_string("IntArray( ");
- DVector<int> data = p_property;
- int len = data.size();
- DVector<int>::Read r = data.read();
- const int *ptr=r.ptr();;
-
- for (int i=0;i<len;i++) {
-
- if (i>0)
- f->store_string(", ");
-
- f->store_string(itos(ptr[i]));
- }
-
-
- f->store_string(" )");
-
- } break;
- case Variant::REAL_ARRAY: {
-
- f->store_string("FloatArray( ");
- DVector<real_t> data = p_property;
- int len = data.size();
- DVector<real_t>::Read r = data.read();
- const real_t *ptr=r.ptr();;
-
- for (int i=0;i<len;i++) {
-
- if (i>0)
- f->store_string(", ");
- f->store_string(rtoss(ptr[i]));
- }
-
- f->store_string(" )");
-
- } break;
- case Variant::STRING_ARRAY: {
-
- f->store_string("StringArray( ");
- DVector<String> data = p_property;
- int len = data.size();
- DVector<String>::Read r = data.read();
- const String *ptr=r.ptr();;
- String s;
- //write_string("\n");
-
-
-
- for (int i=0;i<len;i++) {
-
- if (i>0)
- f->store_string(", ");
- String str=ptr[i];
- f->store_string(""+str.c_escape()+"\"");
- }
-
- f->store_string(" )");
-
- } break;
- case Variant::VECTOR2_ARRAY: {
-
- f->store_string("Vector2Array( ");
- DVector<Vector2> data = p_property;
- int len = data.size();
- DVector<Vector2>::Read r = data.read();
- const Vector2 *ptr=r.ptr();;
-
- for (int i=0;i<len;i++) {
-
- if (i>0)
- f->store_string(", ");
- f->store_string(rtoss(ptr[i].x)+", "+rtoss(ptr[i].y) );
- }
-
- f->store_string(" )");
-
- } break;
- case Variant::VECTOR3_ARRAY: {
-
- f->store_string("Vector3Array( ");
- DVector<Vector3> data = p_property;
- int len = data.size();
- DVector<Vector3>::Read r = data.read();
- const Vector3 *ptr=r.ptr();;
-
- for (int i=0;i<len;i++) {
-
- if (i>0)
- f->store_string(", ");
- f->store_string(rtoss(ptr[i].x)+", "+rtoss(ptr[i].y)+", "+rtoss(ptr[i].z) );
- }
-
- f->store_string(" )");
-
- } break;
- case Variant::COLOR_ARRAY: {
-
- f->store_string("ColorArray( ");
-
- DVector<Color> data = p_property;
- int len = data.size();
- DVector<Color>::Read r = data.read();
- const Color *ptr=r.ptr();;
-
- for (int i=0;i<len;i++) {
+}
- if (i>0)
- f->store_string(", ");
+String ResourceFormatSaverTextInstance::_write_resource(const RES& res) {
- f->store_string(rtoss(ptr[i].r)+", "+rtoss(ptr[i].g)+", "+rtoss(ptr[i].b)+", "+rtoss(ptr[i].a) );
+ if (external_resources.has(res)) {
- }
- f->store_string(" )");
+ return "ExtResource( "+itos(external_resources[res]+1)+" )";
+ } else {
- } break;
- default: {}
+ if (internal_resources.has(res)) {
+ return "SubResource( "+itos(internal_resources[res])+" )";
+ } else 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();
+ return "Resource( \""+path+"\" )";
+ } else {
+ ERR_EXPLAIN("Resource was not pre cached for the resource section, bug?");
+ ERR_FAIL_V("null");
+ //internal resource
+ }
}
- if (r_ok)
- *r_ok=true;
-
+ return "null";
}
-
void ResourceFormatSaverTextInstance::_find_resources(const Variant& p_variant,bool p_main) {
@@ -1580,11 +1143,18 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path,const RES& p_re
}
+ Vector<RES> sorted_er;
+ sorted_er.resize(external_resources.size());
+
for(Map<RES,int>::Element *E=external_resources.front();E;E=E->next()) {
- String p = E->key()->get_path();
+ sorted_er[E->get()]=E->key();
+ }
+
+ for(int i=0;i<sorted_er.size();i++) {
+ String p = sorted_er[i]->get_path();
- f->store_string("[ext_resource path=\""+p+"\" type=\""+E->key()->get_save_type()+"\" id="+itos(E->get()+1)+"]\n"); //bundled
+ f->store_string("[ext_resource path=\""+p+"\" type=\""+sorted_er[i]->get_save_type()+"\" id="+itos(i+1)+"]\n"); //bundled
}
if (external_resources.size())
@@ -1663,8 +1233,9 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path,const RES& p_re
if (PE->get().type==Variant::OBJECT && value.is_zero())
continue;
- write_property(name,value);
- f->store_string("\n");
+ String vars;
+ VariantWriter::write_to_string(value,vars,_write_resources,this);
+ f->store_string(name+" = "+vars+"\n");
}
@@ -1715,17 +1286,22 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path,const RES& p_re
f->store_string(header);
if (instance.is_valid()) {
+
+ String vars;
f->store_string(" instance=");
- write_property("",instance);
+ VariantWriter::write_to_string(instance,vars,_write_resources,this);
+ f->store_string(vars);
+
}
f->store_line("]\n");
for(int j=0;j<state->get_node_property_count(i);j++) {
- write_property(state->get_node_property_name(i,j),state->get_node_property_value(i,j));
- f->store_line(String());
+ String vars;
+ VariantWriter::write_to_string(state->get_node_property_value(i,j),vars,_write_resources,this);
+ f->store_string(String(state->get_node_property_name(i,j))+" = "+vars+"\n");
}
if (state->get_node_property_count(i)) {
@@ -1750,8 +1326,10 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path,const RES& p_re
Array binds=state->get_connection_binds(i);
f->store_string(connstr);
if (binds.size()) {
- f->store_string(" binds=");
- write_property("",binds);
+ String vars;
+ VariantWriter::write_to_string(binds,vars,_write_resources,this);
+ f->store_string(" binds= "+vars);
+
}
f->store_line("]\n");
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-02 00:41:27 +0000