From 135dfb342391e7d5a3a15b44484ce4cdf916b13c Mon Sep 17 00:00:00 2001 From: Maxim Kolganov Date: Fri, 22 Apr 2016 20:00:15 +0300 Subject: [PATCH 1/6] change includes use engine/* directories in engine --- src/engine/core/array.h | 2 +- src/engine/core/associative_array.h | 4 +-- src/engine/core/base_proxy_allocator.h | 6 ++-- src/engine/core/binary_array.cpp | 6 ++-- src/engine/core/blob.cpp | 4 +-- src/engine/core/blob.h | 2 +- src/engine/core/crc32.cpp | 4 +-- src/engine/core/default_allocator.cpp | 2 +- src/engine/core/default_allocator.h | 2 +- src/engine/core/delegate_list.h | 4 +-- src/engine/core/free_list.h | 2 +- src/engine/core/fs/disk_file_device.cpp | 12 ++++---- src/engine/core/fs/disk_file_device.h | 2 +- src/engine/core/fs/file_events_device.cpp | 10 +++---- src/engine/core/fs/file_events_device.h | 4 +-- src/engine/core/fs/file_system.cpp | 26 ++++++++--------- src/engine/core/fs/file_system.h | 2 +- src/engine/core/fs/memory_file_device.cpp | 10 +++---- src/engine/core/fs/memory_file_device.h | 2 +- src/engine/core/fs/os_file.h | 2 +- src/engine/core/fs/pack_file_device.cpp | 8 ++--- src/engine/core/fs/pack_file_device.h | 6 ++-- src/engine/core/fs/pc/os_file.cpp | 8 ++--- src/engine/core/fs/tcp_file_device.cpp | 14 ++++----- src/engine/core/fs/tcp_file_device.h | 2 +- src/engine/core/fs/tcp_file_server.cpp | 22 +++++++------- src/engine/core/geometry.h | 8 ++--- src/engine/core/hash_map.h | 6 ++-- src/engine/core/json_serializer.cpp | 10 +++---- src/engine/core/lifo_allocator.h | 4 +-- src/engine/core/log.cpp | 8 ++--- src/engine/core/log.h | 4 +-- src/engine/core/lua_wrapper.h | 4 +-- src/engine/core/math_utils.cpp | 4 +-- src/engine/core/matrix.cpp | 6 ++-- src/engine/core/matrix.h | 2 +- src/engine/core/mt/lock_free_fixed_queue.h | 6 ++-- src/engine/core/mt/osx/task.cpp | 4 +-- src/engine/core/mt/pc/atomic.cpp | 2 +- src/engine/core/mt/pc/sync.cpp | 8 ++--- src/engine/core/mt/pc/task.cpp | 10 +++---- src/engine/core/mt/pc/thread.cpp | 6 ++-- src/engine/core/mt/transaction.h | 2 +- src/engine/core/mtjd/base_entry.cpp | 6 ++-- src/engine/core/mtjd/base_entry.h | 2 +- src/engine/core/mtjd/group.cpp | 6 ++-- src/engine/core/mtjd/group.h | 2 +- src/engine/core/mtjd/job.cpp | 4 +-- src/engine/core/mtjd/job.h | 4 +-- src/engine/core/mtjd/manager.cpp | 10 +++---- src/engine/core/mtjd/manager.h | 4 +-- src/engine/core/mtjd/scheduler.cpp | 6 ++-- src/engine/core/mtjd/scheduler.h | 4 +-- src/engine/core/mtjd/worker_thread.cpp | 6 ++-- src/engine/core/mtjd/worker_thread.h | 6 ++-- src/engine/core/osx/input_system.cpp | 6 ++-- src/engine/core/osx/socket.cpp | 4 +-- src/engine/core/path.cpp | 14 ++++----- src/engine/core/path.h | 6 ++-- src/engine/core/path_utils.cpp | 4 +-- src/engine/core/pc/input_system.cpp | 10 +++---- src/engine/core/pc/network.cpp | 8 ++--- src/engine/core/pc/system.cpp | 8 ++--- src/engine/core/pc/timer.cpp | 6 ++-- src/engine/core/profiler.cpp | 10 +++---- src/engine/core/profiler.h | 6 ++-- src/engine/core/quat.cpp | 8 ++--- src/engine/core/quat.h | 2 +- src/engine/core/queue.h | 2 +- src/engine/core/resource.cpp | 10 +++---- src/engine/core/resource.h | 6 ++-- src/engine/core/resource_manager.cpp | 8 ++--- src/engine/core/resource_manager.h | 4 +-- src/engine/core/resource_manager_base.cpp | 14 ++++----- src/engine/core/resource_manager_base.h | 4 +-- src/engine/core/string.h | 2 +- src/engine/debug/debug.h | 6 ++-- src/engine/debug/pc/debug.cpp | 8 ++--- src/engine/engine.cpp | 34 +++++++++++----------- src/engine/iplugin.cpp | 4 +-- src/engine/iproperty_descriptor.h | 6 ++-- src/engine/plugin_manager.cpp | 8 ++--- src/engine/property_descriptor.cpp | 4 +-- src/engine/property_descriptor.h | 8 ++--- src/engine/property_register.cpp | 4 +-- src/engine/universe/component.cpp | 2 +- src/engine/universe/hierarchy.cpp | 10 +++---- src/engine/universe/hierarchy.h | 6 ++-- src/engine/universe/universe.cpp | 8 ++--- src/engine/universe/universe.h | 14 ++++----- 90 files changed, 293 insertions(+), 293 deletions(-) diff --git a/src/engine/core/array.h b/src/engine/core/array.h index 92c03539d1..0279983b2b 100644 --- a/src/engine/core/array.h +++ b/src/engine/core/array.h @@ -1,7 +1,7 @@ #pragma once -#include "core/iallocator.h" +#include "engine/core/iallocator.h" namespace Lumix diff --git a/src/engine/core/associative_array.h b/src/engine/core/associative_array.h index 267bfc1c9f..b18dccb918 100644 --- a/src/engine/core/associative_array.h +++ b/src/engine/core/associative_array.h @@ -1,7 +1,7 @@ #pragma once -#include "core/array.h" +#include "engine/core/array.h" namespace Lumix @@ -262,4 +262,4 @@ namespace Lumix }; -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/core/base_proxy_allocator.h b/src/engine/core/base_proxy_allocator.h index fab07f5b8c..e8f0f514e7 100644 --- a/src/engine/core/base_proxy_allocator.h +++ b/src/engine/core/base_proxy_allocator.h @@ -1,8 +1,8 @@ #pragma once -#include "core/iallocator.h" -#include "core/mt/atomic.h" +#include "engine/core/iallocator.h" +#include "engine/core/mt/atomic.h" namespace Lumix @@ -73,4 +73,4 @@ class BaseProxyAllocator : public IAllocator }; -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/core/binary_array.cpp b/src/engine/core/binary_array.cpp index 960f07e60f..97925a9fe3 100644 --- a/src/engine/core/binary_array.cpp +++ b/src/engine/core/binary_array.cpp @@ -1,6 +1,6 @@ #include "binary_array.h" -#include "core/iallocator.h" -#include "core/string.h" +#include "engine/core/iallocator.h" +#include "engine/core/string.h" namespace Lumix @@ -184,4 +184,4 @@ void BinaryArray::grow(int capacity) m_data = new_data; m_capacity = capacity; } -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/core/blob.cpp b/src/engine/core/blob.cpp index 44cd726f84..a2468a8169 100644 --- a/src/engine/core/blob.cpp +++ b/src/engine/core/blob.cpp @@ -1,5 +1,5 @@ -#include "core/blob.h" -#include "core/string.h" +#include "engine/core/blob.h" +#include "engine/core/string.h" namespace Lumix diff --git a/src/engine/core/blob.h b/src/engine/core/blob.h index 0ea4817ce8..93f56de909 100644 --- a/src/engine/core/blob.h +++ b/src/engine/core/blob.h @@ -2,7 +2,7 @@ #include "lumix.h" -#include "core/array.h" +#include "engine/core/array.h" namespace Lumix diff --git a/src/engine/core/crc32.cpp b/src/engine/core/crc32.cpp index ae57ee01c3..d90e5dc4fc 100644 --- a/src/engine/core/crc32.cpp +++ b/src/engine/core/crc32.cpp @@ -1,4 +1,4 @@ -#include "core/crc32.h" +#include "engine/core/crc32.h" namespace Lumix @@ -92,4 +92,4 @@ uint32 continueCrc32(uint32 original_crc, const char* str) } -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/core/default_allocator.cpp b/src/engine/core/default_allocator.cpp index da251990f3..e1df1c1ce2 100644 --- a/src/engine/core/default_allocator.cpp +++ b/src/engine/core/default_allocator.cpp @@ -1,4 +1,4 @@ -#include "core/default_allocator.h" +#include "engine/core/default_allocator.h" #include diff --git a/src/engine/core/default_allocator.h b/src/engine/core/default_allocator.h index 645c93b097..17724b7207 100644 --- a/src/engine/core/default_allocator.h +++ b/src/engine/core/default_allocator.h @@ -2,7 +2,7 @@ #include "lumix.h" -#include "core/iallocator.h" +#include "engine/core/iallocator.h" namespace Lumix diff --git a/src/engine/core/delegate_list.h b/src/engine/core/delegate_list.h index a18873a51e..78d3fc3f34 100644 --- a/src/engine/core/delegate_list.h +++ b/src/engine/core/delegate_list.h @@ -1,8 +1,8 @@ #pragma once -#include "core/array.h" -#include "core/delegate.h" +#include "engine/core/array.h" +#include "engine/core/delegate.h" namespace Lumix diff --git a/src/engine/core/free_list.h b/src/engine/core/free_list.h index 5cba6fee9a..88161428f1 100644 --- a/src/engine/core/free_list.h +++ b/src/engine/core/free_list.h @@ -1,7 +1,7 @@ #pragma once #include "lumix.h" -#include "core/iallocator.h" +#include "engine/core/iallocator.h" namespace Lumix { diff --git a/src/engine/core/fs/disk_file_device.cpp b/src/engine/core/fs/disk_file_device.cpp index edf86932bc..7a2bc8bbb1 100644 --- a/src/engine/core/fs/disk_file_device.cpp +++ b/src/engine/core/fs/disk_file_device.cpp @@ -1,9 +1,9 @@ -#include "core/fs/disk_file_device.h" -#include "core/iallocator.h" -#include "core/fs/file_system.h" -#include "core/fs/os_file.h" -#include "core/path.h" -#include "core/string.h" +#include "engine/core/fs/disk_file_device.h" +#include "engine/core/iallocator.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/path.h" +#include "engine/core/string.h" namespace Lumix diff --git a/src/engine/core/fs/disk_file_device.h b/src/engine/core/fs/disk_file_device.h index e2d94c86b0..b66b2901e8 100644 --- a/src/engine/core/fs/disk_file_device.h +++ b/src/engine/core/fs/disk_file_device.h @@ -1,7 +1,7 @@ #pragma once #include "lumix.h" -#include "core/fs/ifile_device.h" +#include "engine/core/fs/ifile_device.h" namespace Lumix { diff --git a/src/engine/core/fs/file_events_device.cpp b/src/engine/core/fs/file_events_device.cpp index ba3883a8a0..213874efe2 100644 --- a/src/engine/core/fs/file_events_device.cpp +++ b/src/engine/core/fs/file_events_device.cpp @@ -1,7 +1,7 @@ -#include "core/fs/file_events_device.h" -#include "core/iallocator.h" -#include "core/fs/file_system.h" -#include "core/path.h" +#include "engine/core/fs/file_events_device.h" +#include "engine/core/iallocator.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/path.h" #ifdef FILE_EVENT_DEVICE @@ -141,4 +141,4 @@ namespace Lumix } // namespace FS } // ~namespace Lumix -#endif //FILE_EVENT_DEVICE \ No newline at end of file +#endif //FILE_EVENT_DEVICE diff --git a/src/engine/core/fs/file_events_device.h b/src/engine/core/fs/file_events_device.h index 2cf2d52ac1..49bf91f990 100644 --- a/src/engine/core/fs/file_events_device.h +++ b/src/engine/core/fs/file_events_device.h @@ -4,9 +4,9 @@ #ifdef FILE_EVENT_DEVICE #include "lumix.h" -#include "core/fs/ifile_device.h" +#include "engine/core/fs/ifile_device.h" -#include "core/delegate.h" +#include "engine/core/delegate.h" namespace Lumix { diff --git a/src/engine/core/fs/file_system.cpp b/src/engine/core/fs/file_system.cpp index d803fae2bc..61ae98b29c 100644 --- a/src/engine/core/fs/file_system.cpp +++ b/src/engine/core/fs/file_system.cpp @@ -1,16 +1,16 @@ -#include "core/fs/file_system.h" - -#include "core/array.h" -#include "core/base_proxy_allocator.h" -#include "core/fs/disk_file_device.h" -#include "core/fs/file_system.h" -#include "core/mt/lock_free_fixed_queue.h" -#include "core/mt/task.h" -#include "core/mt/transaction.h" -#include "core/path.h" -#include "core/profiler.h" -#include "core/queue.h" -#include "core/string.h" +#include "engine/core/fs/file_system.h" + +#include "engine/core/array.h" +#include "engine/core/base_proxy_allocator.h" +#include "engine/core/fs/disk_file_device.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/mt/lock_free_fixed_queue.h" +#include "engine/core/mt/task.h" +#include "engine/core/mt/transaction.h" +#include "engine/core/path.h" +#include "engine/core/profiler.h" +#include "engine/core/queue.h" +#include "engine/core/string.h" namespace Lumix diff --git a/src/engine/core/fs/file_system.h b/src/engine/core/fs/file_system.h index 0adb652ae9..8e1762db79 100644 --- a/src/engine/core/fs/file_system.h +++ b/src/engine/core/fs/file_system.h @@ -1,7 +1,7 @@ #pragma once #include "lumix.h" -#include "core/delegate.h" +#include "engine/core/delegate.h" namespace Lumix { diff --git a/src/engine/core/fs/memory_file_device.cpp b/src/engine/core/fs/memory_file_device.cpp index 8de520c4b6..6cee25a0cd 100644 --- a/src/engine/core/fs/memory_file_device.cpp +++ b/src/engine/core/fs/memory_file_device.cpp @@ -1,8 +1,8 @@ -#include "core/fs/memory_file_device.h" -#include "core/iallocator.h" -#include "core/fs/file_system.h" -#include "core/math_utils.h" -#include "core/string.h" +#include "engine/core/fs/memory_file_device.h" +#include "engine/core/iallocator.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/math_utils.h" +#include "engine/core/string.h" namespace Lumix diff --git a/src/engine/core/fs/memory_file_device.h b/src/engine/core/fs/memory_file_device.h index 43b2546ffd..81dd6b9d3e 100644 --- a/src/engine/core/fs/memory_file_device.h +++ b/src/engine/core/fs/memory_file_device.h @@ -1,7 +1,7 @@ #pragma once #include "lumix.h" -#include "core/fs/ifile_device.h" +#include "engine/core/fs/ifile_device.h" namespace Lumix { diff --git a/src/engine/core/fs/os_file.h b/src/engine/core/fs/os_file.h index 155ad4ad28..e6f7c74e4a 100644 --- a/src/engine/core/fs/os_file.h +++ b/src/engine/core/fs/os_file.h @@ -1,7 +1,7 @@ #pragma once #include "lumix.h" -#include "core/fs/file_system.h" +#include "engine/core/fs/file_system.h" namespace Lumix { diff --git a/src/engine/core/fs/pack_file_device.cpp b/src/engine/core/fs/pack_file_device.cpp index a827dc2ac6..276f6e5cdc 100644 --- a/src/engine/core/fs/pack_file_device.cpp +++ b/src/engine/core/fs/pack_file_device.cpp @@ -1,7 +1,7 @@ -#include "core/fs/file_system.h" -#include "core/iallocator.h" -#include "core/path.h" -#include "core/string.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/iallocator.h" +#include "engine/core/path.h" +#include "engine/core/string.h" #include "pack_file_device.h" diff --git a/src/engine/core/fs/pack_file_device.h b/src/engine/core/fs/pack_file_device.h index 849b803928..0008b07d24 100644 --- a/src/engine/core/fs/pack_file_device.h +++ b/src/engine/core/fs/pack_file_device.h @@ -1,8 +1,8 @@ #pragma once -#include "core/fs/ifile_device.h" -#include "core/fs/os_file.h" -#include "core/hash_map.h" +#include "engine/core/fs/ifile_device.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/hash_map.h" #include "lumix.h" diff --git a/src/engine/core/fs/pc/os_file.cpp b/src/engine/core/fs/pc/os_file.cpp index 3e35c72a6c..e20fcdfe87 100644 --- a/src/engine/core/fs/pc/os_file.cpp +++ b/src/engine/core/fs/pc/os_file.cpp @@ -1,7 +1,7 @@ -#include "core/fs/os_file.h" -#include "core/iallocator.h" -#include "core/pc/simple_win.h" -#include "core/string.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/iallocator.h" +#include "engine/core/pc/simple_win.h" +#include "engine/core/string.h" #include "lumix.h" diff --git a/src/engine/core/fs/tcp_file_device.cpp b/src/engine/core/fs/tcp_file_device.cpp index 7b5566a43e..fc092cc117 100644 --- a/src/engine/core/fs/tcp_file_device.cpp +++ b/src/engine/core/fs/tcp_file_device.cpp @@ -1,10 +1,10 @@ -#include "core/fs/tcp_file_device.h" -#include "core/iallocator.h" -#include "core/blob.h" -#include "core/fs/file_system.h" -#include "core/mt/sync.h" -#include "core/path.h" -#include "core/network.h" +#include "engine/core/fs/tcp_file_device.h" +#include "engine/core/iallocator.h" +#include "engine/core/blob.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/mt/sync.h" +#include "engine/core/path.h" +#include "engine/core/network.h" namespace Lumix diff --git a/src/engine/core/fs/tcp_file_device.h b/src/engine/core/fs/tcp_file_device.h index 103e7464da..66deedc542 100644 --- a/src/engine/core/fs/tcp_file_device.h +++ b/src/engine/core/fs/tcp_file_device.h @@ -1,7 +1,7 @@ #pragma once #include "lumix.h" -#include "core/fs/ifile_device.h" +#include "engine/core/fs/ifile_device.h" namespace Lumix { diff --git a/src/engine/core/fs/tcp_file_server.cpp b/src/engine/core/fs/tcp_file_server.cpp index a339f0dd4e..e7b1ec0ca1 100644 --- a/src/engine/core/fs/tcp_file_server.cpp +++ b/src/engine/core/fs/tcp_file_server.cpp @@ -1,14 +1,14 @@ -#include "core/fs/tcp_file_server.h" - -#include "core/array.h" -#include "core/free_list.h" -#include "core/fs/os_file.h" -#include "core/fs/tcp_file_device.h" -#include "core/mt/task.h" -#include "core/path.h" -#include "core/profiler.h" -#include "core/string.h" -#include "core/network.h" +#include "engine/core/fs/tcp_file_server.h" + +#include "engine/core/array.h" +#include "engine/core/free_list.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/fs/tcp_file_device.h" +#include "engine/core/mt/task.h" +#include "engine/core/path.h" +#include "engine/core/profiler.h" +#include "engine/core/string.h" +#include "engine/core/network.h" namespace Lumix diff --git a/src/engine/core/geometry.h b/src/engine/core/geometry.h index f754eb50ef..a398c15e75 100644 --- a/src/engine/core/geometry.h +++ b/src/engine/core/geometry.h @@ -1,9 +1,9 @@ #pragma once #include "lumix.h" -#include "core/math_utils.h" -#include "core/matrix.h" -#include "core/vec.h" +#include "engine/core/math_utils.h" +#include "engine/core/matrix.h" +#include "engine/core/vec.h" namespace Lumix @@ -300,4 +300,4 @@ struct AABB }; -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/core/hash_map.h b/src/engine/core/hash_map.h index 1344800e73..7dac3957d2 100644 --- a/src/engine/core/hash_map.h +++ b/src/engine/core/hash_map.h @@ -2,9 +2,9 @@ #include "lumix.h" -#include "core/iallocator.h" -#include "core/math_utils.h" -#include "core/string.h" +#include "engine/core/iallocator.h" +#include "engine/core/math_utils.h" +#include "engine/core/string.h" namespace Lumix diff --git a/src/engine/core/json_serializer.cpp b/src/engine/core/json_serializer.cpp index b654fa6d9b..2bbf496ebc 100644 --- a/src/engine/core/json_serializer.cpp +++ b/src/engine/core/json_serializer.cpp @@ -1,9 +1,9 @@ #include "json_serializer.h" -#include "core/fs/file_system.h" -#include "core/fs/ifile_device.h" -#include "core/log.h" -#include "core/math_utils.h" -#include "core/path.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/ifile_device.h" +#include "engine/core/log.h" +#include "engine/core/math_utils.h" +#include "engine/core/path.h" #include diff --git a/src/engine/core/lifo_allocator.h b/src/engine/core/lifo_allocator.h index 095338cdfd..7225992198 100644 --- a/src/engine/core/lifo_allocator.h +++ b/src/engine/core/lifo_allocator.h @@ -1,7 +1,7 @@ #pragma once -#include "core/iallocator.h" +#include "engine/core/iallocator.h" namespace Lumix @@ -82,4 +82,4 @@ namespace Lumix }; -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/core/log.cpp b/src/engine/core/log.cpp index 4498350df0..0243ea2fdb 100644 --- a/src/engine/core/log.cpp +++ b/src/engine/core/log.cpp @@ -1,7 +1,7 @@ -#include "core/log.h" -#include "core/array.h" -#include "core/path.h" -#include "core/string.h" +#include "engine/core/log.h" +#include "engine/core/array.h" +#include "engine/core/path.h" +#include "engine/core/string.h" namespace Lumix diff --git a/src/engine/core/log.h b/src/engine/core/log.h index ad9a9b4e35..872cf14563 100644 --- a/src/engine/core/log.h +++ b/src/engine/core/log.h @@ -2,8 +2,8 @@ #include "lumix.h" -#include "core/delegate_list.h" -#include "core/string.h" +#include "engine/core/delegate_list.h" +#include "engine/core/string.h" namespace Lumix diff --git a/src/engine/core/lua_wrapper.h b/src/engine/core/lua_wrapper.h index 1ae7f843ae..086db6886e 100644 --- a/src/engine/core/lua_wrapper.h +++ b/src/engine/core/lua_wrapper.h @@ -1,8 +1,8 @@ #pragma once -#include "core/log.h" -#include "core/vec.h" +#include "engine/core/log.h" +#include "engine/core/vec.h" #include #include #include diff --git a/src/engine/core/math_utils.cpp b/src/engine/core/math_utils.cpp index 8c7ea76d60..edd3abe3cf 100644 --- a/src/engine/core/math_utils.cpp +++ b/src/engine/core/math_utils.cpp @@ -1,5 +1,5 @@ -#include "core/math_utils.h" -#include "core/vec.h" +#include "engine/core/math_utils.h" +#include "engine/core/vec.h" #include #include diff --git a/src/engine/core/matrix.cpp b/src/engine/core/matrix.cpp index 3a64e347c0..ab97b96264 100644 --- a/src/engine/core/matrix.cpp +++ b/src/engine/core/matrix.cpp @@ -1,6 +1,6 @@ -#include "core/matrix.h" -#include "core/quat.h" -#include "core/vec.h" +#include "engine/core/matrix.h" +#include "engine/core/quat.h" +#include "engine/core/vec.h" #include diff --git a/src/engine/core/matrix.h b/src/engine/core/matrix.h index c9f09c9c2a..ae9b52ca1e 100644 --- a/src/engine/core/matrix.h +++ b/src/engine/core/matrix.h @@ -2,7 +2,7 @@ #include "lumix.h" -#include "core/vec.h" +#include "engine/core/vec.h" namespace Lumix diff --git a/src/engine/core/mt/lock_free_fixed_queue.h b/src/engine/core/mt/lock_free_fixed_queue.h index 07cb33b2ed..501f727760 100644 --- a/src/engine/core/mt/lock_free_fixed_queue.h +++ b/src/engine/core/mt/lock_free_fixed_queue.h @@ -1,8 +1,8 @@ #pragma once -#include "core/iallocator.h" -#include "core/mt/atomic.h" -#include "core/mt/sync.h" +#include "engine/core/iallocator.h" +#include "engine/core/mt/atomic.h" +#include "engine/core/mt/sync.h" namespace Lumix diff --git a/src/engine/core/mt/osx/task.cpp b/src/engine/core/mt/osx/task.cpp index 6bfbbf2640..c1c5ef3ca4 100644 --- a/src/engine/core/mt/osx/task.cpp +++ b/src/engine/core/mt/osx/task.cpp @@ -1,4 +1,4 @@ -#include "core/lux.h" +#include "engine/core/lux.h" #include "platform/task.h" #include @@ -78,4 +78,4 @@ namespace Lux return true; } } // ~namespace MT -} // ~namespace Lux \ No newline at end of file +} // ~namespace Lux diff --git a/src/engine/core/mt/pc/atomic.cpp b/src/engine/core/mt/pc/atomic.cpp index d9bd45a365..abe279659f 100644 --- a/src/engine/core/mt/pc/atomic.cpp +++ b/src/engine/core/mt/pc/atomic.cpp @@ -1,4 +1,4 @@ -#include "core/mt/atomic.h" +#include "engine/core/mt/atomic.h" #include diff --git a/src/engine/core/mt/pc/sync.cpp b/src/engine/core/mt/pc/sync.cpp index c2207d534a..3095414a65 100644 --- a/src/engine/core/mt/pc/sync.cpp +++ b/src/engine/core/mt/pc/sync.cpp @@ -1,7 +1,7 @@ -#include "core/mt/sync.h" -#include "core/mt/atomic.h" -#include "core/mt/thread.h" -#include "core/pc/simple_win.h" +#include "engine/core/mt/sync.h" +#include "engine/core/mt/atomic.h" +#include "engine/core/mt/thread.h" +#include "engine/core/pc/simple_win.h" diff --git a/src/engine/core/mt/pc/task.cpp b/src/engine/core/mt/pc/task.cpp index be42f773b0..521038edc3 100644 --- a/src/engine/core/mt/pc/task.cpp +++ b/src/engine/core/mt/pc/task.cpp @@ -1,9 +1,9 @@ #include "lumix.h" -#include "core/iallocator.h" -#include "core/mt/task.h" -#include "core/mt/thread.h" -#include "core/pc/simple_win.h" -#include "core/profiler.h" +#include "engine/core/iallocator.h" +#include "engine/core/mt/task.h" +#include "engine/core/mt/thread.h" +#include "engine/core/pc/simple_win.h" +#include "engine/core/profiler.h" diff --git a/src/engine/core/mt/pc/thread.cpp b/src/engine/core/mt/pc/thread.cpp index 9f5440207c..f46ea43fca 100644 --- a/src/engine/core/mt/pc/thread.cpp +++ b/src/engine/core/mt/pc/thread.cpp @@ -1,6 +1,6 @@ #include "lumix.h" -#include "core/mt/thread.h" -#include "core/pc/simple_win.h" +#include "engine/core/mt/thread.h" +#include "engine/core/pc/simple_win.h" namespace Lumix @@ -59,4 +59,4 @@ namespace Lumix } } } //!namespace MT -} //!namespace Lumix \ No newline at end of file +} //!namespace Lumix diff --git a/src/engine/core/mt/transaction.h b/src/engine/core/mt/transaction.h index 0bcb3030d9..3698e7e0bb 100644 --- a/src/engine/core/mt/transaction.h +++ b/src/engine/core/mt/transaction.h @@ -1,6 +1,6 @@ #pragma once -#include "core/mt/sync.h" +#include "engine/core/mt/sync.h" namespace Lumix diff --git a/src/engine/core/mtjd/base_entry.cpp b/src/engine/core/mtjd/base_entry.cpp index 591fc5148b..50bc18a354 100644 --- a/src/engine/core/mtjd/base_entry.cpp +++ b/src/engine/core/mtjd/base_entry.cpp @@ -1,7 +1,7 @@ #include "lumix.h" -#include "core/mtjd/base_entry.h" +#include "engine/core/mtjd/base_entry.h" -#include "core/mtjd/manager.h" +#include "engine/core/mtjd/manager.h" namespace Lumix { @@ -72,4 +72,4 @@ namespace Lumix #endif // TYPE == MULTI_THREAD } } // namepsace MTJD -} // namepsace Lumix \ No newline at end of file +} // namepsace Lumix diff --git a/src/engine/core/mtjd/base_entry.h b/src/engine/core/mtjd/base_entry.h index 8d26be14a3..042d81c61b 100644 --- a/src/engine/core/mtjd/base_entry.h +++ b/src/engine/core/mtjd/base_entry.h @@ -1,7 +1,7 @@ #pragma once -#include "core/Array.h" +#include "engine/core/Array.h" namespace Lumix diff --git a/src/engine/core/mtjd/group.cpp b/src/engine/core/mtjd/group.cpp index f2d79b07ae..c3ca9e9486 100644 --- a/src/engine/core/mtjd/group.cpp +++ b/src/engine/core/mtjd/group.cpp @@ -1,7 +1,7 @@ #include "lumix.h" -#include "core/mtjd/group.h" -#include "core/mt/atomic.h" -#include "core/mt/sync.h" +#include "engine/core/mtjd/group.h" +#include "engine/core/mt/atomic.h" +#include "engine/core/mt/sync.h" namespace Lumix { diff --git a/src/engine/core/mtjd/group.h b/src/engine/core/mtjd/group.h index 75eea63360..b4ab83d784 100644 --- a/src/engine/core/mtjd/group.h +++ b/src/engine/core/mtjd/group.h @@ -1,6 +1,6 @@ #pragma once -#include "core/mtjd/base_entry.h" +#include "engine/core/mtjd/base_entry.h" namespace Lumix { diff --git a/src/engine/core/mtjd/job.cpp b/src/engine/core/mtjd/job.cpp index 9c53c5c07b..6182603662 100644 --- a/src/engine/core/mtjd/job.cpp +++ b/src/engine/core/mtjd/job.cpp @@ -1,7 +1,7 @@ #include "lumix.h" -#include "core/mtjd/job.h" +#include "engine/core/mtjd/job.h" -#include "core/mtjd/manager.h" +#include "engine/core/mtjd/manager.h" namespace Lumix { diff --git a/src/engine/core/mtjd/job.h b/src/engine/core/mtjd/job.h index 695e3c869b..2575e509eb 100644 --- a/src/engine/core/mtjd/job.h +++ b/src/engine/core/mtjd/job.h @@ -1,7 +1,7 @@ #pragma once -#include "core/mtjd/enums.h" -#include "core/mtjd/group.h" +#include "engine/core/mtjd/enums.h" +#include "engine/core/mtjd/group.h" namespace Lumix { diff --git a/src/engine/core/mtjd/manager.cpp b/src/engine/core/mtjd/manager.cpp index ca15a2c261..96a75ba881 100644 --- a/src/engine/core/mtjd/manager.cpp +++ b/src/engine/core/mtjd/manager.cpp @@ -1,11 +1,11 @@ #include "lumix.h" -#include "core/mtjd/manager.h" +#include "engine/core/mtjd/manager.h" -#include "core/mtjd/job.h" -#include "core/mtjd/scheduler.h" -#include "core/mtjd/worker_thread.h" +#include "engine/core/mtjd/job.h" +#include "engine/core/mtjd/scheduler.h" +#include "engine/core/mtjd/worker_thread.h" -#include "core/mt/thread.h" +#include "engine/core/mt/thread.h" namespace Lumix { diff --git a/src/engine/core/mtjd/manager.h b/src/engine/core/mtjd/manager.h index 06c99088c8..9b35ad32c5 100644 --- a/src/engine/core/mtjd/manager.h +++ b/src/engine/core/mtjd/manager.h @@ -6,8 +6,8 @@ #define TYPE MULTI_THREAD -#include "core/mt/lock_free_fixed_queue.h" -#include "core/mt/transaction.h" +#include "engine/core/mt/lock_free_fixed_queue.h" +#include "engine/core/mt/transaction.h" namespace Lumix diff --git a/src/engine/core/mtjd/scheduler.cpp b/src/engine/core/mtjd/scheduler.cpp index d524bed36b..d4d6318e96 100644 --- a/src/engine/core/mtjd/scheduler.cpp +++ b/src/engine/core/mtjd/scheduler.cpp @@ -1,7 +1,7 @@ #include "lumix.h" -#include "core/mtjd/scheduler.h" -#include "core/mtjd/manager.h" -#include "core/profiler.h" +#include "engine/core/mtjd/scheduler.h" +#include "engine/core/mtjd/manager.h" +#include "engine/core/profiler.h" namespace Lumix diff --git a/src/engine/core/mtjd/scheduler.h b/src/engine/core/mtjd/scheduler.h index 78b8944ddf..84b15a0acb 100644 --- a/src/engine/core/mtjd/scheduler.h +++ b/src/engine/core/mtjd/scheduler.h @@ -1,7 +1,7 @@ #pragma once -#include "core/mt/Task.h" -#include "core/mt/sync.h" +#include "engine/core/mt/Task.h" +#include "engine/core/mt/sync.h" namespace Lumix { diff --git a/src/engine/core/mtjd/worker_thread.cpp b/src/engine/core/mtjd/worker_thread.cpp index eff5d3bd0d..3094caa04f 100644 --- a/src/engine/core/mtjd/worker_thread.cpp +++ b/src/engine/core/mtjd/worker_thread.cpp @@ -1,8 +1,8 @@ #include "lumix.h" -#include "core/mtjd/worker_thread.h" +#include "engine/core/mtjd/worker_thread.h" -#include "core/mtjd/manager.h" -#include "core/mtjd/job.h" +#include "engine/core/mtjd/manager.h" +#include "engine/core/mtjd/job.h" #define PROFILE_START #define PROFILE_STOP diff --git a/src/engine/core/mtjd/worker_thread.h b/src/engine/core/mtjd/worker_thread.h index b5e578d771..7304c458c3 100644 --- a/src/engine/core/mtjd/worker_thread.h +++ b/src/engine/core/mtjd/worker_thread.h @@ -1,10 +1,10 @@ #pragma once -#include "core/mt/task.h" -#include "core/mt/lock_free_fixed_queue.h" +#include "engine/core/mt/task.h" +#include "engine/core/mt/lock_free_fixed_queue.h" -#include "core/mtjd/manager.h" +#include "engine/core/mtjd/manager.h" namespace Lumix { diff --git a/src/engine/core/osx/input_system.cpp b/src/engine/core/osx/input_system.cpp index 134eb862cf..294475d50f 100644 --- a/src/engine/core/osx/input_system.cpp +++ b/src/engine/core/osx/input_system.cpp @@ -1,6 +1,6 @@ #include "input_system.h" -#include "core/map.h" -#include "core/string.h" +#include "engine/core/map.h" +#include "engine/core/string.h" namespace Lux @@ -89,4 +89,4 @@ namespace Lux } -} // ~ namespace Lux \ No newline at end of file +} // ~ namespace Lux diff --git a/src/engine/core/osx/socket.cpp b/src/engine/core/osx/socket.cpp index c02b99cf0d..8bc74bdcc5 100644 --- a/src/engine/core/osx/socket.cpp +++ b/src/engine/core/osx/socket.cpp @@ -1,4 +1,4 @@ -#include "core/lux.h" +#include "engine/core/lux.h" #include "socket.h" @@ -59,4 +59,4 @@ bool Socket::receiveAllBytes(void* data, int size) } -#endif // DISABLE_NETWORK \ No newline at end of file +#endif // DISABLE_NETWORK diff --git a/src/engine/core/path.cpp b/src/engine/core/path.cpp index 7cd7cee0b5..5900d90491 100644 --- a/src/engine/core/path.cpp +++ b/src/engine/core/path.cpp @@ -1,11 +1,11 @@ #include "lumix.h" -#include "core/path.h" +#include "engine/core/path.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/mt/sync.h" -#include "core/path_utils.h" -#include "core/string.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/mt/sync.h" +#include "engine/core/path_utils.h" +#include "engine/core/string.h" namespace Lumix @@ -196,4 +196,4 @@ namespace Lumix } -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/core/path.h b/src/engine/core/path.h index e7ba37a429..ca985dc3fe 100644 --- a/src/engine/core/path.h +++ b/src/engine/core/path.h @@ -1,7 +1,7 @@ #pragma once -#include "core/associative_array.h" -#include "core/mt/sync.h" +#include "engine/core/associative_array.h" +#include "engine/core/mt/sync.h" namespace Lumix @@ -77,4 +77,4 @@ class LUMIX_ENGINE_API Path }; -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/core/path_utils.cpp b/src/engine/core/path_utils.cpp index 27ac919d25..ee52736f9e 100644 --- a/src/engine/core/path_utils.cpp +++ b/src/engine/core/path_utils.cpp @@ -1,5 +1,5 @@ #include "path_utils.h" -#include "core/string.h" +#include "engine/core/string.h" namespace Lumix @@ -121,4 +121,4 @@ bool isAbsolute(const char* path) return path[0] != '\0' && path[1] == ':'; } } -} \ No newline at end of file +} diff --git a/src/engine/core/pc/input_system.cpp b/src/engine/core/pc/input_system.cpp index a28051ec9c..934368c306 100644 --- a/src/engine/core/pc/input_system.cpp +++ b/src/engine/core/pc/input_system.cpp @@ -1,8 +1,8 @@ -#include "core/input_system.h" -#include "core/associative_array.h" -#include "core/profiler.h" -#include "core/string.h" -#include "core/vec.h" +#include "engine/core/input_system.h" +#include "engine/core/associative_array.h" +#include "engine/core/profiler.h" +#include "engine/core/string.h" +#include "engine/core/vec.h" #include #include diff --git a/src/engine/core/pc/network.cpp b/src/engine/core/pc/network.cpp index e8f2f32801..ad8479c8ba 100644 --- a/src/engine/core/pc/network.cpp +++ b/src/engine/core/pc/network.cpp @@ -1,8 +1,8 @@ -#include "core/network.h" -#include "core/iallocator.h" -#include "core/string.h" +#include "engine/core/network.h" +#include "engine/core/iallocator.h" +#include "engine/core/string.h" -#include "core/pc/simple_win.h" +#include "engine/core/pc/simple_win.h" #pragma comment(lib, "Ws2_32.lib") #pragma comment(lib, "wininet.lib") diff --git a/src/engine/core/pc/system.cpp b/src/engine/core/pc/system.cpp index ccd69f3217..78bccd395c 100644 --- a/src/engine/core/pc/system.cpp +++ b/src/engine/core/pc/system.cpp @@ -1,6 +1,6 @@ -#include "core/system.h" -#include "core/iallocator.h" -#include "core/string.h" +#include "engine/core/system.h" +#include "engine/core/iallocator.h" +#include "engine/core/string.h" #include @@ -40,4 +40,4 @@ namespace Lumix { return GetProcAddress((HMODULE)handle, name); } -} \ No newline at end of file +} diff --git a/src/engine/core/pc/timer.cpp b/src/engine/core/pc/timer.cpp index 59ab8ead72..d3b3edd46e 100644 --- a/src/engine/core/pc/timer.cpp +++ b/src/engine/core/pc/timer.cpp @@ -1,8 +1,8 @@ #include "lumix.h" -#include "core/iallocator.h" -#include "core/timer.h" +#include "engine/core/iallocator.h" +#include "engine/core/timer.h" -#include "core/pc/simple_win.h" +#include "engine/core/pc/simple_win.h" namespace Lumix { diff --git a/src/engine/core/profiler.cpp b/src/engine/core/profiler.cpp index a8084e3589..8c0939a02b 100644 --- a/src/engine/core/profiler.cpp +++ b/src/engine/core/profiler.cpp @@ -1,9 +1,9 @@ #include "profiler.h" -#include "core/hash_map.h" -#include "core/log.h" -#include "core/timer.h" -#include "core/mt/sync.h" -#include "core/mt/thread.h" +#include "engine/core/hash_map.h" +#include "engine/core/log.h" +#include "engine/core/timer.h" +#include "engine/core/mt/sync.h" +#include "engine/core/mt/thread.h" namespace Lumix diff --git a/src/engine/core/profiler.h b/src/engine/core/profiler.h index 22429230db..9c7bb74dc1 100644 --- a/src/engine/core/profiler.h +++ b/src/engine/core/profiler.h @@ -2,9 +2,9 @@ #include "lumix.h" -#include "core/delegate_list.h" -#include "core/default_allocator.h" -#include "core/hash_map.h" +#include "engine/core/delegate_list.h" +#include "engine/core/default_allocator.h" +#include "engine/core/hash_map.h" namespace Lumix diff --git a/src/engine/core/quat.cpp b/src/engine/core/quat.cpp index 39d29e376f..751bb6cc91 100644 --- a/src/engine/core/quat.cpp +++ b/src/engine/core/quat.cpp @@ -1,8 +1,8 @@ -#include "core/quat.h" +#include "engine/core/quat.h" #include -#include "core/vec.h" -#include "core/math_utils.h" -#include "core/matrix.h" +#include "engine/core/vec.h" +#include "engine/core/math_utils.h" +#include "engine/core/matrix.h" namespace Lumix diff --git a/src/engine/core/quat.h b/src/engine/core/quat.h index 7fbda7d621..33caea3a3f 100644 --- a/src/engine/core/quat.h +++ b/src/engine/core/quat.h @@ -2,7 +2,7 @@ #include "lumix.h" -#include "core/vec.h" +#include "engine/core/vec.h" namespace Lumix diff --git a/src/engine/core/queue.h b/src/engine/core/queue.h index 53d1a5f192..9773789975 100644 --- a/src/engine/core/queue.h +++ b/src/engine/core/queue.h @@ -1,6 +1,6 @@ #pragma once -#include "core/math_utils.h" +#include "engine/core/math_utils.h" namespace Lumix diff --git a/src/engine/core/resource.cpp b/src/engine/core/resource.cpp index 8e4cc151c0..05a2d2026f 100644 --- a/src/engine/core/resource.cpp +++ b/src/engine/core/resource.cpp @@ -1,9 +1,9 @@ #include "lumix.h" -#include "core/resource.h" -#include "core/fs/file_system.h" -#include "core/log.h" -#include "core/path.h" -#include "core/resource_manager.h" +#include "engine/core/resource.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/log.h" +#include "engine/core/path.h" +#include "engine/core/resource_manager.h" namespace Lumix { diff --git a/src/engine/core/resource.h b/src/engine/core/resource.h index 71865848b3..75b63c069f 100644 --- a/src/engine/core/resource.h +++ b/src/engine/core/resource.h @@ -1,9 +1,9 @@ #pragma once -#include "core/fs/file_system.h" -#include "core/delegate_list.h" -#include "core/path.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/delegate_list.h" +#include "engine/core/path.h" namespace Lumix diff --git a/src/engine/core/resource_manager.cpp b/src/engine/core/resource_manager.cpp index c70943374a..d88b0b195e 100644 --- a/src/engine/core/resource_manager.cpp +++ b/src/engine/core/resource_manager.cpp @@ -1,7 +1,7 @@ #include "lumix.h" -#include "core/path.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/path.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" namespace Lumix { @@ -54,4 +54,4 @@ namespace Lumix iter.value()->reload(Path(path)); } } -} \ No newline at end of file +} diff --git a/src/engine/core/resource_manager.h b/src/engine/core/resource_manager.h index fe6576dc24..7be61c66a2 100644 --- a/src/engine/core/resource_manager.h +++ b/src/engine/core/resource_manager.h @@ -1,7 +1,7 @@ #pragma once -#include "core/hash_map.h" +#include "engine/core/hash_map.h" namespace Lumix @@ -59,4 +59,4 @@ class LUMIX_ENGINE_API ResourceManager final }; -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/core/resource_manager_base.cpp b/src/engine/core/resource_manager_base.cpp index 5017e8c8d5..ea8c7e4097 100644 --- a/src/engine/core/resource_manager_base.cpp +++ b/src/engine/core/resource_manager_base.cpp @@ -1,11 +1,11 @@ #include "lumix.h" -#include "core/resource_manager_base.h" +#include "engine/core/resource_manager_base.h" -#include "core/crc32.h" -#include "core/path.h" -#include "core/path_utils.h" -#include "core/resource.h" -#include "core/resource_manager.h" +#include "engine/core/crc32.h" +#include "engine/core/path.h" +#include "engine/core/path_utils.h" +#include "engine/core/resource.h" +#include "engine/core/resource_manager.h" namespace Lumix { @@ -153,4 +153,4 @@ namespace Lumix { ASSERT(m_resources.empty()); } -} \ No newline at end of file +} diff --git a/src/engine/core/resource_manager_base.h b/src/engine/core/resource_manager_base.h index 8c7be153e3..442d521ab2 100644 --- a/src/engine/core/resource_manager_base.h +++ b/src/engine/core/resource_manager_base.h @@ -1,7 +1,7 @@ #pragma once -#include "core/hash_map.h" +#include "engine/core/hash_map.h" namespace Lumix @@ -62,4 +62,4 @@ class LUMIX_ENGINE_API ResourceManagerBase }; -} \ No newline at end of file +} diff --git a/src/engine/core/string.h b/src/engine/core/string.h index fc7ae96ed0..159537ff04 100644 --- a/src/engine/core/string.h +++ b/src/engine/core/string.h @@ -2,7 +2,7 @@ #include "lumix.h" -#include "core/default_allocator.h" +#include "engine/core/default_allocator.h" namespace Lumix diff --git a/src/engine/debug/debug.h b/src/engine/debug/debug.h index 4c58717a93..ca877bc4fd 100644 --- a/src/engine/debug/debug.h +++ b/src/engine/debug/debug.h @@ -2,8 +2,8 @@ #include "lumix.h" -#include "core/iallocator.h" -#include "core/mt/sync.h" +#include "engine/core/iallocator.h" +#include "engine/core/mt/sync.h" namespace Lumix @@ -99,4 +99,4 @@ void LUMIX_ENGINE_API enableCrashReporting(bool enable); void LUMIX_ENGINE_API installUnhandledExceptionHandler(); -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/debug/pc/debug.cpp b/src/engine/debug/pc/debug.cpp index 1a9831ef01..baf99022f8 100644 --- a/src/engine/debug/pc/debug.cpp +++ b/src/engine/debug/pc/debug.cpp @@ -1,7 +1,7 @@ #include "debug/debug.h" -#include "core/mt/atomic.h" -#include "core/string.h" -#include "core/system.h" +#include "engine/core/mt/atomic.h" +#include "engine/core/string.h" +#include "engine/core/system.h" #include #include #include @@ -699,4 +699,4 @@ void installUnhandledExceptionHandler() } -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index 047c450049..bbebae0cf0 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -1,26 +1,26 @@ #include "engine.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/fs/os_file.h" -#include "core/input_system.h" -#include "core/log.h" -#include "core/lua_wrapper.h" -#include "core/math_utils.h" -#include "core/path.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/timer.h" -#include "core/fs/disk_file_device.h" -#include "core/fs/file_system.h" -#include "core/fs/memory_file_device.h" -#include "core/mtjd/manager.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/input_system.h" +#include "engine/core/log.h" +#include "engine/core/lua_wrapper.h" +#include "engine/core/math_utils.h" +#include "engine/core/path.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/timer.h" +#include "engine/core/fs/disk_file_device.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/memory_file_device.h" +#include "engine/core/mtjd/manager.h" #include "debug/debug.h" #include "engine/iplugin.h" #include "engine/property_descriptor.h" #include "engine/property_register.h" #include "plugin_manager.h" -#include "universe/hierarchy.h" -#include "universe/universe.h" +#include "engine/universe/hierarchy.h" +#include "engine/universe/universe.h" namespace Lumix diff --git a/src/engine/iplugin.cpp b/src/engine/iplugin.cpp index b09fff5c4e..cd7a08b090 100644 --- a/src/engine/iplugin.cpp +++ b/src/engine/iplugin.cpp @@ -1,5 +1,5 @@ #include "iplugin.h" -#include "core/string.h" +#include "engine/core/string.h" namespace Lumix @@ -33,4 +33,4 @@ namespace Lumix } return nullptr; } -} \ No newline at end of file +} diff --git a/src/engine/iproperty_descriptor.h b/src/engine/iproperty_descriptor.h index 54162a1502..a8e996a0cb 100644 --- a/src/engine/iproperty_descriptor.h +++ b/src/engine/iproperty_descriptor.h @@ -1,8 +1,8 @@ #pragma once -#include "core/array.h" -#include "universe/universe.h" +#include "engine/core/array.h" +#include "engine/universe/universe.h" namespace Lumix @@ -132,4 +132,4 @@ class IArrayDescriptor : public IPropertyDescriptor }; -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/plugin_manager.cpp b/src/engine/plugin_manager.cpp index 62d8a07756..056ba3fa2d 100644 --- a/src/engine/plugin_manager.cpp +++ b/src/engine/plugin_manager.cpp @@ -1,8 +1,8 @@ #include "plugin_manager.h" -#include "core/array.h" -#include "core/log.h" -#include "core/profiler.h" -#include "core/system.h" +#include "engine/core/array.h" +#include "engine/core/log.h" +#include "engine/core/profiler.h" +#include "engine/core/system.h" #include "debug/debug.h" #include "engine.h" #include "iplugin.h" diff --git a/src/engine/property_descriptor.cpp b/src/engine/property_descriptor.cpp index 8032ae76b9..6f58d1ba9d 100644 --- a/src/engine/property_descriptor.cpp +++ b/src/engine/property_descriptor.cpp @@ -1,5 +1,5 @@ #include "property_descriptor.h" -#include "core/crc32.h" +#include "engine/core/crc32.h" #include #include @@ -37,4 +37,4 @@ IDecimalPropertyDescriptor::IDecimalPropertyDescriptor(IAllocator& allocator) -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/property_descriptor.h b/src/engine/property_descriptor.h index 017b6137ea..d87171c65e 100644 --- a/src/engine/property_descriptor.h +++ b/src/engine/property_descriptor.h @@ -1,11 +1,11 @@ #pragma once -#include "core/blob.h" -#include "core/path.h" -#include "core/string.h" +#include "engine/core/blob.h" +#include "engine/core/path.h" +#include "engine/core/string.h" #include "iplugin.h" #include "iproperty_descriptor.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" namespace Lumix diff --git a/src/engine/property_register.cpp b/src/engine/property_register.cpp index e2b1fb41c6..e4a9bf7f59 100644 --- a/src/engine/property_register.cpp +++ b/src/engine/property_register.cpp @@ -1,6 +1,6 @@ #include "property_register.h" -#include "core/associative_array.h" -#include "core/crc32.h" +#include "engine/core/associative_array.h" +#include "engine/core/crc32.h" #include "engine/iproperty_descriptor.h" diff --git a/src/engine/universe/component.cpp b/src/engine/universe/component.cpp index 695c7060ba..317bd320a0 100644 --- a/src/engine/universe/component.cpp +++ b/src/engine/universe/component.cpp @@ -1,4 +1,4 @@ -#include "universe/component.h" +#include "engine/universe/component.h" const Lumix::ComponentUID Lumix::ComponentUID::INVALID(Entity(-1), 0, 0, -1); diff --git a/src/engine/universe/hierarchy.cpp b/src/engine/universe/hierarchy.cpp index f9c583266c..4cd3acafdd 100644 --- a/src/engine/universe/hierarchy.cpp +++ b/src/engine/universe/hierarchy.cpp @@ -1,8 +1,8 @@ #include "hierarchy.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/hash_map.h" -#include "core/json_serializer.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/hash_map.h" +#include "engine/core/json_serializer.h" #include "engine/engine.h" #include "universe.h" @@ -354,4 +354,4 @@ void Hierarchy::destroy(Hierarchy* hierarchy) } -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/universe/hierarchy.h b/src/engine/universe/hierarchy.h index 9a4c55704e..085857f4eb 100644 --- a/src/engine/universe/hierarchy.h +++ b/src/engine/universe/hierarchy.h @@ -2,8 +2,8 @@ #include "lumix.h" -#include "core/matrix.h" -#include "core/hash_map.h" +#include "engine/core/matrix.h" +#include "engine/core/hash_map.h" #include "engine/iplugin.h" @@ -63,4 +63,4 @@ namespace Lumix }; -} // namespace Lumix \ No newline at end of file +} // namespace Lumix diff --git a/src/engine/universe/universe.cpp b/src/engine/universe/universe.cpp index 12d165a613..2dbde9010e 100644 --- a/src/engine/universe/universe.cpp +++ b/src/engine/universe/universe.cpp @@ -1,8 +1,8 @@ #include "universe.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/matrix.h" -#include "core/json_serializer.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/matrix.h" +#include "engine/core/json_serializer.h" #include "engine/iplugin.h" #include diff --git a/src/engine/universe/universe.h b/src/engine/universe/universe.h index bf4c051c9a..63b4d3bb0a 100644 --- a/src/engine/universe/universe.h +++ b/src/engine/universe/universe.h @@ -2,13 +2,13 @@ #include "lumix.h" -#include "core/array.h" -#include "core/associative_array.h" -#include "core/delegate_list.h" -#include "core/quat.h" -#include "core/string.h" -#include "core/vec.h" -#include "universe/component.h" +#include "engine/core/array.h" +#include "engine/core/associative_array.h" +#include "engine/core/delegate_list.h" +#include "engine/core/quat.h" +#include "engine/core/string.h" +#include "engine/core/vec.h" +#include "engine/universe/component.h" namespace Lumix From 88a871b4f1e9620ef51543ecbc0344e7ac615dae Mon Sep 17 00:00:00 2001 From: Maxim Kolganov Date: Fri, 22 Apr 2016 19:31:59 +0300 Subject: [PATCH 2/6] change includes to "engine/core" directory --- src/animation/animation.cpp | 14 +++--- src/animation/animation.h | 4 +- src/animation/animation_system.cpp | 12 ++--- src/app/main.cpp | 36 +++++++-------- src/audio/audio_scene.cpp | 14 +++--- src/audio/audio_system.cpp | 6 +-- src/audio/clip_manager.cpp | 6 +-- src/audio/clip_manager.h | 6 +-- src/audio/pc/audio_device.cpp | 2 +- src/editor/asset_browser.cpp | 18 ++++---- src/editor/asset_browser.h | 8 ++-- src/editor/editor_icon.cpp | 10 ++--- src/editor/editor_icon.h | 2 +- src/editor/entity_groups.cpp | 4 +- src/editor/entity_groups.h | 2 +- src/editor/entity_template_system.cpp | 12 ++--- src/editor/entity_template_system.h | 4 +- src/editor/file_system_watcher.h | 4 +- src/editor/gizmo.cpp | 12 ++--- src/editor/imgui/imgui_dock.inl | 2 +- src/editor/import_asset_dialog.cpp | 20 ++++----- src/editor/import_asset_dialog.h | 10 ++--- src/editor/log_ui.cpp | 2 +- src/editor/log_ui.h | 6 +-- src/editor/measure_tool.h | 2 +- src/editor/metadata.cpp | 2 +- src/editor/metadata.h | 4 +- src/editor/pc/file_system_watcher.cpp | 8 ++-- src/editor/platform_interface.cpp | 4 +- src/editor/profiler_ui.cpp | 24 +++++----- src/editor/property_grid.cpp | 8 ++-- src/editor/property_grid.h | 2 +- src/editor/render_interface.h | 8 ++-- src/editor/settings.cpp | 4 +- src/editor/studio_app.cpp | 32 +++++++------- src/editor/studio_app.h | 2 +- src/editor/utils.cpp | 8 ++-- src/editor/utils.h | 4 +- src/editor/world_editor.cpp | 44 +++++++++---------- src/editor/world_editor.h | 4 +- src/lua_script/lua_script_manager.cpp | 6 +-- src/lua_script/lua_script_manager.h | 8 ++-- src/lua_script/lua_script_system.cpp | 24 +++++----- src/lua_script/lua_script_system.h | 4 +- src/navigation/navigation_system.cpp | 18 ++++---- src/physics/physics_geometry_manager.cpp | 8 ++-- src/physics/physics_geometry_manager.h | 4 +- src/physics/physics_scene.cpp | 22 +++++----- src/physics/physics_scene.h | 6 +-- src/physics/physics_system.cpp | 8 ++-- src/renderer/culling_system.cpp | 16 +++---- src/renderer/editor/game_view.cpp | 8 ++-- src/renderer/editor/main.cpp | 20 ++++----- src/renderer/editor/scene_view.cpp | 12 ++--- src/renderer/editor/shader_compiler.cpp | 22 +++++----- src/renderer/editor/shader_compiler.h | 6 +-- src/renderer/editor/shader_editor.cpp | 14 +++--- src/renderer/editor/shader_editor.h | 4 +- src/renderer/editor/terrain_editor.cpp | 14 +++--- src/renderer/editor/terrain_editor.h | 4 +- src/renderer/frame_buffer.cpp | 8 ++-- src/renderer/frame_buffer.h | 2 +- src/renderer/material.cpp | 16 +++---- src/renderer/material.h | 6 +-- src/renderer/material_manager.cpp | 2 +- src/renderer/material_manager.h | 2 +- src/renderer/model.cpp | 18 ++++---- src/renderer/model.h | 16 +++---- src/renderer/model_generator.cpp | 4 +- src/renderer/model_manager.cpp | 2 +- src/renderer/model_manager.h | 2 +- src/renderer/particle_system.cpp | 12 ++--- src/renderer/particle_system.h | 4 +- src/renderer/pipeline.cpp | 16 +++---- src/renderer/pipeline.h | 2 +- src/renderer/pose.cpp | 8 ++-- src/renderer/render_scene.cpp | 34 +++++++------- src/renderer/render_scene.h | 2 +- src/renderer/renderer.cpp | 14 +++--- src/renderer/shader.cpp | 14 +++--- src/renderer/shader.h | 4 +- src/renderer/shader_manager.cpp | 2 +- src/renderer/shader_manager.h | 2 +- src/renderer/terrain.cpp | 20 ++++----- src/renderer/terrain.h | 8 ++-- src/renderer/texture.cpp | 14 +++--- src/renderer/texture.h | 2 +- src/renderer/texture_manager.cpp | 2 +- src/renderer/texture_manager.h | 2 +- src/script/script_system.cpp | 16 +++---- src/script/script_system.h | 4 +- src/studio/main.cpp | 2 +- src/unit_tests/core/ut_aabb.cpp | 2 +- src/unit_tests/core/ut_array.cpp | 2 +- src/unit_tests/core/ut_associative_array.cpp | 2 +- src/unit_tests/core/ut_binary_array.cpp | 2 +- src/unit_tests/core/ut_blob.cpp | 4 +- .../core/ut_command_line_parser.cpp | 2 +- src/unit_tests/core/ut_crc32.cpp | 2 +- src/unit_tests/core/ut_delegate.cpp | 2 +- src/unit_tests/core/ut_file_system.cpp | 8 ++-- .../core/ut_fixed_lock_free_queue.cpp | 6 +-- src/unit_tests/core/ut_hash_map.cpp | 4 +- src/unit_tests/core/ut_json_serializer.cpp | 8 ++-- src/unit_tests/core/ut_math_utils.cpp | 2 +- src/unit_tests/core/ut_matrix.cpp | 4 +- src/unit_tests/core/ut_mtjd_framework.cpp | 4 +- src/unit_tests/core/ut_path.cpp | 6 +-- src/unit_tests/core/ut_quat.cpp | 6 +-- src/unit_tests/core/ut_string.cpp | 2 +- src/unit_tests/core/ut_transaction_queue.cpp | 8 ++-- src/unit_tests/core/ut_vec3.cpp | 2 +- src/unit_tests/graphics/ut_clipper.cpp | 8 ++-- src/unit_tests/graphics/ut_texture.cpp | 4 +- src/unit_tests/suite/lumix_unit_tests.h | 4 +- src/unit_tests/suite/unit_test.h | 4 +- src/unit_tests/suite/unit_test_app.cpp | 4 +- src/unit_tests/suite/unit_test_manager.cpp | 14 +++--- 118 files changed, 491 insertions(+), 491 deletions(-) diff --git a/src/animation/animation.cpp b/src/animation/animation.cpp index d78f238b23..406a958977 100644 --- a/src/animation/animation.cpp +++ b/src/animation/animation.cpp @@ -1,11 +1,11 @@ #include "animation/animation.h" -#include "core/fs/file_system.h" -#include "core/log.h" -#include "core/matrix.h" -#include "core/profiler.h" -#include "core/quat.h" -#include "core/resource_manager.h" -#include "core/vec.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/log.h" +#include "engine/core/matrix.h" +#include "engine/core/profiler.h" +#include "engine/core/quat.h" +#include "engine/core/resource_manager.h" +#include "engine/core/vec.h" #include "renderer/model.h" #include "renderer/pose.h" diff --git a/src/animation/animation.h b/src/animation/animation.h index 5f0a2b66f8..74363436f9 100644 --- a/src/animation/animation.h +++ b/src/animation/animation.h @@ -1,7 +1,7 @@ #pragma once -#include "core/resource.h" -#include "core/resource_manager_base.h" +#include "engine/core/resource.h" +#include "engine/core/resource_manager_base.h" namespace Lumix { diff --git a/src/animation/animation_system.cpp b/src/animation/animation_system.cpp index 636dc8e8c3..8c7b10bdad 100644 --- a/src/animation/animation_system.cpp +++ b/src/animation/animation_system.cpp @@ -1,11 +1,11 @@ #include "animation_system.h" #include "animation/animation.h" -#include "core/base_proxy_allocator.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/json_serializer.h" -#include "core/profiler.h" -#include "core/resource_manager.h" +#include "engine/core/base_proxy_allocator.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/json_serializer.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" #include "editor/asset_browser.h" #include "editor/imgui/imgui.h" #include "editor/property_grid.h" diff --git a/src/app/main.cpp b/src/app/main.cpp index 12e23086ed..d916b21fe5 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -1,21 +1,21 @@ -#include "core/blob.h" -#include "core/command_line_parser.h" -#include "core/crc32.h" -#include "core/fs/disk_file_device.h" -#include "core/fs/file_system.h" -#include "core/fs/file_system.h" -#include "core/fs/memory_file_device.h" -#include "core/fs/pack_file_device.h" -#include "core/input_system.h" -#include "core/log.h" -#include "core/lua_wrapper.h" -#include "core/mt/thread.h" -#include "core/path_utils.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" -#include "core/system.h" -#include "core/timer.h" +#include "engine/core/blob.h" +#include "engine/core/command_line_parser.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/disk_file_device.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/memory_file_device.h" +#include "engine/core/fs/pack_file_device.h" +#include "engine/core/input_system.h" +#include "engine/core/log.h" +#include "engine/core/lua_wrapper.h" +#include "engine/core/mt/thread.h" +#include "engine/core/path_utils.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" +#include "engine/core/system.h" +#include "engine/core/timer.h" #include "debug/debug.h" #include "editor/gizmo.h" #include "editor/world_editor.h" diff --git a/src/audio/audio_scene.cpp b/src/audio/audio_scene.cpp index e40a32f45d..87646c0f03 100644 --- a/src/audio/audio_scene.cpp +++ b/src/audio/audio_scene.cpp @@ -2,13 +2,13 @@ #include "audio_device.h" #include "audio_system.h" #include "clip_manager.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/iallocator.h" -#include "core/lua_wrapper.h" -#include "core/matrix.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/iallocator.h" +#include "engine/core/lua_wrapper.h" +#include "engine/core/matrix.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" #include "editor/world_editor.h" #include "engine/engine.h" #include "lua_script/lua_script_system.h" diff --git a/src/audio/audio_system.cpp b/src/audio/audio_system.cpp index 33a44a9641..beb6bfa781 100644 --- a/src/audio/audio_system.cpp +++ b/src/audio/audio_system.cpp @@ -2,9 +2,9 @@ #include "audio_device.h" #include "audio_scene.h" #include "clip_manager.h" -#include "core/crc32.h" -#include "core/path.h" -#include "core/resource_manager.h" +#include "engine/core/crc32.h" +#include "engine/core/path.h" +#include "engine/core/resource_manager.h" #include "editor/asset_browser.h" #include "editor/imgui/imgui.h" #include "editor/studio_app.h" diff --git a/src/audio/clip_manager.cpp b/src/audio/clip_manager.cpp index b608412a6a..933b3c596f 100644 --- a/src/audio/clip_manager.cpp +++ b/src/audio/clip_manager.cpp @@ -1,7 +1,7 @@ #include "clip_manager.h" -#include "core/iallocator.h" -#include "core/resource.h" -#include "core/string.h" +#include "engine/core/iallocator.h" +#include "engine/core/resource.h" +#include "engine/core/string.h" #include "lumix.h" #define STB_VORBIS_HEADER_ONLY #include "stb_vorbis.c" diff --git a/src/audio/clip_manager.h b/src/audio/clip_manager.h index 92eadd3923..f1cac0dc94 100644 --- a/src/audio/clip_manager.h +++ b/src/audio/clip_manager.h @@ -1,9 +1,9 @@ #pragma once -#include "core/array.h" -#include "core/resource.h" -#include "core/resource_manager_base.h" +#include "engine/core/array.h" +#include "engine/core/resource.h" +#include "engine/core/resource_manager_base.h" namespace Lumix diff --git a/src/audio/pc/audio_device.cpp b/src/audio/pc/audio_device.cpp index a805152af5..47db6e54be 100644 --- a/src/audio/pc/audio_device.cpp +++ b/src/audio/pc/audio_device.cpp @@ -1,6 +1,6 @@ #include "audio_device.h" #include "clip_manager.h" -#include "core/log.h" +#include "engine/core/log.h" #include "engine/engine.h" #include "engine/iplugin.h" #include diff --git a/src/editor/asset_browser.cpp b/src/editor/asset_browser.cpp index 0c9d95e872..98dbf67203 100644 --- a/src/editor/asset_browser.cpp +++ b/src/editor/asset_browser.cpp @@ -1,13 +1,13 @@ #include "asset_browser.h" -#include "core/crc32.h" -#include "core/fs/disk_file_device.h" -#include "core/log.h" -#include "core/path_utils.h" -#include "core/profiler.h" -#include "core/resource.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" -#include "core/string.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/disk_file_device.h" +#include "engine/core/log.h" +#include "engine/core/path_utils.h" +#include "engine/core/profiler.h" +#include "engine/core/resource.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" +#include "engine/core/string.h" #include "editor/world_editor.h" #include "engine/engine.h" #include "file_system_watcher.h" diff --git a/src/editor/asset_browser.h b/src/editor/asset_browser.h index 499864c502..958d154553 100644 --- a/src/editor/asset_browser.h +++ b/src/editor/asset_browser.h @@ -1,10 +1,10 @@ #pragma once -#include "core/array.h" -#include "core/delegate_list.h" -#include "core/path.h" -#include "core/mt/sync.h" +#include "engine/core/array.h" +#include "engine/core/delegate_list.h" +#include "engine/core/path.h" +#include "engine/core/mt/sync.h" namespace Lumix diff --git a/src/editor/editor_icon.cpp b/src/editor/editor_icon.cpp index c6f0718509..17c35a4370 100644 --- a/src/editor/editor_icon.cpp +++ b/src/editor/editor_icon.cpp @@ -1,9 +1,9 @@ #include "editor_icon.h" -#include "core/crc32.h" -#include "core/math_utils.h" -#include "core/matrix.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/crc32.h" +#include "engine/core/math_utils.h" +#include "engine/core/matrix.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" #include "engine.h" #include "render_interface.h" #include "universe/universe.h" diff --git a/src/editor/editor_icon.h b/src/editor/editor_icon.h index b3e02729fe..7081539f8e 100644 --- a/src/editor/editor_icon.h +++ b/src/editor/editor_icon.h @@ -1,7 +1,7 @@ #pragma once -#include "core/matrix.h" +#include "engine/core/matrix.h" namespace Lumix diff --git a/src/editor/entity_groups.cpp b/src/editor/entity_groups.cpp index 445769ec2f..43d4c02d8a 100644 --- a/src/editor/entity_groups.cpp +++ b/src/editor/entity_groups.cpp @@ -1,6 +1,6 @@ #include "entity_groups.h" -#include "core/blob.h" -#include "core/string.h" +#include "engine/core/blob.h" +#include "engine/core/string.h" #include "universe/universe.h" diff --git a/src/editor/entity_groups.h b/src/editor/entity_groups.h index 6c4e219c02..10e52a29e3 100644 --- a/src/editor/entity_groups.h +++ b/src/editor/entity_groups.h @@ -2,7 +2,7 @@ #include "lumix.h" -#include "core/array.h" +#include "engine/core/array.h" namespace Lumix diff --git a/src/editor/entity_template_system.cpp b/src/editor/entity_template_system.cpp index 568f38103d..6adc1303ee 100644 --- a/src/editor/entity_template_system.cpp +++ b/src/editor/entity_template_system.cpp @@ -1,10 +1,10 @@ #include "entity_template_system.h" -#include "core/array.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/json_serializer.h" -#include "core/math_utils.h" -#include "core/string.h" +#include "engine/core/array.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/json_serializer.h" +#include "engine/core/math_utils.h" +#include "engine/core/string.h" #include "editor/ieditor_command.h" #include "editor/world_editor.h" #include "engine.h" diff --git a/src/editor/entity_template_system.h b/src/editor/entity_template_system.h index c1b86bc963..22f14b2f84 100644 --- a/src/editor/entity_template_system.h +++ b/src/editor/entity_template_system.h @@ -2,8 +2,8 @@ #include "lumix.h" -#include "core/delegate_list.h" -#include "core/string.h" +#include "engine/core/delegate_list.h" +#include "engine/core/string.h" namespace Lumix diff --git a/src/editor/file_system_watcher.h b/src/editor/file_system_watcher.h index 052f865585..373c443ebc 100644 --- a/src/editor/file_system_watcher.h +++ b/src/editor/file_system_watcher.h @@ -1,7 +1,7 @@ #pragma once -#include "core/delegate.h" -#include "core/path.h" +#include "engine/core/delegate.h" +#include "engine/core/path.h" class LUMIX_EDITOR_API FileSystemWatcher diff --git a/src/editor/gizmo.cpp b/src/editor/gizmo.cpp index 37f5b08960..3486a8d41d 100644 --- a/src/editor/gizmo.cpp +++ b/src/editor/gizmo.cpp @@ -1,9 +1,9 @@ -#include "core/crc32.h" -#include "core/math_utils.h" -#include "core/matrix.h" -#include "core/quat.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/crc32.h" +#include "engine/core/math_utils.h" +#include "engine/core/matrix.h" +#include "engine/core/quat.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" #include "editor/gizmo.h" #include "editor/world_editor.h" #include "engine.h" diff --git a/src/editor/imgui/imgui_dock.inl b/src/editor/imgui/imgui_dock.inl index 25766e94e2..b7fdada137 100644 --- a/src/editor/imgui/imgui_dock.inl +++ b/src/editor/imgui/imgui_dock.inl @@ -1,7 +1,7 @@ #include "imgui.h" #define IMGUI_DEFINE_PLACEMENT_NEW #include "imgui_internal.h" -#include "core/fs/os_file.h" +#include "engine/core/fs/os_file.h" #include diff --git a/src/editor/import_asset_dialog.cpp b/src/editor/import_asset_dialog.cpp index 06f77502f5..b0e2de5a79 100644 --- a/src/editor/import_asset_dialog.cpp +++ b/src/editor/import_asset_dialog.cpp @@ -3,16 +3,16 @@ #include "assimp/ProgressHandler.hpp" #include "assimp/postprocess.h" #include "assimp/scene.h" -#include "core/crc32.h" -#include "core/fs/disk_file_device.h" -#include "core/fs/os_file.h" -#include "core/log.h" -#include "core/lua_wrapper.h" -#include "core/math_utils.h" -#include "core/mt/task.h" -#include "core/mt/thread.h" -#include "core/path_utils.h" -#include "core/system.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/disk_file_device.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/log.h" +#include "engine/core/lua_wrapper.h" +#include "engine/core/math_utils.h" +#include "engine/core/mt/task.h" +#include "engine/core/mt/thread.h" +#include "engine/core/path_utils.h" +#include "engine/core/system.h" #include "crnlib.h" #include "debug/floating_points.h" #include "editor/world_editor.h" diff --git a/src/editor/import_asset_dialog.h b/src/editor/import_asset_dialog.h index b8f06b6593..0aa8b85d2f 100644 --- a/src/editor/import_asset_dialog.h +++ b/src/editor/import_asset_dialog.h @@ -2,11 +2,11 @@ #include "assimp/Importer.hpp" -#include "core/array.h" -#include "core/associative_array.h" -#include "core/binary_array.h" -#include "core/mt/sync.h" -#include "core/string.h" +#include "engine/core/array.h" +#include "engine/core/associative_array.h" +#include "engine/core/binary_array.h" +#include "engine/core/mt/sync.h" +#include "engine/core/string.h" #include "lumix.h" diff --git a/src/editor/log_ui.cpp b/src/editor/log_ui.cpp index 7eb60d326a..c05cbdf2ee 100644 --- a/src/editor/log_ui.cpp +++ b/src/editor/log_ui.cpp @@ -1,5 +1,5 @@ #include "log_ui.h" -#include "core/log.h" +#include "engine/core/log.h" #include "imgui/imgui.h" diff --git a/src/editor/log_ui.h b/src/editor/log_ui.h index c1274fe28c..52203bd379 100644 --- a/src/editor/log_ui.h +++ b/src/editor/log_ui.h @@ -1,9 +1,9 @@ #pragma once -#include "core/array.h" -#include "core/mt/sync.h" -#include "core/string.h" +#include "engine/core/array.h" +#include "engine/core/mt/sync.h" +#include "engine/core/string.h" class LUMIX_EDITOR_API LogUI diff --git a/src/editor/measure_tool.h b/src/editor/measure_tool.h index dec2531fa9..75e16bfb43 100644 --- a/src/editor/measure_tool.h +++ b/src/editor/measure_tool.h @@ -1,7 +1,7 @@ #pragma once -#include "core/vec.h" +#include "engine/core/vec.h" #include "world_editor.h" diff --git a/src/editor/metadata.cpp b/src/editor/metadata.cpp index 05c8362b38..f10a04bf5a 100644 --- a/src/editor/metadata.cpp +++ b/src/editor/metadata.cpp @@ -1,5 +1,5 @@ #include "metadata.h" -#include "core/fs/os_file.h" +#include "engine/core/fs/os_file.h" #include diff --git a/src/editor/metadata.h b/src/editor/metadata.h index 7ee6f88b17..3aee307343 100644 --- a/src/editor/metadata.h +++ b/src/editor/metadata.h @@ -1,8 +1,8 @@ #pragma once -#include "core/associative_array.h" -#include "core/string.h" +#include "engine/core/associative_array.h" +#include "engine/core/string.h" #include diff --git a/src/editor/pc/file_system_watcher.cpp b/src/editor/pc/file_system_watcher.cpp index 12b2774a80..6c21bf29c1 100644 --- a/src/editor/pc/file_system_watcher.cpp +++ b/src/editor/pc/file_system_watcher.cpp @@ -1,9 +1,9 @@ -#include "core/mt/task.h" -#include "core/profiler.h" -#include "core/string.h" +#include "engine/core/mt/task.h" +#include "engine/core/profiler.h" +#include "engine/core/string.h" #include "file_system_watcher.h" -#include "core/pc/simple_win.h" +#include "engine/core/pc/simple_win.h" class FileSystemWatcherPC; diff --git a/src/editor/platform_interface.cpp b/src/editor/platform_interface.cpp index 320e104bd7..f629bed961 100644 --- a/src/editor/platform_interface.cpp +++ b/src/editor/platform_interface.cpp @@ -1,6 +1,6 @@ #include "platform_interface.h" -#include "core/iallocator.h" -#include "core/string.h" +#include "engine/core/iallocator.h" +#include "engine/core/string.h" #include "imgui/imgui.h" #include "renderer/renderer.h" diff --git a/src/editor/profiler_ui.cpp b/src/editor/profiler_ui.cpp index 69bbdf94e3..c57784a0b6 100644 --- a/src/editor/profiler_ui.cpp +++ b/src/editor/profiler_ui.cpp @@ -1,16 +1,16 @@ #include "profiler_ui.h" -#include "core/fs/file_events_device.h" -#include "core/fs/file_system.h" -#include "core/fs/os_file.h" -#include "core/log.h" -#include "core/math_utils.h" -#include "core/mt/atomic.h" -#include "core/mt/lock_free_fixed_queue.h" -#include "core/profiler.h" -#include "core/resource.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" -#include "core/timer.h" +#include "engine/core/fs/file_events_device.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/log.h" +#include "engine/core/math_utils.h" +#include "engine/core/mt/atomic.h" +#include "engine/core/mt/lock_free_fixed_queue.h" +#include "engine/core/profiler.h" +#include "engine/core/resource.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" +#include "engine/core/timer.h" #include "debug/debug.h" #include "engine/engine.h" #include "imgui/imgui.h" diff --git a/src/editor/property_grid.cpp b/src/editor/property_grid.cpp index 330ddc3364..c35b447559 100644 --- a/src/editor/property_grid.cpp +++ b/src/editor/property_grid.cpp @@ -1,9 +1,9 @@ #include "property_grid.h" #include "asset_browser.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/math_utils.h" -#include "core/vec.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/math_utils.h" +#include "engine/core/vec.h" #include "editor/world_editor.h" #include "engine/engine.h" #include "engine/iplugin.h" diff --git a/src/editor/property_grid.h b/src/editor/property_grid.h index 3675176462..0f75d29179 100644 --- a/src/editor/property_grid.h +++ b/src/editor/property_grid.h @@ -1,7 +1,7 @@ #pragma once -#include "core/array.h" +#include "engine/core/array.h" #include "universe/component.h" diff --git a/src/editor/render_interface.h b/src/editor/render_interface.h index 5d34e7bf4b..f87fea7fed 100644 --- a/src/editor/render_interface.h +++ b/src/editor/render_interface.h @@ -2,10 +2,10 @@ #include "lumix.h" -#include "core/geometry.h" -#include "core/matrix.h" -#include "core/path.h" -#include "core/vec.h" +#include "engine/core/geometry.h" +#include "engine/core/matrix.h" +#include "engine/core/path.h" +#include "engine/core/vec.h" namespace Lumix diff --git a/src/editor/settings.cpp b/src/editor/settings.cpp index ce75db497e..d45bfbf016 100644 --- a/src/editor/settings.cpp +++ b/src/editor/settings.cpp @@ -1,6 +1,6 @@ #include "settings.h" -#include "core/fs/os_file.h" -#include "core/log.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/log.h" #include "debug/debug.h" #include "imgui/imgui.h" #include "platform_interface.h" diff --git a/src/editor/studio_app.cpp b/src/editor/studio_app.cpp index f2a7d4945a..2d7516f40f 100644 --- a/src/editor/studio_app.cpp +++ b/src/editor/studio_app.cpp @@ -1,22 +1,22 @@ #include "audio/audio_scene.h" #include "audio/clip_manager.h" #include "asset_browser.h" -#include "core/blob.h" -#include "core/command_line_parser.h" -#include "core/crc32.h" -#include "core/default_allocator.h" -#include "core/fs/file_system.h" -#include "core/fs/os_file.h" -#include "core/input_system.h" -#include "core/log.h" -#include "core/lua_wrapper.h" -#include "core/mt/thread.h" -#include "core/path_utils.h" -#include "core/profiler.h" -#include "core/quat.h" -#include "core/resource_manager.h" -#include "core/system.h" -#include "core/timer.h" +#include "engine/core/blob.h" +#include "engine/core/command_line_parser.h" +#include "engine/core/crc32.h" +#include "engine/core/default_allocator.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/input_system.h" +#include "engine/core/log.h" +#include "engine/core/lua_wrapper.h" +#include "engine/core/mt/thread.h" +#include "engine/core/path_utils.h" +#include "engine/core/profiler.h" +#include "engine/core/quat.h" +#include "engine/core/resource_manager.h" +#include "engine/core/system.h" +#include "engine/core/timer.h" #include "debug/debug.h" #include "editor/gizmo.h" #include "editor/entity_groups.h" diff --git a/src/editor/studio_app.h b/src/editor/studio_app.h index 189cbac57a..0187a7e37f 100644 --- a/src/editor/studio_app.h +++ b/src/editor/studio_app.h @@ -2,7 +2,7 @@ #include "lumix.h" -#include "core/array.h" +#include "engine/core/array.h" #ifdef STATIC_PLUGINS diff --git a/src/editor/utils.cpp b/src/editor/utils.cpp index 318220f490..d930bad139 100644 --- a/src/editor/utils.cpp +++ b/src/editor/utils.cpp @@ -1,8 +1,8 @@ #include "utils.h" -#include "core/crc32.h" -#include "core/math_utils.h" -#include "core/path.h" -#include "core/path_utils.h" +#include "engine/core/crc32.h" +#include "engine/core/math_utils.h" +#include "engine/core/path.h" +#include "engine/core/path_utils.h" #include "editor/world_editor.h" #include "imgui/imgui.h" #include "renderer/render_scene.h" diff --git a/src/editor/utils.h b/src/editor/utils.h index 8cd0ff5300..4683ab0894 100644 --- a/src/editor/utils.h +++ b/src/editor/utils.h @@ -2,8 +2,8 @@ #include "lumix.h" -#include "core/delegate.h" -#include "core/string.h" +#include "engine/core/delegate.h" +#include "engine/core/string.h" #include "imgui/imgui.h" diff --git a/src/editor/world_editor.cpp b/src/editor/world_editor.cpp index 8802323ad3..d37fcab125 100644 --- a/src/editor/world_editor.cpp +++ b/src/editor/world_editor.cpp @@ -1,27 +1,27 @@ #include "world_editor.h" -#include "core/array.h" -#include "core/associative_array.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/delegate_list.h" -#include "core/fs/file_system.h" -#include "core/fs/memory_file_device.h" -#include "core/fs/disk_file_device.h" -#include "core/fs/tcp_file_device.h" -#include "core/fs/tcp_file_server.h" -#include "core/geometry.h" -#include "core/input_system.h" -#include "core/json_serializer.h" -#include "core/log.h" -#include "core/matrix.h" -#include "core/path.h" -#include "core/path_utils.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" -#include "core/system.h" -#include "core/timer.h" +#include "engine/core/array.h" +#include "engine/core/associative_array.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/delegate_list.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/memory_file_device.h" +#include "engine/core/fs/disk_file_device.h" +#include "engine/core/fs/tcp_file_device.h" +#include "engine/core/fs/tcp_file_server.h" +#include "engine/core/geometry.h" +#include "engine/core/input_system.h" +#include "engine/core/json_serializer.h" +#include "engine/core/log.h" +#include "engine/core/matrix.h" +#include "engine/core/path.h" +#include "engine/core/path_utils.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" +#include "engine/core/system.h" +#include "engine/core/timer.h" #include "debug/debug.h" #include "editor/entity_groups.h" #include "editor/editor_icon.h" diff --git a/src/editor/world_editor.h b/src/editor/world_editor.h index d8b600a815..9f67473be3 100644 --- a/src/editor/world_editor.h +++ b/src/editor/world_editor.h @@ -1,8 +1,8 @@ #pragma once #include "lumix.h" -#include "core/array.h" -#include "core/delegate_list.h" +#include "engine/core/array.h" +#include "engine/core/delegate_list.h" #include "universe/component.h" diff --git a/src/lua_script/lua_script_manager.cpp b/src/lua_script/lua_script_manager.cpp index 594a0078ca..80a611b6db 100644 --- a/src/lua_script/lua_script_manager.cpp +++ b/src/lua_script/lua_script_manager.cpp @@ -1,8 +1,8 @@ #include "lua_script_manager.h" -#include "core/crc32.h" -#include "core/log.h" -#include "core/fs/file_system.h" +#include "engine/core/crc32.h" +#include "engine/core/log.h" +#include "engine/core/fs/file_system.h" namespace Lumix diff --git a/src/lua_script/lua_script_manager.h b/src/lua_script/lua_script_manager.h index 5c902d0843..75faef6890 100644 --- a/src/lua_script/lua_script_manager.h +++ b/src/lua_script/lua_script_manager.h @@ -1,10 +1,10 @@ #pragma once -#include "core/array.h" -#include "core/resource.h" -#include "core/resource_manager_base.h" -#include "core/string.h" +#include "engine/core/array.h" +#include "engine/core/resource.h" +#include "engine/core/resource_manager_base.h" +#include "engine/core/string.h" namespace Lumix diff --git a/src/lua_script/lua_script_system.cpp b/src/lua_script/lua_script_system.cpp index b75b3ed610..7be435e77c 100644 --- a/src/lua_script/lua_script_system.cpp +++ b/src/lua_script/lua_script_system.cpp @@ -1,16 +1,16 @@ #include "lua_script_system.h" -#include "core/array.h" -#include "core/base_proxy_allocator.h" -#include "core/binary_array.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/fs/file_system.h" -#include "core/iallocator.h" -#include "core/json_serializer.h" -#include "core/log.h" -#include "core/lua_wrapper.h" -#include "core/path_utils.h" -#include "core/resource_manager.h" +#include "engine/core/array.h" +#include "engine/core/base_proxy_allocator.h" +#include "engine/core/binary_array.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/iallocator.h" +#include "engine/core/json_serializer.h" +#include "engine/core/log.h" +#include "engine/core/lua_wrapper.h" +#include "engine/core/path_utils.h" +#include "engine/core/resource_manager.h" #include "debug/debug.h" #include "editor/asset_browser.h" #include "editor/ieditor_command.h" diff --git a/src/lua_script/lua_script_system.h b/src/lua_script/lua_script_system.h index 795966e1d7..a947134cfe 100644 --- a/src/lua_script/lua_script_system.h +++ b/src/lua_script/lua_script_system.h @@ -1,8 +1,8 @@ #pragma once -#include "core/path.h" -#include "core/string.h" +#include "engine/core/path.h" +#include "engine/core/string.h" #include "engine/iplugin.h" diff --git a/src/navigation/navigation_system.cpp b/src/navigation/navigation_system.cpp index 1cf6a49555..8b88cc17e7 100644 --- a/src/navigation/navigation_system.cpp +++ b/src/navigation/navigation_system.cpp @@ -1,13 +1,13 @@ #include "lumix.h" -#include "core/array.h" -#include "core/base_proxy_allocator.h" -#include "core/crc32.h" -#include "core/fs/os_file.h" -#include "core/iallocator.h" -#include "core/log.h" -#include "core/lua_wrapper.h" -#include "core/profiler.h" -#include "core/vec.h" +#include "engine/core/array.h" +#include "engine/core/base_proxy_allocator.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/iallocator.h" +#include "engine/core/log.h" +#include "engine/core/lua_wrapper.h" +#include "engine/core/profiler.h" +#include "engine/core/vec.h" #include "engine/engine.h" #include "engine/iplugin.h" #include "renderer/model.h" diff --git a/src/physics/physics_geometry_manager.cpp b/src/physics/physics_geometry_manager.cpp index cdf8ab9b66..1cd8f2e229 100644 --- a/src/physics/physics_geometry_manager.cpp +++ b/src/physics/physics_geometry_manager.cpp @@ -1,8 +1,8 @@ #include "physics_geometry_manager.h" -#include "core/fs/file_system.h" -#include "core/resource_manager.h" -#include "core/string.h" -#include "core/vec.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/resource_manager.h" +#include "engine/core/string.h" +#include "engine/core/vec.h" #include "physics/physics_system.h" #include diff --git a/src/physics/physics_geometry_manager.h b/src/physics/physics_geometry_manager.h index 0878df6960..4147c09695 100644 --- a/src/physics/physics_geometry_manager.h +++ b/src/physics/physics_geometry_manager.h @@ -2,8 +2,8 @@ #include "lumix.h" -#include "core/resource.h" -#include "core/resource_manager_base.h" +#include "engine/core/resource.h" +#include "engine/core/resource_manager_base.h" namespace physx diff --git a/src/physics/physics_scene.cpp b/src/physics/physics_scene.cpp index cd9453556f..1290ae7556 100644 --- a/src/physics/physics_scene.cpp +++ b/src/physics/physics_scene.cpp @@ -1,16 +1,16 @@ #include "physics/physics_scene.h" #include "cooking/PxCooking.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/fs/file_system.h" -#include "core/json_serializer.h" -#include "core/log.h" -#include "core/lua_wrapper.h" -#include "core/matrix.h" -#include "core/path.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/json_serializer.h" +#include "engine/core/log.h" +#include "engine/core/lua_wrapper.h" +#include "engine/core/matrix.h" +#include "engine/core/path.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" #include "engine.h" #include "lua_script/lua_script_system.h" #include "renderer/render_scene.h" diff --git a/src/physics/physics_scene.h b/src/physics/physics_scene.h index fcd5d47f83..31ac1b88a7 100644 --- a/src/physics/physics_scene.h +++ b/src/physics/physics_scene.h @@ -2,9 +2,9 @@ #include "lumix.h" -#include "core/iallocator.h" -#include "core/path.h" -#include "core/vec.h" +#include "engine/core/iallocator.h" +#include "engine/core/path.h" +#include "engine/core/vec.h" #include "iplugin.h" diff --git a/src/physics/physics_system.cpp b/src/physics/physics_system.cpp index c2cb59bfee..4a720839c6 100644 --- a/src/physics/physics_system.cpp +++ b/src/physics/physics_system.cpp @@ -3,10 +3,10 @@ #include #include "cooking/PxCooking.h" -#include "core/base_proxy_allocator.h" -#include "core/crc32.h" -#include "core/log.h" -#include "core/resource_manager.h" +#include "engine/core/base_proxy_allocator.h" +#include "engine/core/crc32.h" +#include "engine/core/log.h" +#include "engine/core/resource_manager.h" #include "editor/studio_app.h" #include "editor/utils.h" #include "editor/world_editor.h" diff --git a/src/renderer/culling_system.cpp b/src/renderer/culling_system.cpp index e94429d17a..4f8de18685 100644 --- a/src/renderer/culling_system.cpp +++ b/src/renderer/culling_system.cpp @@ -1,14 +1,14 @@ #include "culling_system.h" #include "lumix.h" -#include "core/binary_array.h" -#include "core/free_list.h" -#include "core/geometry.h" -#include "core/profiler.h" - -#include "core/mtjd/group.h" -#include "core/mtjd/manager.h" -#include "core/mtjd/job.h" +#include "engine/core/binary_array.h" +#include "engine/core/free_list.h" +#include "engine/core/geometry.h" +#include "engine/core/profiler.h" + +#include "engine/core/mtjd/group.h" +#include "engine/core/mtjd/manager.h" +#include "engine/core/mtjd/job.h" namespace Lumix { diff --git a/src/renderer/editor/game_view.cpp b/src/renderer/editor/game_view.cpp index 7cd1aeb233..c632f1059b 100644 --- a/src/renderer/editor/game_view.cpp +++ b/src/renderer/editor/game_view.cpp @@ -1,8 +1,8 @@ #include "game_view.h" -#include "core/crc32.h" -#include "core/input_system.h" -#include "core/profiler.h" -#include "core/resource_manager.h" +#include "engine/core/crc32.h" +#include "engine/core/input_system.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" #include "engine/engine.h" #include "engine/plugin_manager.h" #include "renderer/frame_buffer.h" diff --git a/src/renderer/editor/main.cpp b/src/renderer/editor/main.cpp index 091e477a2f..4c4d27c8a5 100644 --- a/src/renderer/editor/main.cpp +++ b/src/renderer/editor/main.cpp @@ -1,14 +1,14 @@ #include "lumix.h" -#include "core/crc32.h" -#include "core/fs/disk_file_device.h" -#include "core/fs/file_system.h" -#include "core/fs/os_file.h" -#include "core/json_serializer.h" -#include "core/log.h" -#include "core/lua_wrapper.h" -#include "core/path_utils.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/disk_file_device.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/json_serializer.h" +#include "engine/core/log.h" +#include "engine/core/lua_wrapper.h" +#include "engine/core/path_utils.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" #include "editor/asset_browser.h" #include "editor/ieditor_command.h" #include "editor/platform_interface.h" diff --git a/src/renderer/editor/scene_view.cpp b/src/renderer/editor/scene_view.cpp index a01cf54d77..7ac0e72fac 100644 --- a/src/renderer/editor/scene_view.cpp +++ b/src/renderer/editor/scene_view.cpp @@ -1,10 +1,10 @@ #include "scene_view.h" -#include "core/crc32.h" -#include "core/input_system.h" -#include "core/path.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/string.h" +#include "engine/core/crc32.h" +#include "engine/core/input_system.h" +#include "engine/core/path.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/string.h" #include "editor/gizmo.h" #include "editor/imgui/imgui.h" #include "editor/log_ui.h" diff --git a/src/renderer/editor/shader_compiler.cpp b/src/renderer/editor/shader_compiler.cpp index 88bb0f23bb..b0e30a1087 100644 --- a/src/renderer/editor/shader_compiler.cpp +++ b/src/renderer/editor/shader_compiler.cpp @@ -1,15 +1,15 @@ #include "shader_compiler.h" -#include "core/fs/disk_file_device.h" -#include "core/fs/file_system.h" -#include "core/fs/os_file.h" -#include "core/log.h" -#include "core/mt/thread.h" -#include "core/path.h" -#include "core/path_utils.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" -#include "core/system.h" +#include "engine/core/fs/disk_file_device.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/log.h" +#include "engine/core/mt/thread.h" +#include "engine/core/path.h" +#include "engine/core/path_utils.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" +#include "engine/core/system.h" #include "editor/world_editor.h" #include "engine.h" #include "engine/plugin_manager.h" diff --git a/src/renderer/editor/shader_compiler.h b/src/renderer/editor/shader_compiler.h index cafa788858..b30c98fa6e 100644 --- a/src/renderer/editor/shader_compiler.h +++ b/src/renderer/editor/shader_compiler.h @@ -1,9 +1,9 @@ #pragma once -#include "core/associative_array.h" -#include "core/mt/sync.h" -#include "core/string.h" +#include "engine/core/associative_array.h" +#include "engine/core/mt/sync.h" +#include "engine/core/string.h" #include "renderer/shader.h" diff --git a/src/renderer/editor/shader_editor.cpp b/src/renderer/editor/shader_editor.cpp index c3d3740b7d..f8f10047f3 100644 --- a/src/renderer/editor/shader_editor.cpp +++ b/src/renderer/editor/shader_editor.cpp @@ -1,11 +1,11 @@ #include "shader_editor.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/fs/os_file.h" -#include "core/log.h" -#include "core/math_utils.h" -#include "core/path_utils.h" -#include "core/string.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/log.h" +#include "engine/core/math_utils.h" +#include "engine/core/path_utils.h" +#include "engine/core/string.h" #include "editor/platform_interface.h" #include "editor/utils.h" #include diff --git a/src/renderer/editor/shader_editor.h b/src/renderer/editor/shader_editor.h index 66063511a8..cc95ce35b6 100644 --- a/src/renderer/editor/shader_editor.h +++ b/src/renderer/editor/shader_editor.h @@ -1,8 +1,8 @@ #pragma once -#include "core/array.h" -#include "core/path.h" +#include "engine/core/array.h" +#include "engine/core/path.h" #include "editor/imgui/imgui.h" diff --git a/src/renderer/editor/terrain_editor.cpp b/src/renderer/editor/terrain_editor.cpp index f175e9a110..7a3464e8b7 100644 --- a/src/renderer/editor/terrain_editor.cpp +++ b/src/renderer/editor/terrain_editor.cpp @@ -1,11 +1,11 @@ #include "terrain_editor.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/geometry.h" -#include "core/json_serializer.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/geometry.h" +#include "engine/core/json_serializer.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" #include "editor/entity_template_system.h" #include "editor/ieditor_command.h" #include "editor/imgui/imgui.h" diff --git a/src/renderer/editor/terrain_editor.h b/src/renderer/editor/terrain_editor.h index ce42cf8d6e..125f59d120 100644 --- a/src/renderer/editor/terrain_editor.h +++ b/src/renderer/editor/terrain_editor.h @@ -1,8 +1,8 @@ #pragma once -#include "core/binary_array.h" -#include "core/vec.h" +#include "engine/core/binary_array.h" +#include "engine/core/vec.h" #include "editor/world_editor.h" #include "editor/utils.h" diff --git a/src/renderer/frame_buffer.cpp b/src/renderer/frame_buffer.cpp index 794257c694..28311a6680 100644 --- a/src/renderer/frame_buffer.cpp +++ b/src/renderer/frame_buffer.cpp @@ -1,8 +1,8 @@ #include "renderer/frame_buffer.h" -#include "core/json_serializer.h" -#include "core/log.h" -#include "core/string.h" -#include "core/vec.h" +#include "engine/core/json_serializer.h" +#include "engine/core/log.h" +#include "engine/core/string.h" +#include "engine/core/vec.h" #include #include #include diff --git a/src/renderer/frame_buffer.h b/src/renderer/frame_buffer.h index bcb9e71c64..fcfa6f7274 100644 --- a/src/renderer/frame_buffer.h +++ b/src/renderer/frame_buffer.h @@ -2,7 +2,7 @@ #include "lumix.h" -#include "core/vec.h" +#include "engine/core/vec.h" #include diff --git a/src/renderer/material.cpp b/src/renderer/material.cpp index 57fdaba24d..5ea91747ea 100644 --- a/src/renderer/material.cpp +++ b/src/renderer/material.cpp @@ -1,12 +1,12 @@ #include "renderer/material.h" -#include "core/crc32.h" -#include "core/fs/file_system.h" -#include "core/json_serializer.h" -#include "core/log.h" -#include "core/path_utils.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/json_serializer.h" +#include "engine/core/log.h" +#include "engine/core/path_utils.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" #include "renderer/material_manager.h" #include "renderer/pipeline.h" #include "renderer/renderer.h" diff --git a/src/renderer/material.h b/src/renderer/material.h index 4d8064b2d3..da8ab91fdf 100644 --- a/src/renderer/material.h +++ b/src/renderer/material.h @@ -1,9 +1,9 @@ #pragma once -#include "core/array.h" -#include "core/resource.h" -#include "core/vec.h" +#include "engine/core/array.h" +#include "engine/core/resource.h" +#include "engine/core/vec.h" #include diff --git a/src/renderer/material_manager.cpp b/src/renderer/material_manager.cpp index 88673703a3..6e43d289cc 100644 --- a/src/renderer/material_manager.cpp +++ b/src/renderer/material_manager.cpp @@ -1,7 +1,7 @@ #include "lumix.h" #include "renderer/material_manager.h" -#include "core/resource.h" +#include "engine/core/resource.h" #include "renderer/material.h" namespace Lumix diff --git a/src/renderer/material_manager.h b/src/renderer/material_manager.h index 77a25d34ec..a712b1bb95 100644 --- a/src/renderer/material_manager.h +++ b/src/renderer/material_manager.h @@ -1,6 +1,6 @@ #pragma once -#include "core/resource_manager_base.h" +#include "engine/core/resource_manager_base.h" namespace Lumix { diff --git a/src/renderer/model.cpp b/src/renderer/model.cpp index 9257219103..f3a7ffa96c 100644 --- a/src/renderer/model.cpp +++ b/src/renderer/model.cpp @@ -1,15 +1,15 @@ #include "lumix.h" #include "renderer/model.h" -#include "core/array.h" -#include "core/crc32.h" -#include "core/fs/file_system.h" -#include "core/log.h" -#include "core/path_utils.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" -#include "core/vec.h" +#include "engine/core/array.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/log.h" +#include "engine/core/path_utils.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" +#include "engine/core/vec.h" #include "renderer/material.h" #include "renderer/model_manager.h" #include "renderer/pose.h" diff --git a/src/renderer/model.h b/src/renderer/model.h index 34c74111a8..a3a4e70f35 100644 --- a/src/renderer/model.h +++ b/src/renderer/model.h @@ -1,14 +1,14 @@ #pragma once -#include "core/array.h" -#include "core/geometry.h" -#include "core/hash_map.h" -#include "core/matrix.h" -#include "core/quat.h" -#include "core/string.h" -#include "core/vec.h" -#include "core/resource.h" +#include "engine/core/array.h" +#include "engine/core/geometry.h" +#include "engine/core/hash_map.h" +#include "engine/core/matrix.h" +#include "engine/core/quat.h" +#include "engine/core/string.h" +#include "engine/core/vec.h" +#include "engine/core/resource.h" #include diff --git a/src/renderer/model_generator.cpp b/src/renderer/model_generator.cpp index 1e0fb01b60..2fb21a7720 100644 --- a/src/renderer/model_generator.cpp +++ b/src/renderer/model_generator.cpp @@ -1,6 +1,6 @@ #include "model_generator.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" #include "renderer/model.h" diff --git a/src/renderer/model_manager.cpp b/src/renderer/model_manager.cpp index 14f05097fe..eddf510052 100644 --- a/src/renderer/model_manager.cpp +++ b/src/renderer/model_manager.cpp @@ -1,7 +1,7 @@ #include "lumix.h" #include "renderer/model_manager.h" -#include "core/resource.h" +#include "engine/core/resource.h" #include "renderer/model.h" namespace Lumix diff --git a/src/renderer/model_manager.h b/src/renderer/model_manager.h index 92d76f8606..1d50e23c52 100644 --- a/src/renderer/model_manager.h +++ b/src/renderer/model_manager.h @@ -1,6 +1,6 @@ #pragma once -#include "core/resource_manager_base.h" +#include "engine/core/resource_manager_base.h" namespace Lumix { diff --git a/src/renderer/particle_system.cpp b/src/renderer/particle_system.cpp index 808387a89f..a23382b611 100644 --- a/src/renderer/particle_system.cpp +++ b/src/renderer/particle_system.cpp @@ -1,10 +1,10 @@ #include "particle_system.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/math_utils.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/math_utils.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" #include "editor/gizmo.h" #include "editor/world_editor.h" #include "renderer/material.h" diff --git a/src/renderer/particle_system.h b/src/renderer/particle_system.h index 1c6ef02d89..37d7d75da6 100644 --- a/src/renderer/particle_system.h +++ b/src/renderer/particle_system.h @@ -2,8 +2,8 @@ #include "lumix.h" -#include "core/array.h" -#include "core/vec.h" +#include "engine/core/array.h" +#include "engine/core/vec.h" namespace Lumix diff --git a/src/renderer/pipeline.cpp b/src/renderer/pipeline.cpp index 6ed7bfe985..86f55e8c86 100644 --- a/src/renderer/pipeline.cpp +++ b/src/renderer/pipeline.cpp @@ -1,13 +1,13 @@ #include "pipeline.h" -#include "core/crc32.h" -#include "core/fs/disk_file_device.h" -#include "core/fs/file_system.h" -#include "core/geometry.h" -#include "core/lifo_allocator.h" -#include "core/log.h" -#include "core/lua_wrapper.h" -#include "core/profiler.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/disk_file_device.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/geometry.h" +#include "engine/core/lifo_allocator.h" +#include "engine/core/log.h" +#include "engine/core/lua_wrapper.h" +#include "engine/core/profiler.h" #include "engine.h" #include "lua_script/lua_script_system.h" #include "renderer/frame_buffer.h" diff --git a/src/renderer/pipeline.h b/src/renderer/pipeline.h index 72f94fd016..e215d5b79d 100644 --- a/src/renderer/pipeline.h +++ b/src/renderer/pipeline.h @@ -1,7 +1,7 @@ #pragma once #include "lumix.h" -#include "core/delegate.h" +#include "engine/core/delegate.h" struct lua_State; diff --git a/src/renderer/pose.cpp b/src/renderer/pose.cpp index 6f1bcba8d7..ae2ee2c7b3 100644 --- a/src/renderer/pose.cpp +++ b/src/renderer/pose.cpp @@ -1,8 +1,8 @@ #include "renderer/pose.h" -#include "core/matrix.h" -#include "core/quat.h" -#include "core/profiler.h" -#include "core/vec.h" +#include "engine/core/matrix.h" +#include "engine/core/quat.h" +#include "engine/core/profiler.h" +#include "engine/core/vec.h" #include "renderer/model.h" diff --git a/src/renderer/render_scene.cpp b/src/renderer/render_scene.cpp index b022e40df4..25c145462e 100644 --- a/src/renderer/render_scene.cpp +++ b/src/renderer/render_scene.cpp @@ -1,22 +1,22 @@ #include "render_scene.h" -#include "core/array.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/fs/file_system.h" -#include "core/geometry.h" -#include "core/json_serializer.h" -#include "core/lifo_allocator.h" -#include "core/log.h" -#include "core/lua_wrapper.h" -#include "core/math_utils.h" -#include "core/mtjd/generic_job.h" -#include "core/mtjd/job.h" -#include "core/mtjd/manager.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" -#include "core/timer.h" +#include "engine/core/array.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/geometry.h" +#include "engine/core/json_serializer.h" +#include "engine/core/lifo_allocator.h" +#include "engine/core/log.h" +#include "engine/core/lua_wrapper.h" +#include "engine/core/math_utils.h" +#include "engine/core/mtjd/generic_job.h" +#include "engine/core/mtjd/job.h" +#include "engine/core/mtjd/manager.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" +#include "engine/core/timer.h" #include "engine.h" diff --git a/src/renderer/render_scene.h b/src/renderer/render_scene.h index 6d914f1d1f..8bb71ae657 100644 --- a/src/renderer/render_scene.h +++ b/src/renderer/render_scene.h @@ -2,7 +2,7 @@ #include "lumix.h" -#include "core/matrix.h" +#include "engine/core/matrix.h" #include "iplugin.h" diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp index b269bf5b8d..442e79ad6d 100644 --- a/src/renderer/renderer.cpp +++ b/src/renderer/renderer.cpp @@ -1,12 +1,12 @@ #include "renderer.h" -#include "core/array.h" -#include "core/crc32.h" -#include "core/fs/os_file.h" -#include "core/lifo_allocator.h" -#include "core/log.h" -#include "core/profiler.h" -#include "core/resource_manager.h" +#include "engine/core/array.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/os_file.h" +#include "engine/core/lifo_allocator.h" +#include "engine/core/log.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" #include "debug/debug.h" #include "engine.h" #include "engine/property_descriptor.h" diff --git a/src/renderer/shader.cpp b/src/renderer/shader.cpp index 9888b298cd..dbe4a868bd 100644 --- a/src/renderer/shader.cpp +++ b/src/renderer/shader.cpp @@ -1,11 +1,11 @@ #include "renderer/shader.h" -#include "core/crc32.h" -#include "core/fs/file_system.h" -#include "core/lua_wrapper.h" -#include "core/log.h" -#include "core/path_utils.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/lua_wrapper.h" +#include "engine/core/log.h" +#include "engine/core/path_utils.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" #include "renderer/renderer.h" #include "renderer/shader_manager.h" #include diff --git a/src/renderer/shader.h b/src/renderer/shader.h index e099d3326b..51d5566893 100644 --- a/src/renderer/shader.h +++ b/src/renderer/shader.h @@ -1,6 +1,6 @@ #pragma once -#include "core/array.h" -#include "core/resource.h" +#include "engine/core/array.h" +#include "engine/core/resource.h" #include diff --git a/src/renderer/shader_manager.cpp b/src/renderer/shader_manager.cpp index 1e986bf3cd..6a46b043fa 100644 --- a/src/renderer/shader_manager.cpp +++ b/src/renderer/shader_manager.cpp @@ -1,7 +1,7 @@ #include "lumix.h" #include "renderer/shader_manager.h" -#include "core/resource.h" +#include "engine/core/resource.h" #include "renderer/shader.h" namespace Lumix diff --git a/src/renderer/shader_manager.h b/src/renderer/shader_manager.h index 037ddcc6c7..c843007196 100644 --- a/src/renderer/shader_manager.h +++ b/src/renderer/shader_manager.h @@ -1,6 +1,6 @@ #pragma once -#include "core/resource_manager_base.h" +#include "engine/core/resource_manager_base.h" namespace Lumix { diff --git a/src/renderer/terrain.cpp b/src/renderer/terrain.cpp index 55dbfefc3f..c57c2340f7 100644 --- a/src/renderer/terrain.cpp +++ b/src/renderer/terrain.cpp @@ -1,14 +1,14 @@ #include "terrain.h" -#include "core/blob.h" -#include "core/crc32.h" -#include "core/geometry.h" -#include "core/json_serializer.h" -#include "core/lifo_allocator.h" -#include "core/log.h" -#include "core/math_utils.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/blob.h" +#include "engine/core/crc32.h" +#include "engine/core/geometry.h" +#include "engine/core/json_serializer.h" +#include "engine/core/lifo_allocator.h" +#include "engine/core/log.h" +#include "engine/core/math_utils.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" #include "engine.h" #include "renderer/material.h" #include "renderer/model.h" diff --git a/src/renderer/terrain.h b/src/renderer/terrain.h index 5ceff15ca4..cd987f2225 100644 --- a/src/renderer/terrain.h +++ b/src/renderer/terrain.h @@ -1,10 +1,10 @@ #pragma once -#include "core/array.h" -#include "core/associative_array.h" -#include "core/resource.h" -#include "core/vec.h" +#include "engine/core/array.h" +#include "engine/core/associative_array.h" +#include "engine/core/resource.h" +#include "engine/core/vec.h" #include diff --git a/src/renderer/texture.cpp b/src/renderer/texture.cpp index 1f421f6755..ccae91524d 100644 --- a/src/renderer/texture.cpp +++ b/src/renderer/texture.cpp @@ -1,10 +1,10 @@ -#include "core/fs/file_system.h" -#include "core/log.h" -#include "core/math_utils.h" -#include "core/path_utils.h" -#include "core/profiler.h" -#include "core/resource_manager.h" -#include "core/resource_manager_base.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/log.h" +#include "engine/core/math_utils.h" +#include "engine/core/path_utils.h" +#include "engine/core/profiler.h" +#include "engine/core/resource_manager.h" +#include "engine/core/resource_manager_base.h" #include "renderer/texture.h" #include "renderer/texture_manager.h" #include diff --git a/src/renderer/texture.h b/src/renderer/texture.h index 6a2053b37b..1249befee7 100644 --- a/src/renderer/texture.h +++ b/src/renderer/texture.h @@ -1,7 +1,7 @@ #pragma once -#include "core/resource.h" +#include "engine/core/resource.h" #include diff --git a/src/renderer/texture_manager.cpp b/src/renderer/texture_manager.cpp index 4ffee90582..ae8335cf30 100644 --- a/src/renderer/texture_manager.cpp +++ b/src/renderer/texture_manager.cpp @@ -1,7 +1,7 @@ #include "lumix.h" #include "renderer/texture_manager.h" -#include "core/resource.h" +#include "engine/core/resource.h" #include "renderer/texture.h" namespace Lumix diff --git a/src/renderer/texture_manager.h b/src/renderer/texture_manager.h index 012a2eb785..56ec676a89 100644 --- a/src/renderer/texture_manager.h +++ b/src/renderer/texture_manager.h @@ -1,6 +1,6 @@ #pragma once -#include "core/resource_manager_base.h" +#include "engine/core/resource_manager_base.h" namespace Lumix { diff --git a/src/script/script_system.cpp b/src/script/script_system.cpp index 490beb64d5..a119dcdf6b 100644 --- a/src/script/script_system.cpp +++ b/src/script/script_system.cpp @@ -1,13 +1,13 @@ #include "script_system.h" #include -#include "core/iallocator.h" -#include "core/crc32.h" -#include "core/fs/file_system.h" -#include "core/fs/ifile.h" -#include "core/json_serializer.h" -#include "core/library.h" -#include "core/log.h" -#include "core/array.h" +#include "engine/core/iallocator.h" +#include "engine/core/crc32.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/ifile.h" +#include "engine/core/json_serializer.h" +#include "engine/core/library.h" +#include "engine/core/log.h" +#include "engine/core/array.h" #include "editor/world_editor.h" #include "engine/engine.h" #include "universe/universe.h" diff --git a/src/script/script_system.h b/src/script/script_system.h index 5c4254cb1b..900ac6533c 100644 --- a/src/script/script_system.h +++ b/src/script/script_system.h @@ -1,8 +1,8 @@ #pragma once -#include "core/lumix.h" -#include "core/string.h" +#include "engine/core/lumix.h" +#include "engine/core/string.h" #include "engine/iplugin.h" #include "universe/universe.h" diff --git a/src/studio/main.cpp b/src/studio/main.cpp index 509ac8e829..bb7a9940a9 100644 --- a/src/studio/main.cpp +++ b/src/studio/main.cpp @@ -1,5 +1,5 @@ #include "editor/studio_app.h" -#include "core/pc/simple_win.h" +#include "engine/core/pc/simple_win.h" INT WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, INT) diff --git a/src/unit_tests/core/ut_aabb.cpp b/src/unit_tests/core/ut_aabb.cpp index 7e312493f0..b4b4144a63 100644 --- a/src/unit_tests/core/ut_aabb.cpp +++ b/src/unit_tests/core/ut_aabb.cpp @@ -1,5 +1,5 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/geometry.h" +#include "engine/core/geometry.h" void UT_aabb(const char* params) diff --git a/src/unit_tests/core/ut_array.cpp b/src/unit_tests/core/ut_array.cpp index e21dbb78e4..e5b135a930 100644 --- a/src/unit_tests/core/ut_array.cpp +++ b/src/unit_tests/core/ut_array.cpp @@ -1,5 +1,5 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/array.h" +#include "engine/core/array.h" void UT_array(const char* params) diff --git a/src/unit_tests/core/ut_associative_array.cpp b/src/unit_tests/core/ut_associative_array.cpp index 0ac2b4747e..fa787ef62a 100644 --- a/src/unit_tests/core/ut_associative_array.cpp +++ b/src/unit_tests/core/ut_associative_array.cpp @@ -1,5 +1,5 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/associative_array.h" +#include "engine/core/associative_array.h" void UT_associative_array(const char* params) diff --git a/src/unit_tests/core/ut_binary_array.cpp b/src/unit_tests/core/ut_binary_array.cpp index d8e97b952e..4cfcb24b54 100644 --- a/src/unit_tests/core/ut_binary_array.cpp +++ b/src/unit_tests/core/ut_binary_array.cpp @@ -1,5 +1,5 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/binary_array.h" +#include "engine/core/binary_array.h" #include diff --git a/src/unit_tests/core/ut_blob.cpp b/src/unit_tests/core/ut_blob.cpp index f9618e8803..741cad28d4 100644 --- a/src/unit_tests/core/ut_blob.cpp +++ b/src/unit_tests/core/ut_blob.cpp @@ -1,6 +1,6 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/blob.h" -#include "core/string.h" +#include "engine/core/blob.h" +#include "engine/core/string.h" void UT_blob(const char* params) diff --git a/src/unit_tests/core/ut_command_line_parser.cpp b/src/unit_tests/core/ut_command_line_parser.cpp index fca4ab9c9e..063d3f3f7d 100644 --- a/src/unit_tests/core/ut_command_line_parser.cpp +++ b/src/unit_tests/core/ut_command_line_parser.cpp @@ -1,5 +1,5 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/command_line_parser.h" +#include "engine/core/command_line_parser.h" void UT_command_line_parser(const char* params) diff --git a/src/unit_tests/core/ut_crc32.cpp b/src/unit_tests/core/ut_crc32.cpp index f5514ff1ae..051351fe55 100644 --- a/src/unit_tests/core/ut_crc32.cpp +++ b/src/unit_tests/core/ut_crc32.cpp @@ -1,5 +1,5 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/crc32.h" +#include "engine/core/crc32.h" void UT_crc32(const char* params) diff --git a/src/unit_tests/core/ut_delegate.cpp b/src/unit_tests/core/ut_delegate.cpp index 3c31269b28..af064c8e75 100644 --- a/src/unit_tests/core/ut_delegate.cpp +++ b/src/unit_tests/core/ut_delegate.cpp @@ -1,5 +1,5 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/delegate.h" +#include "engine/core/delegate.h" static int x = 0; diff --git a/src/unit_tests/core/ut_file_system.cpp b/src/unit_tests/core/ut_file_system.cpp index 005e32c012..67caf2955a 100644 --- a/src/unit_tests/core/ut_file_system.cpp +++ b/src/unit_tests/core/ut_file_system.cpp @@ -1,9 +1,9 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/fs/file_system.h" -#include "core/fs/disk_file_device.h" -#include "core/fs/file_events_device.h" -#include "core/path.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/disk_file_device.h" +#include "engine/core/fs/file_events_device.h" +#include "engine/core/path.h" namespace { diff --git a/src/unit_tests/core/ut_fixed_lock_free_queue.cpp b/src/unit_tests/core/ut_fixed_lock_free_queue.cpp index 3e0cd21ce8..f6fc58de16 100644 --- a/src/unit_tests/core/ut_fixed_lock_free_queue.cpp +++ b/src/unit_tests/core/ut_fixed_lock_free_queue.cpp @@ -1,8 +1,8 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/mt/lock_free_fixed_queue.h" -#include "core/mt/task.h" -#include "core/mt/thread.h" +#include "engine/core/mt/lock_free_fixed_queue.h" +#include "engine/core/mt/task.h" +#include "engine/core/mt/thread.h" namespace { diff --git a/src/unit_tests/core/ut_hash_map.cpp b/src/unit_tests/core/ut_hash_map.cpp index 2e8d75aba3..a09e5cd5aa 100644 --- a/src/unit_tests/core/ut_hash_map.cpp +++ b/src/unit_tests/core/ut_hash_map.cpp @@ -1,7 +1,7 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/array.h" -#include "core/hash_map.h" +#include "engine/core/array.h" +#include "engine/core/hash_map.h" #include "debug/debug.h" namespace diff --git a/src/unit_tests/core/ut_json_serializer.cpp b/src/unit_tests/core/ut_json_serializer.cpp index dc0c589a29..108853cd80 100644 --- a/src/unit_tests/core/ut_json_serializer.cpp +++ b/src/unit_tests/core/ut_json_serializer.cpp @@ -1,8 +1,8 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/fs/file_system.h" -#include "core/fs/memory_file_device.h" -#include "core/json_serializer.h" -#include "core/path.h" +#include "engine/core/fs/file_system.h" +#include "engine/core/fs/memory_file_device.h" +#include "engine/core/json_serializer.h" +#include "engine/core/path.h" #include diff --git a/src/unit_tests/core/ut_math_utils.cpp b/src/unit_tests/core/ut_math_utils.cpp index e538f053f2..5ba042c44f 100644 --- a/src/unit_tests/core/ut_math_utils.cpp +++ b/src/unit_tests/core/ut_math_utils.cpp @@ -1,5 +1,5 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/math_utils.h" +#include "engine/core/math_utils.h" void UT_math_utils_abs_signum(const char* params) diff --git a/src/unit_tests/core/ut_matrix.cpp b/src/unit_tests/core/ut_matrix.cpp index 205389f051..426d23f19e 100644 --- a/src/unit_tests/core/ut_matrix.cpp +++ b/src/unit_tests/core/ut_matrix.cpp @@ -1,6 +1,6 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/matrix.h" -#include "core/quat.h" +#include "engine/core/matrix.h" +#include "engine/core/quat.h" void expectSameMatrices(const Lumix::Matrix& mtx1, const Lumix::Matrix& mtx2) diff --git a/src/unit_tests/core/ut_mtjd_framework.cpp b/src/unit_tests/core/ut_mtjd_framework.cpp index 3f58f283ba..0fe4231d10 100644 --- a/src/unit_tests/core/ut_mtjd_framework.cpp +++ b/src/unit_tests/core/ut_mtjd_framework.cpp @@ -1,6 +1,6 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/mtjd/job.h" -#include "core/mtjd/manager.h" +#include "engine/core/mtjd/job.h" +#include "engine/core/mtjd/manager.h" namespace diff --git a/src/unit_tests/core/ut_path.cpp b/src/unit_tests/core/ut_path.cpp index bc9d6954f8..c67e00bf5f 100644 --- a/src/unit_tests/core/ut_path.cpp +++ b/src/unit_tests/core/ut_path.cpp @@ -1,8 +1,8 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/path.h" -#include "core/crc32.h" -#include "core/string.h" +#include "engine/core/path.h" +#include "engine/core/crc32.h" +#include "engine/core/string.h" const char src_path[] = "Unit\\Test\\PATH_1231231.EXT"; const char res_path[] = "unit/test/path_1231231.ext"; diff --git a/src/unit_tests/core/ut_quat.cpp b/src/unit_tests/core/ut_quat.cpp index d7602f39fb..cbabebe548 100644 --- a/src/unit_tests/core/ut_quat.cpp +++ b/src/unit_tests/core/ut_quat.cpp @@ -1,8 +1,8 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/quat.h" -#include "core/matrix.h" -#include "core/math_utils.h" +#include "engine/core/quat.h" +#include "engine/core/matrix.h" +#include "engine/core/math_utils.h" #include diff --git a/src/unit_tests/core/ut_string.cpp b/src/unit_tests/core/ut_string.cpp index 54dcd3f007..e131915c08 100644 --- a/src/unit_tests/core/ut_string.cpp +++ b/src/unit_tests/core/ut_string.cpp @@ -1,5 +1,5 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/string.h" +#include "engine/core/string.h" #include diff --git a/src/unit_tests/core/ut_transaction_queue.cpp b/src/unit_tests/core/ut_transaction_queue.cpp index 99902b4fb4..2bfacc39ea 100644 --- a/src/unit_tests/core/ut_transaction_queue.cpp +++ b/src/unit_tests/core/ut_transaction_queue.cpp @@ -1,9 +1,9 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/mt/lock_free_fixed_queue.h" -#include "core/mt/transaction.h" -#include "core/mt/task.h" -#include "core/mt/thread.h" +#include "engine/core/mt/lock_free_fixed_queue.h" +#include "engine/core/mt/transaction.h" +#include "engine/core/mt/task.h" +#include "engine/core/mt/thread.h" namespace { diff --git a/src/unit_tests/core/ut_vec3.cpp b/src/unit_tests/core/ut_vec3.cpp index 3acd520496..847834167b 100644 --- a/src/unit_tests/core/ut_vec3.cpp +++ b/src/unit_tests/core/ut_vec3.cpp @@ -1,5 +1,5 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/vec.h" +#include "engine/core/vec.h" #include diff --git a/src/unit_tests/graphics/ut_clipper.cpp b/src/unit_tests/graphics/ut_clipper.cpp index 9f77a6f46b..305a967cc8 100644 --- a/src/unit_tests/graphics/ut_clipper.cpp +++ b/src/unit_tests/graphics/ut_clipper.cpp @@ -1,10 +1,10 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/geometry.h" -#include "core/timer.h" -#include "core/log.h" +#include "engine/core/geometry.h" +#include "engine/core/timer.h" +#include "engine/core/log.h" -#include "core/mtjd/manager.h" +#include "engine/core/mtjd/manager.h" #include "renderer/culling_system.h" diff --git a/src/unit_tests/graphics/ut_texture.cpp b/src/unit_tests/graphics/ut_texture.cpp index 976b7cd8cf..4f4d404a49 100644 --- a/src/unit_tests/graphics/ut_texture.cpp +++ b/src/unit_tests/graphics/ut_texture.cpp @@ -1,7 +1,7 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/fs/disk_file_device.h" -#include "core/fs/file_system.h" +#include "engine/core/fs/disk_file_device.h" +#include "engine/core/fs/file_system.h" #include "renderer/texture.h" namespace diff --git a/src/unit_tests/suite/lumix_unit_tests.h b/src/unit_tests/suite/lumix_unit_tests.h index b1378346fb..8a3f998a6e 100644 --- a/src/unit_tests/suite/lumix_unit_tests.h +++ b/src/unit_tests/suite/lumix_unit_tests.h @@ -1,8 +1,8 @@ #pragma once #include "lumix.h" -#include "core/log.h" -#include "core/mt/task.h" +#include "engine/core/log.h" +#include "engine/core/mt/task.h" #include "unit_tests/suite/unit_test_manager.h" #include "unit_tests/suite/unit_test_app.h" diff --git a/src/unit_tests/suite/unit_test.h b/src/unit_tests/suite/unit_test.h index 8cc476bfe7..fc58060907 100644 --- a/src/unit_tests/suite/unit_test.h +++ b/src/unit_tests/suite/unit_test.h @@ -1,8 +1,8 @@ #pragma once -#include "core/math_utils.h" -#include "core/string.h" +#include "engine/core/math_utils.h" +#include "engine/core/string.h" namespace Lumix diff --git a/src/unit_tests/suite/unit_test_app.cpp b/src/unit_tests/suite/unit_test_app.cpp index 614e76e212..010b4fe8dc 100644 --- a/src/unit_tests/suite/unit_test_app.cpp +++ b/src/unit_tests/suite/unit_test_app.cpp @@ -1,7 +1,7 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/log.h" -#include "core/pc/simple_win.h" +#include "engine/core/log.h" +#include "engine/core/pc/simple_win.h" #include diff --git a/src/unit_tests/suite/unit_test_manager.cpp b/src/unit_tests/suite/unit_test_manager.cpp index 76c3d2cbbb..a62b2337d6 100644 --- a/src/unit_tests/suite/unit_test_manager.cpp +++ b/src/unit_tests/suite/unit_test_manager.cpp @@ -1,12 +1,12 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "core/log.h" -#include "core/mt/lock_free_fixed_queue.h" -#include "core/mt/task.h" -#include "core/mt/thread.h" -#include "core/mt/transaction.h" -#include "core/queue.h" -#include "core/array.h" +#include "engine/core/log.h" +#include "engine/core/mt/lock_free_fixed_queue.h" +#include "engine/core/mt/task.h" +#include "engine/core/mt/thread.h" +#include "engine/core/mt/transaction.h" +#include "engine/core/queue.h" +#include "engine/core/array.h" #include #include From 6467fe584c86a266a8b46fddb5c762659a11c2c0 Mon Sep 17 00:00:00 2001 From: Maxim Kolganov Date: Fri, 22 Apr 2016 19:33:06 +0300 Subject: [PATCH 3/6] change includes to "engine/universe" directory --- src/animation/animation_system.cpp | 2 +- src/app/main.cpp | 2 +- src/audio/audio_scene.cpp | 2 +- src/editor/editor_icon.cpp | 2 +- src/editor/entity_groups.cpp | 2 +- src/editor/entity_template_system.cpp | 2 +- src/editor/gizmo.cpp | 2 +- src/editor/import_asset_dialog.cpp | 2 +- src/editor/property_grid.h | 2 +- src/editor/utils.cpp | 2 +- src/editor/world_editor.cpp | 2 +- src/editor/world_editor.h | 2 +- src/lua_script/lua_script_system.cpp | 2 +- src/navigation/navigation_system.cpp | 2 +- src/physics/physics_scene.cpp | 2 +- src/physics/physics_system.cpp | 2 +- src/renderer/editor/terrain_editor.cpp | 2 +- src/renderer/particle_system.cpp | 2 +- src/renderer/pipeline.cpp | 2 +- src/renderer/render_scene.cpp | 2 +- src/renderer/renderer.cpp | 2 +- src/renderer/terrain.cpp | 2 +- src/script/script_system.cpp | 2 +- src/script/script_system.h | 2 +- src/unit_tests/engine/ut_universe.cpp | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/animation/animation_system.cpp b/src/animation/animation_system.cpp index 8c7b10bdad..c7a08701ad 100644 --- a/src/animation/animation_system.cpp +++ b/src/animation/animation_system.cpp @@ -17,7 +17,7 @@ #include "renderer/model.h" #include "renderer/pose.h" #include "renderer/render_scene.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" namespace Lumix diff --git a/src/app/main.cpp b/src/app/main.cpp index d916b21fe5..fe5f2aa294 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -24,7 +24,7 @@ #include "renderer/pipeline.h" #include "renderer/renderer.h" #include "renderer/texture.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #include #include diff --git a/src/audio/audio_scene.cpp b/src/audio/audio_scene.cpp index 87646c0f03..0a93347c39 100644 --- a/src/audio/audio_scene.cpp +++ b/src/audio/audio_scene.cpp @@ -12,7 +12,7 @@ #include "editor/world_editor.h" #include "engine/engine.h" #include "lua_script/lua_script_system.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" namespace Lumix diff --git a/src/editor/editor_icon.cpp b/src/editor/editor_icon.cpp index 17c35a4370..3a3c25b681 100644 --- a/src/editor/editor_icon.cpp +++ b/src/editor/editor_icon.cpp @@ -6,7 +6,7 @@ #include "engine/core/resource_manager_base.h" #include "engine.h" #include "render_interface.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #include "world_editor.h" #include diff --git a/src/editor/entity_groups.cpp b/src/editor/entity_groups.cpp index 43d4c02d8a..24110b11a3 100644 --- a/src/editor/entity_groups.cpp +++ b/src/editor/entity_groups.cpp @@ -1,7 +1,7 @@ #include "entity_groups.h" #include "engine/core/blob.h" #include "engine/core/string.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" namespace Lumix diff --git a/src/editor/entity_template_system.cpp b/src/editor/entity_template_system.cpp index 6adc1303ee..2cc17257ee 100644 --- a/src/editor/entity_template_system.cpp +++ b/src/editor/entity_template_system.cpp @@ -9,7 +9,7 @@ #include "editor/world_editor.h" #include "engine.h" #include "iplugin.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #include diff --git a/src/editor/gizmo.cpp b/src/editor/gizmo.cpp index 3486a8d41d..edf9ba6acc 100644 --- a/src/editor/gizmo.cpp +++ b/src/editor/gizmo.cpp @@ -9,7 +9,7 @@ #include "engine.h" #include "render_interface.h" #include "renderer/render_scene.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #include #include diff --git a/src/editor/import_asset_dialog.cpp b/src/editor/import_asset_dialog.cpp index b0e2de5a79..2c3b877653 100644 --- a/src/editor/import_asset_dialog.cpp +++ b/src/editor/import_asset_dialog.cpp @@ -29,7 +29,7 @@ #include "renderer/render_scene.h" #include "renderer/renderer.h" #include "renderer/texture.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #ifndef STATIC_PLUGINS #define STB_IMAGE_IMPLEMENTATION #endif diff --git a/src/editor/property_grid.h b/src/editor/property_grid.h index 0f75d29179..af3ef545cd 100644 --- a/src/editor/property_grid.h +++ b/src/editor/property_grid.h @@ -2,7 +2,7 @@ #include "engine/core/array.h" -#include "universe/component.h" +#include "engine/universe/component.h" namespace Lumix diff --git a/src/editor/utils.cpp b/src/editor/utils.cpp index d930bad139..f6f3936640 100644 --- a/src/editor/utils.cpp +++ b/src/editor/utils.cpp @@ -6,7 +6,7 @@ #include "editor/world_editor.h" #include "imgui/imgui.h" #include "renderer/render_scene.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" void getEntityListDisplayName(Lumix::WorldEditor& editor, diff --git a/src/editor/world_editor.cpp b/src/editor/world_editor.cpp index d37fcab125..b9c80ea8a2 100644 --- a/src/editor/world_editor.cpp +++ b/src/editor/world_editor.cpp @@ -38,7 +38,7 @@ #include "renderer/model.h" #include "renderer/pipeline.h" #include "renderer/render_scene.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" namespace Lumix diff --git a/src/editor/world_editor.h b/src/editor/world_editor.h index 9f67473be3..e2565135b4 100644 --- a/src/editor/world_editor.h +++ b/src/editor/world_editor.h @@ -3,7 +3,7 @@ #include "lumix.h" #include "engine/core/array.h" #include "engine/core/delegate_list.h" -#include "universe/component.h" +#include "engine/universe/component.h" namespace Lumix diff --git a/src/lua_script/lua_script_system.cpp b/src/lua_script/lua_script_system.cpp index 7be435e77c..28f9798eda 100644 --- a/src/lua_script/lua_script_system.cpp +++ b/src/lua_script/lua_script_system.cpp @@ -25,7 +25,7 @@ #include "iplugin.h" #include "lua_script/lua_script_manager.h" #include "plugin_manager.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" namespace Lumix diff --git a/src/navigation/navigation_system.cpp b/src/navigation/navigation_system.cpp index 8b88cc17e7..6ec2328515 100644 --- a/src/navigation/navigation_system.cpp +++ b/src/navigation/navigation_system.cpp @@ -14,7 +14,7 @@ #include "renderer/material.h" #include "renderer/render_scene.h" #include "renderer/texture.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #include #include #include diff --git a/src/physics/physics_scene.cpp b/src/physics/physics_scene.cpp index 1290ae7556..c6bfa2d329 100644 --- a/src/physics/physics_scene.cpp +++ b/src/physics/physics_scene.cpp @@ -17,7 +17,7 @@ #include "renderer/texture.h" #include "physics/physics_system.h" #include "physics/physics_geometry_manager.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #include diff --git a/src/physics/physics_system.cpp b/src/physics/physics_system.cpp index 4a720839c6..a8d4721fee 100644 --- a/src/physics/physics_system.cpp +++ b/src/physics/physics_system.cpp @@ -16,7 +16,7 @@ #include "physics/physics_geometry_manager.h" #include "physics/physics_scene.h" #include "renderer/render_scene.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" namespace Lumix diff --git a/src/renderer/editor/terrain_editor.cpp b/src/renderer/editor/terrain_editor.cpp index 7a3464e8b7..2e599ab05e 100644 --- a/src/renderer/editor/terrain_editor.cpp +++ b/src/renderer/editor/terrain_editor.cpp @@ -24,7 +24,7 @@ #include "renderer/render_scene.h" #include "renderer/texture.h" #include "renderer/terrain.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #include diff --git a/src/renderer/particle_system.cpp b/src/renderer/particle_system.cpp index a23382b611..e3b0b897c7 100644 --- a/src/renderer/particle_system.cpp +++ b/src/renderer/particle_system.cpp @@ -9,7 +9,7 @@ #include "editor/world_editor.h" #include "renderer/material.h" #include "renderer/render_scene.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #include diff --git a/src/renderer/pipeline.cpp b/src/renderer/pipeline.cpp index 86f55e8c86..5b9521ee4f 100644 --- a/src/renderer/pipeline.cpp +++ b/src/renderer/pipeline.cpp @@ -21,7 +21,7 @@ #include "renderer/shader.h" #include "renderer/terrain.h" #include "renderer/texture.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #include #include diff --git a/src/renderer/render_scene.cpp b/src/renderer/render_scene.cpp index 25c145462e..e732bbd7cf 100644 --- a/src/renderer/render_scene.cpp +++ b/src/renderer/render_scene.cpp @@ -34,7 +34,7 @@ #include "renderer/terrain.h" #include "renderer/texture.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #include diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp index 442e79ad6d..ac7be45432 100644 --- a/src/renderer/renderer.cpp +++ b/src/renderer/renderer.cpp @@ -20,7 +20,7 @@ #include "renderer/shader_manager.h" #include "renderer/texture.h" #include "renderer/texture_manager.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #include #include #include diff --git a/src/renderer/terrain.cpp b/src/renderer/terrain.cpp index c57c2340f7..937189dbfb 100644 --- a/src/renderer/terrain.cpp +++ b/src/renderer/terrain.cpp @@ -15,7 +15,7 @@ #include "renderer/render_scene.h" #include "renderer/shader.h" #include "renderer/texture.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" #include #include diff --git a/src/script/script_system.cpp b/src/script/script_system.cpp index a119dcdf6b..905b887e67 100644 --- a/src/script/script_system.cpp +++ b/src/script/script_system.cpp @@ -10,7 +10,7 @@ #include "engine/core/array.h" #include "editor/world_editor.h" #include "engine/engine.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" static const uint32_t SCRIPT_HASH = crc32("script"); diff --git a/src/script/script_system.h b/src/script/script_system.h index 900ac6533c..ef367337e1 100644 --- a/src/script/script_system.h +++ b/src/script/script_system.h @@ -4,7 +4,7 @@ #include "engine/core/lumix.h" #include "engine/core/string.h" #include "engine/iplugin.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" namespace Lumix diff --git a/src/unit_tests/engine/ut_universe.cpp b/src/unit_tests/engine/ut_universe.cpp index a000af59c5..dfde9a45b7 100644 --- a/src/unit_tests/engine/ut_universe.cpp +++ b/src/unit_tests/engine/ut_universe.cpp @@ -1,5 +1,5 @@ #include "unit_tests/suite/lumix_unit_tests.h" -#include "universe/universe.h" +#include "engine/universe/universe.h" namespace From ab5e2abc078f301b83f226ecaf91c8d710431855 Mon Sep 17 00:00:00 2001 From: Maxim Kolganov Date: Fri, 22 Apr 2016 19:34:34 +0300 Subject: [PATCH 4/6] change includes to "engine/debug" directory --- src/app/main.cpp | 2 +- src/editor/import_asset_dialog.cpp | 2 +- src/editor/profiler_ui.cpp | 2 +- src/editor/settings.cpp | 2 +- src/editor/studio_app.cpp | 2 +- src/editor/world_editor.cpp | 2 +- src/engine/debug/pc/debug.cpp | 2 +- src/engine/debug/pc/floating_points.cpp | 2 +- src/engine/engine.cpp | 2 +- src/engine/plugin_manager.cpp | 2 +- src/lua_script/lua_script_system.cpp | 2 +- src/renderer/renderer.cpp | 2 +- src/unit_tests/core/ut_hash_map.cpp | 2 +- src/unit_tests/main.cpp | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index fe5f2aa294..587130de97 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -16,7 +16,7 @@ #include "engine/core/resource_manager_base.h" #include "engine/core/system.h" #include "engine/core/timer.h" -#include "debug/debug.h" +#include "engine/debug/debug.h" #include "editor/gizmo.h" #include "editor/world_editor.h" #include "engine/engine.h" diff --git a/src/editor/import_asset_dialog.cpp b/src/editor/import_asset_dialog.cpp index 2c3b877653..07bd0aeaeb 100644 --- a/src/editor/import_asset_dialog.cpp +++ b/src/editor/import_asset_dialog.cpp @@ -14,7 +14,7 @@ #include "engine/core/path_utils.h" #include "engine/core/system.h" #include "crnlib.h" -#include "debug/floating_points.h" +#include "engine/debug/floating_points.h" #include "editor/world_editor.h" #include "engine/engine.h" #include "engine/plugin_manager.h" diff --git a/src/editor/profiler_ui.cpp b/src/editor/profiler_ui.cpp index c57784a0b6..f386777ac2 100644 --- a/src/editor/profiler_ui.cpp +++ b/src/editor/profiler_ui.cpp @@ -11,7 +11,7 @@ #include "engine/core/resource_manager.h" #include "engine/core/resource_manager_base.h" #include "engine/core/timer.h" -#include "debug/debug.h" +#include "engine/debug/debug.h" #include "engine/engine.h" #include "imgui/imgui.h" #include "utils.h" diff --git a/src/editor/settings.cpp b/src/editor/settings.cpp index d45bfbf016..4b968e2de6 100644 --- a/src/editor/settings.cpp +++ b/src/editor/settings.cpp @@ -1,7 +1,7 @@ #include "settings.h" #include "engine/core/fs/os_file.h" #include "engine/core/log.h" -#include "debug/debug.h" +#include "engine/debug/debug.h" #include "imgui/imgui.h" #include "platform_interface.h" #include "utils.h" diff --git a/src/editor/studio_app.cpp b/src/editor/studio_app.cpp index 2d7516f40f..f1ccb21413 100644 --- a/src/editor/studio_app.cpp +++ b/src/editor/studio_app.cpp @@ -17,7 +17,7 @@ #include "engine/core/resource_manager.h" #include "engine/core/system.h" #include "engine/core/timer.h" -#include "debug/debug.h" +#include "engine/debug/debug.h" #include "editor/gizmo.h" #include "editor/entity_groups.h" #include "editor/entity_template_system.h" diff --git a/src/editor/world_editor.cpp b/src/editor/world_editor.cpp index b9c80ea8a2..491fca7fe9 100644 --- a/src/editor/world_editor.cpp +++ b/src/editor/world_editor.cpp @@ -22,7 +22,7 @@ #include "engine/core/resource_manager_base.h" #include "engine/core/system.h" #include "engine/core/timer.h" -#include "debug/debug.h" +#include "engine/debug/debug.h" #include "editor/entity_groups.h" #include "editor/editor_icon.h" #include "editor/entity_template_system.h" diff --git a/src/engine/debug/pc/debug.cpp b/src/engine/debug/pc/debug.cpp index baf99022f8..481a7f18c8 100644 --- a/src/engine/debug/pc/debug.cpp +++ b/src/engine/debug/pc/debug.cpp @@ -1,4 +1,4 @@ -#include "debug/debug.h" +#include "engine/debug/debug.h" #include "engine/core/mt/atomic.h" #include "engine/core/string.h" #include "engine/core/system.h" diff --git a/src/engine/debug/pc/floating_points.cpp b/src/engine/debug/pc/floating_points.cpp index bcf33de9ef..a6b339fe60 100644 --- a/src/engine/debug/pc/floating_points.cpp +++ b/src/engine/debug/pc/floating_points.cpp @@ -1,4 +1,4 @@ -#include "debug/floating_points.h" +#include "engine/debug/floating_points.h" #include namespace Lumix diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index bbebae0cf0..68dda09914 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -14,7 +14,7 @@ #include "engine/core/fs/file_system.h" #include "engine/core/fs/memory_file_device.h" #include "engine/core/mtjd/manager.h" -#include "debug/debug.h" +#include "engine/debug/debug.h" #include "engine/iplugin.h" #include "engine/property_descriptor.h" #include "engine/property_register.h" diff --git a/src/engine/plugin_manager.cpp b/src/engine/plugin_manager.cpp index 056ba3fa2d..77eb5a185d 100644 --- a/src/engine/plugin_manager.cpp +++ b/src/engine/plugin_manager.cpp @@ -3,7 +3,7 @@ #include "engine/core/log.h" #include "engine/core/profiler.h" #include "engine/core/system.h" -#include "debug/debug.h" +#include "engine/debug/debug.h" #include "engine.h" #include "iplugin.h" diff --git a/src/lua_script/lua_script_system.cpp b/src/lua_script/lua_script_system.cpp index 28f9798eda..45dee826fd 100644 --- a/src/lua_script/lua_script_system.cpp +++ b/src/lua_script/lua_script_system.cpp @@ -11,7 +11,7 @@ #include "engine/core/lua_wrapper.h" #include "engine/core/path_utils.h" #include "engine/core/resource_manager.h" -#include "debug/debug.h" +#include "engine/debug/debug.h" #include "editor/asset_browser.h" #include "editor/ieditor_command.h" #include "editor/imgui/imgui.h" diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp index ac7be45432..d99d8872dd 100644 --- a/src/renderer/renderer.cpp +++ b/src/renderer/renderer.cpp @@ -7,7 +7,7 @@ #include "engine/core/log.h" #include "engine/core/profiler.h" #include "engine/core/resource_manager.h" -#include "debug/debug.h" +#include "engine/debug/debug.h" #include "engine.h" #include "engine/property_descriptor.h" #include "engine/property_register.h" diff --git a/src/unit_tests/core/ut_hash_map.cpp b/src/unit_tests/core/ut_hash_map.cpp index a09e5cd5aa..831576b9d8 100644 --- a/src/unit_tests/core/ut_hash_map.cpp +++ b/src/unit_tests/core/ut_hash_map.cpp @@ -2,7 +2,7 @@ #include "engine/core/array.h" #include "engine/core/hash_map.h" -#include "debug/debug.h" +#include "engine/debug/debug.h" namespace { diff --git a/src/unit_tests/main.cpp b/src/unit_tests/main.cpp index f041baa4f3..46d106d4e3 100644 --- a/src/unit_tests/main.cpp +++ b/src/unit_tests/main.cpp @@ -1,5 +1,5 @@ #include "lumix.h" -#include "debug/floating_points.h" +#include "engine/debug/floating_points.h" #include "unit_tests/suite/unit_test_app.h" From 9e0b12b621e91c6e083a90b4880d840dadbd048d Mon Sep 17 00:00:00 2001 From: Maxim Kolganov Date: Fri, 22 Apr 2016 19:51:38 +0300 Subject: [PATCH 5/6] change includes to individual files in engine/ directory --- src/animation/animation_system.cpp | 2 +- src/animation/animation_system.h | 4 ++-- src/audio/audio_device.h | 2 +- src/audio/clip_manager.cpp | 2 +- src/editor/editor_icon.cpp | 2 +- src/editor/entity_groups.h | 2 +- src/editor/entity_template_system.cpp | 4 ++-- src/editor/entity_template_system.h | 2 +- src/editor/gizmo.cpp | 2 +- src/editor/gizmo.h | 2 +- src/editor/import_asset_dialog.h | 2 +- src/editor/platform_interface.h | 2 +- src/editor/profiler_ui.h | 2 +- src/editor/render_interface.h | 2 +- src/editor/settings.h | 2 +- src/editor/studio_app.cpp | 2 +- src/editor/studio_app.h | 2 +- src/editor/utils.h | 2 +- src/editor/world_editor.cpp | 6 +++--- src/editor/world_editor.h | 2 +- src/engine/core/binary_array.h | 2 +- src/engine/core/blob.h | 2 +- src/engine/core/command_line_parser.h | 2 +- src/engine/core/crc32.h | 2 +- src/engine/core/default_allocator.h | 2 +- src/engine/core/delegate.h | 2 +- src/engine/core/free_list.h | 2 +- src/engine/core/fs/disk_file_device.h | 2 +- src/engine/core/fs/file_events_device.h | 2 +- src/engine/core/fs/file_system.h | 2 +- src/engine/core/fs/ifile_device.h | 2 +- src/engine/core/fs/memory_file_device.h | 2 +- src/engine/core/fs/os_file.h | 2 +- src/engine/core/fs/pack_file_device.h | 2 +- src/engine/core/fs/pc/os_file.cpp | 2 +- src/engine/core/fs/tcp_file_device.h | 2 +- src/engine/core/fs/tcp_file_server.h | 2 +- src/engine/core/geometry.h | 2 +- src/engine/core/hash_map.h | 2 +- src/engine/core/iallocator.h | 2 +- src/engine/core/input_system.h | 2 +- src/engine/core/json_serializer.h | 2 +- src/engine/core/log.h | 2 +- src/engine/core/math_utils.h | 2 +- src/engine/core/matrix.h | 2 +- src/engine/core/mt/atomic.h | 2 +- src/engine/core/mt/pc/task.cpp | 2 +- src/engine/core/mt/pc/thread.cpp | 2 +- src/engine/core/mt/sync.h | 2 +- src/engine/core/mt/task.h | 2 +- src/engine/core/mtjd/base_entry.cpp | 2 +- src/engine/core/mtjd/group.cpp | 2 +- src/engine/core/mtjd/job.cpp | 2 +- src/engine/core/mtjd/manager.cpp | 2 +- src/engine/core/mtjd/scheduler.cpp | 2 +- src/engine/core/mtjd/worker_thread.cpp | 2 +- src/engine/core/network.h | 2 +- src/engine/core/path.cpp | 2 +- src/engine/core/path_utils.h | 2 +- src/engine/core/pc/timer.cpp | 2 +- src/engine/core/profiler.h | 2 +- src/engine/core/quat.h | 2 +- src/engine/core/resource.cpp | 2 +- src/engine/core/resource_manager.cpp | 2 +- src/engine/core/resource_manager_base.cpp | 2 +- src/engine/core/string.h | 2 +- src/engine/core/system.h | 2 +- src/engine/core/vec.h | 2 +- src/engine/debug/debug.h | 2 +- src/engine/debug/floating_points.h | 2 +- src/engine/engine.cpp | 4 ++-- src/engine/engine.h | 2 +- src/engine/iplugin.cpp | 2 +- src/engine/iplugin.h | 2 +- src/engine/plugin_manager.cpp | 6 +++--- src/engine/plugin_manager.h | 2 +- src/engine/property_descriptor.cpp | 2 +- src/engine/property_descriptor.h | 4 ++-- src/engine/property_register.cpp | 2 +- src/engine/property_register.h | 2 +- src/engine/universe/component.h | 2 +- src/engine/universe/hierarchy.h | 2 +- src/engine/universe/universe.h | 2 +- src/lua_script/lua_script_system.cpp | 6 +++--- src/navigation/navigation_system.cpp | 2 +- src/physics/physics_geometry_manager.h | 2 +- src/physics/physics_scene.cpp | 2 +- src/physics/physics_scene.h | 4 ++-- src/physics/physics_system.cpp | 2 +- src/physics/physics_system.h | 4 ++-- src/renderer/culling_system.cpp | 2 +- src/renderer/culling_system.h | 2 +- src/renderer/editor/main.cpp | 2 +- src/renderer/editor/shader_compiler.cpp | 2 +- src/renderer/editor/terrain_editor.cpp | 2 +- src/renderer/frame_buffer.h | 2 +- src/renderer/material_manager.cpp | 2 +- src/renderer/model.cpp | 2 +- src/renderer/model_generator.h | 2 +- src/renderer/model_manager.cpp | 2 +- src/renderer/particle_system.h | 2 +- src/renderer/pipeline.cpp | 2 +- src/renderer/pipeline.h | 2 +- src/renderer/pose.h | 2 +- src/renderer/render_scene.cpp | 2 +- src/renderer/render_scene.h | 4 ++-- src/renderer/renderer.cpp | 2 +- src/renderer/renderer.h | 4 ++-- src/renderer/shader_manager.cpp | 2 +- src/renderer/terrain.cpp | 2 +- src/renderer/texture_manager.cpp | 2 +- src/unit_tests/main.cpp | 2 +- src/unit_tests/suite/lumix_unit_tests.h | 2 +- 113 files changed, 127 insertions(+), 127 deletions(-) diff --git a/src/animation/animation_system.cpp b/src/animation/animation_system.cpp index c7a08701ad..25d4254070 100644 --- a/src/animation/animation_system.cpp +++ b/src/animation/animation_system.cpp @@ -11,7 +11,7 @@ #include "editor/property_grid.h" #include "editor/studio_app.h" #include "editor/world_editor.h" -#include "engine.h" +#include "engine/engine.h" #include "engine/property_descriptor.h" #include "engine/property_register.h" #include "renderer/model.h" diff --git a/src/animation/animation_system.h b/src/animation/animation_system.h index 9ac7645218..acd25854a6 100644 --- a/src/animation/animation_system.h +++ b/src/animation/animation_system.h @@ -1,8 +1,8 @@ #pragma once -#include "lumix.h" -#include "iplugin.h" +#include "engine/lumix.h" +#include "engine/iplugin.h" namespace Lumix diff --git a/src/audio/audio_device.h b/src/audio/audio_device.h index 384341f167..9ce7bcb2ca 100644 --- a/src/audio/audio_device.h +++ b/src/audio/audio_device.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/audio/clip_manager.cpp b/src/audio/clip_manager.cpp index 933b3c596f..2b8b76891a 100644 --- a/src/audio/clip_manager.cpp +++ b/src/audio/clip_manager.cpp @@ -2,7 +2,7 @@ #include "engine/core/iallocator.h" #include "engine/core/resource.h" #include "engine/core/string.h" -#include "lumix.h" +#include "engine/lumix.h" #define STB_VORBIS_HEADER_ONLY #include "stb_vorbis.c" #include diff --git a/src/editor/editor_icon.cpp b/src/editor/editor_icon.cpp index 3a3c25b681..4170492dd3 100644 --- a/src/editor/editor_icon.cpp +++ b/src/editor/editor_icon.cpp @@ -4,7 +4,7 @@ #include "engine/core/matrix.h" #include "engine/core/resource_manager.h" #include "engine/core/resource_manager_base.h" -#include "engine.h" +#include "engine/engine.h" #include "render_interface.h" #include "engine/universe/universe.h" #include "world_editor.h" diff --git a/src/editor/entity_groups.h b/src/editor/entity_groups.h index 10e52a29e3..a0ab05bd16 100644 --- a/src/editor/entity_groups.h +++ b/src/editor/entity_groups.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/array.h" diff --git a/src/editor/entity_template_system.cpp b/src/editor/entity_template_system.cpp index 2cc17257ee..2283614049 100644 --- a/src/editor/entity_template_system.cpp +++ b/src/editor/entity_template_system.cpp @@ -7,8 +7,8 @@ #include "engine/core/string.h" #include "editor/ieditor_command.h" #include "editor/world_editor.h" -#include "engine.h" -#include "iplugin.h" +#include "engine/engine.h" +#include "engine/iplugin.h" #include "engine/universe/universe.h" #include diff --git a/src/editor/entity_template_system.h b/src/editor/entity_template_system.h index 22f14b2f84..ddb5dc996b 100644 --- a/src/editor/entity_template_system.h +++ b/src/editor/entity_template_system.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/delegate_list.h" #include "engine/core/string.h" diff --git a/src/editor/gizmo.cpp b/src/editor/gizmo.cpp index edf9ba6acc..60dd956a41 100644 --- a/src/editor/gizmo.cpp +++ b/src/editor/gizmo.cpp @@ -6,7 +6,7 @@ #include "engine/core/resource_manager_base.h" #include "editor/gizmo.h" #include "editor/world_editor.h" -#include "engine.h" +#include "engine/engine.h" #include "render_interface.h" #include "renderer/render_scene.h" #include "engine/universe/universe.h" diff --git a/src/editor/gizmo.h b/src/editor/gizmo.h index bed448d464..69219b1732 100644 --- a/src/editor/gizmo.h +++ b/src/editor/gizmo.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/editor/import_asset_dialog.h b/src/editor/import_asset_dialog.h index 0aa8b85d2f..fa703ad7f9 100644 --- a/src/editor/import_asset_dialog.h +++ b/src/editor/import_asset_dialog.h @@ -7,7 +7,7 @@ #include "engine/core/binary_array.h" #include "engine/core/mt/sync.h" #include "engine/core/string.h" -#include "lumix.h" +#include "engine/lumix.h" class Metadata; diff --git a/src/editor/platform_interface.h b/src/editor/platform_interface.h index d9ee965091..cb8861dcdb 100644 --- a/src/editor/platform_interface.h +++ b/src/editor/platform_interface.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/editor/profiler_ui.h b/src/editor/profiler_ui.h index 447a183252..c49e787fa7 100644 --- a/src/editor/profiler_ui.h +++ b/src/editor/profiler_ui.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/editor/render_interface.h b/src/editor/render_interface.h index f87fea7fed..344c019606 100644 --- a/src/editor/render_interface.h +++ b/src/editor/render_interface.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/geometry.h" #include "engine/core/matrix.h" #include "engine/core/path.h" diff --git a/src/editor/settings.h b/src/editor/settings.h index 008dfc9f84..1a156027ed 100644 --- a/src/editor/settings.h +++ b/src/editor/settings.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/editor/studio_app.cpp b/src/editor/studio_app.cpp index f1ccb21413..594f7fc390 100644 --- a/src/editor/studio_app.cpp +++ b/src/editor/studio_app.cpp @@ -22,7 +22,7 @@ #include "editor/entity_groups.h" #include "editor/entity_template_system.h" #include "editor/world_editor.h" -#include "engine.h" +#include "engine/engine.h" #include "engine/plugin_manager.h" #include "import_asset_dialog.h" #include "log_ui.h" diff --git a/src/editor/studio_app.h b/src/editor/studio_app.h index 0187a7e37f..64908f0ad3 100644 --- a/src/editor/studio_app.h +++ b/src/editor/studio_app.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/array.h" diff --git a/src/editor/utils.h b/src/editor/utils.h index 4683ab0894..545a16086e 100644 --- a/src/editor/utils.h +++ b/src/editor/utils.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/delegate.h" #include "engine/core/string.h" #include "imgui/imgui.h" diff --git a/src/editor/world_editor.cpp b/src/editor/world_editor.cpp index 491fca7fe9..f2fe1123f6 100644 --- a/src/editor/world_editor.cpp +++ b/src/editor/world_editor.cpp @@ -28,12 +28,12 @@ #include "editor/entity_template_system.h" #include "editor/gizmo.h" #include "editor/measure_tool.h" -#include "engine.h" +#include "engine/engine.h" #include "engine/iproperty_descriptor.h" #include "engine/property_register.h" #include "ieditor_command.h" -#include "iplugin.h" -#include "plugin_manager.h" +#include "engine/iplugin.h" +#include "engine/plugin_manager.h" #include "render_interface.h" #include "renderer/model.h" #include "renderer/pipeline.h" diff --git a/src/editor/world_editor.h b/src/editor/world_editor.h index e2565135b4..6d326d6ca1 100644 --- a/src/editor/world_editor.h +++ b/src/editor/world_editor.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/array.h" #include "engine/core/delegate_list.h" #include "engine/universe/component.h" diff --git a/src/engine/core/binary_array.h b/src/engine/core/binary_array.h index 288d94761b..5407b16183 100644 --- a/src/engine/core/binary_array.h +++ b/src/engine/core/binary_array.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/core/blob.h b/src/engine/core/blob.h index 93f56de909..894cc9e158 100644 --- a/src/engine/core/blob.h +++ b/src/engine/core/blob.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/array.h" diff --git a/src/engine/core/command_line_parser.h b/src/engine/core/command_line_parser.h index 7d01420ac2..b4198f0c38 100644 --- a/src/engine/core/command_line_parser.h +++ b/src/engine/core/command_line_parser.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/core/crc32.h b/src/engine/core/crc32.h index 608af4731b..1ad6326b0d 100644 --- a/src/engine/core/crc32.h +++ b/src/engine/core/crc32.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/core/default_allocator.h b/src/engine/core/default_allocator.h index 17724b7207..ff079824f4 100644 --- a/src/engine/core/default_allocator.h +++ b/src/engine/core/default_allocator.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/iallocator.h" diff --git a/src/engine/core/delegate.h b/src/engine/core/delegate.h index d932eb7c03..1dc2af6cce 100644 --- a/src/engine/core/delegate.h +++ b/src/engine/core/delegate.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" // base on molecular musings blogpost diff --git a/src/engine/core/free_list.h b/src/engine/core/free_list.h index 88161428f1..0b446e6594 100644 --- a/src/engine/core/free_list.h +++ b/src/engine/core/free_list.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/iallocator.h" namespace Lumix diff --git a/src/engine/core/fs/disk_file_device.h b/src/engine/core/fs/disk_file_device.h index b66b2901e8..4cad2f8fc3 100644 --- a/src/engine/core/fs/disk_file_device.h +++ b/src/engine/core/fs/disk_file_device.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/fs/ifile_device.h" namespace Lumix diff --git a/src/engine/core/fs/file_events_device.h b/src/engine/core/fs/file_events_device.h index 49bf91f990..6f72ed7a1d 100644 --- a/src/engine/core/fs/file_events_device.h +++ b/src/engine/core/fs/file_events_device.h @@ -3,7 +3,7 @@ #define FILE_EVENT_DEVICE #ifdef FILE_EVENT_DEVICE -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/fs/ifile_device.h" #include "engine/core/delegate.h" diff --git a/src/engine/core/fs/file_system.h b/src/engine/core/fs/file_system.h index 8e1762db79..492c458778 100644 --- a/src/engine/core/fs/file_system.h +++ b/src/engine/core/fs/file_system.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/delegate.h" namespace Lumix diff --git a/src/engine/core/fs/ifile_device.h b/src/engine/core/fs/ifile_device.h index 800fe3e1e1..601c8ceef5 100644 --- a/src/engine/core/fs/ifile_device.h +++ b/src/engine/core/fs/ifile_device.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix { diff --git a/src/engine/core/fs/memory_file_device.h b/src/engine/core/fs/memory_file_device.h index 81dd6b9d3e..715d917a86 100644 --- a/src/engine/core/fs/memory_file_device.h +++ b/src/engine/core/fs/memory_file_device.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/fs/ifile_device.h" namespace Lumix diff --git a/src/engine/core/fs/os_file.h b/src/engine/core/fs/os_file.h index e6f7c74e4a..02021370b6 100644 --- a/src/engine/core/fs/os_file.h +++ b/src/engine/core/fs/os_file.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/fs/file_system.h" namespace Lumix diff --git a/src/engine/core/fs/pack_file_device.h b/src/engine/core/fs/pack_file_device.h index 0008b07d24..e01ee499f8 100644 --- a/src/engine/core/fs/pack_file_device.h +++ b/src/engine/core/fs/pack_file_device.h @@ -3,7 +3,7 @@ #include "engine/core/fs/ifile_device.h" #include "engine/core/fs/os_file.h" #include "engine/core/hash_map.h" -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/core/fs/pc/os_file.cpp b/src/engine/core/fs/pc/os_file.cpp index e20fcdfe87..198c04fefd 100644 --- a/src/engine/core/fs/pc/os_file.cpp +++ b/src/engine/core/fs/pc/os_file.cpp @@ -2,7 +2,7 @@ #include "engine/core/iallocator.h" #include "engine/core/pc/simple_win.h" #include "engine/core/string.h" -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/core/fs/tcp_file_device.h b/src/engine/core/fs/tcp_file_device.h index 66deedc542..d6cb95dfec 100644 --- a/src/engine/core/fs/tcp_file_device.h +++ b/src/engine/core/fs/tcp_file_device.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/fs/ifile_device.h" namespace Lumix diff --git a/src/engine/core/fs/tcp_file_server.h b/src/engine/core/fs/tcp_file_server.h index a87aa87247..3667ff5442 100644 --- a/src/engine/core/fs/tcp_file_server.h +++ b/src/engine/core/fs/tcp_file_server.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix { diff --git a/src/engine/core/geometry.h b/src/engine/core/geometry.h index a398c15e75..243464d21f 100644 --- a/src/engine/core/geometry.h +++ b/src/engine/core/geometry.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/math_utils.h" #include "engine/core/matrix.h" #include "engine/core/vec.h" diff --git a/src/engine/core/hash_map.h b/src/engine/core/hash_map.h index 7dac3957d2..3693d3cf80 100644 --- a/src/engine/core/hash_map.h +++ b/src/engine/core/hash_map.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/iallocator.h" #include "engine/core/math_utils.h" #include "engine/core/string.h" diff --git a/src/engine/core/iallocator.h b/src/engine/core/iallocator.h index 677489030e..bb6689329a 100644 --- a/src/engine/core/iallocator.h +++ b/src/engine/core/iallocator.h @@ -2,7 +2,7 @@ #include -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/core/input_system.h b/src/engine/core/input_system.h index 91748036a7..8696cc0ccb 100644 --- a/src/engine/core/input_system.h +++ b/src/engine/core/input_system.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/core/json_serializer.h b/src/engine/core/json_serializer.h index 1487fe0438..58d0119b0d 100644 --- a/src/engine/core/json_serializer.h +++ b/src/engine/core/json_serializer.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/core/log.h b/src/engine/core/log.h index 872cf14563..797e69f9aa 100644 --- a/src/engine/core/log.h +++ b/src/engine/core/log.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/delegate_list.h" #include "engine/core/string.h" diff --git a/src/engine/core/math_utils.h b/src/engine/core/math_utils.h index ecb0906de3..404cdb8afa 100644 --- a/src/engine/core/math_utils.h +++ b/src/engine/core/math_utils.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/core/matrix.h b/src/engine/core/matrix.h index ae9b52ca1e..8f820be741 100644 --- a/src/engine/core/matrix.h +++ b/src/engine/core/matrix.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/vec.h" diff --git a/src/engine/core/mt/atomic.h b/src/engine/core/mt/atomic.h index 7dec6d4cfc..4295f1761f 100644 --- a/src/engine/core/mt/atomic.h +++ b/src/engine/core/mt/atomic.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix { diff --git a/src/engine/core/mt/pc/task.cpp b/src/engine/core/mt/pc/task.cpp index 521038edc3..29527e3106 100644 --- a/src/engine/core/mt/pc/task.cpp +++ b/src/engine/core/mt/pc/task.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/iallocator.h" #include "engine/core/mt/task.h" #include "engine/core/mt/thread.h" diff --git a/src/engine/core/mt/pc/thread.cpp b/src/engine/core/mt/pc/thread.cpp index f46ea43fca..1d68e93aa3 100644 --- a/src/engine/core/mt/pc/thread.cpp +++ b/src/engine/core/mt/pc/thread.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/mt/thread.h" #include "engine/core/pc/simple_win.h" diff --git a/src/engine/core/mt/sync.h b/src/engine/core/mt/sync.h index 2cd9e40b90..c594a74c62 100644 --- a/src/engine/core/mt/sync.h +++ b/src/engine/core/mt/sync.h @@ -1,5 +1,5 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix { diff --git a/src/engine/core/mt/task.h b/src/engine/core/mt/task.h index 7989fe098b..6ea62c51d8 100644 --- a/src/engine/core/mt/task.h +++ b/src/engine/core/mt/task.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix { diff --git a/src/engine/core/mtjd/base_entry.cpp b/src/engine/core/mtjd/base_entry.cpp index 50bc18a354..23cf028134 100644 --- a/src/engine/core/mtjd/base_entry.cpp +++ b/src/engine/core/mtjd/base_entry.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/mtjd/base_entry.h" #include "engine/core/mtjd/manager.h" diff --git a/src/engine/core/mtjd/group.cpp b/src/engine/core/mtjd/group.cpp index c3ca9e9486..9a15c5f41f 100644 --- a/src/engine/core/mtjd/group.cpp +++ b/src/engine/core/mtjd/group.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/mtjd/group.h" #include "engine/core/mt/atomic.h" #include "engine/core/mt/sync.h" diff --git a/src/engine/core/mtjd/job.cpp b/src/engine/core/mtjd/job.cpp index 6182603662..0a7a3ad7a3 100644 --- a/src/engine/core/mtjd/job.cpp +++ b/src/engine/core/mtjd/job.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/mtjd/job.h" #include "engine/core/mtjd/manager.h" diff --git a/src/engine/core/mtjd/manager.cpp b/src/engine/core/mtjd/manager.cpp index 96a75ba881..63b4e9d543 100644 --- a/src/engine/core/mtjd/manager.cpp +++ b/src/engine/core/mtjd/manager.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/mtjd/manager.h" #include "engine/core/mtjd/job.h" diff --git a/src/engine/core/mtjd/scheduler.cpp b/src/engine/core/mtjd/scheduler.cpp index d4d6318e96..a4941c43f5 100644 --- a/src/engine/core/mtjd/scheduler.cpp +++ b/src/engine/core/mtjd/scheduler.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/mtjd/scheduler.h" #include "engine/core/mtjd/manager.h" #include "engine/core/profiler.h" diff --git a/src/engine/core/mtjd/worker_thread.cpp b/src/engine/core/mtjd/worker_thread.cpp index 3094caa04f..a4bb6c87c0 100644 --- a/src/engine/core/mtjd/worker_thread.cpp +++ b/src/engine/core/mtjd/worker_thread.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/mtjd/worker_thread.h" #include "engine/core/mtjd/manager.h" diff --git a/src/engine/core/network.h b/src/engine/core/network.h index 9b1b6ca9c8..ca67931387 100644 --- a/src/engine/core/network.h +++ b/src/engine/core/network.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/core/path.cpp b/src/engine/core/path.cpp index 5900d90491..3a5305180f 100644 --- a/src/engine/core/path.cpp +++ b/src/engine/core/path.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/path.h" #include "engine/core/blob.h" diff --git a/src/engine/core/path_utils.h b/src/engine/core/path_utils.h index 6ecfd0434b..95454b76a9 100644 --- a/src/engine/core/path_utils.h +++ b/src/engine/core/path_utils.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/core/pc/timer.cpp b/src/engine/core/pc/timer.cpp index d3b3edd46e..3e27c7c285 100644 --- a/src/engine/core/pc/timer.cpp +++ b/src/engine/core/pc/timer.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/iallocator.h" #include "engine/core/timer.h" diff --git a/src/engine/core/profiler.h b/src/engine/core/profiler.h index 9c7bb74dc1..7cc8fac9e8 100644 --- a/src/engine/core/profiler.h +++ b/src/engine/core/profiler.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/delegate_list.h" #include "engine/core/default_allocator.h" #include "engine/core/hash_map.h" diff --git a/src/engine/core/quat.h b/src/engine/core/quat.h index 33caea3a3f..dbd50e5708 100644 --- a/src/engine/core/quat.h +++ b/src/engine/core/quat.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/vec.h" diff --git a/src/engine/core/resource.cpp b/src/engine/core/resource.cpp index 05a2d2026f..38860bdaf1 100644 --- a/src/engine/core/resource.cpp +++ b/src/engine/core/resource.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/resource.h" #include "engine/core/fs/file_system.h" #include "engine/core/log.h" diff --git a/src/engine/core/resource_manager.cpp b/src/engine/core/resource_manager.cpp index d88b0b195e..bf0d7c3877 100644 --- a/src/engine/core/resource_manager.cpp +++ b/src/engine/core/resource_manager.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/path.h" #include "engine/core/resource_manager.h" #include "engine/core/resource_manager_base.h" diff --git a/src/engine/core/resource_manager_base.cpp b/src/engine/core/resource_manager_base.cpp index ea8c7e4097..e88bbd8dc7 100644 --- a/src/engine/core/resource_manager_base.cpp +++ b/src/engine/core/resource_manager_base.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/resource_manager_base.h" #include "engine/core/crc32.h" diff --git a/src/engine/core/string.h b/src/engine/core/string.h index 159537ff04..16033e7f62 100644 --- a/src/engine/core/string.h +++ b/src/engine/core/string.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/default_allocator.h" diff --git a/src/engine/core/system.h b/src/engine/core/system.h index 1d3ad2c54c..ef8b58a401 100644 --- a/src/engine/core/system.h +++ b/src/engine/core/system.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/core/vec.h b/src/engine/core/vec.h index 6504f935cb..6a2c51ed2e 100644 --- a/src/engine/core/vec.h +++ b/src/engine/core/vec.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/debug/debug.h b/src/engine/debug/debug.h index ca877bc4fd..390500eed6 100644 --- a/src/engine/debug/debug.h +++ b/src/engine/debug/debug.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/iallocator.h" #include "engine/core/mt/sync.h" diff --git a/src/engine/debug/floating_points.h b/src/engine/debug/floating_points.h index a31bf2e3f9..a3831d5463 100644 --- a/src/engine/debug/floating_points.h +++ b/src/engine/debug/floating_points.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index 68dda09914..90760faecf 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -1,4 +1,4 @@ -#include "engine.h" +#include "engine/engine.h" #include "engine/core/blob.h" #include "engine/core/crc32.h" #include "engine/core/fs/os_file.h" @@ -18,7 +18,7 @@ #include "engine/iplugin.h" #include "engine/property_descriptor.h" #include "engine/property_register.h" -#include "plugin_manager.h" +#include "engine/plugin_manager.h" #include "engine/universe/hierarchy.h" #include "engine/universe/universe.h" diff --git a/src/engine/engine.h b/src/engine/engine.h index 67eeb97fe7..990980e4c0 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" struct lua_State; diff --git a/src/engine/iplugin.cpp b/src/engine/iplugin.cpp index cd7a08b090..0562e28f43 100644 --- a/src/engine/iplugin.cpp +++ b/src/engine/iplugin.cpp @@ -1,4 +1,4 @@ -#include "iplugin.h" +#include "engine/iplugin.h" #include "engine/core/string.h" diff --git a/src/engine/iplugin.h b/src/engine/iplugin.h index dde713641e..9e91471894 100644 --- a/src/engine/iplugin.h +++ b/src/engine/iplugin.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/plugin_manager.cpp b/src/engine/plugin_manager.cpp index 77eb5a185d..85769b412f 100644 --- a/src/engine/plugin_manager.cpp +++ b/src/engine/plugin_manager.cpp @@ -1,11 +1,11 @@ -#include "plugin_manager.h" +#include "engine/plugin_manager.h" #include "engine/core/array.h" #include "engine/core/log.h" #include "engine/core/profiler.h" #include "engine/core/system.h" #include "engine/debug/debug.h" -#include "engine.h" -#include "iplugin.h" +#include "engine/engine.h" +#include "engine/iplugin.h" namespace Lumix diff --git a/src/engine/plugin_manager.h b/src/engine/plugin_manager.h index a70105159d..7c4ee67267 100644 --- a/src/engine/plugin_manager.h +++ b/src/engine/plugin_manager.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/property_descriptor.cpp b/src/engine/property_descriptor.cpp index 6f58d1ba9d..adf64e163a 100644 --- a/src/engine/property_descriptor.cpp +++ b/src/engine/property_descriptor.cpp @@ -1,4 +1,4 @@ -#include "property_descriptor.h" +#include "engine/property_descriptor.h" #include "engine/core/crc32.h" #include #include diff --git a/src/engine/property_descriptor.h b/src/engine/property_descriptor.h index d87171c65e..c53808188d 100644 --- a/src/engine/property_descriptor.h +++ b/src/engine/property_descriptor.h @@ -3,8 +3,8 @@ #include "engine/core/blob.h" #include "engine/core/path.h" #include "engine/core/string.h" -#include "iplugin.h" -#include "iproperty_descriptor.h" +#include "engine/iplugin.h" +#include "engine/iproperty_descriptor.h" #include "engine/universe/universe.h" diff --git a/src/engine/property_register.cpp b/src/engine/property_register.cpp index e4a9bf7f59..b184ca3b65 100644 --- a/src/engine/property_register.cpp +++ b/src/engine/property_register.cpp @@ -1,4 +1,4 @@ -#include "property_register.h" +#include "engine/property_register.h" #include "engine/core/associative_array.h" #include "engine/core/crc32.h" #include "engine/iproperty_descriptor.h" diff --git a/src/engine/property_register.h b/src/engine/property_register.h index dd8656a1a3..ec9373b01c 100644 --- a/src/engine/property_register.h +++ b/src/engine/property_register.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/universe/component.h b/src/engine/universe/component.h index 0a75c32ae5..dc6c525641 100644 --- a/src/engine/universe/component.h +++ b/src/engine/universe/component.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/engine/universe/hierarchy.h b/src/engine/universe/hierarchy.h index 085857f4eb..fd2810b86d 100644 --- a/src/engine/universe/hierarchy.h +++ b/src/engine/universe/hierarchy.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/matrix.h" #include "engine/core/hash_map.h" #include "engine/iplugin.h" diff --git a/src/engine/universe/universe.h b/src/engine/universe/universe.h index 63b4d3bb0a..1a93081c22 100644 --- a/src/engine/universe/universe.h +++ b/src/engine/universe/universe.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/array.h" #include "engine/core/associative_array.h" #include "engine/core/delegate_list.h" diff --git a/src/lua_script/lua_script_system.cpp b/src/lua_script/lua_script_system.cpp index 45dee826fd..085dc8282d 100644 --- a/src/lua_script/lua_script_system.cpp +++ b/src/lua_script/lua_script_system.cpp @@ -19,12 +19,12 @@ #include "editor/studio_app.h" #include "editor/utils.h" #include "editor/world_editor.h" -#include "engine.h" +#include "engine/engine.h" #include "engine/property_register.h" #include "engine/property_descriptor.h" -#include "iplugin.h" +#include "engine/iplugin.h" #include "lua_script/lua_script_manager.h" -#include "plugin_manager.h" +#include "engine/plugin_manager.h" #include "engine/universe/universe.h" diff --git a/src/navigation/navigation_system.cpp b/src/navigation/navigation_system.cpp index 6ec2328515..c5df106696 100644 --- a/src/navigation/navigation_system.cpp +++ b/src/navigation/navigation_system.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/array.h" #include "engine/core/base_proxy_allocator.h" #include "engine/core/crc32.h" diff --git a/src/physics/physics_geometry_manager.h b/src/physics/physics_geometry_manager.h index 4147c09695..ca95a811b9 100644 --- a/src/physics/physics_geometry_manager.h +++ b/src/physics/physics_geometry_manager.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/resource.h" #include "engine/core/resource_manager_base.h" diff --git a/src/physics/physics_scene.cpp b/src/physics/physics_scene.cpp index c6bfa2d329..8aecef5642 100644 --- a/src/physics/physics_scene.cpp +++ b/src/physics/physics_scene.cpp @@ -11,7 +11,7 @@ #include "engine/core/profiler.h" #include "engine/core/resource_manager.h" #include "engine/core/resource_manager_base.h" -#include "engine.h" +#include "engine/engine.h" #include "lua_script/lua_script_system.h" #include "renderer/render_scene.h" #include "renderer/texture.h" diff --git a/src/physics/physics_scene.h b/src/physics/physics_scene.h index 31ac1b88a7..4c5146c635 100644 --- a/src/physics/physics_scene.h +++ b/src/physics/physics_scene.h @@ -1,11 +1,11 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/iallocator.h" #include "engine/core/path.h" #include "engine/core/vec.h" -#include "iplugin.h" +#include "engine/iplugin.h" struct lua_State; diff --git a/src/physics/physics_system.cpp b/src/physics/physics_system.cpp index a8d4721fee..fa17a467d7 100644 --- a/src/physics/physics_system.cpp +++ b/src/physics/physics_system.cpp @@ -10,7 +10,7 @@ #include "editor/studio_app.h" #include "editor/utils.h" #include "editor/world_editor.h" -#include "engine.h" +#include "engine/engine.h" #include "engine/property_descriptor.h" #include "engine/property_register.h" #include "physics/physics_geometry_manager.h" diff --git a/src/physics/physics_system.h b/src/physics/physics_system.h index 6cf98ca758..f4903e19d2 100644 --- a/src/physics/physics_system.h +++ b/src/physics/physics_system.h @@ -1,8 +1,8 @@ #pragma once -#include "lumix.h" -#include "iplugin.h" +#include "engine/lumix.h" +#include "engine/iplugin.h" namespace physx diff --git a/src/renderer/culling_system.cpp b/src/renderer/culling_system.cpp index 4f8de18685..caa39cfaba 100644 --- a/src/renderer/culling_system.cpp +++ b/src/renderer/culling_system.cpp @@ -1,5 +1,5 @@ #include "culling_system.h" -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/binary_array.h" #include "engine/core/free_list.h" diff --git a/src/renderer/culling_system.h b/src/renderer/culling_system.h index ac95e61ece..b326b98e69 100644 --- a/src/renderer/culling_system.h +++ b/src/renderer/culling_system.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/renderer/editor/main.cpp b/src/renderer/editor/main.cpp index 4c4d27c8a5..39bf2c37dc 100644 --- a/src/renderer/editor/main.cpp +++ b/src/renderer/editor/main.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/crc32.h" #include "engine/core/fs/disk_file_device.h" #include "engine/core/fs/file_system.h" diff --git a/src/renderer/editor/shader_compiler.cpp b/src/renderer/editor/shader_compiler.cpp index b0e30a1087..730a02e87f 100644 --- a/src/renderer/editor/shader_compiler.cpp +++ b/src/renderer/editor/shader_compiler.cpp @@ -11,7 +11,7 @@ #include "engine/core/resource_manager_base.h" #include "engine/core/system.h" #include "editor/world_editor.h" -#include "engine.h" +#include "engine/engine.h" #include "engine/plugin_manager.h" #include "renderer/renderer.h" #include "editor/asset_browser.h" diff --git a/src/renderer/editor/terrain_editor.cpp b/src/renderer/editor/terrain_editor.cpp index 2e599ab05e..17e5ccc8c9 100644 --- a/src/renderer/editor/terrain_editor.cpp +++ b/src/renderer/editor/terrain_editor.cpp @@ -16,7 +16,7 @@ #endif #include "editor/stb/stb_image.h" #include "editor/utils.h" -#include "engine.h" +#include "engine/engine.h" #include "engine/iproperty_descriptor.h" #include "engine/property_register.h" #include "renderer/material.h" diff --git a/src/renderer/frame_buffer.h b/src/renderer/frame_buffer.h index fcfa6f7274..33e385757b 100644 --- a/src/renderer/frame_buffer.h +++ b/src/renderer/frame_buffer.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/vec.h" #include diff --git a/src/renderer/material_manager.cpp b/src/renderer/material_manager.cpp index 6e43d289cc..7708a68acf 100644 --- a/src/renderer/material_manager.cpp +++ b/src/renderer/material_manager.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "renderer/material_manager.h" #include "engine/core/resource.h" diff --git a/src/renderer/model.cpp b/src/renderer/model.cpp index f3a7ffa96c..693e73b525 100644 --- a/src/renderer/model.cpp +++ b/src/renderer/model.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "renderer/model.h" #include "engine/core/array.h" diff --git a/src/renderer/model_generator.h b/src/renderer/model_generator.h index 5bac4d9023..8ea6934ffb 100644 --- a/src/renderer/model_generator.h +++ b/src/renderer/model_generator.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace bgfx diff --git a/src/renderer/model_manager.cpp b/src/renderer/model_manager.cpp index eddf510052..9c2a48b31e 100644 --- a/src/renderer/model_manager.cpp +++ b/src/renderer/model_manager.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "renderer/model_manager.h" #include "engine/core/resource.h" diff --git a/src/renderer/particle_system.h b/src/renderer/particle_system.h index 37d7d75da6..57f196060f 100644 --- a/src/renderer/particle_system.h +++ b/src/renderer/particle_system.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/array.h" #include "engine/core/vec.h" diff --git a/src/renderer/pipeline.cpp b/src/renderer/pipeline.cpp index 5b9521ee4f..07814052be 100644 --- a/src/renderer/pipeline.cpp +++ b/src/renderer/pipeline.cpp @@ -8,7 +8,7 @@ #include "engine/core/log.h" #include "engine/core/lua_wrapper.h" #include "engine/core/profiler.h" -#include "engine.h" +#include "engine/engine.h" #include "lua_script/lua_script_system.h" #include "renderer/frame_buffer.h" #include "renderer/material.h" diff --git a/src/renderer/pipeline.h b/src/renderer/pipeline.h index e215d5b79d..2eff15b826 100644 --- a/src/renderer/pipeline.h +++ b/src/renderer/pipeline.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/delegate.h" diff --git a/src/renderer/pose.h b/src/renderer/pose.h index ff1c04f004..dd60f1efff 100644 --- a/src/renderer/pose.h +++ b/src/renderer/pose.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" namespace Lumix diff --git a/src/renderer/render_scene.cpp b/src/renderer/render_scene.cpp index e732bbd7cf..2472c66ece 100644 --- a/src/renderer/render_scene.cpp +++ b/src/renderer/render_scene.cpp @@ -18,7 +18,7 @@ #include "engine/core/resource_manager_base.h" #include "engine/core/timer.h" -#include "engine.h" +#include "engine/engine.h" #include "lua_script/lua_script_system.h" diff --git a/src/renderer/render_scene.h b/src/renderer/render_scene.h index 8bb71ae657..55b17e5576 100644 --- a/src/renderer/render_scene.h +++ b/src/renderer/render_scene.h @@ -1,9 +1,9 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/matrix.h" -#include "iplugin.h" +#include "engine/iplugin.h" struct lua_State; diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp index d99d8872dd..0aabf103c7 100644 --- a/src/renderer/renderer.cpp +++ b/src/renderer/renderer.cpp @@ -8,7 +8,7 @@ #include "engine/core/profiler.h" #include "engine/core/resource_manager.h" #include "engine/debug/debug.h" -#include "engine.h" +#include "engine/engine.h" #include "engine/property_descriptor.h" #include "engine/property_register.h" #include "renderer/material.h" diff --git a/src/renderer/renderer.h b/src/renderer/renderer.h index 476fb3c71b..a8a4a02fc4 100644 --- a/src/renderer/renderer.h +++ b/src/renderer/renderer.h @@ -1,7 +1,7 @@ #pragma once -#include "lumix.h" -#include "iplugin.h" +#include "engine/lumix.h" +#include "engine/iplugin.h" namespace bgfx diff --git a/src/renderer/shader_manager.cpp b/src/renderer/shader_manager.cpp index 6a46b043fa..1470f25391 100644 --- a/src/renderer/shader_manager.cpp +++ b/src/renderer/shader_manager.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "renderer/shader_manager.h" #include "engine/core/resource.h" diff --git a/src/renderer/terrain.cpp b/src/renderer/terrain.cpp index 937189dbfb..165d83d69f 100644 --- a/src/renderer/terrain.cpp +++ b/src/renderer/terrain.cpp @@ -9,7 +9,7 @@ #include "engine/core/profiler.h" #include "engine/core/resource_manager.h" #include "engine/core/resource_manager_base.h" -#include "engine.h" +#include "engine/engine.h" #include "renderer/material.h" #include "renderer/model.h" #include "renderer/render_scene.h" diff --git a/src/renderer/texture_manager.cpp b/src/renderer/texture_manager.cpp index ae8335cf30..39f93df79b 100644 --- a/src/renderer/texture_manager.cpp +++ b/src/renderer/texture_manager.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "renderer/texture_manager.h" #include "engine/core/resource.h" diff --git a/src/unit_tests/main.cpp b/src/unit_tests/main.cpp index 46d106d4e3..4d7f0085ce 100644 --- a/src/unit_tests/main.cpp +++ b/src/unit_tests/main.cpp @@ -1,4 +1,4 @@ -#include "lumix.h" +#include "engine/lumix.h" #include "engine/debug/floating_points.h" #include "unit_tests/suite/unit_test_app.h" diff --git a/src/unit_tests/suite/lumix_unit_tests.h b/src/unit_tests/suite/lumix_unit_tests.h index 8a3f998a6e..aad8e67cb3 100644 --- a/src/unit_tests/suite/lumix_unit_tests.h +++ b/src/unit_tests/suite/lumix_unit_tests.h @@ -1,6 +1,6 @@ #pragma once -#include "lumix.h" +#include "engine/lumix.h" #include "engine/core/log.h" #include "engine/core/mt/task.h" From e4a926e91744ac0bedf2cddd7c67c6b08c94274e Mon Sep 17 00:00:00 2001 From: Maxim Kolganov Date: Fri, 22 Apr 2016 20:00:36 +0300 Subject: [PATCH 6/6] remove "../src/engine" from includedirs in genie.lua --- projects/genie.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/genie.lua b/projects/genie.lua index c70bffb633..a22f394700 100644 --- a/projects/genie.lua +++ b/projects/genie.lua @@ -195,7 +195,7 @@ solution "LumixEngine" configurations { "Debug", "Release", "RelWithDebInfo" } platforms { "x32", "x64" } flags { "FatalWarnings", "NoPCH" } - includedirs {"../src", "../src/engine"} + includedirs {"../src"} location(LOCATION) language "C++" startproject "studio" @@ -396,4 +396,4 @@ project "studio" links { "editor" } useLua() - defaultConfigurations() \ No newline at end of file + defaultConfigurations()