10 år sedan · 7a5303d8b6
--- a/genie/crown.lua
+++ b/genie/crown.lua
@@ -9,26 +9,26 @@ function crown_project(_name, _kind, _defines)
 
				 		kind (_kind)
			
 
				 
			
 
				 		includedirs {
			
 
				-			CROWN_DIR .. "engine",
			
 
				-			CROWN_DIR .. "engine/core",
			
 
				-			CROWN_DIR .. "engine/core/containers",
			
 
				-			CROWN_DIR .. "engine/core/filesystem",
			
 
				-			CROWN_DIR .. "engine/core/json",
			
 
				-			CROWN_DIR .. "engine/core/math",
			
 
				-			CROWN_DIR .. "engine/core/memory",
			
 
				-			CROWN_DIR .. "engine/core/network",
			
 
				-			CROWN_DIR .. "engine/core/settings",
			
 
				-			CROWN_DIR .. "engine/core/strings",
			
 
				-			CROWN_DIR .. "engine/core/thread",
			
 
				-			CROWN_DIR .. "engine/main",
			
 
				-			CROWN_DIR .. "engine/input",
			
 
				-			CROWN_DIR .. "engine/renderers",
			
 
				-			CROWN_DIR .. "engine/resource",
			
 
				-			CROWN_DIR .. "engine/lua",
			
 
				-			CROWN_DIR .. "engine/audio",
			
 
				-			CROWN_DIR .. "engine/compilers",
			
 
				-			CROWN_DIR .. "engine/physics",
			
 
				-			CROWN_DIR .. "engine/world",
			
 
				+			CROWN_DIR .. "src",
			
 
				+			CROWN_DIR .. "src/core",
			
 
				+			CROWN_DIR .. "src/core/containers",
			
 
				+			CROWN_DIR .. "src/core/filesystem",
			
 
				+			CROWN_DIR .. "src/core/json",
			
 
				+			CROWN_DIR .. "src/core/math",
			
 
				+			CROWN_DIR .. "src/core/memory",
			
 
				+			CROWN_DIR .. "src/core/network",
			
 
				+			CROWN_DIR .. "src/core/settings",
			
 
				+			CROWN_DIR .. "src/core/strings",
			
 
				+			CROWN_DIR .. "src/core/thread",
			
 
				+			CROWN_DIR .. "src/main",
			
 
				+			CROWN_DIR .. "src/input",
			
 
				+			CROWN_DIR .. "src/renderers",
			
 
				+			CROWN_DIR .. "src/resource",
			
 
				+			CROWN_DIR .. "src/lua",
			
 
				+			CROWN_DIR .. "src/audio",
			
 
				+			CROWN_DIR .. "src/compilers",
			
 
				+			CROWN_DIR .. "src/physics",
			
 
				+			CROWN_DIR .. "src/world",
			
 
				 			CROWN_DIR .. "third/freetype",
			
 
				 			CROWN_DIR .. "third/stb_image",
			
 
				 			CROWN_DIR .. "third/stb_vorbis",
			
@@ -392,8 +392,8 @@ function crown_project(_name, _kind, _defines)
 
				 		configuration {}
			
 
				 
			
 
				 		files {
			
 
				-			CROWN_DIR .. "engine/**.h",
			
 
				-			CROWN_DIR .. "engine/**.cpp"
			
 
				+			CROWN_DIR .. "src/**.h",
			
 
				+			CROWN_DIR .. "src/**.cpp"
			
 
				 		}
			
 
				 
			
 
				 		strip()
			
--- a/engine/audio/audio.h
+++ b/engine/audio/audio.h
--- a/engine/audio/sound_world.h
+++ b/engine/audio/sound_world.h
--- a/engine/audio/sound_world_al.cpp
+++ b/engine/audio/sound_world_al.cpp
--- a/engine/audio/sound_world_null.cpp
+++ b/engine/audio/sound_world_null.cpp
--- a/engine/audio/sound_world_sles.cpp
+++ b/engine/audio/sound_world_sles.cpp
--- a/engine/compilers/bundle_compiler.cpp
+++ b/engine/compilers/bundle_compiler.cpp
--- a/engine/compilers/bundle_compiler.h
+++ b/engine/compilers/bundle_compiler.h
--- a/engine/compilers/compile_options.h
+++ b/engine/compilers/compile_options.h
--- a/engine/compilers/compiler_types.h
+++ b/engine/compilers/compiler_types.h
--- a/engine/config.h
+++ b/engine/config.h
--- a/engine/console_server.cpp
+++ b/engine/console_server.cpp
--- a/engine/console_server.h
+++ b/engine/console_server.h
@@ -12,17 +12,6 @@
 
				 namespace crown
			
 
				 {
			
 
				 
			
 
				-struct Client
			
 
				-{
			
 
				-	Id id;
			
 
				-	TCPSocket socket;
			
 
				-
			
 
				-	void close()
			
 
				-	{
			
 
				-		socket.close();
			
 
				-	}
			
 
				-};
			
 
				-
			
 
				 class ConsoleServer
			
 
				 {
			
 
				 public:
			
@@ -56,6 +45,17 @@ private:
 
				 
			
 
				 	TCPSocket m_server;
			
 
				 
			
 
				+	struct Client
			
 
				+	{
			
 
				+		Id id;
			
 
				+		TCPSocket socket;
			
 
				+
			
 
				+		void close()
			
 
				+		{
			
 
				+			socket.close();
			
 
				+		}
			
 
				+	};
			
 
				+
			
 
				 	typedef IdArray<CE_MAX_CONSOLE_CLIENTS, Client> ClientArray;
			
 
				 	ClientArray m_clients;
			
 
				 };
			
--- a/engine/core/command_line.h
+++ b/engine/core/command_line.h
--- a/engine/core/compat/msvc/alloca.h
+++ b/engine/core/compat/msvc/alloca.h
--- a/engine/core/compat/msvc/inttypes.h
+++ b/engine/core/compat/msvc/inttypes.h
--- a/engine/core/containers/array.h
+++ b/engine/core/containers/array.h
--- a/engine/core/containers/blob.h
+++ b/engine/core/containers/blob.h
--- a/engine/core/containers/container_types.h
+++ b/engine/core/containers/container_types.h
--- a/engine/core/containers/dynamic_blob.h
+++ b/engine/core/containers/dynamic_blob.h
--- a/engine/core/containers/event_stream.h
+++ b/engine/core/containers/event_stream.h
--- a/engine/core/containers/hash.h
+++ b/engine/core/containers/hash.h
--- a/engine/core/containers/id_array.h
+++ b/engine/core/containers/id_array.h
--- a/engine/core/containers/id_table.h
+++ b/engine/core/containers/id_table.h
--- a/engine/core/containers/map.h
+++ b/engine/core/containers/map.h
--- a/engine/core/containers/priority_queue.h
+++ b/engine/core/containers/priority_queue.h
--- a/engine/core/containers/queue.h
+++ b/engine/core/containers/queue.h
--- a/engine/core/containers/sort_map.h
+++ b/engine/core/containers/sort_map.h
--- a/engine/core/containers/vector.h
+++ b/engine/core/containers/vector.h
--- a/engine/core/error.cpp
+++ b/engine/core/error.cpp
--- a/engine/core/error.h
+++ b/engine/core/error.h
--- a/engine/core/filesystem/apk_file.cpp
+++ b/engine/core/filesystem/apk_file.cpp
--- a/engine/core/filesystem/apk_file.h
+++ b/engine/core/filesystem/apk_file.h
--- a/engine/core/filesystem/apk_filesystem.cpp
+++ b/engine/core/filesystem/apk_filesystem.cpp
--- a/engine/core/filesystem/apk_filesystem.h
+++ b/engine/core/filesystem/apk_filesystem.h
--- a/engine/core/filesystem/disk_file.cpp
+++ b/engine/core/filesystem/disk_file.cpp
--- a/engine/core/filesystem/disk_file.h
+++ b/engine/core/filesystem/disk_file.h
--- a/engine/core/filesystem/disk_filesystem.cpp
+++ b/engine/core/filesystem/disk_filesystem.cpp
--- a/engine/core/filesystem/disk_filesystem.h
+++ b/engine/core/filesystem/disk_filesystem.h
--- a/engine/core/filesystem/file.h
+++ b/engine/core/filesystem/file.h
--- a/engine/core/filesystem/filesystem.h
+++ b/engine/core/filesystem/filesystem.h
--- a/engine/core/filesystem/filesystem_types.h
+++ b/engine/core/filesystem/filesystem_types.h
--- a/engine/core/filesystem/network_file.cpp
+++ b/engine/core/filesystem/network_file.cpp
--- a/engine/core/filesystem/network_file.h
+++ b/engine/core/filesystem/network_file.h
--- a/engine/core/filesystem/network_filesystem.cpp
+++ b/engine/core/filesystem/network_filesystem.cpp
--- a/engine/core/filesystem/network_filesystem.h
+++ b/engine/core/filesystem/network_filesystem.h
--- a/engine/core/filesystem/null_file.h
+++ b/engine/core/filesystem/null_file.h
--- a/engine/core/filesystem/os_file.h
+++ b/engine/core/filesystem/os_file.h
--- a/engine/core/filesystem/reader_writer.h
+++ b/engine/core/filesystem/reader_writer.h
--- a/engine/core/functional.h
+++ b/engine/core/functional.h
--- a/engine/core/json/json.cpp
+++ b/engine/core/json/json.cpp
--- a/engine/core/json/json.h
+++ b/engine/core/json/json.h
--- a/engine/core/json/json_parser.cpp
+++ b/engine/core/json/json_parser.cpp
--- a/engine/core/json/json_parser.h
+++ b/engine/core/json/json_parser.h
--- a/engine/core/json/njson.cpp
+++ b/engine/core/json/njson.cpp
--- a/engine/core/json/njson.h
+++ b/engine/core/json/njson.h
--- a/engine/core/log.cpp
+++ b/engine/core/log.cpp
--- a/engine/core/log.h
+++ b/engine/core/log.h
--- a/engine/core/macros.h
+++ b/engine/core/macros.h
--- a/engine/core/math/aabb.h
+++ b/engine/core/math/aabb.h
--- a/engine/core/math/color4.cpp
+++ b/engine/core/math/color4.cpp
--- a/engine/core/math/color4.h
+++ b/engine/core/math/color4.h
--- a/engine/core/math/frustum.h
+++ b/engine/core/math/frustum.h
--- a/engine/core/math/intersection.cpp
+++ b/engine/core/math/intersection.cpp
--- a/engine/core/math/intersection.h
+++ b/engine/core/math/intersection.h
--- a/engine/core/math/math_types.h
+++ b/engine/core/math/math_types.h
--- a/engine/core/math/math_utils.h
+++ b/engine/core/math/math_utils.h
--- a/engine/core/math/matrix3x3.h
+++ b/engine/core/math/matrix3x3.h
--- a/engine/core/math/matrix4x4.h
+++ b/engine/core/math/matrix4x4.h
--- a/engine/core/math/plane.h
+++ b/engine/core/math/plane.h
--- a/engine/core/math/quaternion.h
+++ b/engine/core/math/quaternion.h
--- a/engine/core/math/random.h
+++ b/engine/core/math/random.h
--- a/engine/core/math/sphere.h
+++ b/engine/core/math/sphere.h
--- a/engine/core/math/vector2.h
+++ b/engine/core/math/vector2.h
--- a/engine/core/math/vector3.h
+++ b/engine/core/math/vector3.h
--- a/engine/core/math/vector4.h
+++ b/engine/core/math/vector4.h
--- a/engine/core/memory/allocator.h
+++ b/engine/core/memory/allocator.h
--- a/engine/core/memory/linear_allocator.cpp
+++ b/engine/core/memory/linear_allocator.cpp
--- a/engine/core/memory/linear_allocator.h
+++ b/engine/core/memory/linear_allocator.h
--- a/engine/core/memory/memory.cpp
+++ b/engine/core/memory/memory.cpp
--- a/engine/core/memory/memory.h
+++ b/engine/core/memory/memory.h
--- a/engine/core/memory/memory_types.h
+++ b/engine/core/memory/memory_types.h
--- a/engine/core/memory/pool_allocator.cpp
+++ b/engine/core/memory/pool_allocator.cpp
--- a/engine/core/memory/pool_allocator.h
+++ b/engine/core/memory/pool_allocator.h
--- a/engine/core/memory/proxy_allocator.cpp
+++ b/engine/core/memory/proxy_allocator.cpp
--- a/engine/core/memory/proxy_allocator.h
+++ b/engine/core/memory/proxy_allocator.h
--- a/engine/core/memory/stack_allocator.cpp
+++ b/engine/core/memory/stack_allocator.cpp
--- a/engine/core/memory/stack_allocator.h
+++ b/engine/core/memory/stack_allocator.h
--- a/engine/core/memory/temp_allocator.h
+++ b/engine/core/memory/temp_allocator.h
--- a/engine/core/murmur.cpp
+++ b/engine/core/murmur.cpp
--- a/engine/core/murmur.h
+++ b/engine/core/murmur.h
--- a/engine/core/network/net_address.h
+++ b/engine/core/network/net_address.h
--- a/engine/core/network/socket.h
+++ b/engine/core/network/socket.h
--- a/engine/core/os.h
+++ b/engine/core/os.h
--- a/engine/core/os_event_queue.h
+++ b/engine/core/os_event_queue.h
--- a/engine/core/os_window_android.cpp
+++ b/engine/core/os_window_android.cpp
--- a/engine/core/os_window_android.h
+++ b/engine/core/os_window_android.h
--- a/engine/core/os_window_linux.cpp
+++ b/engine/core/os_window_linux.cpp
--- a/engine/core/os_window_linux.h
+++ b/engine/core/os_window_linux.h
--- a/engine/core/os_window_windows.cpp
+++ b/engine/core/os_window_windows.cpp