summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/2d/space_shooter/asteroid.gd6
-rw-r--r--demos/2d/space_shooter/enemy1.gd6
-rw-r--r--demos/2d/space_shooter/enemy2.gd10
-rw-r--r--demos/2d/space_shooter/rail.gd6
-rw-r--r--demos/2d/space_shooter/ship.gd4
-rw-r--r--platform/osx/os_osx.mm39
-rw-r--r--scene/gui/text_edit.cpp26
-rw-r--r--scene/resources/dynamic_font.cpp285
-rw-r--r--scene/resources/dynamic_font.h23
-rw-r--r--tools/editor/editor_fonts.cpp66
-rw-r--r--tools/editor_fonts/DroidSans.ttfbin0 -> 190044 bytes
-rw-r--r--tools/editor_fonts/DroidSansArabic.ttfbin0 -> 35908 bytes
-rw-r--r--tools/editor_fonts/DroidSansFallback.ttfbin0 -> 3640264 bytes
-rw-r--r--tools/editor_fonts/DroidSansHebrew.ttfbin0 -> 23076 bytes
-rw-r--r--tools/editor_fonts/DroidSansJapanese.ttfbin0 -> 1173140 bytes
-rw-r--r--tools/editor_fonts/DroidSansThai.ttfbin0 -> 36028 bytes
-rw-r--r--tools/editor_fonts/droid_sans.ttfbin6314324 -> 0 bytes
17 files changed, 389 insertions, 82 deletions
diff --git a/demos/2d/space_shooter/asteroid.gd b/demos/2d/space_shooter/asteroid.gd
index 9f6734e122..ab71f413eb 100644
--- a/demos/2d/space_shooter/asteroid.gd
+++ b/demos/2d/space_shooter/asteroid.gd
@@ -10,7 +10,7 @@ var speed_y = 0.0
var destroyed = false
-func _process(delta):
+func _fixed_process(delta):
translate(Vector2(SPEED, speed_y)*delta)
@@ -23,7 +23,7 @@ func destroy():
return
destroyed = true
get_node("anim").play("explode")
- set_process(false)
+ set_fixed_process(false)
get_node("sfx").play("sound_explode")
# Accumulate points
get_node("/root/game_state").points += 1
@@ -34,7 +34,7 @@ func is_enemy():
func _on_visibility_enter_screen():
- set_process(true)
+ set_fixed_process(true)
# Make it spin!
get_node("anim").play("spin")
diff --git a/demos/2d/space_shooter/enemy1.gd b/demos/2d/space_shooter/enemy1.gd
index 204995c05d..e127eb2777 100644
--- a/demos/2d/space_shooter/enemy1.gd
+++ b/demos/2d/space_shooter/enemy1.gd
@@ -7,7 +7,7 @@ const SPEED = -200
var destroyed=false
-func _process(delta):
+func _fixed_process(delta):
get_parent().translate(Vector2(SPEED*delta, 0))
@@ -20,14 +20,14 @@ func destroy():
return
destroyed = true
get_node("anim").play("explode")
- set_process(false)
+ set_fixed_process(false)
get_node("sfx").play("sound_explode")
# Accumulate points
get_node("/root/game_state").points += 5
func _on_visibility_enter_screen():
- set_process(true)
+ set_fixed_process(true)
get_node("anim").play("zigzag")
get_node("anim").seek(randf()*2.0) # Make it start from any pos
diff --git a/demos/2d/space_shooter/enemy2.gd b/demos/2d/space_shooter/enemy2.gd
index cd06579d74..773c266d8c 100644
--- a/demos/2d/space_shooter/enemy2.gd
+++ b/demos/2d/space_shooter/enemy2.gd
@@ -9,7 +9,7 @@ var shoot_timeout = 0
var destroyed=false
-func _process(delta):
+func _fixed_process(delta):
translate(Vector2(SPEED*delta, 0))
shoot_timeout -= delta
@@ -33,18 +33,14 @@ func destroy():
return
destroyed = true
get_node("anim").play("explode")
- set_process(false)
+ set_fixed_process(false)
get_node("sfx").play("sound_explode")
# Accumulate points
get_node("/root/game_state").points += 10
-func _ready():
- set_fixed_process(true)
-
-
func _on_visibility_enter_screen():
- set_process(true)
+ set_fixed_process(true)
func _on_visibility_exit_screen():
diff --git a/demos/2d/space_shooter/rail.gd b/demos/2d/space_shooter/rail.gd
index 7362dff97d..a9559806cb 100644
--- a/demos/2d/space_shooter/rail.gd
+++ b/demos/2d/space_shooter/rail.gd
@@ -7,13 +7,13 @@ var offset = 0
func stop():
- set_process(false)
+ set_fixed_process(false)
-func _process(delta):
+func _fixed_process(delta):
offset += delta*SPEED
set_pos(Vector2(offset, 0))
func _ready():
- set_process(true)
+ set_fixed_process(true)
diff --git a/demos/2d/space_shooter/ship.gd b/demos/2d/space_shooter/ship.gd
index 0bc9ca6b13..d3a4cd335d 100644
--- a/demos/2d/space_shooter/ship.gd
+++ b/demos/2d/space_shooter/ship.gd
@@ -9,7 +9,7 @@ var prev_shooting = false
var killed = false
-func _process(delta):
+func _fixed_process(delta):
var motion = Vector2()
if Input.is_action_pressed("move_up"):
motion += Vector2(0, -1)
@@ -53,7 +53,7 @@ func _process(delta):
func _ready():
screen_size = get_viewport().get_rect().size
- set_process(true)
+ set_fixed_process(true)
func _hit_something():
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index b614dd57aa..065fe52b09 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -291,16 +291,52 @@ static int button_mask=0;
self = [super init];
trackingArea = nil;
[self updateTrackingAreas];
-
+ [self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
return self;
}
+
-(void)dealloc
{
[trackingArea release];
[super dealloc];
}
+- (NSDragOperation)draggingEntered:(id < NSDraggingInfo >)sender {
+ return NSDragOperationCopy;
+}
+
+- (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)sender {
+ return NSDragOperationCopy;
+}
+
+- (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
+
+
+ NSPasteboard *pboard = [sender draggingPasteboard];
+ NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
+
+ Vector<String> files;
+ for(int i=0;i<filenames.count;i++) {
+ NSString *ns = [filenames objectAtIndex:i];
+ char *utfs = strdup([ns UTF8String]);
+ String ret;
+ ret.parse_utf8(utfs);
+ free(utfs);
+ files.push_back(ret);
+
+
+ }
+
+ if (files.size()) {
+ OS_OSX::singleton->main_loop->drop_files(files,0);
+ OS_OSX::singleton->move_window_to_foreground();
+ }
+
+ return NO;
+}
+
+
- (BOOL)isOpaque
{
return YES;
@@ -833,6 +869,7 @@ static int translateKey(unsigned int key)
@implementation GodotWindow
+
- (BOOL)canBecomeKeyWindow
{
// Required for NSBorderlessWindowMask windows
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index fd6e97d33f..fe03b34105 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -700,15 +700,6 @@ void TextEdit::_notification(int p_what) {
if (highlighted_text.length() != 0 && highlighted_text != search_text)
highlighted_text_col = _get_column_pos_of_word(highlighted_text, str, SEARCH_MATCH_CASE|SEARCH_WHOLE_WORDS, 0);
- if (cache.line_number_w) {
- String fc = String::num(line+1);
- while (fc.length() < line_number_char_count) {
- fc="0"+fc;
- }
-
- cache.font->draw(ci,Point2(cache.style_normal->get_margin(MARGIN_LEFT)+cache.breakpoint_gutter_width,ofs_y+cache.font->get_ascent()),fc,cache.line_number_color);
- }
-
const Map<int,Text::ColorRegionInfo>& cri_map=text.get_color_region_info(line);
@@ -720,8 +711,14 @@ void TextEdit::_notification(int p_what) {
if (text.is_breakpoint(line)) {
VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(xmargin_beg, ofs_y,xmargin_end-xmargin_beg,get_row_height()),cache.breakpoint_color);
+ }
+
+ if (line==cursor.line) {
+ VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(0, ofs_y,xmargin_end,get_row_height()),cache.current_line_color);
+ }
- // draw breakpoint marker
+ // draw breakpoint marker
+ if (text.is_breakpoint(line)) {
if (draw_breakpoint_gutter) {
int vertical_gap = cache.breakpoint_gutter_width / 2;
int marker_size = cache.breakpoint_gutter_width - vertical_gap;
@@ -731,10 +728,13 @@ void TextEdit::_notification(int p_what) {
}
- if (line==cursor.line) {
-
- VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(xmargin_beg, ofs_y,xmargin_end-xmargin_beg,get_row_height()),cache.current_line_color);
+ if (cache.line_number_w) {
+ String fc = String::num(line+1);
+ while (fc.length() < line_number_char_count) {
+ fc="0"+fc;
+ }
+ cache.font->draw(ci,Point2(cache.style_normal->get_margin(MARGIN_LEFT)+cache.breakpoint_gutter_width,ofs_y+cache.font->get_ascent()),fc,cache.line_number_color);
}
for (int j=0;j<str.length();j++) {
diff --git a/scene/resources/dynamic_font.cpp b/scene/resources/dynamic_font.cpp
index c76b5f3d3a..3cd5e5f329 100644
--- a/scene/resources/dynamic_font.cpp
+++ b/scene/resources/dynamic_font.cpp
@@ -156,7 +156,7 @@ float DynamicFontAtSize::get_descent() const {
return descent;
}
-Size2 DynamicFontAtSize::get_char_size(CharType p_char,CharType p_next) const {
+Size2 DynamicFontAtSize::get_char_size(CharType p_char,CharType p_next,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const {
if (!valid)
return Size2(1,1);
@@ -165,12 +165,66 @@ Size2 DynamicFontAtSize::get_char_size(CharType p_char,CharType p_next) const {
const Character *c = char_map.getptr(p_char);
ERR_FAIL_COND_V(!c,Size2());
- Size2 ret( c->advance, get_height());
+ Size2 ret(0,get_height());
+
+ if (!c->found) {
+
+ //not found, try in fallbacks
+ for(int i=0;i<p_fallbacks.size();i++) {
+
+ DynamicFontAtSize *fb = const_cast<DynamicFontAtSize*>(p_fallbacks[i].ptr());
+ if (!fb->valid)
+ continue;
+
+ fb->_update_char(p_char);
+ const Character *ch = fb->char_map.getptr(p_char);
+ ERR_CONTINUE(!ch);
+
+ if (!ch->found)
+ continue;
+
+ c=ch;
+ break;
+ }
+ //not found, try 0xFFFD to display 'not found'.
+
+ if (!c->found) {
+
+ const_cast<DynamicFontAtSize*>(this)->_update_char(0xFFFD);
+ c = char_map.getptr(0xFFFD);
+ ERR_FAIL_COND_V(!c,Size2());
+
+ }
+ }
+
+ if (c->found) {
+ ret.x=c->advance;
+ }
+
if (p_next) {
FT_Vector delta;
FT_Get_Kerning( face, p_char,p_next, FT_KERNING_DEFAULT, &delta );
- ret.x+=delta.x>>6;
+
+ if (delta.x==0) {
+ for(int i=0;i<p_fallbacks.size();i++) {
+
+ DynamicFontAtSize *fb = const_cast<DynamicFontAtSize*>(p_fallbacks[i].ptr());
+ if (!fb->valid)
+ continue;
+
+ FT_Get_Kerning( fb->face, p_char,p_next, FT_KERNING_DEFAULT, &delta );
+
+ if (delta.x==0)
+ continue;
+
+ ret.x+=delta.x>>6;
+ break;
+ }
+ } else {
+ ret.x+=delta.x>>6;
+ }
+
}
@@ -178,7 +232,7 @@ Size2 DynamicFontAtSize::get_char_size(CharType p_char,CharType p_next) const {
}
-float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate) const {
+float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const {
if (!valid)
return 0;
@@ -187,30 +241,88 @@ float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2& p_pos, const
const Character * c = char_map.getptr(p_char);
- if (!c) {
- return 0;
+ float advance=0;
+
+ if (!c->found) {
+
+ //not found, try in fallbacks
+ bool used_fallback=false;
+
+ for(int i=0;i<p_fallbacks.size();i++) {
+
+ DynamicFontAtSize *fb = const_cast<DynamicFontAtSize*>(p_fallbacks[i].ptr());
+ if (!fb->valid)
+ continue;
+
+ fb->_update_char(p_char);
+ const Character *ch = fb->char_map.getptr(p_char);
+ ERR_CONTINUE(!ch);
+
+ if (!ch->found)
+ continue;
+
+ Point2 cpos=p_pos;
+ cpos.x+=ch->h_align;
+ cpos.y-=get_ascent();
+ cpos.y+=ch->v_align;
+ ERR_FAIL_COND_V( ch->texture_idx<-1 || ch->texture_idx>=fb->textures.size(),0);
+ if (ch->texture_idx!=-1)
+ VisualServer::get_singleton()->canvas_item_add_texture_rect_region( p_canvas_item, Rect2( cpos, ch->rect.size ), fb->textures[ch->texture_idx].texture->get_rid(),ch->rect, p_modulate );
+ advance=ch->advance;
+ used_fallback=true;
+ break;
+ }
+ //not found, try 0xFFFD to display 'not found'.
+
+ if (!used_fallback) {
+
+ const_cast<DynamicFontAtSize*>(this)->_update_char(0xFFFD);
+ c = char_map.getptr(0xFFFD);
+
+ }
}
- Point2 cpos=p_pos;
- cpos.x+=c->h_align;
- cpos.y-=get_ascent();
- cpos.y+=c->v_align;
- ERR_FAIL_COND_V( c->texture_idx<-1 || c->texture_idx>=textures.size(),0);
- if (c->texture_idx!=-1)
- VisualServer::get_singleton()->canvas_item_add_texture_rect_region( p_canvas_item, Rect2( cpos, c->rect.size ), textures[c->texture_idx].texture->get_rid(),c->rect, p_modulate );
+ if (c->found) {
+
+
+ Point2 cpos=p_pos;
+ cpos.x+=c->h_align;
+ cpos.y-=get_ascent();
+ cpos.y+=c->v_align;
+ ERR_FAIL_COND_V( c->texture_idx<-1 || c->texture_idx>=textures.size(),0);
+ if (c->texture_idx!=-1)
+ VisualServer::get_singleton()->canvas_item_add_texture_rect_region( p_canvas_item, Rect2( cpos, c->rect.size ), textures[c->texture_idx].texture->get_rid(),c->rect, p_modulate );
+ advance=c->advance;
+ //textures[c->texture_idx].texture->draw(p_canvas_item,Vector2());
+ }
- //textures[c->texture_idx].texture->draw(p_canvas_item,Vector2());
- float ret = c->advance;
if (p_next) {
FT_Vector delta;
FT_Get_Kerning( face, p_char,p_next, FT_KERNING_DEFAULT, &delta );
- ret+=delta.x>>6;
+ if (delta.x==0) {
+ for(int i=0;i<p_fallbacks.size();i++) {
+
+ DynamicFontAtSize *fb = const_cast<DynamicFontAtSize*>(p_fallbacks[i].ptr());
+ if (!fb->valid)
+ continue;
+
+ FT_Get_Kerning( fb->face, p_char,p_next, FT_KERNING_DEFAULT, &delta );
+
+ if (delta.x==0)
+ continue;
+
+ advance+=delta.x>>6;
+ break;
+ }
+ } else {
+ advance+=delta.x>>6;
+ }
}
- return ret;
+ return advance;
}
unsigned long DynamicFontAtSize::_ft_stream_io(FT_Stream stream, unsigned long offset, unsigned char* buffer, unsigned long count ) {
@@ -245,6 +357,18 @@ void DynamicFontAtSize::_update_char(CharType p_char) {
FT_GlyphSlot slot = face->glyph;
+ if (FT_Get_Char_Index( face, p_char)==0) {
+ //not found
+ Character ch;
+ ch.texture_idx=-1;
+ ch.advance=0;
+ ch.h_align=0;
+ ch.v_align=0;
+ ch.found=false;
+
+ char_map[p_char]=ch;
+ return;
+ }
int error = FT_Load_Char( face, p_char, FT_LOAD_RENDER|(font->force_autohinter?FT_LOAD_FORCE_AUTOHINT:0) );
if (!error) {
error = FT_Render_Glyph( face->glyph, ft_render_mode_normal );
@@ -259,6 +383,7 @@ void DynamicFontAtSize::_update_char(CharType p_char) {
ch.advance=advance;
ch.h_align=0;
ch.v_align=0;
+ ch.found=false;
char_map[p_char]=ch;
@@ -412,6 +537,7 @@ void DynamicFontAtSize::_update_char(CharType p_char) {
chr.v_align=ascent-yofs;// + ascent - descent;
chr.advance=advance;
chr.texture_idx=tex_index;
+ chr.found=true;
chr.rect=Rect2(tex_x+rect_margin,tex_y+rect_margin,w,h);
@@ -443,18 +569,6 @@ DynamicFontAtSize::~DynamicFontAtSize(){
/////////////////////////
-void DynamicFont::_bind_methods() {
-
- ObjectTypeDB::bind_method(_MD("set_font_data","data:DynamicFontData"),&DynamicFont::set_font_data);
- ObjectTypeDB::bind_method(_MD("get_font_data:DynamicFontData"),&DynamicFont::get_font_data);
-
- ObjectTypeDB::bind_method(_MD("set_size","data"),&DynamicFont::set_size);
- ObjectTypeDB::bind_method(_MD("get_size"),&DynamicFont::get_size);
-
- ADD_PROPERTY(PropertyInfo(Variant::INT,"size"),_SCS("set_size"),_SCS("get_size"));
- ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"font",PROPERTY_HINT_RESOURCE_TYPE,"DynamicFontData"),_SCS("set_font_data"),_SCS("get_font_data"));
-}
-
void DynamicFont::set_font_data(const Ref<DynamicFontData>& p_data) {
@@ -476,6 +590,9 @@ void DynamicFont::set_size(int p_size){
if (!data.is_valid())
return;
data_at_size=data->_get_dynamic_font_at_size(size);
+ for(int i=0;i<fallbacks.size();i++) {
+ fallback_data_at_size[i]=fallbacks[i]->_get_dynamic_font_at_size(size);
+ }
}
int DynamicFont::get_size() const{
@@ -513,7 +630,7 @@ Size2 DynamicFont::get_char_size(CharType p_char,CharType p_next) const{
if (!data_at_size.is_valid())
return Size2(1,1);
- return data_at_size->get_char_size(p_char,p_next);
+ return data_at_size->get_char_size(p_char,p_next,fallback_data_at_size);
}
@@ -527,8 +644,114 @@ float DynamicFont::draw_char(RID p_canvas_item, const Point2& p_pos, const CharT
if (!data_at_size.is_valid())
return 0;
- return data_at_size->draw_char(p_canvas_item,p_pos,p_char,p_next,p_modulate);
+ return data_at_size->draw_char(p_canvas_item,p_pos,p_char,p_next,p_modulate,fallback_data_at_size);
+
+}
+void DynamicFont::set_fallback(int p_idx,const Ref<DynamicFontData>& p_data) {
+
+ ERR_FAIL_COND(p_data.is_null());
+ ERR_FAIL_INDEX(p_idx,fallbacks.size());
+ fallbacks[p_idx]=p_data;
+ fallback_data_at_size[p_idx]=fallbacks[p_idx]->_get_dynamic_font_at_size(size);
+
+}
+
+void DynamicFont::add_fallback(const Ref<DynamicFontData>& p_data) {
+
+ ERR_FAIL_COND(p_data.is_null());
+ fallbacks.push_back(p_data);
+ fallback_data_at_size.push_back(fallbacks[fallbacks.size()-1]->_get_dynamic_font_at_size(size)); //const..
+
+ _change_notify();
+}
+
+int DynamicFont::get_fallback_count() const {
+ return fallbacks.size();
+}
+Ref<DynamicFontData> DynamicFont::get_fallback(int p_idx) const {
+
+ ERR_FAIL_INDEX_V(p_idx,fallbacks.size(),Ref<DynamicFontData>());
+
+ return fallbacks[p_idx];
+}
+void DynamicFont::remove_fallback(int p_idx) {
+
+ ERR_FAIL_INDEX(p_idx,fallbacks.size());
+ fallbacks.remove(p_idx);
+ fallback_data_at_size.remove(p_idx);
+ _change_notify();
+}
+
+bool DynamicFont::_set(const StringName& p_name, const Variant& p_value) {
+
+ String str = p_name;
+ if (str.begins_with("fallback/")) {
+ int idx = str.get_slicec('/',1).to_int();
+ Ref<DynamicFontData> fd = p_value;
+
+ if (fd.is_valid()) {
+ if (idx==fallbacks.size()) {
+ add_fallback(fd);
+ return true;
+ } else if (idx>=0 && idx<fallbacks.size()) {
+ set_fallback(idx,fd);
+ return true;
+ } else {
+ return false;
+ }
+ } else if (idx>=0 && idx<fallbacks.size()) {
+ remove_fallback(idx);
+ return true;
+ }
+ }
+
+ return false;
+}
+
+bool DynamicFont::_get(const StringName& p_name,Variant &r_ret) const{
+
+ String str = p_name;
+ if (str.begins_with("fallback/")) {
+ int idx = str.get_slicec('/',1).to_int();
+
+ if (idx==fallbacks.size()) {
+ r_ret=Ref<DynamicFontData>();
+ return true;
+ } else if (idx>=0 && idx<fallbacks.size()) {
+ r_ret=get_fallback(idx);
+ return true;
+ }
+ }
+
+ return false;
+}
+void DynamicFont::_get_property_list( List<PropertyInfo> *p_list) const{
+
+ for(int i=0;i<fallbacks.size();i++) {
+ p_list->push_back(PropertyInfo(Variant::OBJECT,"fallback/"+itos(i),PROPERTY_HINT_RESOURCE_TYPE,"DynamicFontData"));
+ }
+
+ p_list->push_back(PropertyInfo(Variant::OBJECT,"fallback/"+itos(fallbacks.size()),PROPERTY_HINT_RESOURCE_TYPE,"DynamicFontData"));
+}
+
+
+void DynamicFont::_bind_methods() {
+
+ ObjectTypeDB::bind_method(_MD("set_font_data","data:DynamicFontData"),&DynamicFont::set_font_data);
+ ObjectTypeDB::bind_method(_MD("get_font_data:DynamicFontData"),&DynamicFont::get_font_data);
+
+ ObjectTypeDB::bind_method(_MD("set_size","data"),&DynamicFont::set_size);
+ ObjectTypeDB::bind_method(_MD("get_size"),&DynamicFont::get_size);
+
+ ObjectTypeDB::bind_method(_MD("add_fallback","data:DynamicFontData"),&DynamicFont::add_fallback);
+ ObjectTypeDB::bind_method(_MD("set_fallback","idx","data:DynamicFontData"),&DynamicFont::set_fallback);
+ ObjectTypeDB::bind_method(_MD("get_fallback:DynamicFontData","idx"),&DynamicFont::get_fallback);
+ ObjectTypeDB::bind_method(_MD("remove_fallback","idx"),&DynamicFont::remove_fallback);
+ ObjectTypeDB::bind_method(_MD("get_fallback_count"),&DynamicFont::get_fallback_count);
+
+ ADD_PROPERTY(PropertyInfo(Variant::INT,"font/size"),_SCS("set_size"),_SCS("get_size"));
+ ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"font/font",PROPERTY_HINT_RESOURCE_TYPE,"DynamicFontData"),_SCS("set_font_data"),_SCS("get_font_data"));
}
DynamicFont::DynamicFont() {
diff --git a/scene/resources/dynamic_font.h b/scene/resources/dynamic_font.h
index f0cf80b042..1a46e1e468 100644
--- a/scene/resources/dynamic_font.h
+++ b/scene/resources/dynamic_font.h
@@ -72,6 +72,7 @@ class DynamicFontAtSize : public Reference {
struct Character {
+ bool found;
int texture_idx;
Rect2 rect;
float v_align;
@@ -108,9 +109,9 @@ public:
float get_ascent() const;
float get_descent() const;
- Size2 get_char_size(CharType p_char,CharType p_next=0) const;
+ Size2 get_char_size(CharType p_char,CharType p_next,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const;
- float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next=0,const Color& p_modulate=Color(1,1,1)) const;
+ float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const;
@@ -124,13 +125,22 @@ class DynamicFont : public Font {
OBJ_TYPE( DynamicFont, Font );
- Ref<DynamicFontData> data;
+ Ref<DynamicFontData> data;
Ref<DynamicFontAtSize> data_at_size;
+
+ Vector< Ref<DynamicFontData> > fallbacks;
+ Vector< Ref<DynamicFontAtSize> > fallback_data_at_size;
+
+
int size;
bool valid;
protected:
+ bool _set(const StringName& p_name, const Variant& p_value);
+ bool _get(const StringName& p_name,Variant &r_ret) const;
+ void _get_property_list( List<PropertyInfo> *p_list) const;
+
static void _bind_methods();
public:
@@ -141,6 +151,13 @@ public:
void set_size(int p_size);
int get_size() const;
+
+ void add_fallback(const Ref<DynamicFontData>& p_data);
+ void set_fallback(int p_idx,const Ref<DynamicFontData>& p_data);
+ int get_fallback_count() const;
+ Ref<DynamicFontData> get_fallback(int p_idx) const;
+ void remove_fallback(int p_idx);
+
virtual float get_height() const;
virtual float get_ascent() const;
diff --git a/tools/editor/editor_fonts.cpp b/tools/editor/editor_fonts.cpp
index da947748a4..ff2267daf1 100644
--- a/tools/editor/editor_fonts.cpp
+++ b/tools/editor/editor_fonts.cpp
@@ -67,23 +67,62 @@ static Ref<BitmapFont> make_font(int p_height,int p_ascent, int p_valign, int p_
}
+
+#define MAKE_DROID_SANS(m_name,m_size) \
+ Ref<DynamicFont> m_name;\
+ m_name.instance();\
+ m_name->set_size(m_size);\
+ m_name->set_font_data(DroidSans);\
+ m_name->add_fallback(DroidSansFallback);\
+ m_name->add_fallback(DroidSansJapanese);\
+ m_name->add_fallback(DroidSansArabic);\
+ m_name->add_fallback(DroidSansHebrew);\
+ m_name->add_fallback(DroidSansThai);
+
+
+
void editor_register_fonts(Ref<Theme> p_theme) {
+ /* Droid Sans */
+
+ Ref<DynamicFontData> DroidSans;
+ DroidSans.instance();
+ DroidSans->set_font_ptr(_font_DroidSans,_font_DroidSans_size);
+ DroidSans->set_force_autohinter(true); //just looks better..i think?
+
+ Ref<DynamicFontData> DroidSansFallback;
+ DroidSansFallback.instance();
+ DroidSansFallback->set_font_ptr(_font_DroidSansFallback,_font_DroidSansFallback_size);
+ DroidSansFallback->set_force_autohinter(true); //just looks better..i think?
+ Ref<DynamicFontData> DroidSansJapanese;
+ DroidSansJapanese.instance();
+ DroidSansJapanese->set_font_ptr(_font_DroidSansJapanese,_font_DroidSansJapanese_size);
+ DroidSansJapanese->set_force_autohinter(true); //just looks better..i think?
+
+ Ref<DynamicFontData> DroidSansArabic;
+ DroidSansArabic.instance();
+ DroidSansArabic->set_font_ptr(_font_DroidSansArabic,_font_DroidSansArabic_size);
+ DroidSansArabic->set_force_autohinter(true); //just looks better..i think?
+
+ Ref<DynamicFontData> DroidSansHebrew;
+ DroidSansHebrew.instance();
+ DroidSansHebrew->set_font_ptr(_font_DroidSansHebrew,_font_DroidSansHebrew_size);
+ DroidSansHebrew->set_force_autohinter(true); //just looks better..i think?
+
+ Ref<DynamicFontData> DroidSansThai;
+ DroidSansThai.instance();
+ DroidSansThai->set_font_ptr(_font_DroidSansThai,_font_DroidSansThai_size);
+ DroidSansThai->set_force_autohinter(true); //just looks better..i think?
+
+ /* Source Code Pro */
- Ref<DynamicFontData> dfd;
- dfd.instance();
- dfd->set_font_ptr(_font_droid_sans,_font_droid_sans_size);
- dfd->set_force_autohinter(true); //just looks better..i think?
Ref<DynamicFontData> dfmono;
dfmono.instance();
dfmono->set_font_ptr(_font_source_code_pro,_font_source_code_pro_size);
//dfd->set_force_autohinter(true); //just looks better..i think?
- Ref<DynamicFont> df;
- df.instance();
- df->set_size(int(EditorSettings::get_singleton()->get("global/font_size"))*EDSCALE);
- df->set_font_data(dfd);
+ MAKE_DROID_SANS(df,int(EditorSettings::get_singleton()->get("global/font_size"))*EDSCALE);
p_theme->set_default_theme_font(df);
@@ -92,15 +131,10 @@ void editor_register_fonts(Ref<Theme> p_theme) {
// Ref<BitmapFont> doc_title_font = make_font(_bi_font_doc_title_font_height,_bi_font_doc_title_font_ascent,0,_bi_font_doc_title_font_charcount,_bi_font_doc_title_font_characters,p_theme->get_icon("DocTitleFont","EditorIcons"));
// Ref<BitmapFont> doc_code_font = make_font(_bi_font_doc_code_font_height,_bi_font_doc_code_font_ascent,0,_bi_font_doc_code_font_charcount,_bi_font_doc_code_font_characters,p_theme->get_icon("DocCodeFont","EditorIcons"));
- Ref<DynamicFont> df_title;
- df_title.instance();
- df_title->set_size(int(EDITOR_DEF("help/help_title_font_size",18))*EDSCALE);
- df_title->set_font_data(dfd);
+ MAKE_DROID_SANS(df_title,int(EDITOR_DEF("help/help_title_font_size",18))*EDSCALE);
+
+ MAKE_DROID_SANS(df_doc,int(EDITOR_DEF("help/help_font_size",16))*EDSCALE);
- Ref<DynamicFont> df_doc;
- df_doc.instance();
- df_doc->set_size(int(EDITOR_DEF("help/help_font_size",16))*EDSCALE);
- df_doc->set_font_data(dfd);
p_theme->set_font("doc","EditorFonts",df_doc);
p_theme->set_font("doc_title","EditorFonts",df_title);
diff --git a/tools/editor_fonts/DroidSans.ttf b/tools/editor_fonts/DroidSans.ttf
new file mode 100644
index 0000000000..767c63ad00
--- /dev/null
+++ b/tools/editor_fonts/DroidSans.ttf
Binary files differ
diff --git a/tools/editor_fonts/DroidSansArabic.ttf b/tools/editor_fonts/DroidSansArabic.ttf
new file mode 100644
index 0000000000..660e2a9916
--- /dev/null
+++ b/tools/editor_fonts/DroidSansArabic.ttf
Binary files differ
diff --git a/tools/editor_fonts/DroidSansFallback.ttf b/tools/editor_fonts/DroidSansFallback.ttf
new file mode 100644
index 0000000000..206621fc6c
--- /dev/null
+++ b/tools/editor_fonts/DroidSansFallback.ttf
Binary files differ
diff --git a/tools/editor_fonts/DroidSansHebrew.ttf b/tools/editor_fonts/DroidSansHebrew.ttf
new file mode 100644
index 0000000000..8d77e3e4cf
--- /dev/null
+++ b/tools/editor_fonts/DroidSansHebrew.ttf
Binary files differ
diff --git a/tools/editor_fonts/DroidSansJapanese.ttf b/tools/editor_fonts/DroidSansJapanese.ttf
new file mode 100644
index 0000000000..412fa3de05
--- /dev/null
+++ b/tools/editor_fonts/DroidSansJapanese.ttf
Binary files differ
diff --git a/tools/editor_fonts/DroidSansThai.ttf b/tools/editor_fonts/DroidSansThai.ttf
new file mode 100644
index 0000000000..f849baeff9
--- /dev/null
+++ b/tools/editor_fonts/DroidSansThai.ttf
Binary files differ
diff --git a/tools/editor_fonts/droid_sans.ttf b/tools/editor_fonts/droid_sans.ttf
deleted file mode 100644
index a117feac85..0000000000
--- a/tools/editor_fonts/droid_sans.ttf
+++ /dev/null
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 02:43:59 +0000