Zylann
/
godot_voxel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved VoxelLodTerrain and VoxelTerrain stuff to their own folders

master
Marc Gilleron 2022-03-20 22:57:53 +00:00
parent f764fe7f1a
commit 8d8d8b336d
19 changed files with 70 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SCsub
View File

@ -45,6 +45,8 @@ voxel_files = [
"terrain/*.cpp",
"terrain/instancing/*.cpp",
"terrain/fixed_lod/*.cpp",
"terrain/variable_lod/*.cpp",
"server/*.cpp",
"edition/*.cpp",

2
edition/voxel_tool_lod_terrain.cpp
View File

@ -2,7 +2,7 @@
#include "../constants/voxel_string_names.h"
#include "../storage/voxel_buffer_gd.h"
#include "../storage/voxel_data_grid.h"
#include "../terrain/voxel_lod_terrain.h"
#include "../terrain/variable_lod/voxel_lod_terrain.h"
#include "../util/funcs.h"
#include "../util/godot/funcs.h"
#include "../util/island_finder.h"

2
edition/voxel_tool_terrain.cpp
View File

@ -2,7 +2,7 @@
#include "../meshers/blocky/voxel_mesher_blocky.h"
#include "../meshers/cubes/voxel_mesher_cubes.h"
#include "../storage/voxel_buffer_gd.h"
#include "../terrain/voxel_terrain.h"
#include "../terrain/fixed_lod/voxel_terrain.h"
#include "../util/godot/funcs.h"
#include "../util/voxel_raycast.h"

4
editor/terrain/voxel_terrain_editor_plugin.cpp
View File

@ -1,7 +1,7 @@
#include "voxel_terrain_editor_plugin.h"
#include "../../generators/voxel_generator.h"
#include "../../terrain/voxel_lod_terrain.h"
#include "../../terrain/voxel_terrain.h"
#include "../../terrain/fixed_lod/voxel_terrain.h"
#include "../../terrain/variable_lod/voxel_lod_terrain.h"
#include "../about_window.h"
#include "../graph/voxel_graph_node_inspector_wrapper.h"
#include "voxel_terrain_editor_task_indicator.h"

6
register_types.cpp
View File

@ -27,13 +27,13 @@
#include "streams/voxel_block_serializer_gd.h"
#include "streams/voxel_stream_block_files.h"
#include "streams/voxel_stream_script.h"
#include "terrain/fixed_lod/voxel_box_mover.h"
#include "terrain/fixed_lod/voxel_terrain.h"
#include "terrain/instancing/voxel_instance_component.h"
#include "terrain/instancing/voxel_instance_library_scene_item.h"
#include "terrain/instancing/voxel_instancer.h"
#include "terrain/voxel_box_mover.h"
#include "terrain/voxel_lod_terrain.h"
#include "terrain/variable_lod/voxel_lod_terrain.h"
#include "terrain/voxel_mesh_block.h"
#include "terrain/voxel_terrain.h"
#include "terrain/voxel_viewer.h"
#include "util/macros.h"
#include "util/noise/fast_noise_lite.h"

6
terrain/voxel_box_mover.cpp → terrain/fixed_lod/voxel_box_mover.cpp
View File

@ -1,7 +1,7 @@
#include "voxel_box_mover.h"
#include "../meshers/blocky/voxel_mesher_blocky.h"
#include "../meshers/cubes/voxel_mesher_cubes.h"
#include "../util/godot/funcs.h"
#include "../../meshers/blocky/voxel_mesher_blocky.h"
#include "../../meshers/cubes/voxel_mesher_cubes.h"
#include "../../util/godot/funcs.h"
namespace zylann::voxel {

0
terrain/voxel_box_mover.h → terrain/fixed_lod/voxel_box_mover.h
View File

2
terrain/voxel_mesh_block_vt.h → terrain/fixed_lod/voxel_mesh_block_vt.h
View File

@ -1,7 +1,7 @@
#ifndef VOXEL_MESH_BLOCK_VT_H
#define VOXEL_MESH_BLOCK_VT_H
#include "voxel_mesh_block.h"
#include "../voxel_mesh_block.h"
namespace zylann::voxel {

22
terrain/voxel_terrain.cpp → terrain/fixed_lod/voxel_terrain.cpp
View File

@ -1,15 +1,15 @@
#include "voxel_terrain.h"
#include "../constants/voxel_constants.h"
#include "../constants/voxel_string_names.h"
#include "../edition/voxel_tool_terrain.h"
#include "../server/voxel_server.h"
#include "../server/voxel_server_updater.h"
#include "../storage/voxel_buffer_gd.h"
#include "../util/funcs.h"
#include "../util/macros.h"
#include "../util/profiling.h"
#include "../util/profiling_clock.h"
#include "voxel_data_block_enter_info.h"
#include "../../constants/voxel_constants.h"
#include "../../constants/voxel_string_names.h"
#include "../../edition/voxel_tool_terrain.h"
#include "../../server/voxel_server.h"
#include "../../server/voxel_server_updater.h"
#include "../../storage/voxel_buffer_gd.h"
#include "../../util/funcs.h"
#include "../../util/macros.h"
#include "../../util/profiling.h"
#include "../../util/profiling_clock.h"
#include "../voxel_data_block_enter_info.h"
#include <core/config/engine.h>
#include <core/core_string_names.h>

12
terrain/voxel_terrain.h → terrain/fixed_lod/voxel_terrain.h
View File

@ -1,13 +1,13 @@
#ifndef VOXEL_TERRAIN_H
#define VOXEL_TERRAIN_H
#include "../server/voxel_server.h"
#include "../storage/voxel_data_map.h"
#include "../util/godot/funcs.h"
#include "voxel_data_block_enter_info.h"
#include "../../server/voxel_server.h"
#include "../../storage/voxel_data_map.h"
#include "../../util/godot/funcs.h"
#include "../voxel_data_block_enter_info.h"
#include "../voxel_mesh_map.h"
#include "../voxel_node.h"
#include "voxel_mesh_block_vt.h"
#include "voxel_mesh_map.h"
#include "voxel_node.h"
#include <scene/3d/node_3d.h>

2
terrain/instancing/voxel_instancer.cpp
View File

@ -3,7 +3,7 @@
#include "../../util/godot/funcs.h"
#include "../../util/macros.h"
#include "../../util/profiling.h"
#include "../voxel_lod_terrain.h"
#include "../variable_lod/voxel_lod_terrain.h"
#include "voxel_instance_component.h"
#include "voxel_instance_library_scene_item.h"
#include "voxel_instancer_rigidbody.h"

2
terrain/lod_octree.h → terrain/variable_lod/lod_octree.h
View File

@ -1,7 +1,7 @@
#ifndef LOD_OCTREE_H
#define LOD_OCTREE_H
#include "../util/math/box3i.h"
#include "../../util/math/box3i.h"
namespace zylann::voxel {

24
terrain/voxel_lod_terrain.cpp → terrain/variable_lod/voxel_lod_terrain.cpp
View File

@ -1,16 +1,16 @@
#include "voxel_lod_terrain.h"
#include "../constants/voxel_string_names.h"
#include "../edition/voxel_tool_lod_terrain.h"
#include "../meshers/transvoxel/voxel_mesher_transvoxel.h"
#include "../server/voxel_server_gd.h"
#include "../server/voxel_server_updater.h"
#include "../util/funcs.h"
#include "../util/godot/funcs.h"
#include "../util/macros.h"
#include "../util/profiling.h"
#include "../util/profiling_clock.h"
#include "../util/tasks/async_dependency_tracker.h"
#include "instancing/voxel_instancer.h"
#include "../../constants/voxel_string_names.h"
#include "../../edition/voxel_tool_lod_terrain.h"
#include "../../meshers/transvoxel/voxel_mesher_transvoxel.h"
#include "../../server/voxel_server_gd.h"
#include "../../server/voxel_server_updater.h"
#include "../../util/funcs.h"
#include "../../util/godot/funcs.h"
#include "../../util/macros.h"
#include "../../util/profiling.h"
#include "../../util/profiling_clock.h"
#include "../../util/tasks/async_dependency_tracker.h"
#include "../instancing/voxel_instancer.h"
#include "voxel_lod_terrain_update_task.h"
#include <core/config/engine.h>

12
terrain/voxel_lod_terrain.h → terrain/variable_lod/voxel_lod_terrain.h
View File

@ -1,19 +1,19 @@
#ifndef VOXEL_LOD_TERRAIN_HPP
#define VOXEL_LOD_TERRAIN_HPP
#include "../server/mesh_block_task.h"
#include "../server/voxel_server.h"
#include "../storage/voxel_data_map.h"
#include "../../server/mesh_block_task.h"
#include "../../server/voxel_server.h"
#include "../../storage/voxel_data_map.h"
#include "../voxel_mesh_map.h"
#include "../voxel_node.h"
#include "lod_octree.h"
#include "voxel_lod_terrain_update_data.h"
#include "voxel_mesh_block_vlt.h"
#include "voxel_mesh_map.h"
#include "voxel_node.h"
#include <unordered_set>
#ifdef TOOLS_ENABLED
#include "../editor/voxel_debug.h"
#include "../../editor/voxel_debug.h"
#endif
namespace zylann::voxel {

12
terrain/voxel_lod_terrain_update_data.h → terrain/variable_lod/voxel_lod_terrain_update_data.h
View File

@ -1,13 +1,13 @@
#ifndef VOXEL_LOD_TERRAIN_UPDATE_DATA_H
#define VOXEL_LOD_TERRAIN_UPDATE_DATA_H
#include "../constants/voxel_constants.h"
#include "../generators/voxel_generator.h"
#include "../storage/voxel_data_map.h"
#include "../streams/voxel_stream.h"
#include "../util/fixed_array.h"
#include "../../constants/voxel_constants.h"
#include "../../generators/voxel_generator.h"
#include "../../storage/voxel_data_map.h"
#include "../../streams/voxel_stream.h"
#include "../../util/fixed_array.h"
#include "../voxel_mesh_map.h"
#include "lod_octree.h"
#include "voxel_mesh_map.h"
#include <unordered_set>

16
terrain/voxel_lod_terrain_update_task.cpp → terrain/variable_lod/voxel_lod_terrain_update_task.cpp
View File

@ -1,12 +1,12 @@
#include "voxel_lod_terrain_update_task.h"
#include "../server/generate_block_task.h"
#include "../server/load_block_data_task.h"
#include "../server/mesh_block_task.h"
#include "../server/save_block_data_task.h"
#include "../server/voxel_server.h"
#include "../util/godot/funcs.h"
#include "../util/profiling.h"
#include "../util/profiling_clock.h"
#include "../../server/generate_block_task.h"
#include "../../server/load_block_data_task.h"
#include "../../server/mesh_block_task.h"
#include "../../server/save_block_data_task.h"
#include "../../server/voxel_server.h"
#include "../../util/godot/funcs.h"
#include "../../util/profiling.h"
#include "../../util/profiling_clock.h"
namespace zylann::voxel {

4
terrain/voxel_lod_terrain_update_task.h → terrain/variable_lod/voxel_lod_terrain_update_task.h
View File

@ -1,8 +1,8 @@
#ifndef VOXEL_LOD_TERRAIN_UPDATE_TASK_H
#define VOXEL_LOD_TERRAIN_UPDATE_TASK_H
#include "../server/priority_dependency.h"
#include "../util/tasks/threaded_task.h"
#include "../../server/priority_dependency.h"
#include "../../util/tasks/threaded_task.h"
#include "voxel_lod_terrain_update_data.h"
namespace zylann::voxel {

6
terrain/voxel_mesh_block_vlt.cpp → terrain/variable_lod/voxel_mesh_block_vlt.cpp
View File

@ -1,7 +1,7 @@
#include "voxel_mesh_block_vlt.h"
#include "../constants/voxel_string_names.h"
#include "../util/profiling.h"
#include "free_mesh_task.h"
#include "../../constants/voxel_string_names.h"
#include "../../util/profiling.h"
#include "../free_mesh_task.h"
namespace zylann::voxel {

2
terrain/voxel_mesh_block_vlt.h → terrain/variable_lod/voxel_mesh_block_vlt.h
View File

@ -1,7 +1,7 @@
#ifndef VOXEL_MESH_BLOCK_VLT_H
#define VOXEL_MESH_BLOCK_VLT_H
#include "voxel_mesh_block.h"
#include "../voxel_mesh_block.h"
namespace zylann::voxel {