Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-22 11:56:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved fonts into a new subfolder.

Browse Source
This commit is contained in:
Relintai 2023-12-10 14:42:30 +01:00
parent 4cbc387c53
commit 08160fd63f
41 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/animation_bezier_editor.cpp
View File

@ -55,7 +55,7 @@
#include "scene/gui/range.h" #include "scene/gui/range.h"
#include "core/input/shortcut.h" #include "core/input/shortcut.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
float AnimationBezierTrackEdit::_bezier_h_to_pixel(float p_h) { float AnimationBezierTrackEdit::_bezier_h_to_pixel(float p_h) {
float h = p_h; float h = p_h;

2
editor/animation_track_editor.cpp
View File

@ -87,7 +87,7 @@
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "servers/audio/audio_stream.h" #include "servers/audio/audio_stream.h"

2
editor/animation_track_editor_plugins.cpp
View File

@ -51,7 +51,7 @@
#include "core/object/undo_redo.h" #include "core/object/undo_redo.h"
#include "core/containers/vector.h" #include "core/containers/vector.h"
#include "scene/animation/animation.h" #include "scene/animation/animation.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "servers/rendering_server.h" #include "servers/rendering_server.h"
/// BOOL /// /// BOOL ///

2
editor/editor_about.cpp
View File

@ -55,7 +55,7 @@
#include "scene/gui/texture_rect.h" #include "scene/gui/texture_rect.h"
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
// The metadata key used to store and retrieve the version text to copy to the clipboard. // The metadata key used to store and retrieve the version text to copy to the clipboard.

2
editor/editor_audio_buses.cpp
View File

@ -66,7 +66,7 @@
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/timer.h" #include "scene/main/timer.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "servers/audio/audio_effect.h" #include "servers/audio/audio_effect.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"

4
editor/editor_fonts.cpp
View File

@ -38,8 +38,8 @@
#include "core/variant/variant.h" #include "core/variant/variant.h"
#include "editor_scale.h" #include "editor_scale.h"
#include "editor_settings.h" #include "editor_settings.h"
#include "scene/resources/dynamic_font.h" #include "scene/resources/font/dynamic_font.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/theme.h" #include "scene/resources/theme.h"
#define MAKE_FALLBACKS(m_name) \ #define MAKE_FALLBACKS(m_name) \

2
editor/editor_help.cpp
View File

@ -59,7 +59,7 @@
#include "scene/gui/texture_button.h" #include "scene/gui/texture_button.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"

2
editor/editor_inspector.cpp
View File

@ -63,7 +63,7 @@
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/property_utils.h" #include "scene/property_utils.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "servers/rendering_server.h" #include "servers/rendering_server.h"

2
editor/editor_log.cpp
View File

@ -50,7 +50,7 @@
#include "scene/gui/separator.h" #include "scene/gui/separator.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/dynamic_font.h" #include "scene/resources/font/dynamic_font.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
void EditorLog::LogFilter::initialize_button(const String &p_tooltip, Object *p_cb_obj, const StringName &p_method) { void EditorLog::LogFilter::initialize_button(const String &p_tooltip, Object *p_cb_obj, const StringName &p_method) {

2
editor/editor_properties.cpp
View File

@ -84,7 +84,7 @@
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
///////////////////// NULL ///////////////////////// ///////////////////// NULL /////////////////////////

2
editor/editor_spin_slider.cpp
View File

@ -53,7 +53,7 @@
#include "scene/gui/popup_menu.h" #include "scene/gui/popup_menu.h"
#include "scene/gui/texture_rect.h" #include "scene/gui/texture_rect.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"

2
editor/editor_themes.cpp
View File

@ -52,7 +52,7 @@
#include "editor_scale.h" #include "editor_scale.h"
#include "editor_settings.h" #include "editor_settings.h"
#include "modules/modules_enabled.gen.h" // For svg. #include "modules/modules_enabled.gen.h" // For svg.
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#ifdef MODULE_SVG_ENABLED #ifdef MODULE_SVG_ENABLED

2
editor/find_in_files.cpp
View File

@ -59,7 +59,7 @@
#include "core/object/reference.h" #include "core/object/reference.h"
#include "core/typedefs.h" #include "core/typedefs.h"
#include "scene/2d/canvas_item.h" #include "scene/2d/canvas_item.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
const char *FindInFiles::SIGNAL_RESULT_FOUND = "result_found"; const char *FindInFiles::SIGNAL_RESULT_FOUND = "result_found";
const char *FindInFiles::SIGNAL_FINISHED = "finished"; const char *FindInFiles::SIGNAL_FINISHED = "finished";

2
editor/plugins/abstract_polygon_2d_editor.cpp
View File

@ -55,7 +55,7 @@
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
AbstractPolygon2DEditor::Vertex::Vertex() : AbstractPolygon2DEditor::Vertex::Vertex() :

2
editor/plugins/animation_blend_space_1d_editor.cpp
View File

@ -62,7 +62,7 @@
#include "scene/gui/spin_box.h" #include "scene/gui/spin_box.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "scene/animation/animation_blend_space_1d.h" #include "scene/animation/animation_blend_space_1d.h"

2
editor/plugins/animation_blend_space_2d_editor.cpp
View File

@ -67,7 +67,7 @@
#include "scene/gui/spin_box.h" #include "scene/gui/spin_box.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
bool AnimationNodeBlendSpace2DEditor::can_edit(const Ref<AnimationNode> &p_node) { bool AnimationNodeBlendSpace2DEditor::can_edit(const Ref<AnimationNode> &p_node) {

2
editor/plugins/animation_state_machine_editor.cpp
View File

@ -62,7 +62,7 @@
#include "scene/gui/separator.h" #include "scene/gui/separator.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"

4
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -94,8 +94,8 @@
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/main/timer.h" #include "scene/main/timer.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/dynamic_font.h" #include "scene/resources/font/dynamic_font.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/theme.h" #include "scene/resources/theme.h"
#include "servers/rendering_server.h" #include "servers/rendering_server.h"

2
editor/plugins/curve_editor_plugin.cpp
View File

@ -52,7 +52,7 @@
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "scene/2d/canvas_item.h" #include "scene/2d/canvas_item.h"
#include "scene/gui/popup_menu.h" #include "scene/gui/popup_menu.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
CurveEditor::CurveEditor() { CurveEditor::CurveEditor() {

4
editor/plugins/editor_preview_plugins.cpp
View File

@ -35,7 +35,7 @@
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
#include "scene/resources/bit_map.h" #include "scene/resources/bit_map.h"
#include "scene/resources/dynamic_font.h" #include "scene/resources/font/dynamic_font.h"
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "servers/audio/audio_stream.h" #include "servers/audio/audio_stream.h"
@ -62,7 +62,7 @@
#include "core/containers/rb_set.h" #include "core/containers/rb_set.h"
#include "core/typedefs.h" #include "core/typedefs.h"
#include "core/containers/vector.h" #include "core/containers/vector.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/shader.h" #include "scene/resources/shader.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"

2
editor/plugins/spatial_editor_plugin.cpp
View File

@ -89,7 +89,7 @@
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/environment_3d.h" #include "scene/resources/environment_3d.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/gradient.h" #include "scene/resources/gradient.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/shader.h" #include "scene/resources/shader.h"

4
editor/plugins/texture_editor_plugin.cpp
View File

@ -31,7 +31,7 @@
#include "texture_editor_plugin.h" #include "texture_editor_plugin.h"
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
#include "scene/resources/dynamic_font.h" #include "scene/resources/font/dynamic_font.h"
#include "core/object/class_db.h" #include "core/object/class_db.h"
#include "core/math/color.h" #include "core/math/color.h"
#include "core/io/image.h" #include "core/io/image.h"
@ -41,7 +41,7 @@
#include "scene/gui/label.h" #include "scene/gui/label.h"
#include "scene/gui/texture_rect.h" #include "scene/gui/texture_rect.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
class EditorNode; class EditorNode;

2
editor/plugins/theme_editor_plugin.cpp
View File

@ -69,7 +69,7 @@
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/main/timer.h" #include "scene/main/timer.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
void ThemeItemImportTree::_update_items_tree() { void ThemeItemImportTree::_update_items_tree() {

2
editor/plugins/theme_editor_preview.h
View File

@ -38,7 +38,7 @@
#include "core/string/ustring.h" #include "core/string/ustring.h"
#include "scene/resources/theme.h" #include "scene/resources/theme.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"

2
editor/property_editor.cpp
View File

@ -94,7 +94,7 @@
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "servers/rendering_server.h" #include "servers/rendering_server.h"

2
editor/script_editor_debugger.cpp
View File

@ -88,7 +88,7 @@
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"

4
editor_modules/editor_code_editor/editor_code_text_editor.cpp
View File

@ -60,8 +60,8 @@
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/timer.h" #include "scene/main/timer.h"
#include "scene/resources/dynamic_font.h" #include "scene/resources/font/dynamic_font.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "editor_find_replace_bar.h" #include "editor_find_replace_bar.h"

2
editor_modules/editor_code_editor/editor_find_replace_bar.cpp
View File

@ -46,7 +46,7 @@
#include "scene/gui/text_edit.h" #include "scene/gui/text_edit.h"
#include "scene/gui/texture_button.h" #include "scene/gui/texture_button.h"
#include "scene/gui/tool_button.h" #include "scene/gui/tool_button.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
void EditorFindReplaceBar::_notification(int p_what) { void EditorFindReplaceBar::_notification(int p_what) {

2
editor_modules/text_editor/text_editor_vanilla_editor.cpp
View File

@ -18,7 +18,7 @@
#include "editor_code_editor/editor_code_text_editor.h" #include "editor_code_editor/editor_code_text_editor.h"
#include "editor_code_editor/editor_find_replace_bar.h" #include "editor_code_editor/editor_find_replace_bar.h"
#include "scene/resources/dynamic_font.h" #include "scene/resources/font/dynamic_font.h"
String TextEditorVanillaEditor::get_current_path() { String TextEditorVanillaEditor::get_current_path() {
return current_path; return current_path;

2
editor_modules/text_editor/text_file_editor.cpp
View File

@ -24,7 +24,7 @@
#include "scene/gui/separator.h" #include "scene/gui/separator.h"
#include "scene/gui/split_container.h" #include "scene/gui/split_container.h"
#include "scene/gui/text_edit.h" #include "scene/gui/text_edit.h"
#include "scene/resources/dynamic_font.h" #include "scene/resources/font/dynamic_font.h"
void TextFileEditor::connect_signals() { void TextFileEditor::connect_signals() {
file_list->connect("confirmed", this, "update_list"); file_list->connect("confirmed", this, "update_list");

2
scene/2d/canvas_item.cpp
View File

@ -35,7 +35,7 @@
#include "core/version.h" #include "core/version.h"
#include "scene/main/canvas_layer.h" #include "scene/main/canvas_layer.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "scene/resources/world_2d.h" #include "scene/resources/world_2d.h"

2
scene/3d/label_3d.h
View File

@ -32,7 +32,7 @@
#define LABEL_3D_H #define LABEL_3D_H
#include "scene/3d/visual_instance.h" #include "scene/3d/visual_instance.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/material.h" #include "scene/resources/material.h"
class TriangleMesh; class TriangleMesh;

2
scene/main/scene_tree.cpp
View File

@ -46,7 +46,7 @@
#include "scene/animation/scene_tree_tween.h" #include "scene/animation/scene_tree_tween.h"
#include "scene/debugger/script_debugger_remote.h" #include "scene/debugger/script_debugger_remote.h"
#include "scene/gui/control.h" #include "scene/gui/control.h"
#include "scene/resources/dynamic_font.h" #include "scene/resources/font/dynamic_font.h"
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"

2
scene/register_scene_types.cpp
View File

@ -150,7 +150,7 @@
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/shapes/cylinder_shape.h" #include "scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/default_theme/default_theme.h" #include "scene/resources/default_theme/default_theme.h"
#include "scene/resources/dynamic_font.h" #include "scene/resources/font/dynamic_font.h"
#include "scene/resources/gradient.h" #include "scene/resources/gradient.h"
#include "scene/resources/shapes/height_map_shape.h" #include "scene/resources/shapes/height_map_shape.h"
#include "scene/resources/immediate_mesh.h" #include "scene/resources/immediate_mesh.h"

7
scene/resources/SCsub
View File

@ -46,6 +46,13 @@ env.add_source_files(navigation_obj, "navigation/*.cpp")
for o in navigation_obj: for o in navigation_obj:
scene_obj.append(o) scene_obj.append(o)
# font
font_obj = []
env.add_source_files(font_obj, "font/*.cpp")
for o in font_obj:
scene_obj.append(o)
env.scene_sources += scene_obj env.scene_sources += scene_obj
# Needed to force rebuilding the scene files when the thirdparty code is updated. # Needed to force rebuilding the scene files when the thirdparty code is updated.

0
scene/resources/dynamic_font.cpp → scene/resources/font/dynamic_font.cpp
View File

2
scene/resources/dynamic_font.h → scene/resources/font/dynamic_font.h
View File

@ -37,7 +37,7 @@
#include "core/os/mutex.h" #include "core/os/mutex.h"
#include "core/os/thread_safe.h" #include "core/os/thread_safe.h"
#include "core/containers/pair.h" #include "core/containers/pair.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include <ft2build.h> #include <ft2build.h>

0
scene/resources/font.cpp → scene/resources/font/font.cpp
View File

0
scene/resources/font.h → scene/resources/font/font.h
View File

2
scene/resources/primitive_meshes.h
View File

@ -30,7 +30,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
///@TODO probably should change a few integers to unsigned integers... ///@TODO probably should change a few integers to unsigned integers...

2
scene/resources/theme.h
View File

@ -32,7 +32,7 @@
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "core/object/resource.h" #include "core/object/resource.h"
#include "scene/resources/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/shader.h" #include "scene/resources/shader.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"