Moved edition-related classes to a sub-folder

master
Marc Gilleron 2020-01-26 20:29:44 +00:00
parent 20dc0008f4
commit 0ac1b7e6dc
13 changed files with 14 additions and 13 deletions

1
SCsub
View File

@ -14,6 +14,7 @@ files = [
"util/*.cpp",
"terrain/*.cpp",
"math/*.cpp",
"edition/*.cpp",
"thirdparty/lz4/*.c"
]

View File

@ -1,6 +1,6 @@
#include "voxel_tool.h"
#include "terrain/voxel_lod_terrain.h"
#include "voxel_buffer.h"
#include "../terrain/voxel_lod_terrain.h"
#include "../voxel_buffer.h"
Vector3 VoxelRaycastResult::_b_get_position() const {
return position.to_vec3();

View File

@ -1,7 +1,7 @@
#ifndef VOXEL_TOOL_H
#define VOXEL_TOOL_H
#include "math/rect3i.h"
#include "../math/rect3i.h"
#include <core/reference.h>
class VoxelBuffer;

View File

@ -1,5 +1,5 @@
#include "voxel_tool_buffer.h"
#include "voxel_buffer.h"
#include "../voxel_buffer.h"
VoxelToolBuffer::VoxelToolBuffer(Ref<VoxelBuffer> vb) {
ERR_FAIL_COND(vb.is_null());

View File

@ -1,6 +1,6 @@
#include "voxel_tool_lod_terrain.h"
#include "terrain/voxel_lod_terrain.h"
#include "terrain/voxel_map.h"
#include "../terrain/voxel_lod_terrain.h"
#include "../terrain/voxel_map.h"
VoxelToolLodTerrain::VoxelToolLodTerrain(VoxelLodTerrain *terrain, Ref<VoxelMap> map) {
ERR_FAIL_COND(terrain == nullptr);

View File

@ -1,7 +1,7 @@
#include "voxel_tool_terrain.h"
#include "terrain/voxel_map.h"
#include "terrain/voxel_terrain.h"
#include "util/voxel_raycast.h"
#include "../terrain/voxel_map.h"
#include "../terrain/voxel_terrain.h"
#include "../util/voxel_raycast.h"
VoxelToolTerrain::VoxelToolTerrain(VoxelTerrain *terrain, Ref<VoxelMap> map) {
ERR_FAIL_COND(terrain == nullptr);

View File

@ -1,4 +1,5 @@
#include "register_types.h"
#include "edition/voxel_tool.h"
#include "meshers/blocky/voxel_mesher_blocky.h"
#include "meshers/dmc/voxel_mesher_dmc.h"
#include "meshers/transvoxel/voxel_mesher_transvoxel.h"
@ -18,7 +19,6 @@
#include "voxel_library.h"
#include "voxel_memory_pool.h"
#include "voxel_string_names.h"
#include "voxel_tool.h"
void register_voxel_types() {

View File

@ -1,9 +1,9 @@
#include "voxel_lod_terrain.h"
#include "../edition/voxel_tool_lod_terrain.h"
#include "../math/rect3i.h"
#include "../streams/voxel_stream_file.h"
#include "../util/profiling_clock.h"
#include "../voxel_string_names.h"
#include "../voxel_tool_lod_terrain.h"
#include "voxel_map.h"
#include <core/core_string_names.h>

View File

@ -1,9 +1,9 @@
#include "voxel_terrain.h"
#include "../edition/voxel_tool_terrain.h"
#include "../streams/voxel_stream_file.h"
#include "../util/profiling_clock.h"
#include "../util/utility.h"
#include "../util/voxel_raycast.h"
#include "../voxel_tool_terrain.h"
#include "voxel_block.h"
#include "voxel_map.h"

View File

@ -4,8 +4,8 @@
#include "voxel_memory_pool.h"
#endif
#include "edition/voxel_tool_buffer.h"
#include "voxel_buffer.h"
#include "voxel_tool_buffer.h"
#include <core/math/math_funcs.h>
#include <string.h>