diff options
Diffstat (limited to 'modules')
20 files changed, 224 insertions, 445 deletions
diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp index 229d0b2b39..6eb37290ec 100644 --- a/modules/dds/texture_loader_dds.cpp +++ b/modules/dds/texture_loader_dds.cpp @@ -291,6 +291,15 @@ static Ref<Image> _dds_load_layer(Ref<FileAccess> p_file, DDSFormat p_dds_format if (info.compressed) { // BC compressed. + w += w % info.divisor; + h += h % info.divisor; + if (w != p_width) { + WARN_PRINT(vformat("%s: DDS width '%d' is not divisible by %d. This is not allowed as per the DDS specification, attempting to load anyway.", p_file->get_path(), p_width, info.divisor)); + } + if (h != p_height) { + WARN_PRINT(vformat("%s: DDS height '%d' is not divisible by %d. This is not allowed as per the DDS specification, attempting to load anyway.", p_file->get_path(), p_height, info.divisor)); + } + uint32_t size = MAX(info.divisor, w) / info.divisor * MAX(info.divisor, h) / info.divisor * info.block_size; if (p_flags & DDSD_LINEARSIZE) { diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp index d61c97eabf..5732a3372b 100644 --- a/modules/gdscript/language_server/gdscript_extend_parser.cpp +++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp @@ -59,6 +59,12 @@ lsp::Position GodotPosition::to_lsp(const Vector<String> &p_lines) const { return res; } res.line = line - 1; + + // Special case: `column = 0` -> Starts at beginning of line. + if (column <= 0) { + return res; + } + // Note: character outside of `pos_line.length()-1` is valid. res.character = column - 1; @@ -240,9 +246,12 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p r_symbol.kind = lsp::SymbolKind::Class; r_symbol.deprecated = false; r_symbol.range = range_of_node(p_class); - r_symbol.range.start.line = MAX(r_symbol.range.start.line, 0); if (p_class->identifier) { r_symbol.selectionRange = range_of_node(p_class->identifier); + } else { + // No meaningful `selectionRange`, but we must ensure that it is inside of `range`. + r_symbol.selectionRange.start = r_symbol.range.start; + r_symbol.selectionRange.end = r_symbol.range.start; } r_symbol.detail = "class " + r_symbol.name; { diff --git a/modules/gdscript/tests/scripts/lsp/first_line_comment.gd b/modules/gdscript/tests/scripts/lsp/first_line_comment.gd new file mode 100644 index 0000000000..34ead5fabb --- /dev/null +++ b/modules/gdscript/tests/scripts/lsp/first_line_comment.gd @@ -0,0 +1,2 @@ +# Some comment +extends Node diff --git a/modules/gdscript/tests/scripts/runtime/features/stringify.gd b/modules/gdscript/tests/scripts/runtime/features/stringify.gd index 463d207e59..69aecec6a8 100644 --- a/modules/gdscript/tests/scripts/runtime/features/stringify.gd +++ b/modules/gdscript/tests/scripts/runtime/features/stringify.gd @@ -22,6 +22,7 @@ func test(): print(AABB(Vector3.ZERO, Vector3.ONE)) print(Basis.from_euler(Vector3(0, 0, 0))) print(Transform3D.IDENTITY) + print(Projection.IDENTITY) print(Color(1, 2, 3, 4)) print(StringName("hello")) diff --git a/modules/gdscript/tests/scripts/runtime/features/stringify.out b/modules/gdscript/tests/scripts/runtime/features/stringify.out index 9983366db0..b044f8105d 100644 --- a/modules/gdscript/tests/scripts/runtime/features/stringify.out +++ b/modules/gdscript/tests/scripts/runtime/features/stringify.out @@ -17,6 +17,7 @@ hello world [P: (0.0, 0.0, 0.0), S: (1.0, 1.0, 1.0)] [X: (1.0, 0.0, 0.0), Y: (0.0, 1.0, 0.0), Z: (0.0, 0.0, 1.0)] [X: (1.0, 0.0, 0.0), Y: (0.0, 1.0, 0.0), Z: (0.0, 0.0, 1.0), O: (0.0, 0.0, 0.0)] +[X: (1.0, 0.0, 0.0, 0.0), Y: (0.0, 1.0, 0.0, 0.0), Z: (0.0, 0.0, 1.0, 0.0), W: (0.0, 0.0, 0.0, 1.0)] (1.0, 2.0, 3.0, 4.0) hello hello/world diff --git a/modules/gdscript/tests/test_lsp.h b/modules/gdscript/tests/test_lsp.h index bd9af6fc36..b5a3b83462 100644 --- a/modules/gdscript/tests/test_lsp.h +++ b/modules/gdscript/tests/test_lsp.h @@ -377,6 +377,18 @@ func f(): gd.to_lsp(lines); } + SUBCASE("special case: zero column for root class") { + GodotPosition gd(1, 0); + lsp::Position expected = lsp_pos(0, 0); + lsp::Position actual = gd.to_lsp(lines); + CHECK_EQ(actual, expected); + } + SUBCASE("special case: zero line and column for root class") { + GodotPosition gd(0, 0); + lsp::Position expected = lsp_pos(0, 0); + lsp::Position actual = gd.to_lsp(lines); + CHECK_EQ(actual, expected); + } SUBCASE("special case: negative line for root class") { GodotPosition gd(-1, 0); lsp::Position expected = lsp_pos(0, 0); @@ -473,6 +485,25 @@ func f(): memdelete(proto); finish_language(); } + TEST_CASE("[workspace][document_symbol]") { + GDScriptLanguageProtocol *proto = initialize(root); + REQUIRE(proto); + + SUBCASE("selectionRange of root class must be inside range") { + String path = "res://lsp/first_line_comment.gd"; + assert_no_errors_in(path); + GDScriptLanguageProtocol::get_singleton()->get_workspace()->parse_local_script(path); + ExtendGDScriptParser *parser = GDScriptLanguageProtocol::get_singleton()->get_workspace()->parse_results[path]; + REQUIRE(parser); + lsp::DocumentSymbol cls = parser->get_symbols(); + + REQUIRE(((cls.range.start.line == cls.selectionRange.start.line && cls.range.start.character <= cls.selectionRange.start.character) || (cls.range.start.line < cls.selectionRange.start.line))); + REQUIRE(((cls.range.end.line == cls.selectionRange.end.line && cls.range.end.character >= cls.selectionRange.end.character) || (cls.range.end.line > cls.selectionRange.end.line))); + } + + memdelete(proto); + finish_language(); + } } } // namespace GDScriptTests diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index 328d79d979..39eec218f7 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -1235,6 +1235,8 @@ void GridMapEditor::_update_cursor_instance() { Ref<Mesh> mesh = node->get_mesh_library()->get_item_mesh(selected_palette); if (!mesh.is_null() && mesh->get_rid().is_valid()) { cursor_instance = RenderingServer::get_singleton()->instance_create2(mesh->get_rid(), get_tree()->get_root()->get_world_3d()->get_scenario()); + RS::ShadowCastingSetting cast_shadows = (RS::ShadowCastingSetting)node->get_mesh_library()->get_item_mesh_cast_shadow(selected_palette); + RS::get_singleton()->instance_geometry_set_cast_shadows_setting(cursor_instance, cast_shadows); } } } else if (mode_buttons_group->get_pressed_button() == select_mode_button) { diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index 58bf2f4bde..4ea3d94512 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -716,6 +716,9 @@ bool GridMap::_octant_update(const OctantKey &p_key) { RS::get_singleton()->instance_set_transform(instance, get_global_transform()); } + RS::ShadowCastingSetting cast_shadows = (RS::ShadowCastingSetting)mesh_library->get_item_mesh_cast_shadow(E.key); + RS::get_singleton()->instance_geometry_set_cast_shadows_setting(instance, cast_shadows); + mmi.multimesh = mm; mmi.instance = instance; diff --git a/modules/lightmapper_rd/lightmapper_rd.cpp b/modules/lightmapper_rd/lightmapper_rd.cpp index ee17835b3e..99ba113483 100644 --- a/modules/lightmapper_rd/lightmapper_rd.cpp +++ b/modules/lightmapper_rd/lightmapper_rd.cpp @@ -724,7 +724,7 @@ void LightmapperRD::_raster_geometry(RenderingDevice *rd, Size2i atlas_size, int raster_push_constant.uv_offset[0] = -0.5f / float(atlas_size.x); raster_push_constant.uv_offset[1] = -0.5f / float(atlas_size.y); - RD::DrawListID draw_list = rd->draw_list_begin(framebuffers[i], RD::INITIAL_ACTION_CLEAR, RD::FINAL_ACTION_STORE, RD::INITIAL_ACTION_CLEAR, RD::FINAL_ACTION_DISCARD, clear_colors, 1.0, 0, Rect2(), RDD::BreadcrumbMarker::LIGHTMAPPER_PASS); + RD::DrawListID draw_list = rd->draw_list_begin(framebuffers[i], RD::DRAW_CLEAR_ALL, clear_colors, 1.0f, 0, Rect2(), RDD::BreadcrumbMarker::LIGHTMAPPER_PASS); //draw opaque rd->draw_list_bind_render_pipeline(draw_list, raster_pipeline); rd->draw_list_bind_uniform_set(draw_list, raster_base_uniform, 0); @@ -1421,6 +1421,7 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d tf.texture_type = RD::TEXTURE_TYPE_2D; tf.usage_bits = RD::TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; tf.format = RD::DATA_FORMAT_D32_SFLOAT; + tf.is_discardable = true; raster_depth_buffer = rd->texture_create(tf, RD::TextureView()); } @@ -2051,8 +2052,6 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d uint32_t seam_offset = 0; uint32_t triangle_offset = 0; - Vector<Color> clear_colors; - clear_colors.push_back(Color(0, 0, 0, 1)); for (int i = 0; i < atlas_slices; i++) { int subslices = (p_bake_sh ? 4 : 1); @@ -2066,7 +2065,7 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d seams_push_constant.debug = debug; // Store the current subslice in the breadcrumb. - RD::DrawListID draw_list = rd->draw_list_begin(framebuffers[i * subslices + k], RD::INITIAL_ACTION_LOAD, RD::FINAL_ACTION_STORE, RD::INITIAL_ACTION_CLEAR, RD::FINAL_ACTION_DISCARD, clear_colors, 1.0, 0, Rect2(), RDD::BreadcrumbMarker::LIGHTMAPPER_PASS | seams_push_constant.slice); + RD::DrawListID draw_list = rd->draw_list_begin(framebuffers[i * subslices + k], RD::DRAW_CLEAR_DEPTH, Vector<Color>(), 1.0f, 0, Rect2(), RDD::BreadcrumbMarker::LIGHTMAPPER_PASS | seams_push_constant.slice); rd->draw_list_bind_uniform_set(draw_list, raster_base_uniform, 0); rd->draw_list_bind_uniform_set(draw_list, blendseams_raster_uniform, 1); diff --git a/modules/navigation/nav_map.cpp b/modules/navigation/nav_map.cpp index 38bb70568f..5745bfe2c0 100644 --- a/modules/navigation/nav_map.cpp +++ b/modules/navigation/nav_map.cpp @@ -358,16 +358,10 @@ Vector3 NavMap::get_random_point(uint32_t p_navigation_layers, bool p_uniformly) void NavMap::sync() { RWLockWrite write_lock(map_rwlock); - // Performance Monitor - int _new_pm_region_count = regions.size(); - int _new_pm_agent_count = agents.size(); - int _new_pm_link_count = links.size(); - int _new_pm_polygon_count = pm_polygon_count; - int _new_pm_edge_count = pm_edge_count; - int _new_pm_edge_merge_count = pm_edge_merge_count; - int _new_pm_edge_connection_count = pm_edge_connection_count; - int _new_pm_edge_free_count = pm_edge_free_count; - int _new_pm_obstacle_count = obstacles.size(); + performance_data.pm_region_count = regions.size(); + performance_data.pm_agent_count = agents.size(); + performance_data.pm_link_count = links.size(); + performance_data.pm_obstacle_count = obstacles.size(); // Check if we need to update the links. if (regenerate_polygons) { @@ -390,11 +384,11 @@ void NavMap::sync() { } if (regenerate_links) { - _new_pm_polygon_count = 0; - _new_pm_edge_count = 0; - _new_pm_edge_merge_count = 0; - _new_pm_edge_connection_count = 0; - _new_pm_edge_free_count = 0; + performance_data.pm_polygon_count = 0; + performance_data.pm_edge_count = 0; + performance_data.pm_edge_merge_count = 0; + performance_data.pm_edge_connection_count = 0; + performance_data.pm_edge_free_count = 0; // Remove regions connections. region_external_connections.clear(); @@ -426,7 +420,7 @@ void NavMap::sync() { } } - _new_pm_polygon_count = polygon_count; + performance_data.pm_polygon_count = polygon_count; // Group all edges per key. connection_pairs_map.clear(); @@ -441,7 +435,7 @@ void NavMap::sync() { HashMap<gd::EdgeKey, ConnectionPair, gd::EdgeKey>::Iterator pair_it = connection_pairs_map.find(ek); if (!pair_it) { pair_it = connection_pairs_map.insert(ek, ConnectionPair()); - _new_pm_edge_count += 1; + performance_data.pm_edge_count += 1; ++free_edges_count; } ConnectionPair &pair = pair_it->value; @@ -478,7 +472,7 @@ void NavMap::sync() { c1.polygon->edges[c1.edge].connections.push_back(c2); c2.polygon->edges[c2.edge].connections.push_back(c1); // Note: The pathway_start/end are full for those connection and do not need to be modified. - _new_pm_edge_merge_count += 1; + performance_data.pm_edge_merge_count += 1; } else { CRASH_COND_MSG(pair.size != 1, vformat("Number of connection != 1. Found: %d", pair.size)); if (use_edge_connections && pair.connections[0].polygon->owner->get_use_edge_connections()) { @@ -494,7 +488,7 @@ void NavMap::sync() { // to be connected, create new polygons to remove that small gap is // not really useful and would result in wasteful computation during // connection, integration and path finding. - _new_pm_edge_free_count = free_edges.size(); + performance_data.pm_edge_free_count = free_edges.size(); const real_t edge_connection_margin_squared = edge_connection_margin * edge_connection_margin; @@ -551,7 +545,7 @@ void NavMap::sync() { // Add the connection to the region_connection map. region_external_connections[(NavRegion *)free_edge.polygon->owner].push_back(new_connection); - _new_pm_edge_connection_count += 1; + performance_data.pm_edge_connection_count += 1; } } @@ -689,17 +683,6 @@ void NavMap::sync() { regenerate_links = false; obstacles_dirty = false; agents_dirty = false; - - // Performance Monitor. - pm_region_count = _new_pm_region_count; - pm_agent_count = _new_pm_agent_count; - pm_link_count = _new_pm_link_count; - pm_polygon_count = _new_pm_polygon_count; - pm_edge_count = _new_pm_edge_count; - pm_edge_merge_count = _new_pm_edge_merge_count; - pm_edge_connection_count = _new_pm_edge_connection_count; - pm_edge_free_count = _new_pm_edge_free_count; - pm_obstacle_count = _new_pm_obstacle_count; } void NavMap::_update_rvo_obstacles_tree_2d() { diff --git a/modules/navigation/nav_map.h b/modules/navigation/nav_map.h index 2594ace8fc..b7cce05852 100644 --- a/modules/navigation/nav_map.h +++ b/modules/navigation/nav_map.h @@ -118,15 +118,7 @@ class NavMap : public NavRid { bool avoidance_use_high_priority_threads = true; // Performance Monitor - int pm_region_count = 0; - int pm_agent_count = 0; - int pm_link_count = 0; - int pm_polygon_count = 0; - int pm_edge_count = 0; - int pm_edge_merge_count = 0; - int pm_edge_connection_count = 0; - int pm_edge_free_count = 0; - int pm_obstacle_count = 0; + gd::PerformanceData performance_data; HashMap<NavRegion *, LocalVector<gd::Edge::Connection>> region_external_connections; @@ -222,15 +214,15 @@ public: void dispatch_callbacks(); // Performance Monitor - int get_pm_region_count() const { return pm_region_count; } - int get_pm_agent_count() const { return pm_agent_count; } - int get_pm_link_count() const { return pm_link_count; } - int get_pm_polygon_count() const { return pm_polygon_count; } - int get_pm_edge_count() const { return pm_edge_count; } - int get_pm_edge_merge_count() const { return pm_edge_merge_count; } - int get_pm_edge_connection_count() const { return pm_edge_connection_count; } - int get_pm_edge_free_count() const { return pm_edge_free_count; } - int get_pm_obstacle_count() const { return pm_obstacle_count; } + int get_pm_region_count() const { return performance_data.pm_region_count; } + int get_pm_agent_count() const { return performance_data.pm_agent_count; } + int get_pm_link_count() const { return performance_data.pm_link_count; } + int get_pm_polygon_count() const { return performance_data.pm_polygon_count; } + int get_pm_edge_count() const { return performance_data.pm_edge_count; } + int get_pm_edge_merge_count() const { return performance_data.pm_edge_merge_count; } + int get_pm_edge_connection_count() const { return performance_data.pm_edge_connection_count; } + int get_pm_edge_free_count() const { return performance_data.pm_edge_free_count; } + int get_pm_obstacle_count() const { return performance_data.pm_obstacle_count; } int get_region_connections_count(NavRegion *p_region) const; Vector3 get_region_connection_pathway_start(NavRegion *p_region, int p_connection_id) const; diff --git a/modules/navigation/nav_utils.h b/modules/navigation/nav_utils.h index 525c786ec5..407128eac3 100644 --- a/modules/navigation/nav_utils.h +++ b/modules/navigation/nav_utils.h @@ -300,6 +300,19 @@ private: } } }; + +struct PerformanceData { + int pm_region_count = 0; + int pm_agent_count = 0; + int pm_link_count = 0; + int pm_polygon_count = 0; + int pm_edge_count = 0; + int pm_edge_merge_count = 0; + int pm_edge_connection_count = 0; + int pm_edge_free_count = 0; + int pm_obstacle_count = 0; +}; + } // namespace gd #endif // NAV_UTILS_H diff --git a/modules/text_server_adv/thorvg_bounds_iterator.cpp b/modules/text_server_adv/thorvg_bounds_iterator.cpp deleted file mode 100644 index 4d521b2e8d..0000000000 --- a/modules/text_server_adv/thorvg_bounds_iterator.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************/ -/* thorvg_bounds_iterator.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* REDOT ENGINE */ -/* https://redotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2024-present Redot Engine contributors */ -/* (see REDOT_AUTHORS.md) */ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#ifdef GDEXTENSION -// Headers for building as GDExtension plug-in. - -#include <godot_cpp/godot.hpp> - -using namespace godot; - -#elif defined(GODOT_MODULE) -// Headers for building as built-in module. - -#include "core/typedefs.h" - -#include "modules/modules_enabled.gen.h" // For svg. -#endif - -#ifdef MODULE_SVG_ENABLED - -#include "thorvg_bounds_iterator.h" - -#include <tvgIteratorAccessor.h> -#include <tvgPaint.h> - -// This function uses private ThorVG API to get bounding box of top level children elements. - -void tvg_get_bounds(tvg::Picture *p_picture, float &r_min_x, float &r_min_y, float &r_max_x, float &r_max_y) { - tvg::IteratorAccessor itrAccessor; - if (tvg::Iterator *it = itrAccessor.iterator(p_picture)) { - while (const tvg::Paint *child = it->next()) { - float x = 0, y = 0, w = 0, h = 0; - child->bounds(&x, &y, &w, &h, true); - r_min_x = MIN(x, r_min_x); - r_min_y = MIN(y, r_min_y); - r_max_x = MAX(x + w, r_max_x); - r_max_y = MAX(y + h, r_max_y); - } - delete (it); - } -} - -#endif // MODULE_SVG_ENABLED diff --git a/modules/text_server_adv/thorvg_bounds_iterator.h b/modules/text_server_adv/thorvg_bounds_iterator.h deleted file mode 100644 index 0cd9acc3b4..0000000000 --- a/modules/text_server_adv/thorvg_bounds_iterator.h +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************/ -/* thorvg_bounds_iterator.h */ -/**************************************************************************/ -/* This file is part of: */ -/* REDOT ENGINE */ -/* https://redotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2024-present Redot Engine contributors */ -/* (see REDOT_AUTHORS.md) */ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#ifndef THORVG_BOUNDS_ITERATOR_H -#define THORVG_BOUNDS_ITERATOR_H - -#ifdef GDEXTENSION -// Headers for building as GDExtension plug-in. - -#include <godot_cpp/core/mutex_lock.hpp> -#include <godot_cpp/godot.hpp> - -using namespace godot; - -#elif defined(GODOT_MODULE) -// Headers for building as built-in module. - -#include "core/typedefs.h" - -#include "modules/modules_enabled.gen.h" // For svg. -#endif - -#ifdef MODULE_SVG_ENABLED - -#include <thorvg.h> - -void tvg_get_bounds(tvg::Picture *p_picture, float &r_min_x, float &r_min_y, float &r_max_x, float &r_max_y); - -#endif // MODULE_SVG_ENABLED - -#endif // THORVG_BOUNDS_ITERATOR_H diff --git a/modules/text_server_adv/thorvg_svg_in_ot.cpp b/modules/text_server_adv/thorvg_svg_in_ot.cpp index 99523e7b6c..84d6bc12b4 100644 --- a/modules/text_server_adv/thorvg_svg_in_ot.cpp +++ b/modules/text_server_adv/thorvg_svg_in_ot.cpp @@ -59,8 +59,6 @@ using namespace godot; #include "thorvg_svg_in_ot.h" -#include "thorvg_bounds_iterator.h" - #include <freetype/otsvg.h> #include <ft2build.h> @@ -94,8 +92,9 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin parser.instantiate(); parser->_open_buffer((const uint8_t *)document->svg_document, document->svg_document_length); - float aspect = 1.0f; String xml_body; + double embox_x = document->units_per_EM; + double embox_y = document->units_per_EM; while (parser->read() == OK) { if (parser->has_attribute("id")) { const String &gl_name = parser->get_named_attribute_value("id"); @@ -113,15 +112,26 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin PackedStringArray vb = parser->get_named_attribute_value("viewBox").split(" "); if (vb.size() == 4) { - aspect = vb[2].to_float() / vb[3].to_float(); + embox_x = vb[2].to_float(); + embox_y = vb[3].to_float(); } } - continue; + if (parser->has_attribute("width")) { + embox_x = parser->get_named_attribute_value("width").to_float(); + } + if (parser->has_attribute("height")) { + embox_y = parser->get_named_attribute_value("height").to_float(); + } } if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { xml_body += vformat("<%s", parser->get_node_name()); + bool is_svg_tag = parser->get_node_name() == "svg"; for (int i = 0; i < parser->get_attribute_count(); i++) { - xml_body += vformat(" %s=\"%s\"", parser->get_attribute_name(i), parser->get_attribute_value(i)); + String aname = parser->get_attribute_name(i); + if (is_svg_tag && (aname == "viewBox" || aname == "width" || aname == "height")) { + continue; + } + xml_body += vformat(" %s=\"%s\"", aname, parser->get_attribute_value(i)); } if (parser->is_empty()) { @@ -135,91 +145,78 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin xml_body += vformat("</%s>", parser->get_node_name()); } } - String temp_xml_str = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 1 1\">" + xml_body; - CharString temp_xml = temp_xml_str.utf8(); std::unique_ptr<tvg::Picture> picture = tvg::Picture::gen(); - tvg::Result result = picture->load(temp_xml.get_data(), temp_xml.length(), "svg+xml", false); - if (result != tvg::Result::Success) { - ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (bounds detection)."); - } - - float min_x = INFINITY, min_y = INFINITY, max_x = -INFINITY, max_y = -INFINITY; - tvg_get_bounds(picture.get(), min_x, min_y, max_x, max_y); + gl_state.xml_code = xml_body.utf8(); - float new_h = (max_y - min_y); - float new_w = (max_x - min_x); - - if (new_h * aspect >= new_w) { - new_w = (new_h * aspect); - } else { - new_h = (new_w / aspect); + tvg::Result result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false); + if (result != tvg::Result::Success) { + ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph metrics)."); } - String xml_code_str = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"" + rtos(min_x) + " " + rtos(min_y) + " " + rtos(new_w) + " " + rtos(new_h) + "\">" + xml_body; - gl_state.xml_code = xml_code_str.utf8(); + float svg_width, svg_height; + picture->size(&svg_width, &svg_height); + double aspect = svg_width / svg_height; - picture = tvg::Picture::gen(); - result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false); + result = picture->size(embox_x * aspect, embox_y); if (result != tvg::Result::Success) { - ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph metrics)."); + ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document."); } - float x_svg_to_out, y_svg_to_out; - x_svg_to_out = (float)metrics.x_ppem / new_w; - y_svg_to_out = (float)metrics.y_ppem / new_h; + double x_svg_to_out = (double)metrics.x_ppem / embox_x; + double y_svg_to_out = (double)metrics.y_ppem / embox_y; - gl_state.m.e11 = (double)document->transform.xx / (1 << 16) * x_svg_to_out; - gl_state.m.e12 = -(double)document->transform.xy / (1 << 16) * x_svg_to_out; - gl_state.m.e21 = -(double)document->transform.yx / (1 << 16) * y_svg_to_out; - gl_state.m.e22 = (double)document->transform.yy / (1 << 16) * y_svg_to_out; - gl_state.m.e13 = (double)document->delta.x / 64 * new_w / metrics.x_ppem; - gl_state.m.e23 = -(double)document->delta.y / 64 * new_h / metrics.y_ppem; + gl_state.m.e11 = (double)document->transform.xx / (1 << 16); + gl_state.m.e12 = -(double)document->transform.xy / (1 << 16); + gl_state.m.e21 = -(double)document->transform.yx / (1 << 16); + gl_state.m.e22 = (double)document->transform.yy / (1 << 16); + gl_state.m.e13 = (double)document->delta.x / 64 * embox_x / metrics.x_ppem; + gl_state.m.e23 = -(double)document->delta.y / 64 * embox_y / metrics.y_ppem; gl_state.m.e31 = 0; gl_state.m.e32 = 0; gl_state.m.e33 = 1; - result = picture->transform(gl_state.m); + result = picture->size(embox_x * aspect * x_svg_to_out, embox_y * y_svg_to_out); if (result != tvg::Result::Success) { - ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document."); + ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document."); } - result = picture->bounds(&gl_state.x, &gl_state.y, &gl_state.w, &gl_state.h, true); + result = picture->transform(gl_state.m); if (result != tvg::Result::Success) { - ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to get SVG bounds."); + ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document."); } - gl_state.bmp_y = gl_state.h + metrics.descender / 64.f; - gl_state.bmp_x = 0; + picture->size(&gl_state.w, &gl_state.h); + gl_state.x = (gl_state.h - gl_state.w) / 2.0; + gl_state.y = -gl_state.h; gl_state.ready = true; } - p_slot->bitmap_left = (FT_Int)gl_state.bmp_x; - p_slot->bitmap_top = (FT_Int)gl_state.bmp_y; + p_slot->bitmap_left = (FT_Int)gl_state.x; + p_slot->bitmap_top = (FT_Int)-gl_state.y; - float tmp = ceil(gl_state.h); - p_slot->bitmap.rows = (unsigned int)tmp; - tmp = ceil(gl_state.w); - p_slot->bitmap.width = (unsigned int)tmp; + double tmpd = Math::ceil(gl_state.h); + p_slot->bitmap.rows = (unsigned int)tmpd; + tmpd = Math::ceil(gl_state.w); + p_slot->bitmap.width = (unsigned int)tmpd; p_slot->bitmap.pitch = (int)p_slot->bitmap.width * 4; + p_slot->bitmap.pixel_mode = FT_PIXEL_MODE_BGRA; - float metrics_width, metrics_height; - float horiBearingX, horiBearingY; - float vertBearingX, vertBearingY; + float metrics_width = (float)gl_state.w; + float metrics_height = (float)gl_state.h; + + float horiBearingX = (float)gl_state.x; + float horiBearingY = (float)-gl_state.y; - metrics_width = (float)gl_state.w; - metrics_height = (float)gl_state.h; - horiBearingX = (float)gl_state.x; - horiBearingY = (float)-gl_state.y; - vertBearingX = p_slot->metrics.horiBearingX / 64.0f - p_slot->metrics.horiAdvance / 64.0f / 2; - vertBearingY = (p_slot->metrics.vertAdvance / 64.0f - p_slot->metrics.height / 64.0f) / 2; + float vertBearingX = p_slot->metrics.horiBearingX / 64.0f - p_slot->metrics.horiAdvance / 64.0f / 2; + float vertBearingY = (p_slot->metrics.vertAdvance / 64.0f - p_slot->metrics.height / 64.0f) / 2; - tmp = roundf(metrics_width * 64); - p_slot->metrics.width = (FT_Pos)tmp; - tmp = roundf(metrics_height * 64); - p_slot->metrics.height = (FT_Pos)tmp; + float tmpf = Math::round(metrics_width * 64); + p_slot->metrics.width = (FT_Pos)tmpf; + tmpf = Math::round(metrics_height * 64); + p_slot->metrics.height = (FT_Pos)tmpf; p_slot->metrics.horiBearingX = (FT_Pos)(horiBearingX * 64); p_slot->metrics.horiBearingY = (FT_Pos)(horiBearingY * 64); @@ -252,6 +249,10 @@ FT_Error tvg_svg_in_ot_render(FT_GlyphSlot p_slot, FT_Pointer *p_state) { if (res != tvg::Result::Success) { ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph rendering)."); } + res = picture->size(gl_state.w, gl_state.h); + if (res != tvg::Result::Success) { + ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document."); + } res = picture->transform(gl_state.m); if (res != tvg::Result::Success) { ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document."); diff --git a/modules/text_server_adv/thorvg_svg_in_ot.h b/modules/text_server_adv/thorvg_svg_in_ot.h index 5d002981e3..41fee572cd 100644 --- a/modules/text_server_adv/thorvg_svg_in_ot.h +++ b/modules/text_server_adv/thorvg_svg_in_ot.h @@ -62,8 +62,6 @@ using namespace godot; struct GL_State { bool ready = false; - float bmp_x = 0; - float bmp_y = 0; float x = 0; float y = 0; float w = 0; diff --git a/modules/text_server_fb/thorvg_bounds_iterator.cpp b/modules/text_server_fb/thorvg_bounds_iterator.cpp deleted file mode 100644 index 4d521b2e8d..0000000000 --- a/modules/text_server_fb/thorvg_bounds_iterator.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************/ -/* thorvg_bounds_iterator.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* REDOT ENGINE */ -/* https://redotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2024-present Redot Engine contributors */ -/* (see REDOT_AUTHORS.md) */ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#ifdef GDEXTENSION -// Headers for building as GDExtension plug-in. - -#include <godot_cpp/godot.hpp> - -using namespace godot; - -#elif defined(GODOT_MODULE) -// Headers for building as built-in module. - -#include "core/typedefs.h" - -#include "modules/modules_enabled.gen.h" // For svg. -#endif - -#ifdef MODULE_SVG_ENABLED - -#include "thorvg_bounds_iterator.h" - -#include <tvgIteratorAccessor.h> -#include <tvgPaint.h> - -// This function uses private ThorVG API to get bounding box of top level children elements. - -void tvg_get_bounds(tvg::Picture *p_picture, float &r_min_x, float &r_min_y, float &r_max_x, float &r_max_y) { - tvg::IteratorAccessor itrAccessor; - if (tvg::Iterator *it = itrAccessor.iterator(p_picture)) { - while (const tvg::Paint *child = it->next()) { - float x = 0, y = 0, w = 0, h = 0; - child->bounds(&x, &y, &w, &h, true); - r_min_x = MIN(x, r_min_x); - r_min_y = MIN(y, r_min_y); - r_max_x = MAX(x + w, r_max_x); - r_max_y = MAX(y + h, r_max_y); - } - delete (it); - } -} - -#endif // MODULE_SVG_ENABLED diff --git a/modules/text_server_fb/thorvg_bounds_iterator.h b/modules/text_server_fb/thorvg_bounds_iterator.h deleted file mode 100644 index 0cd9acc3b4..0000000000 --- a/modules/text_server_fb/thorvg_bounds_iterator.h +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************/ -/* thorvg_bounds_iterator.h */ -/**************************************************************************/ -/* This file is part of: */ -/* REDOT ENGINE */ -/* https://redotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2024-present Redot Engine contributors */ -/* (see REDOT_AUTHORS.md) */ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#ifndef THORVG_BOUNDS_ITERATOR_H -#define THORVG_BOUNDS_ITERATOR_H - -#ifdef GDEXTENSION -// Headers for building as GDExtension plug-in. - -#include <godot_cpp/core/mutex_lock.hpp> -#include <godot_cpp/godot.hpp> - -using namespace godot; - -#elif defined(GODOT_MODULE) -// Headers for building as built-in module. - -#include "core/typedefs.h" - -#include "modules/modules_enabled.gen.h" // For svg. -#endif - -#ifdef MODULE_SVG_ENABLED - -#include <thorvg.h> - -void tvg_get_bounds(tvg::Picture *p_picture, float &r_min_x, float &r_min_y, float &r_max_x, float &r_max_y); - -#endif // MODULE_SVG_ENABLED - -#endif // THORVG_BOUNDS_ITERATOR_H diff --git a/modules/text_server_fb/thorvg_svg_in_ot.cpp b/modules/text_server_fb/thorvg_svg_in_ot.cpp index 10e690593e..84d6bc12b4 100644 --- a/modules/text_server_fb/thorvg_svg_in_ot.cpp +++ b/modules/text_server_fb/thorvg_svg_in_ot.cpp @@ -51,7 +51,7 @@ using namespace godot; #include "core/typedefs.h" #include "core/variant/variant.h" -#include "modules/modules_enabled.gen.h" // For svg. +#include "modules/modules_enabled.gen.h" // For svg, freetype. #endif #ifdef MODULE_SVG_ENABLED @@ -59,8 +59,6 @@ using namespace godot; #include "thorvg_svg_in_ot.h" -#include "thorvg_bounds_iterator.h" - #include <freetype/otsvg.h> #include <ft2build.h> @@ -94,8 +92,9 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin parser.instantiate(); parser->_open_buffer((const uint8_t *)document->svg_document, document->svg_document_length); - float aspect = 1.0f; String xml_body; + double embox_x = document->units_per_EM; + double embox_y = document->units_per_EM; while (parser->read() == OK) { if (parser->has_attribute("id")) { const String &gl_name = parser->get_named_attribute_value("id"); @@ -113,15 +112,26 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin PackedStringArray vb = parser->get_named_attribute_value("viewBox").split(" "); if (vb.size() == 4) { - aspect = vb[2].to_float() / vb[3].to_float(); + embox_x = vb[2].to_float(); + embox_y = vb[3].to_float(); } } - continue; + if (parser->has_attribute("width")) { + embox_x = parser->get_named_attribute_value("width").to_float(); + } + if (parser->has_attribute("height")) { + embox_y = parser->get_named_attribute_value("height").to_float(); + } } if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { xml_body += vformat("<%s", parser->get_node_name()); + bool is_svg_tag = parser->get_node_name() == "svg"; for (int i = 0; i < parser->get_attribute_count(); i++) { - xml_body += vformat(" %s=\"%s\"", parser->get_attribute_name(i), parser->get_attribute_value(i)); + String aname = parser->get_attribute_name(i); + if (is_svg_tag && (aname == "viewBox" || aname == "width" || aname == "height")) { + continue; + } + xml_body += vformat(" %s=\"%s\"", aname, parser->get_attribute_value(i)); } if (parser->is_empty()) { @@ -135,91 +145,78 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin xml_body += vformat("</%s>", parser->get_node_name()); } } - String temp_xml_str = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 1 1\">" + xml_body; - CharString temp_xml = temp_xml_str.utf8(); std::unique_ptr<tvg::Picture> picture = tvg::Picture::gen(); - tvg::Result result = picture->load(temp_xml.get_data(), temp_xml.length(), "svg+xml", false); - if (result != tvg::Result::Success) { - ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (bounds detection)."); - } - - float min_x = INFINITY, min_y = INFINITY, max_x = -INFINITY, max_y = -INFINITY; - tvg_get_bounds(picture.get(), min_x, min_y, max_x, max_y); + gl_state.xml_code = xml_body.utf8(); - float new_h = (max_y - min_y); - float new_w = (max_x - min_x); - - if (new_h * aspect >= new_w) { - new_w = (new_h * aspect); - } else { - new_h = (new_w / aspect); + tvg::Result result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false); + if (result != tvg::Result::Success) { + ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph metrics)."); } - String xml_code_str = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"" + rtos(min_x) + " " + rtos(min_y) + " " + rtos(new_w) + " " + rtos(new_h) + "\">" + xml_body; - gl_state.xml_code = xml_code_str.utf8(); + float svg_width, svg_height; + picture->size(&svg_width, &svg_height); + double aspect = svg_width / svg_height; - picture = tvg::Picture::gen(); - result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false); + result = picture->size(embox_x * aspect, embox_y); if (result != tvg::Result::Success) { - ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph metrics)."); + ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document."); } - float x_svg_to_out, y_svg_to_out; - x_svg_to_out = (float)metrics.x_ppem / new_w; - y_svg_to_out = (float)metrics.y_ppem / new_h; + double x_svg_to_out = (double)metrics.x_ppem / embox_x; + double y_svg_to_out = (double)metrics.y_ppem / embox_y; - gl_state.m.e11 = (double)document->transform.xx / (1 << 16) * x_svg_to_out; - gl_state.m.e12 = -(double)document->transform.xy / (1 << 16) * x_svg_to_out; - gl_state.m.e21 = -(double)document->transform.yx / (1 << 16) * y_svg_to_out; - gl_state.m.e22 = (double)document->transform.yy / (1 << 16) * y_svg_to_out; - gl_state.m.e13 = (double)document->delta.x / 64 * new_w / metrics.x_ppem; - gl_state.m.e23 = -(double)document->delta.y / 64 * new_h / metrics.y_ppem; + gl_state.m.e11 = (double)document->transform.xx / (1 << 16); + gl_state.m.e12 = -(double)document->transform.xy / (1 << 16); + gl_state.m.e21 = -(double)document->transform.yx / (1 << 16); + gl_state.m.e22 = (double)document->transform.yy / (1 << 16); + gl_state.m.e13 = (double)document->delta.x / 64 * embox_x / metrics.x_ppem; + gl_state.m.e23 = -(double)document->delta.y / 64 * embox_y / metrics.y_ppem; gl_state.m.e31 = 0; gl_state.m.e32 = 0; gl_state.m.e33 = 1; - result = picture->transform(gl_state.m); + result = picture->size(embox_x * aspect * x_svg_to_out, embox_y * y_svg_to_out); if (result != tvg::Result::Success) { - ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document."); + ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document."); } - result = picture->bounds(&gl_state.x, &gl_state.y, &gl_state.w, &gl_state.h, true); + result = picture->transform(gl_state.m); if (result != tvg::Result::Success) { - ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to get SVG bounds."); + ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document."); } - gl_state.bmp_y = gl_state.h + metrics.descender / 64.f; - gl_state.bmp_x = 0; + picture->size(&gl_state.w, &gl_state.h); + gl_state.x = (gl_state.h - gl_state.w) / 2.0; + gl_state.y = -gl_state.h; gl_state.ready = true; } - p_slot->bitmap_left = (FT_Int)gl_state.bmp_x; - p_slot->bitmap_top = (FT_Int)gl_state.bmp_y; + p_slot->bitmap_left = (FT_Int)gl_state.x; + p_slot->bitmap_top = (FT_Int)-gl_state.y; - float tmp = ceil(gl_state.h); - p_slot->bitmap.rows = (unsigned int)tmp; - tmp = ceil(gl_state.w); - p_slot->bitmap.width = (unsigned int)tmp; + double tmpd = Math::ceil(gl_state.h); + p_slot->bitmap.rows = (unsigned int)tmpd; + tmpd = Math::ceil(gl_state.w); + p_slot->bitmap.width = (unsigned int)tmpd; p_slot->bitmap.pitch = (int)p_slot->bitmap.width * 4; + p_slot->bitmap.pixel_mode = FT_PIXEL_MODE_BGRA; - float metrics_width, metrics_height; - float horiBearingX, horiBearingY; - float vertBearingX, vertBearingY; + float metrics_width = (float)gl_state.w; + float metrics_height = (float)gl_state.h; + + float horiBearingX = (float)gl_state.x; + float horiBearingY = (float)-gl_state.y; - metrics_width = (float)gl_state.w; - metrics_height = (float)gl_state.h; - horiBearingX = (float)gl_state.x; - horiBearingY = (float)-gl_state.y; - vertBearingX = p_slot->metrics.horiBearingX / 64.0f - p_slot->metrics.horiAdvance / 64.0f / 2; - vertBearingY = (p_slot->metrics.vertAdvance / 64.0f - p_slot->metrics.height / 64.0f) / 2; + float vertBearingX = p_slot->metrics.horiBearingX / 64.0f - p_slot->metrics.horiAdvance / 64.0f / 2; + float vertBearingY = (p_slot->metrics.vertAdvance / 64.0f - p_slot->metrics.height / 64.0f) / 2; - tmp = roundf(metrics_width * 64); - p_slot->metrics.width = (FT_Pos)tmp; - tmp = roundf(metrics_height * 64); - p_slot->metrics.height = (FT_Pos)tmp; + float tmpf = Math::round(metrics_width * 64); + p_slot->metrics.width = (FT_Pos)tmpf; + tmpf = Math::round(metrics_height * 64); + p_slot->metrics.height = (FT_Pos)tmpf; p_slot->metrics.horiBearingX = (FT_Pos)(horiBearingX * 64); p_slot->metrics.horiBearingY = (FT_Pos)(horiBearingY * 64); @@ -252,6 +249,10 @@ FT_Error tvg_svg_in_ot_render(FT_GlyphSlot p_slot, FT_Pointer *p_state) { if (res != tvg::Result::Success) { ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph rendering)."); } + res = picture->size(gl_state.w, gl_state.h); + if (res != tvg::Result::Success) { + ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document."); + } res = picture->transform(gl_state.m); if (res != tvg::Result::Success) { ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document."); diff --git a/modules/text_server_fb/thorvg_svg_in_ot.h b/modules/text_server_fb/thorvg_svg_in_ot.h index 5d002981e3..41fee572cd 100644 --- a/modules/text_server_fb/thorvg_svg_in_ot.h +++ b/modules/text_server_fb/thorvg_svg_in_ot.h @@ -62,8 +62,6 @@ using namespace godot; struct GL_State { bool ready = false; - float bmp_x = 0; - float bmp_y = 0; float x = 0; float y = 0; float w = 0; |