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

Merge branch 'master' of https://github.com/okamstudio/godot

Browse source
This commit is contained in:
Juan Linietsky 2015-05-04 18:32:18 -03:00
commit a6e6c5b878
6 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/ustring.cpp
View file

@ -3297,8 +3297,11 @@ String String::path_to_file(const String& p_path) const {
String src=this->replace("\\","/").get_base_dir();
String dst=p_path.replace("\\","/").get_base_dir();
return src.path_to(dst)+p_path.get_file();
String rel = src.path_to(dst);
if (rel==dst) // failed
return p_path;
else
return rel+p_path.get_file();
}
String String::path_to(const String& p_path) const {
@ -3333,7 +3336,9 @@ String String::path_to(const String& p_path) const {
String src_begin=src.get_slice("/",0);
String dst_begin=dst.get_slice("/",0);
ERR_FAIL_COND_V(src_begin!=dst_begin,p_path); //return dst absolute path
if (src_begin!=dst_begin)
return p_path; //impossible to do this
base=src_begin;
src=src.substr(src_begin.length(),src.length());
dst=dst.substr(dst_begin.length(),dst.length());

1
drivers/windows/dir_access_windows.cpp
View file

@ -167,6 +167,7 @@ Error DirAccessWindows::change_dir(String p_dir) {
if (worked) {
GetCurrentDirectoryW(2048,real_current_dir_name);
current_dir=real_current_dir_name; // TODO, utf8 parser
current_dir=current_dir.replace("\\","/");

11
platform/windows/os_windows.cpp
View file

@ -2117,12 +2117,13 @@ bool OS_Windows::has_environment(const String& p_var) const {
String OS_Windows::get_environment(const String& p_var) const {
char* val = getenv(p_var.utf8().get_data());
if (val)
return val;
wchar_t wval[0x7Fff]; // MSDN says 32767 char is the maximum
int wlen = GetEnvironmentVariableW(p_var.c_str(),wval,0x7Fff);
if ( wlen > 0 ) {
return wval;
}
return "";
};
}
String OS_Windows::get_stdin_string(bool p_block) {

1
scene/gui/file_dialog.cpp
View file

@ -92,7 +92,6 @@ void FileDialog::_file_entered(const String& p_file) {
}
void FileDialog::_save_confirm_pressed() {
String f=dir_access->get_current_dir().plus_file(file->get_text());
emit_signal("file_selected",f);
hide();

1
tools/editor/editor_import_export.cpp
View file

@ -47,6 +47,7 @@ String EditorImportPlugin::validate_source_path(const String& p_path) {
String rp = Globals::get_singleton()->get_resource_path();
if (!rp.ends_with("/"))
rp+="/";
return rp.path_to_file(gp);
}

7
tools/editor/io_plugins/editor_font_import_plugin.cpp
View file

@ -406,7 +406,10 @@ class EditorFontImportDialog : public ConfirmationDialog {
imd->set_option(opt,v);
}
imd->add_source(EditorImportPlugin::validate_source_path(source->get_line_edit()->get_text()));
String src_path = EditorImportPlugin::validate_source_path(source->get_line_edit()->get_text());
//print_line("pre src path "+source->get_line_edit()->get_text());
//print_line("src path "+src_path);
imd->add_source(src_path);
imd->set_option("font/size",font_size->get_val());
return imd;
@ -1018,7 +1021,7 @@ Ref<Font> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMetadata
int h = slot->bitmap.rows;
int p = slot->bitmap.pitch;
print_line("W: "+itos(w)+" P: "+itos(slot->bitmap.pitch));
//print_line("W: "+itos(w)+" P: "+itos(slot->bitmap.pitch));
if (font_mode==_EditorFontImportOptions::FONT_DISTANCE_FIELD) {