Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-02-19 22:24:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved back the servers and resources from core.

Browse Source
This commit is contained in:
Relintai 2023-12-10 23:11:07 +01:00
parent 11945d7f1d
commit 88e9ad04f2
255 changed files with 411 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/SCsub
View File

@ -200,8 +200,6 @@ SConscript("log/SCsub")
SConscript("object/SCsub")
SConscript("input/SCsub")
SConscript("bind/SCsub")
SConscript("scene/SCsub")
SConscript("servers/SCsub")
# Build it all as a library
lib = env.add_library("core", env.core_sources)

22
core/register_core_types.cpp
View File

@ -80,10 +80,6 @@
#include "core/bind/logger_bind.h"
#include "core/log/logger_backend.h"
#include "core/servers/rendering/rendering_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
static Ref<ResourceFormatSaverBinary> resource_saver_binary;
static Ref<ResourceFormatLoaderBinary> resource_loader_binary;
static Ref<ResourceFormatImporter> resource_format_importer;
@ -114,16 +110,6 @@ extern void unregister_global_constants();
extern void register_variant_methods();
extern void unregister_variant_methods();
static bool has_server_feature_callback(const String &p_feature) {
if (RenderingServer::get_singleton()) {
if (RenderingServer::get_singleton()->has_os_feature(p_feature)) {
return true;
}
}
return false;
}
void register_core_types() {
OS::get_singleton()->benchmark_begin_measure("register_core_types");
@ -279,8 +265,6 @@ void register_core_settings() {
}
void register_core_singletons() {
OS::get_singleton()->set_has_server_feature_callback(has_server_feature_callback);
ClassDB::register_class<ProjectSettings>();
ClassDB::register_virtual_class<IP>();
ClassDB::register_class<_Geometry>();
@ -301,9 +285,6 @@ void register_core_singletons() {
ClassDB::register_class<ThreadPoolExecuteJob>();
ClassDB::register_class<ThreadPool>();
ClassDB::register_class<_ScriptServer>();
ClassDB::register_virtual_class<RenderingServer>();
ClassDB::register_virtual_class<PhysicsServer>();
ClassDB::register_virtual_class<Physics2DServer>();
Engine::get_singleton()->add_singleton(Engine::Singleton("ProjectSettings", ProjectSettings::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("IP", IP::get_singleton()));
@ -322,9 +303,6 @@ void register_core_singletons() {
Engine::get_singleton()->add_singleton(Engine::Singleton("PLogger", _PLogger::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("ThreadPool", ThreadPool::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("ScriptServer", _ScriptServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("RenderingServer", RenderingServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer", PhysicsServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("Physics2DServer", Physics2DServer::get_singleton()));
}
void unregister_core_types() {

8
core/scene/SCsub
View File

@ -1,8 +0,0 @@
#!/usr/bin/env python
Import("env")
env.add_source_files(env.core_sources, "resources/*.cpp")
env.add_source_files(env.core_sources, "resources/shapes/*.cpp")
env.add_source_files(env.core_sources, "resources/shapes_2d/*.cpp")
#env.add_source_files(env.core_sources, "*.cpp")

8
core/servers/SCsub
View File

@ -1,8 +0,0 @@
#!/usr/bin/env python
Import("env")
env.add_source_files(env.core_sources, "rendering/*.cpp")
env.add_source_files(env.core_sources, "physics/*.cpp")
env.add_source_files(env.core_sources, "physics_2d/*.cpp")
#env.add_source_files(env.core_sources, "*.cpp")

2
drivers/dummy/rasterizer_dummy.h
View File

@ -34,7 +34,7 @@
#include "core/containers/self_list.h"
#include "scene/resources/mesh/mesh.h"
#include "servers/rendering/rasterizer.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
class RasterizerSceneDummy : public RasterizerScene {
public:

2
drivers/gles2/shader_compiler_gles2.h
View File

@ -34,7 +34,7 @@
#include "core/string/string_builder.h"
#include "servers/rendering/shader_language.h"
#include "servers/rendering/shader_types.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
class ShaderCompilerGLES2 {
public:

2
drivers/unix/os_unix.cpp
View File

@ -38,7 +38,7 @@
#include "drivers/unix/net_socket_posix.h"
#include "drivers/unix/sub_process_unix.h"
#include "drivers/unix/thread_posix.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#ifdef __APPLE__
#include <mach-o/dyld.h>

2
editor/animation_track_editor_plugins.cpp
View File

@ -52,7 +52,7 @@
#include "core/containers/vector.h"
#include "scene/animation/animation.h"
#include "scene/resources/font/font.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
/// BOOL ///
int AnimationTrackEditBool::get_key_height() const {

2
editor/editor_atlas_packer.cpp
View File

@ -33,7 +33,7 @@
#include "core/math/rect2.h"
#include "core/typedefs.h"
#include "core/string/ustring.h"
#include "core/scene/resources/bit_map.h"
#include "scene/resources/bit_map.h"
void EditorAtlasPacker::_plot_triangle(Ref<BitMap> p_bitmap, Vector2i *vertices) {
int width = p_bitmap->get_size().width;

2
editor/editor_atlas_packer.h
View File

@ -32,7 +32,7 @@
#include "core/math/vector2.h"
#include "core/containers/vector.h"
#include "core/scene/resources/bit_map.h"
#include "scene/resources/bit_map.h"
#include "core/object/reference.h"
class BitMap;

2
editor/editor_inspector.cpp
View File

@ -66,7 +66,7 @@
#include "scene/resources/font/font.h"
#include "scene/resources/packed_scene.h"
#include "scene/resources/style_box.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
Size2 EditorProperty::get_minimum_size() const {
Size2 ms;

6
editor/editor_node.cpp
View File

@ -188,9 +188,9 @@
#include "scene/resources/packed_scene.h"
#include "scene/resources/world_3d.h"
#include "servers/navigation_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/physics_2d_server.h"
#include "servers/physics_server.h"
#include "servers/rendering_server.h"
#include "modules/modules_enabled.gen.h"

2
editor/editor_plugin.cpp
View File

@ -72,7 +72,7 @@
#include "scene/gui/tab_container.h"
#include "scene/resources/mesh/mesh.h"
#include "scene/resources/texture.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "modules/modules_enabled.gen.h"

2
editor/editor_resource_preview.cpp
View File

@ -49,7 +49,7 @@
#include "core/object/script_language.h"
#include "core/typedefs.h"
#include "scene/main/control.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
bool EditorResourcePreviewGenerator::handles(const String &p_type) const {
if (get_script_instance() && get_script_instance()->has_method("handles")) {

2
editor/import/resource_importer_bitmask.cpp
View File

@ -34,7 +34,7 @@
#include "core/io/image_loader.h"
#include "editor/editor_file_system.h"
#include "editor/editor_node.h"
#include "core/scene/resources/bit_map.h"
#include "scene/resources/bit_map.h"
#include "scene/resources/texture.h"
#include "core/io/image.h"

10
editor/import/resource_importer_scene.cpp
View File

@ -41,15 +41,15 @@
#include "scene/3d/vehicle_body.h"
#include "scene/animation/animation_player.h"
#include "scene/animation/animation.h"
#include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/box_shape.h"
#include "scene/resources/mesh/mesh.h"
#include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/packed_scene.h"
#include "core/scene/resources/shapes/plane_shape.h"
#include "core/scene/resources/shapes/ray_shape.h"
#include "scene/resources/shapes/plane_shape.h"
#include "scene/resources/shapes/ray_shape.h"
#include "scene/resources/resource_format_text.h"
#include "core/scene/resources/shapes/shape.h"
#include "core/scene/resources/shapes/sphere_shape.h"
#include "scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h"
#include "scene/resources/material/spatial_material.h"
#include "scene/resources/material/shader_material.h"

2
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -81,7 +81,7 @@
#include "scene/main/viewport.h"
#include "scene/animation/animation.h"
#include "scene/resources/texture.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
void AnimationPlayerEditor::_node_removed(Node *p_node) {
if (player && player == p_node) {

2
editor/plugins/audio_stream_editor_plugin.cpp
View File

@ -52,7 +52,7 @@
#include "scene/gui/tool_button.h"
#include "scene/main/node.h"
#include "scene/resources/texture.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "servers/audio/audio_stream.h"
void AudioStreamEditor::_notification(int p_what) {

2
editor/plugins/bit_map_editor_plugin.h
View File

@ -33,7 +33,7 @@
#include "editor/editor_inspector.h"
#include "editor/editor_plugin.h"
#include "core/scene/resources/bit_map.h"
#include "scene/resources/bit_map.h"
#include "scene/gui/box_container.h"

2
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -98,7 +98,7 @@
#include "scene/resources/font/font.h"
#include "scene/resources/packed_scene.h"
#include "scene/resources/theme.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "modules/modules_enabled.gen.h"

16
editor/plugins/collision_shape_2d_editor_plugin.cpp
View File

@ -44,14 +44,14 @@
#include "scene/2d/collision_shape_2d.h"
#include "scene/main/node.h"
#include "scene/main/scene_tree.h"
#include "core/scene/resources/shapes_2d/capsule_shape_2d.h"
#include "core/scene/resources/shapes_2d/circle_shape_2d.h"
#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "core/scene/resources/shapes_2d/line_shape_2d.h"
#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "core/scene/resources/shapes_2d/segment_shape_2d.h"
#include "core/scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/shapes_2d/capsule_shape_2d.h"
#include "scene/resources/shapes_2d/circle_shape_2d.h"
#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/line_shape_2d.h"
#include "scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "scene/resources/shapes_2d/segment_shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/texture.h"
void CollisionShape2DEditor::_node_removed(Node *p_node) {

4
editor/plugins/editor_preview_plugins.cpp
View File

@ -34,7 +34,7 @@
#include "core/os/os.h"
#include "editor/editor_settings.h"
#include "editor/editor_scale.h"
#include "core/scene/resources/bit_map.h"
#include "scene/resources/bit_map.h"
#include "scene/resources/font/dynamic_font.h"
#include "scene/resources/material/material.h"
#include "scene/resources/mesh/mesh.h"
@ -66,7 +66,7 @@
#include "scene/resources/shader.h"
#include "scene/resources/texture.h"
#include "servers/audio_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
void post_process_preview(Ref<Image> p_image) {
if (p_image->get_format() != Image::FORMAT_RGBA8) {

2
editor/plugins/gradient_editor_plugin.cpp
View File

@ -36,7 +36,7 @@
#include "core/object/undo_redo.h"
#include "core/containers/vector.h"
#include "editor/editor_node.h"
#include "core/scene/resources/gradient.h"
#include "scene/resources/gradient.h"
Size2 GradientEditor::get_minimum_size() const {
return Size2(0, 60) * EDSCALE;

2
editor/plugins/material_editor_plugin.cpp
View File

@ -63,7 +63,7 @@
#include "scene/resources/mesh/mesh.h"
#include "scene/resources/shader.h"
#include "scene/resources/texture.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
class EditorNode;

2
editor/plugins/mesh_instance_editor_plugin.cpp
View File

@ -61,7 +61,7 @@
#include "scene/main/scene_tree.h"
#include "scene/resources/mesh/mesh.h"
#include "scene/resources/navigation/navigation_mesh.h"
#include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/shape.h"
#include "spatial_editor_plugin.h"
void MeshInstanceEditor::_node_removed(Node *p_node) {

2
editor/plugins/path_2d_editor_plugin.cpp
View File

@ -52,7 +52,7 @@
#include "scene/gui/separator.h"
#include "scene/gui/tool_button.h"
#include "scene/main/node.h"
#include "core/scene/resources/curve.h"
#include "scene/resources/curve.h"
#include "scene/resources/texture.h"
void Path2DEditor::_notification(int p_what) {

2
editor/plugins/path_editor_plugin.cpp
View File

@ -54,7 +54,7 @@
#include "scene/gui/separator.h"
#include "scene/gui/tool_button.h"
#include "scene/main/node.h"
#include "core/scene/resources/curve.h"
#include "scene/resources/curve.h"
#include "scene/resources/material/material.h"
#include "spatial_editor_plugin.h"

2
editor/plugins/polygon_2d_editor_plugin.cpp
View File

@ -76,7 +76,7 @@
#include "scene/gui/tool_button.h"
#include "scene/main/node.h"
#include "scene/resources/texture.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
class EditorNode;
class Node2D;

6
editor/plugins/spatial_editor_plugin.cpp
View File

@ -90,14 +90,14 @@
#include "scene/main/viewport.h"
#include "scene/resources/environment_3d.h"
#include "scene/resources/font/font.h"
#include "core/scene/resources/gradient.h"
#include "scene/resources/gradient.h"
#include "scene/resources/packed_scene.h"
#include "scene/resources/shader.h"
#include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/shape.h"
#include "scene/resources/style_box.h"
#include "scene/resources/mesh/surface_tool.h"
#include "scene/resources/world_3d.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "modules/modules_enabled.gen.h"

2
editor/plugins/sprite_editor_plugin.cpp
View File

@ -37,7 +37,7 @@
#include "scene/2d/mesh_instance_2d.h"
#include "scene/2d/polygon_2d.h"
#include "scene/gui/box_container.h"
#include "core/scene/resources/bit_map.h"
#include "scene/resources/bit_map.h"
#include "thirdparty/misc/clipper.hpp"
#include "scene/resources/mesh/mesh.h"
#include "core/variant/array.h"

2
editor/plugins/texture_region_editor_plugin.cpp
View File

@ -62,7 +62,7 @@
#include "scene/gui/spin_box.h"
#include "scene/gui/tool_button.h"
#include "scene/main/node.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
/**
@author Mariano Suligoy

4
editor/project_manager.cpp
View File

@ -85,8 +85,8 @@
#include "scene/main/scene_tree.h"
#include "scene/resources/texture.h"
#include "servers/navigation_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_2d_server.h"
#include "servers/physics_server.h"
#include "thirdparty/minizip/ioapi.h"
#include "thirdparty/minizip/unzip.h"

2
editor/property_editor.cpp
View File

@ -97,7 +97,7 @@
#include "scene/resources/font/font.h"
#include "scene/resources/style_box.h"
#include "scene/resources/texture.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
void EditorResourceConversionPlugin::_bind_methods() {
MethodInfo mi;

22
editor/spatial_editor_gizmos.cpp
View File

@ -86,27 +86,27 @@
#include "scene/main/scene_tree.h"
#include "scene/main/timer.h"
#include "scene/main/viewport.h"
#include "core/scene/resources/shapes/box_shape.h"
#include "core/scene/resources/shapes/capsule_shape.h"
#include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "core/scene/resources/shapes/cylinder_shape.h"
#include "core/scene/resources/shapes/height_map_shape.h"
#include "scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/shapes/height_map_shape.h"
#include "scene/resources/material/material.h"
#include "scene/resources/material/spatial_material.h"
#include "scene/resources/material/shader_material.h"
#include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/occluder_shape.h"
#include "scene/resources/occluder_shape_polygon.h"
#include "core/scene/resources/shapes/plane_shape.h"
#include "scene/resources/shapes/plane_shape.h"
#include "scene/resources/mesh/primitive_meshes.h"
#include "core/scene/resources/shapes/ray_shape.h"
#include "core/scene/resources/shapes/shape.h"
#include "core/scene/resources/shapes/sphere_shape.h"
#include "scene/resources/shapes/ray_shape.h"
#include "scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h"
#include "scene/resources/mesh/surface_tool.h"
#include "scene/resources/world_3d.h"
#include "servers/navigation_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#ifdef MODULE_SKELETON_3D_ENABLED
#include "modules/skeleton_3d/nodes/skeleton.h"

12
editor_modules/gltf/extensions/physics/gltf_collider.cpp
View File

@ -33,12 +33,12 @@
#include "../../gltf_state.h"
#include "core/math/convex_hull.h"
#include "scene/3d/area.h"
#include "core/scene/resources/shapes/box_shape.h"
#include "core/scene/resources/shapes/capsule_shape.h"
#include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "core/scene/resources/shapes/cylinder_shape.h"
#include "core/scene/resources/shapes/sphere_shape.h"
#include "scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/shapes/sphere_shape.h"
void GLTFCollider::_bind_methods() {
ClassDB::bind_method(D_METHOD("to_node", "cache_shapes"), &GLTFCollider::to_node, DEFVAL(false));

2
editor_modules/shader_editor/shader_editor_plugin.cpp
View File

@ -64,7 +64,7 @@
#include "scene/gui/resources/syntax_highlighter.h"
#include "servers/rendering/shader_language.h"
#include "servers/rendering/shader_types.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "editor_code_editor/editor_find_replace_bar.h"
#include "editor_code_editor/editor_goto_line_dialog.h"

2
main/input_default.cpp
View File

@ -35,7 +35,7 @@
#include "core/os/os.h"
#include "core/config/project_settings.h"
#include "scene/resources/texture.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#ifdef DEV_ENABLED
#include "core/os/thread.h"

6
main/main.cpp
View File

@ -67,10 +67,10 @@
#include "servers/navigation/navigation_mesh_generator_dummy.h"
#include "servers/navigation_2d_server.h"
#include "servers/navigation_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_2d_server.h"
#include "servers/physics_server.h"
#include "servers/register_server_types.h"
#include "core/servers/rendering/rendering_server_callbacks.h"
#include "servers/rendering_server_callbacks.h"
#ifdef TOOLS_ENABLED
#include "editor/doc/doc_data.h"

6
main/performance.cpp
View File

@ -36,9 +36,9 @@
#include "scene/main/scene_tree.h"
#include "servers/audio_server.h"
#include "servers/navigation_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/physics_2d_server.h"
#include "servers/physics_server.h"
#include "servers/rendering_server.h"
Performance *Performance::singleton = nullptr;

4
main/tests/test_physics.cpp
View File

@ -36,8 +36,8 @@
#include "core/os/main_loop.h"
#include "core/os/os.h"
#include "core/string/print_string.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/physics_server.h"
#include "servers/rendering_server.h"
class TestPhysicsMainLoop : public MainLoop {
GDCLASS(TestPhysicsMainLoop, MainLoop);

4
main/tests/test_physics_2d.cpp
View File

File diff suppressed because one or more lines are too long

2
main/tests/test_render.cpp
View File

@ -36,7 +36,7 @@
#include "core/os/main_loop.h"
#include "core/os/os.h"
#include "core/string/print_string.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#define OBJECT_COUNT 50

2
modules/csg/csg_shape.cpp
View File

@ -30,7 +30,7 @@
#include "csg_shape.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "scene/resources/world_3d.h"
#include "scene/resources/mesh/mesh.h"

2
modules/csg/csg_shape.h
View File

@ -36,7 +36,7 @@
#include "csg.h"
#include "scene/3d/path.h"
#include "scene/3d/visual_instance.h"
#include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/concave_polygon_shape.h"
#include "thirdparty/misc/mikktspace.h"
class CSGShape : public GeometryInstance {

2
modules/entity_spell_system/entities/stats/stat_data.h
View File

@ -24,7 +24,7 @@ SOFTWARE.
#include "core/object/resource.h"
#include "core/scene/resources/curve.h"
#include "scene/resources/curve.h"
#include "level_stat_data.h"

18
modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp
View File

@ -35,18 +35,18 @@
#include "core/math/convex_hull.h"
#include "scene/3d/mesh_instance.h"
#include "scene/3d/physics_body.h"
#include "core/scene/resources/shapes/box_shape.h"
#include "core/scene/resources/shapes/capsule_shape.h"
#include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "core/scene/resources/shapes/cylinder_shape.h"
#include "core/scene/resources/shapes/height_map_shape.h"
#include "scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/shapes/height_map_shape.h"
#include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
#include "core/scene/resources/shapes/plane_shape.h"
#include "scene/resources/shapes/plane_shape.h"
#include "scene/resources/mesh/primitive_meshes.h"
#include "core/scene/resources/shapes/shape.h"
#include "core/scene/resources/shapes/sphere_shape.h"
#include "scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h"
bool GridMap3DNavigationGeometryParser3D::parses_node(Node *p_node) {
return (Object::cast_to<GridMap>(p_node) != nullptr);

2
modules/gridmap/grid_map.cpp
View File

@ -39,7 +39,7 @@
#include "scene/resources/mesh/surface_tool.h"
#include "scene/main/scene_string_names.h"
#include "servers/navigation_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/world_3d.h"

2
modules/gridmap/mesh_library.cpp
View File

@ -30,7 +30,7 @@
#include "mesh_library.h"
#include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/box_shape.h"
#include "scene/resources/navigation/navigation_mesh.h"
MeshLibrary::Item::Item() {

2
modules/gridmap/mesh_library.h
View File

@ -35,7 +35,7 @@
#include "core/object/resource.h"
#include "scene/3d/navigation_mesh_instance.h"
#include "scene/resources/mesh/mesh.h"
#include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/shape.h"
class NavigationMesh;

2
modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp
View File

@ -6,7 +6,7 @@
#include "core/io/resource_loader.h"
#include "scene/resources/texture.h"
#include "core/scene/resources/bit_map.h"
#include "scene/resources/bit_map.h"
String ImagePickerButton::get_image_path() {
return image_path;

2
modules/mesh_data_resource/mesh_data_resource.h
View File

@ -29,7 +29,7 @@ SOFTWARE.
#include "scene/resources/mesh/mesh.h"
#include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/shape.h"
class MeshDataResource : public Resource {
GDCLASS(MeshDataResource, Resource);

14
modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp
View File

@ -22,13 +22,13 @@ SOFTWARE.
#include "mdr_import_plugin_base.h"
#include "core/scene/resources/shapes/box_shape.h"
#include "core/scene/resources/shapes/capsule_shape.h"
#include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "core/scene/resources/shapes/cylinder_shape.h"
#include "core/scene/resources/shapes/shape.h"
#include "core/scene/resources/shapes/sphere_shape.h"
#include "scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h"
#include "modules/modules_enabled.gen.h"

2
modules/mesh_utils/mesh_utils.cpp
View File

@ -25,7 +25,7 @@ SOFTWARE.
#include "core/variant/variant.h"
#include "scene/resources/mesh/mesh.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "xatlas/xatlas.h"

2
modules/mesh_utils/simplify.h
View File

@ -32,7 +32,7 @@
#include <map>
#include <vector>
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
namespace Simplify {

12
modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp
View File

@ -33,12 +33,12 @@
#include "core/math/convex_hull.h"
#include "scene/2d/mesh_instance_2d.h"
#include "scene/2d/physics_body_2d.h"
#include "core/scene/resources/shapes_2d/capsule_shape_2d.h"
#include "core/scene/resources/shapes_2d/circle_shape_2d.h"
#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "core/scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/shapes_2d/capsule_shape_2d.h"
#include "scene/resources/shapes_2d/circle_shape_2d.h"
#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_2d/navigation_polygon.h"

18
modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp
View File

@ -33,16 +33,16 @@
#include "core/math/convex_hull.h"
#include "scene/3d/mesh_instance.h"
#include "scene/3d/physics_body.h"
#include "core/scene/resources/shapes/box_shape.h"
#include "core/scene/resources/shapes/capsule_shape.h"
#include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "core/scene/resources/shapes/cylinder_shape.h"
#include "core/scene/resources/shapes/height_map_shape.h"
#include "core/scene/resources/shapes/plane_shape.h"
#include "scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/shapes/height_map_shape.h"
#include "scene/resources/shapes/plane_shape.h"
#include "scene/resources/mesh/primitive_meshes.h"
#include "core/scene/resources/shapes/shape.h"
#include "core/scene/resources/shapes/sphere_shape.h"
#include "scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h"
#include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"

2
modules/paint/nodes/curve_2d/editor/paint_curve_2d_editor_plugin.cpp
View File

@ -52,7 +52,7 @@
#include "scene/gui/separator.h"
#include "scene/gui/tool_button.h"
#include "scene/main/node.h"
#include "core/scene/resources/curve.h"
#include "scene/resources/curve.h"
#include "scene/resources/texture.h"
#include "../paint_curve_2d.h"

2
modules/paint/nodes/curve_2d/paint_curve_2d.cpp
View File

@ -31,7 +31,7 @@
#include "paint_curve_2d.h"
#include "core/config/engine.h"
#include "core/scene/resources/curve.h"
#include "scene/resources/curve.h"
#include "scene/main/scene_string_names.h"
#ifdef TOOLS_ENABLED

2
modules/paint/nodes/polygon_2d/editor/paint_polygon_2d_editor_plugin.cpp
View File

@ -72,7 +72,7 @@
#include "scene/gui/tool_button.h"
#include "scene/main/node.h"
#include "scene/resources/texture.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "../paint_polygon_2d.h"

6
modules/props/prop_instance_merger.cpp
View File

@ -5,7 +5,7 @@
//#include "../thread_pool/thread_pool.h"
#include "scene/resources/world_3d.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "core/config/engine.h"
@ -16,7 +16,7 @@
} \
return r;
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "modules/modules_enabled.gen.h"
@ -48,7 +48,7 @@
#include "tiled_wall/tiled_wall_data.h"
#include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/box_shape.h"
const float PropInstanceMerger::LOD_CHECK_INTERVAL = 2;

4
modules/props/prop_instance_prop_job.cpp
View File

@ -28,9 +28,9 @@ SOFTWARE.
#include "prop_instance.h"
#include "prop_instance_merger.h"
#include "prop_mesher.h"
#include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/shape.h"
#include "scene/resources/world_3d.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "singleton/prop_cache.h"
#include "scene/resources/material/spatial_material.h"
#include "scene/resources/material/shader_material.h"

2
modules/props/props/prop_data.cpp
View File

@ -26,7 +26,7 @@ SOFTWARE.
#include "prop_data_light.h"
#include "prop_data_prop.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "modules/modules_enabled.gen.h"

2
modules/props/tiled_wall/tiled_wall.cpp
View File

@ -16,7 +16,7 @@
#include "core/core_string_names.h"
#include "scene/resources/world_3d.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "tiled_wall_data.h"
int TiledWall::get_width() const {

2
modules/props/tiled_wall/tiled_wall_data.cpp
View File

@ -22,7 +22,7 @@ SOFTWARE.
#include "tiled_wall_data.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#define VARIANT_ARRAY_GET(arr) \
Vector<Variant> r; \

6
modules/props_2d/prop_2d_instance_merger.cpp
View File

@ -4,7 +4,7 @@
//#include "../thread_pool/thread_pool.h"
#include "scene/resources/world_2d.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "core/config/engine.h"
@ -19,7 +19,7 @@
} \
return r;
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "modules/modules_enabled.gen.h"
@ -45,7 +45,7 @@
#include "tiled_wall/tiled_wall_2d_data.h"
#include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/box_shape.h"
bool Prop2DInstanceMerger::get_building() {
return _building;

2
modules/props_2d/prop_2d_instance_merger.h
View File

@ -25,7 +25,7 @@ SOFTWARE.
#include "prop_2d_instance.h"
#include "scene/main/node_2d.h"
#include "core/scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h"
#include "core/math/vector3.h"

2
modules/props_2d/prop_2d_instance_prop_job.cpp
View File

@ -27,7 +27,7 @@ SOFTWARE.
#include "prop_2d_instance.h"
#include "prop_2d_instance_merger.h"
#include "prop_2d_mesher.h"
#include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/shape.h"
#include "singleton/prop_2d_cache.h"
#include "modules/modules_enabled.gen.h"

2
modules/props_2d/prop_2d_instance_prop_job.h
View File

@ -24,7 +24,7 @@ SOFTWARE.
#include "prop_2d_instance_job.h"
#include "core/scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h"
#include "modules/modules_enabled.gen.h"

2
modules/props_2d/props/prop_2d_data.cpp
View File

@ -26,7 +26,7 @@ SOFTWARE.
#include "prop_2d_data_light.h"
#include "prop_2d_data_prop.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "modules/modules_enabled.gen.h"

2
modules/props_2d/tiled_wall/tiled_wall_2d_data.cpp
View File

@ -22,7 +22,7 @@ SOFTWARE.
#include "tiled_wall_2d_data.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#define VARIANT_ARRAY_GET(arr) \
Vector<Variant> r; \

4
modules/skeleton_3d/editor/skeleton_editor_plugin.cpp
View File

@ -55,8 +55,8 @@
#include "scene/gui/texture_rect.h"
#include "scene/gui/tree.h"
#include "scene/main/viewport.h"
#include "core/scene/resources/shapes/capsule_shape.h"
#include "core/scene/resources/shapes/sphere_shape.h"
#include "scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/sphere_shape.h"
#include "scene/resources/mesh/surface_tool.h"
#include "physical_bone_editor_plugin.h"

2
modules/skeleton_3d/nodes/physical_bone.h
View File

@ -34,7 +34,7 @@
#include "core/object/reference.h"
#include "core/containers/vset.h"
#include "scene/3d/collision_object.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "scene/3d/physics_body.h"
class PhysicsMaterial;

2
modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp
View File

@ -31,7 +31,7 @@
#include "skeleton_modification_3d_jiggle.h"
#include "../nodes/skeleton.h"
#include "skeleton_modification_stack_3d.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "scene/resources/world_3d.h"
bool SkeletonModification3DJiggle::_set(const StringName &p_path, const Variant &p_value) {

2
modules/terraman/meshers/default/terrain_mesher_default.cpp
View File

@ -27,7 +27,7 @@ SOFTWARE.
#include "../../defines.h"
#include "scene/3d/mesh_instance.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
_FORCE_INLINE_ int TerrainMesherDefault::get_build_flags() const {
return _build_flags;

4
modules/terraman/world/default/terrain_chunk_default.cpp
View File

@ -24,8 +24,8 @@ SOFTWARE.
#include "../../defines.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/physics_server.h"
#include "servers/rendering_server.h"
#include "../../../opensimplex/open_simplex_noise.h"
#include "../../meshers/default/terrain_mesher_default.h"

2
modules/terraman/world/default/terrain_world_default.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE.
#include "../jobs/terrain_light_job.h"
#include "../jobs/terrain_prop_job.h"
#include "../jobs/terrain_terrain_job.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
_FORCE_INLINE_ int TerrainWorldDefault::get_build_flags() const {
return _build_flags;

2
modules/terraman/world/jobs/terrain_prop_job.cpp
View File

@ -32,7 +32,7 @@ SOFTWARE.
#include "../../meshers/terrain_mesher.h"
#include "../default/terrain_chunk_default.h"
#include "scene/resources/world_3d.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "scene/resources/material/spatial_material.h"
#include "scene/resources/material/shader_material.h"

2
modules/terraman/world/jobs/terrain_terrain_job.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE.
#include "../../meshers/terrain_mesher.h"
#include "../default/terrain_chunk_default.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "scene/resources/material/spatial_material.h"
#include "scene/resources/material/shader_material.h"

2
modules/terraman/world/terrain_chunk.cpp
View File

@ -28,7 +28,7 @@ SOFTWARE.
#include "core/object/message_queue.h"
#include "jobs/terrain_job.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "terrain_structure.h"
#include "core/os/thread_pool.h"

2
modules/terraman/world/terrain_world_editor.cpp
View File

@ -34,7 +34,7 @@ SOFTWARE.
#include "../library/terrain_library.h"
#include "../library/terrain_surface.h"
#include "scene/resources/world_3d.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "../defines.h"

4
modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp
View File

@ -28,10 +28,10 @@ SOFTWARE.
#include "../../defines.h"
#include "scene/3d/mesh_instance.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "scene/resources/world_2d.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "servers/physics_2d_server.h"
_FORCE_INLINE_ int Terrain2DMesherDefault::get_build_flags() const {
return _build_flags;

2
modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.cpp
View File

@ -25,7 +25,7 @@ SOFTWARE.
#include "core/math/math_funcs.h"
#include "../../library/terrain_2d_material_cache.h"
#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h"
void Terrain2DMesherIsometric::_add_chunk(Ref<Terrain2DChunk> p_chunk) {
Ref<Terrain2DChunkDefault> chunk = p_chunk;

4
modules/terraman_2d/meshers/terrain_2d_mesher.cpp
View File

@ -28,8 +28,8 @@ SOFTWARE.
#include "../world/default/terrain_2d_chunk_default.h"
#include "../world/terrain_2d_chunk.h"
#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "servers/physics_2d_server.h"
#include "modules/modules_enabled.gen.h"

2
modules/terraman_2d/meshers/terrain_2d_mesher.h
View File

@ -44,7 +44,7 @@ SOFTWARE.
#include "../../mesh_data_resource/mesh_data_resource.h"
#endif
#include "core/scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h"
#include "../library/terrain_2d_library.h"

6
modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp
View File

@ -24,8 +24,8 @@ SOFTWARE.
#include "../../defines.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/physics_server.h"
#include "servers/rendering_server.h"
#include "../../../opensimplex/open_simplex_noise.h"
#include "../../meshers/default/terrain_2d_mesher_default.h"
@ -40,7 +40,7 @@ SOFTWARE.
#include "../jobs/terrain_2d_terrain_job.h"
#include "scene/resources/world_3d.h"
#include "scene/resources/world_2d.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "servers/physics_2d_server.h"
const String Terrain2DChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider";

2
modules/terraman_2d/world/jobs/terrain_2d_terrain_job.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE.
#include "../../meshers/terrain_2d_mesher.h"
#include "../default/terrain_2d_chunk_default.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "servers/physics_2d_server.h"
#include "modules/modules_enabled.gen.h"

2
modules/terraman_2d/world/terrain_2d_chunk.h
View File

@ -49,7 +49,7 @@ SOFTWARE.
#include "../../props_2d/props/prop_2d_data.h"
#endif
#include "core/scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h"
#include "../library/terrain_2d_library.h"
#include "../library/terrain_2d_surface.h"

2
modules/tile_map/tile_map.cpp
View File

@ -37,7 +37,7 @@
#include "scene/2d/collision_object_2d.h"
#include "scene/resources/world_2d.h"
#include "servers/navigation_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "servers/physics_2d_server.h"
#include "servers/rendering/rendering_server_canvas_helper.h"
#include "scene/resources/material/shader_material.h"

4
modules/tile_map/tile_set.h
View File

@ -36,9 +36,9 @@
#include "core/variant/array.h"
#include "scene/2d/light_occluder_2d.h"
#include "scene/2d/navigation_polygon_instance.h"
#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/navigation_2d/navigation_polygon.h"
#include "core/scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/texture.h"
#include "scene/resources/material/shader_material.h"

4
modules/tile_map/tile_set_editor_plugin.h
View File

@ -32,8 +32,8 @@
#include "editor/editor_node.h"
#include "scene/2d/sprite.h"
#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "tile_set.h"
#define WORKSPACE_MARGIN Vector2(10, 10)

2
modules/voxelman/meshers/cubic/voxel_mesher_cubic.cpp
View File

@ -26,7 +26,7 @@ SOFTWARE.
#include "../../defines.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
void VoxelMesherCubic::_add_chunk(Ref<VoxelChunk> p_chunk) {
Ref<VoxelChunkDefault> chunk = p_chunk;

2
modules/voxelman/meshers/default/voxel_mesher_default.cpp
View File

@ -27,7 +27,7 @@ SOFTWARE.
#include "../../defines.h"
#include "scene/3d/mesh_instance.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
_FORCE_INLINE_ int VoxelMesherDefault::get_build_flags() const {
return _build_flags;

2
modules/voxelman/meshers/marching_cubes/voxel_mesher_marching_cubes.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE.
#include "../../world/jobs/voxel_job.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
void VoxelMesherMarchingCubes::get_voxel_type_array(int *arr, Ref<VoxelChunk> chunk, const int x, const int y, const int z, const int size) {
uint8_t *channel_type = chunk->channel_get(_channel_index_type);

4
modules/voxelman/world/default/voxel_chunk_default.cpp
View File

@ -24,8 +24,8 @@ SOFTWARE.
#include "../../defines.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/physics_server.h"
#include "servers/rendering_server.h"
#include "../../../opensimplex/open_simplex_noise.h"
#include "../../meshers/default/voxel_mesher_default.h"

2
modules/voxelman/world/jobs/voxel_prop_job.cpp
View File

@ -33,7 +33,7 @@ SOFTWARE.
#include "../../library/voxel_material_cache.h"
#include "../default/voxel_chunk_default.h"
#include "scene/resources/world_3d.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "scene/resources/material/spatial_material.h"
#include "scene/resources/material/shader_material.h"

2
modules/voxelman/world/jobs/voxel_terrain_job.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE.
#include "../../library/voxel_material_cache.h"
#include "../default/voxel_chunk_default.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "scene/resources/material/spatial_material.h"
#include "scene/resources/material/shader_material.h"

2
modules/voxelman/world/voxel_chunk.cpp
View File

@ -27,7 +27,7 @@ SOFTWARE.
#include "../defines.h"
#include "jobs/voxel_job.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "voxel_structure.h"
#include "core/os/thread_pool.h"

2
modules/voxelman/world/voxel_world_editor.cpp
View File

@ -34,7 +34,7 @@ SOFTWARE.
#include "../library/voxel_library.h"
#include "../library/voxel_surface.h"
#include "scene/resources/world_3d.h"
#include "core/servers/physics/physics_server.h"
#include "servers/physics_server.h"
#include "../defines.h"

2
platform/frt/os_frt.cpp
View File

@ -35,7 +35,7 @@
#include "core/input/input.h"
#include "core/os/file_access.h"
#include "drivers/unix/os_unix.h"
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "servers/rendering/rasterizer.h"
#include "servers/audio/audio_driver_dummy.h"
#include "servers/rendering/rendering_server_raster.h"

2
platform/frt_sdl/frt_godot3.cc
View File

@ -17,7 +17,7 @@
#pragma GCC diagnostic ignored "-Wvolatile"
#include "servers/audio_server.h"
#pragma GCC diagnostic pop
#include "core/servers/rendering/rendering_server.h"
#include "servers/rendering_server.h"
#include "servers/rendering/rendering_server_wrap_mt.h"
#include "servers/rendering/rasterizer.h"
#include "servers/rendering/rendering_server_raster.h"

Some files were not shown because too many files have changed in this diff Show More