浏览代码

Merge pull request #52176 from BastiaanOlij/fix_gl_size_param

Fix double named size parameter
Max Hilbrunner 4 年之前
父节点
当前提交
7368004869
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      doc/classes/TextServer.xml
  2. 1 1
      modules/gdnative/text/text_server_gdnative.cpp
  3. 1 1
      servers/text_server.cpp

+ 1 - 1
doc/classes/TextServer.xml

@@ -551,7 +551,7 @@
 			<argument index="0" name="font_rid" type="RID" />
 			<argument index="1" name="size" type="Vector2i" />
 			<argument index="2" name="glyph" type="int" />
-			<argument index="3" name="size" type="Vector2" />
+			<argument index="3" name="gl_size" type="Vector2" />
 			<description>
 				Sets size of the glyph.
 			</description>

+ 1 - 1
modules/gdnative/text/text_server_gdnative.cpp

@@ -383,7 +383,7 @@ Vector2 TextServerGDNative::font_get_glyph_size(RID p_font_rid, const Vector2i &
 
 void TextServerGDNative::font_set_glyph_size(RID p_font_rid, const Vector2i &p_size, int32_t p_glyph, const Vector2 &p_gl_size) {
 	ERR_FAIL_COND(interface == nullptr);
-	interface->font_set_glyph_size(data, (godot_rid *)&p_font_rid, (const godot_vector2i *)&p_size, p_glyph, (const godot_vector2 *)&p_size);
+	interface->font_set_glyph_size(data, (godot_rid *)&p_font_rid, (const godot_vector2i *)&p_size, p_glyph, (const godot_vector2 *)&p_gl_size);
 }
 
 Rect2 TextServerGDNative::font_get_glyph_uv_rect(RID p_font_rid, const Vector2i &p_size, int32_t p_glyph) const {

+ 1 - 1
servers/text_server.cpp

@@ -291,7 +291,7 @@ void TextServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("font_set_glyph_offset", "font_rid", "size", "glyph", "offset"), &TextServer::font_set_glyph_offset);
 
 	ClassDB::bind_method(D_METHOD("font_get_glyph_size", "font_rid", "size", "glyph"), &TextServer::font_get_glyph_size);
-	ClassDB::bind_method(D_METHOD("font_set_glyph_size", "font_rid", "size", "glyph", "size"), &TextServer::font_set_glyph_size);
+	ClassDB::bind_method(D_METHOD("font_set_glyph_size", "font_rid", "size", "glyph", "gl_size"), &TextServer::font_set_glyph_size);
 
 	ClassDB::bind_method(D_METHOD("font_get_glyph_uv_rect", "font_rid", "size", "glyph"), &TextServer::font_get_glyph_uv_rect);
 	ClassDB::bind_method(D_METHOD("font_set_glyph_uv_rect", "font_rid", "size", "glyph", "uv_rect"), &TextServer::font_set_glyph_uv_rect);