From 0fa588a8301b50cff5975f6c9fe8dd7969f59f16 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 28 Apr 2016 22:21:18 -0300 Subject: move Font to BitmapFont so we can add DynamicFont later.. --- .../io_plugins/editor_font_import_plugin.cpp | 38 +++++++++++----------- .../editor/io_plugins/editor_font_import_plugin.h | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'tools/editor/io_plugins') diff --git a/tools/editor/io_plugins/editor_font_import_plugin.cpp b/tools/editor/io_plugins/editor_font_import_plugin.cpp index ff126a8e8..715e48fcc 100644 --- a/tools/editor/io_plugins/editor_font_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_font_import_plugin.cpp @@ -437,7 +437,7 @@ class EditorFontImportDialog : public ConfirmationDialog { void _update() { Ref imd = get_rimd(); - Ref font = plugin->generate_font(imd); + Ref font = plugin->generate_font(imd); test_label->add_font_override("font",font); _update_text(); } @@ -454,7 +454,7 @@ class EditorFontImportDialog : public ConfirmationDialog { void _import_inc(String p_font) { - Ref font = ResourceLoader::load(p_font); + Ref font = ResourceLoader::load(p_font); if (!font.is_valid()) return; Ref tex = font->get_texture(0); @@ -471,12 +471,12 @@ class EditorFontImportDialog : public ConfirmationDialog { for(int i=0;iget_character(k); + BitmapFont::Character c=font->get_character(k); f->store_line("{"+itos(k)+","+rtos(c.rect.pos.x)+","+rtos(c.rect.pos.y)+","+rtos(c.rect.size.x)+","+rtos(c.rect.size.y)+","+rtos(c.v_align)+","+rtos(c.h_align)+","+rtos(c.advance)+"},"); } f->store_line("};"); - Vector kp=font->get_kerning_pair_keys(); + Vector kp=font->get_kerning_pair_keys(); f->store_line("static const int _builtin_font_kerning_pair_count="+itos(kp.size())+";"); f->store_line("static const int _builtin_font_kerning_pairs["+itos(kp.size())+"][3]={"); for(int i=0;i fl; - Ref font= memnew(Font); + Ref font= memnew(BitmapFont); dest->get_file_dialog()->add_filter("*.fnt ; Font" ); //ResourceSaver::get_recognized_extensions(font,&fl); //for(List::Element *E=fl.front();E;E=E->next()) { @@ -875,12 +875,12 @@ static unsigned char get_SDF_radial( } -Ref EditorFontImportPlugin::generate_font(const Ref& p_from, const String &p_existing) { +Ref EditorFontImportPlugin::generate_font(const Ref& p_from, const String &p_existing) { Ref from = p_from; - ERR_FAIL_COND_V(from->get_source_count()!=1,Ref()); + ERR_FAIL_COND_V(from->get_source_count()!=1,Ref()); String src_path = EditorImportPlugin::expand_source_path(from->get_source_path(0)); @@ -888,15 +888,15 @@ Ref EditorFontImportPlugin::generate_font(const Refshow_warning("Path: "+src_path+"\nIs a Godot font file, please supply a BMFont type file instead."); - return Ref(); + return Ref(); } - Ref font; + Ref font; font.instance(); Error err = font->create_from_fnt(src_path); if (err) { EditorNode::get_singleton()->show_warning("Path: "+src_path+"\nFailed opening as BMFont file."); - return Ref(); + return Ref(); } return font; @@ -913,7 +913,7 @@ Ref EditorFontImportPlugin::generate_font(const Ref() ); + ERR_FAIL_COND_V( error !=0, Ref() ); print_line("loadfrom: "+src_path); error = FT_New_Face( library, src_path.utf8().get_data(),0,&face ); @@ -928,7 +928,7 @@ Ref EditorFontImportPlugin::generate_font(const Ref()); + ERR_FAIL_COND_V(error,Ref()); int height=0; @@ -940,7 +940,7 @@ Ref EditorFontImportPlugin::generate_font(const Ref() ); + ERR_FAIL_COND_V( error,Ref() ); } @@ -987,7 +987,7 @@ Ref EditorFontImportPlugin::generate_font(const Ref() ); + ERR_FAIL_COND_V( !fa,Ref() ); } @@ -1546,15 +1546,15 @@ Ref EditorFontImportPlugin::generate_font(const Refget_option("extra_space/bottom"); bool disable_filter = from->get_option("advanced/disable_filter"); - Ref font; + Ref font; if (p_existing!=String() && ResourceCache::has(p_existing)) { - font = Ref( ResourceCache::get(p_existing)->cast_to()); + font = Ref( ResourceCache::get(p_existing)->cast_to()); } if (font.is_null()) { - font = Ref( memnew( Font ) ); + font = Ref( memnew( BitmapFont ) ); } font->clear(); @@ -1596,7 +1596,7 @@ Ref EditorFontImportPlugin::generate_font(const Ref(); + return Ref(); #endif } @@ -1616,7 +1616,7 @@ void EditorFontImportPlugin::import_dialog(const String& p_from){ Error EditorFontImportPlugin::import(const String& p_path, const Ref& p_from){ - Ref font = EditorFontImportPlugin::generate_font(p_from,p_path); + Ref font = EditorFontImportPlugin::generate_font(p_from,p_path); if (!font.is_valid()) return ERR_CANT_CREATE; diff --git a/tools/editor/io_plugins/editor_font_import_plugin.h b/tools/editor/io_plugins/editor_font_import_plugin.h index 814897c5f..ce26ef91e 100644 --- a/tools/editor/io_plugins/editor_font_import_plugin.h +++ b/tools/editor/io_plugins/editor_font_import_plugin.h @@ -42,7 +42,7 @@ class EditorFontImportPlugin : public EditorImportPlugin { EditorFontImportDialog *dialog; public: - Ref generate_font(const Ref& p_from,const String& p_existing=String()); //used by editor + Ref generate_font(const Ref& p_from,const String& p_existing=String()); //used by editor virtual String get_name() const; virtual String get_visible_name() const; -- cgit v1.2.3-70-g09d2