asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

-fixed relative path saving to file, fixes #1694

Browse source
This commit is contained in:
Juan Linietsky 2015-04-18 16:33:31 -03:00
parent 170a9349d2
commit a5cbfbbcbb
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/io/resource_format_binary.cpp
View file

@ -390,7 +390,7 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v) {
if (path.find("://")==-1 && path.is_rel_path()) { if (path.find("://")==-1 && path.is_rel_path()) {
// path is relative to file being loaded, so convert to a resource path // path is relative to file being loaded, so convert to a resource path
path=Globals::get_singleton()->localize_path(res_path.get_base_dir()+"/"+path); path=Globals::get_singleton()->localize_path(res_path.get_base_dir().plus_file(path));
} }

6
core/io/resource_format_xml.cpp
View file

@ -458,7 +458,7 @@ Error ResourceInteractiveLoaderXML::parse_property(Variant& r_v, String &r_name)
path=path.replace("local://",local_path+"::"); path=path.replace("local://",local_path+"::");
else if (path.find("://")==-1 && path.is_rel_path()) { else if (path.find("://")==-1 && path.is_rel_path()) {
// path is relative to file being loaded, so convert to a resource 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); path=Globals::get_singleton()->localize_path(local_path.get_base_dir().plus_file(path));
} }
@ -1423,7 +1423,7 @@ Error ResourceInteractiveLoaderXML::poll() {
if (path.find("://")==-1 && path.is_rel_path()) { if (path.find("://")==-1 && path.is_rel_path()) {
// path is relative to file being loaded, so convert to a resource 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); path=Globals::get_singleton()->localize_path(local_path.get_base_dir().plus_file(path));
} }
@ -1601,7 +1601,7 @@ void ResourceInteractiveLoaderXML::get_dependencies(FileAccess *f,List<String> *
if (path.find("://")==-1 && path.is_rel_path()) { if (path.find("://")==-1 && path.is_rel_path()) {
// path is relative to file being loaded, so convert to a resource 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); path=Globals::get_singleton()->localize_path(local_path.get_base_dir().plus_file(path));
} }
if (path.ends_with("*")) { if (path.ends_with("*")) {

2
drivers/gles2/shaders/canvas.glsl
View file

@ -296,7 +296,7 @@ LIGHT_SHADER_CODE
} }
highp vec4 s = shadow_matrix * highp vec4(point,0.0,1.0); highp vec4 s = shadow_matrix * vec4(point,0.0,1.0);
s.xyz/=s.w; s.xyz/=s.w;
su=s.x*0.5+0.5; su=s.x*0.5+0.5;
sz=s.z*0.5+0.5; sz=s.z*0.5+0.5;