From 78b85685316340501d849f5398228d401d0b773b Mon Sep 17 00:00:00 2001 From: i0gan Date: Sun, 29 Sep 2024 22:59:36 +0800 Subject: [PATCH] Update: Change src dir --- CMakeLists.txt | 5 ++--- res | 2 +- src/{squick => }/core/CMakeLists.txt | 0 src/{squick => }/core/base.cc | 0 src/{squick => }/core/base.h | 0 src/{squick => }/core/consistent_hash.h | 0 src/{squick => }/core/data_list.h | 0 src/{squick => }/core/date_time.h | 0 src/{squick => }/core/dyn_lib.cc | 0 src/{squick => }/core/dyn_lib.h | 0 src/{squick => }/core/exception.cc | 0 src/{squick => }/core/exception.h | 0 src/{squick => }/core/guid.h | 0 src/{squick => }/core/i_module.h | 0 src/{squick => }/core/i_object.h | 0 src/{squick => }/core/i_plugin.h | 0 src/{squick => }/core/i_plugin_manager.h | 2 +- src/{squick => }/core/i_property.h | 0 src/{squick => }/core/i_property_manager.h | 0 src/{squick => }/core/i_record.h | 0 src/{squick => }/core/i_record_manager.h | 0 src/{squick => }/core/i_tag_module.h | 0 src/{squick => }/core/list.h | 0 src/{squick => }/core/map.h | 0 src/{squick => }/core/map_ex.h | 0 src/{squick => }/core/math.h | 0 src/{squick => }/core/mem_manager.h | 0 src/{squick => }/core/memory_counter.cc | 0 src/{squick => }/core/memory_counter.h | 0 src/{squick => }/core/object.cc | 0 src/{squick => }/core/object.h | 0 src/{squick => }/core/performance.h | 2 +- src/{squick => }/core/platform.h | 0 src/{squick => }/core/plugin_manager.cc | 6 +++--- src/{squick => }/core/plugin_manager.h | 0 src/{squick => }/core/plugin_server.cc | 4 ++-- src/{squick => }/core/plugin_server.h | 0 src/{squick => }/core/property.cc | 0 src/{squick => }/core/property.h | 0 src/{squick => }/core/property_manager.cc | 0 src/{squick => }/core/property_manager.h | 0 src/{squick => }/core/queue.h | 0 src/{squick => }/core/record.cc | 0 src/{squick => }/core/record.h | 0 src/{squick => }/core/recordManager.cc | 0 src/{squick => }/core/record_manager.h | 0 src/{squick => }/core/smart_enum.h | 0 src/{squick => }/core/string_ring_buffer.h | 0 src/{squick => }/core/termcolor.h | 0 src/{squick => }/core/vector2.h | 0 src/{squick => }/core/vector3.h | 0 src/{squick => }/core/vector4.h | 0 src/main.cc | 4 ++-- src/plugin/CMakeLists.txt | 6 ++++++ .../plugin => plugin/core}/CMakeLists.txt | 0 .../core}/actor/CMakeLists.txt | 0 .../plugin => plugin/core}/actor/actor.cc | 2 +- .../plugin => plugin/core}/actor/actor.h | 8 ++++---- .../core}/actor/actor_module.cc | 0 .../core}/actor/actor_module.h | 4 ++-- .../plugin => plugin/core}/actor/export.h | 0 .../core}/actor/i_actor_module.h | 2 +- .../core}/actor/i_component_module.h | 8 ++++---- .../plugin => plugin/core}/actor/plugin.cc | 2 +- .../plugin => plugin/core}/actor/plugin.h | 4 ++-- .../core}/config/CMakeLists.txt | 0 .../core}/config/class_module.cc | 0 .../core}/config/class_module.cc~ | 0 .../core}/config/class_module.h | 14 ++++++------- .../core}/config/config_module.cc | 0 .../core}/config/config_module.h | 6 +++--- .../core}/config/element_module.cc | 0 .../core}/config/element_module.h | 14 ++++++------- .../plugin => plugin/core}/config/export.h | 0 .../core}/config/i_class_module.h | 4 ++-- .../core}/config/i_common_config_module.h | 2 +- .../core}/config/i_element_module.h | 8 ++++---- .../plugin => plugin/core}/config/myrc4.cc | 0 .../plugin => plugin/core}/config/myrc4.h | 0 .../plugin => plugin/core}/config/plugin.cc | 0 .../plugin => plugin/core}/config/plugin.h | 4 ++-- .../plugin => plugin/core}/log/CMakeLists.txt | 0 .../plugin => plugin/core}/log/export.h | 2 +- .../plugin => plugin/core}/log/i_log_module.h | 4 ++-- .../plugin => plugin/core}/log/log_module.cc | 4 ++-- .../plugin => plugin/core}/log/log_module.h | 2 +- .../plugin => plugin/core}/log/plugin.cc | 0 .../plugin => plugin/core}/log/plugin.h | 4 ++-- .../plugin => plugin/core}/lua/CMakeLists.txt | 0 .../plugin => plugin/core}/lua/export.h | 0 .../core}/lua/lua_pb_module.cc | 0 .../core}/lua/lua_pb_module.h | 6 +++--- .../core}/lua/lua_script_module.cc | 0 .../core}/lua/lua_script_module.h | 10 +++++----- .../plugin => plugin/core}/lua/plugin.cc | 0 .../plugin => plugin/core}/lua/plugin.h | 4 ++-- .../core}/navigation/CMakeLists.txt | 0 .../core}/navigation/export.h | 0 .../navigation/i_navigation_data_module.h | 8 ++++---- .../core}/navigation/i_navigation_module.h | 2 +- .../navigation/navigation_data_module.cc | 0 .../core}/navigation/navigation_data_module.h | 14 ++++++------- .../core}/navigation/navigation_module.cc | 0 .../core}/navigation/navigation_module.h | 14 ++++++------- .../core}/navigation/plugin.cc | 0 .../core}/navigation/plugin.h | 4 ++-- .../plugin => plugin/core}/net/CMakeLists.txt | 0 .../plugin => plugin/core}/net/coroutine.h | 0 .../plugin => plugin/core}/net/export.h | 0 .../plugin => plugin/core}/net/http_client.cc | 0 .../plugin => plugin/core}/net/http_client.h | 0 .../core}/net/http_client_module.cc | 0 .../core}/net/http_client_module.h | 4 ++-- .../plugin => plugin/core}/net/http_server.cc | 2 +- .../plugin => plugin/core}/net/http_server.h | 4 ++-- .../core}/net/http_server_module.cc | 2 +- .../core}/net/http_server_module.h | 8 ++++---- .../core}/net/i_http_client.h | 2 +- .../core}/net/i_http_client_module.h | 2 +- .../core}/net/i_http_server.h | 2 +- .../core}/net/i_http_server_module.h | 4 ++-- .../plugin => plugin/core}/net/i_net.h | 2 +- .../core}/net/i_net_client_module.h | 4 ++-- .../plugin => plugin/core}/net/i_net_module.h | 12 +++++------ .../core}/net/i_pb_log_module.h | 2 +- .../plugin => plugin/core}/net/i_request.h | 0 .../plugin => plugin/core}/net/i_response.h | 0 .../plugin => plugin/core}/net/i_ws_module.h | 10 +++++----- src/{squick/plugin => plugin/core}/net/net.cc | 4 ++-- src/{squick/plugin => plugin/core}/net/net.h | 0 .../core}/net/net_client_module.cc | 0 .../core}/net/net_client_module.h | 8 ++++---- .../plugin => plugin/core}/net/net_module.cc | 0 .../plugin => plugin/core}/net/net_module.h | 10 +++++----- .../core}/net/pb_log_module.cc | 0 .../core}/net/pb_log_module.h | 2 +- .../plugin => plugin/core}/net/plugin.cc | 0 .../plugin => plugin/core}/net/plugin.h | 4 ++-- .../plugin => plugin/core}/net/udp_module.cc | 0 .../plugin => plugin/core}/net/udp_module.h | 0 .../plugin => plugin/core}/net/ws_error.h | 0 .../plugin => plugin/core}/net/ws_module.cc | 0 .../plugin => plugin/core}/net/ws_module.h | 0 .../core}/node/CMakeLists.txt | 0 .../plugin => plugin/core}/node/export.h | 0 .../core}/node/i_node_module.h | 4 ++-- .../core}/node/node_module.cc | 2 +- .../plugin => plugin/core}/node/node_module.h | 6 +++--- .../plugin => plugin/core}/node/plugin.cc | 0 .../plugin => plugin/core}/node/plugin.h | 4 ++-- .../core}/thread/CMakeLists.txt | 0 .../plugin => plugin/core}/thread/export.h | 0 .../core}/thread/i_thread_pool_module.h | 2 +- .../plugin => plugin/core}/thread/plugin.cc | 0 .../plugin => plugin/core}/thread/plugin.h | 2 +- .../core}/thread/thread_pool_module.cc | 0 .../core}/thread/thread_pool_module.h | 8 ++++---- .../core}/utils/CMakeLists.txt | 0 .../core}/utils/error_bus_module.cc | 0 .../core}/utils/error_bus_module.h | 0 .../core}/utils/event_module.cc | 0 .../core}/utils/event_module.h | 0 .../plugin => plugin/core}/utils/export.h | 0 .../core}/utils/i_error_bus_module.h | 4 ++-- .../core}/utils/i_event_module.h | 10 +++++----- .../core}/utils/i_schedule_module.h | 10 +++++----- .../plugin => plugin/core}/utils/plugin.cc | 0 .../plugin => plugin/core}/utils/plugin.h | 2 +- .../core}/utils/schedule_module.cc | 0 .../core}/utils/schedule_module.h | 14 ++++++------- .../core}/world/CMakeLists.txt | 0 .../core}/world/cell_module.cc | 0 .../core}/world/cell_module.h | 10 +++++----- .../core}/world/data_tail_module.cc | 2 +- .../core}/world/data_tail_module.h | 6 +++--- .../core}/world/elo_module.cc | 0 .../plugin => plugin/core}/world/elo_module.h | 0 .../plugin => plugin/core}/world/export.h | 0 .../core}/world/i_cell_module.h | 8 ++++---- .../core}/world/i_data_tail_module.h | 2 +- .../core}/world/i_elo_module.h | 2 +- .../core}/world/i_scene_module.h | 20 +++++++++---------- .../core}/world/i_world_module.h | 10 +++++----- .../plugin => plugin/core}/world/plugin.cc | 0 .../plugin => plugin/core}/world/plugin.h | 4 ++-- .../core}/world/scene_module.cc | 4 ++-- .../core}/world/scene_module.h | 10 +++++----- .../core}/world/world_module.cc | 16 +++++++-------- .../core}/world/world_module.h | 16 +++++++-------- src/{ => plugin}/node/CMakeLists.txt | 0 .../node/backstage/CMakeLists.txt | 0 src/{ => plugin}/node/backstage/golib/go.mod | 0 src/{ => plugin}/node/backstage/golib/go.sum | 0 src/{ => plugin}/node/backstage/golib/main.go | 0 .../node/backstage/logic/CMakeLists.txt | 0 .../node/backstage/logic/i_logic_module.h | 2 +- .../node/backstage/logic/logic_module.cc | 0 .../node/backstage/logic/logic_module.h | 8 ++++---- .../node/backstage/logic/plugin.cc | 0 .../node/backstage/logic/plugin.h | 2 +- .../node/backstage/logic/struct.h | 4 ++-- src/{ => plugin}/node/db_proxy/CMakeLists.txt | 0 .../node/db_proxy/clickhouse/CMakeLists.txt | 0 .../db_proxy/clickhouse/clickhouse_module.cc | 0 .../db_proxy/clickhouse/clickhouse_module.h | 4 ++-- .../db_proxy/clickhouse/i_clickhouse_module.h | 0 .../node/db_proxy/clickhouse/plugin.cc | 0 .../node/db_proxy/clickhouse/plugin.h | 2 +- .../node/db_proxy/logic/CMakeLists.txt | 0 .../node/db_proxy/logic/i_db_module.h | 8 ++++---- .../node/db_proxy/logic/i_logic_module.h | 2 +- .../node/db_proxy/logic/logic_module.cc | 0 .../node/db_proxy/logic/logic_module.h | 4 ++-- .../node/db_proxy/logic/plugin.cc | 0 src/{ => plugin}/node/db_proxy/logic/plugin.h | 2 +- .../node/db_proxy/mongo/CMakeLists.txt | 0 src/{ => plugin}/node/db_proxy/mongo/export.h | 0 .../node/db_proxy/mongo/i_mongo_module.h | 0 .../node/db_proxy/mongo/mongo_module.cc | 0 .../node/db_proxy/mongo/mongo_module.h | 6 +++--- .../node/db_proxy/mongo/plugin.cc | 0 src/{ => plugin}/node/db_proxy/mongo/plugin.h | 2 +- .../node/db_proxy/mysql/CMakeLists.txt | 0 .../node/db_proxy/mysql/i_mysql_module.h | 0 .../node/db_proxy/mysql/mysql_module.cc | 0 .../node/db_proxy/mysql/mysql_module.h | 8 ++++---- .../node/db_proxy/mysql/plugin.cc | 0 src/{ => plugin}/node/db_proxy/mysql/plugin.h | 2 +- .../node/db_proxy/redis/CMakeLists.txt | 0 .../node/db_proxy/redis/i_redis_module.h | 0 .../node/db_proxy/redis/plugin.cc | 0 src/{ => plugin}/node/db_proxy/redis/plugin.h | 2 +- .../node/db_proxy/redis/redis_module.cc | 0 .../node/db_proxy/redis/redis_module.h | 2 +- src/{ => plugin}/node/ds_mgr/CMakeLists.txt | 0 .../node/ds_mgr/logic/CMakeLists.txt | 0 .../node/ds_mgr/logic/i_logic_module.h | 2 +- .../node/ds_mgr/logic/logic_module.cc | 0 .../node/ds_mgr/logic/logic_module.h | 8 ++++---- .../node/ds_mgr/logic/manager_module.cc | 0 .../node/ds_mgr/logic/manager_module.h | 10 +++++----- src/{ => plugin}/node/ds_mgr/logic/plugin.cc | 0 src/{ => plugin}/node/ds_mgr/logic/plugin.h | 4 ++-- src/{ => plugin}/node/game/CMakeLists.txt | 0 .../node/game/logic/CMakeLists.txt | 0 src/{ => plugin}/node/game/logic/game.cc | 0 src/{ => plugin}/node/game/logic/game.h | 0 .../node/game/logic/game_mgr_module.cc | 0 .../node/game/logic/game_mgr_module.h | 2 +- src/{ => plugin}/node/game/logic/i_game.h | 2 +- .../node/game/logic/i_game_mgr_module.h | 10 +++++----- src/{ => plugin}/node/game/logic/plugin.cc | 0 src/{ => plugin}/node/game/logic/plugin.h | 4 ++-- src/{ => plugin}/node/global/CMakeLists.txt | 0 .../node/global/logic/CMakeLists.txt | 0 .../node/global/logic/i_logic_module.h | 2 +- .../node/global/logic/logic_module.cc | 0 .../node/global/logic/logic_module.h | 4 ++-- src/{ => plugin}/node/global/logic/plugin.cc | 0 src/{ => plugin}/node/global/logic/plugin.h | 2 +- src/{ => plugin}/node/master/CMakeLists.txt | 0 .../node/master/logic/CMakeLists.txt | 0 .../node/master/logic/i_logic_module.h | 2 +- .../node/master/logic/logic_module.cc | 0 .../node/master/logic/logic_module.h | 6 +++--- src/{ => plugin}/node/master/logic/plugin.cc | 0 src/{ => plugin}/node/master/logic/plugin.h | 4 ++-- src/{ => plugin}/node/match/CMakeLists.txt | 0 src/{ => plugin}/node/player/CMakeLists.txt | 0 .../node/player/logic/CMakeLists.txt | 0 src/{ => plugin}/node/player/logic/README.md | 0 .../node/player/logic/logic_module.cc | 2 +- .../node/player/logic/logic_module.h | 12 +++++------ src/{ => plugin}/node/player/logic/plugin.cc | 0 src/{ => plugin}/node/player/logic/plugin.h | 4 ++-- src/{ => plugin}/node/proxy/CMakeLists.txt | 0 .../node/proxy/logic/CMakeLists.txt | 0 .../node/proxy/logic/i_logic_module.h | 2 +- .../node/proxy/logic/logic_module.cc | 2 +- .../node/proxy/logic/logic_module.h | 12 +++++------ src/{ => plugin}/node/proxy/logic/plugin.cc | 0 src/{ => plugin}/node/proxy/logic/plugin.h | 4 ++-- src/{ => plugin}/node/room/CMakeLists.txt | 0 src/{ => plugin}/node/web/CMakeLists.txt | 0 .../node/web/logic/CMakeLists.txt | 0 .../node/web/logic/i_logic_module.h | 2 +- .../node/web/logic/logic_module.cc | 0 .../node/web/logic/logic_module.h | 8 ++++---- src/{ => plugin}/node/web/logic/plugin.cc | 0 src/{ => plugin}/node/web/logic/plugin.h | 2 +- src/{ => plugin}/node/web/logic/struct.h | 4 ++-- src/{ => plugin}/node/world/CMakeLists.txt | 0 .../node/world/logic/CMakeLists.txt | 0 .../node/world/logic/i_logic_module.h | 2 +- .../node/world/logic/logic_module.cc | 0 .../node/world/logic/logic_module.h | 4 ++-- src/{ => plugin}/node/world/logic/plugin.cc | 0 src/{ => plugin}/node/world/logic/plugin.h | 2 +- src/{ => plugin}/tutorial/CMakeLists.txt | 0 .../tutorial/t1_plugin/CMakeLists.txt | 0 src/{ => plugin}/tutorial/t1_plugin/plugin.cc | 0 .../tutorial/t1_plugin}/plugin.h | 2 +- .../tutorial/t1_plugin/simple_module.cc | 0 .../tutorial/t1_plugin/simple_module.h | 2 +- .../tutorial/t2_property/CMakeLists.txt | 0 .../tutorial/t2_property/plugin.cc | 0 .../tutorial/t2_property/plugin.h | 2 +- .../tutorial/t2_property/property_module.cc | 4 ++-- .../tutorial/t2_property/property_module.h | 4 ++-- .../tutorial/t3_event/CMakeLists.txt | 0 .../tutorial/t3_event/event_module.cc | 0 .../tutorial/t3_event/event_module.h | 6 +++--- src/{ => plugin}/tutorial/t3_event/plugin.cc | 0 .../tutorial/t3_event}/plugin.h | 2 +- .../tutorial/t4_actor/CMakeLists.txt | 0 .../tutorial/t4_actor/actor_module.cc | 0 .../tutorial/t4_actor/actor_module.h | 4 ++-- src/{ => plugin}/tutorial/t4_actor/plugin.cc | 0 .../tutorial/t4_actor}/plugin.h | 2 +- .../tutorial/t5_http/CMakeLists.txt | 0 .../tutorial/t5_http/http_module.cc | 0 .../tutorial/t5_http/http_module.h | 4 ++-- src/{ => plugin}/tutorial/t5_http/plugin.cc | 0 src/plugin/tutorial/t5_http/plugin.h | 13 ++++++++++++ .../tutorial/t6_rpc/CMakeLists.txt | 0 src/{ => plugin}/tutorial/t6_rpc/plugin.cc | 0 src/plugin/tutorial/t6_rpc/plugin.h | 13 ++++++++++++ .../tutorial/t6_rpc/rpc_module.cc | 0 src/{ => plugin}/tutorial/t6_rpc/rpc_module.h | 4 ++-- .../tutorial/t7_config/CMakeLists.txt | 0 .../tutorial/t7_config/config_module.cc | 0 .../tutorial/t7_config/config_module.h | 2 +- src/{ => plugin}/tutorial/t7_config/plugin.cc | 0 src/plugin/tutorial/t7_config/plugin.h | 13 ++++++++++++ .../tutorial/t8_thread/CMakeLists.txt | 0 src/{ => plugin}/tutorial/t8_thread/plugin.cc | 0 src/plugin/tutorial/t8_thread/plugin.h | 13 ++++++++++++ .../tutorial/t8_thread/thread_module.cc | 2 +- .../tutorial/t8_thread/thread_module.h | 2 +- .../tutorial/t9_navigation/CMakeLists.txt | 0 .../t9_navigation/navigation_module.cc | 0 .../t9_navigation/navigation_module.h | 4 ++-- .../tutorial/t9_navigation/plugin.cc | 0 src/plugin/tutorial/t9_navigation/plugin.h | 13 ++++++++++++ src/squick/CMakeLists.txt | 2 -- src/struct/limit.h | 2 +- src/struct/struct.h | 8 ++++---- src/tutorial/t5_http/plugin.h | 13 ------------ src/tutorial/t6_rpc/plugin.h | 13 ------------ src/tutorial/t7_config/plugin.h | 13 ------------ src/tutorial/t8_thread/plugin.h | 13 ------------ src/tutorial/t9_navigation/plugin.h | 13 ------------ tools/build_all.sh | 9 +++++++++ tools/clean_all.sh | 8 ++++++-- tools/format/change_name.sh | 3 ++- 355 files changed, 433 insertions(+), 416 deletions(-) rename src/{squick => }/core/CMakeLists.txt (100%) rename src/{squick => }/core/base.cc (100%) rename src/{squick => }/core/base.h (100%) rename src/{squick => }/core/consistent_hash.h (100%) rename src/{squick => }/core/data_list.h (100%) rename src/{squick => }/core/date_time.h (100%) rename src/{squick => }/core/dyn_lib.cc (100%) rename src/{squick => }/core/dyn_lib.h (100%) rename src/{squick => }/core/exception.cc (100%) rename src/{squick => }/core/exception.h (100%) rename src/{squick => }/core/guid.h (100%) rename src/{squick => }/core/i_module.h (100%) rename src/{squick => }/core/i_object.h (100%) rename src/{squick => }/core/i_plugin.h (100%) rename src/{squick => }/core/i_plugin_manager.h (99%) rename src/{squick => }/core/i_property.h (100%) rename src/{squick => }/core/i_property_manager.h (100%) rename src/{squick => }/core/i_record.h (100%) rename src/{squick => }/core/i_record_manager.h (100%) rename src/{squick => }/core/i_tag_module.h (100%) rename src/{squick => }/core/list.h (100%) rename src/{squick => }/core/map.h (100%) rename src/{squick => }/core/map_ex.h (100%) rename src/{squick => }/core/math.h (100%) rename src/{squick => }/core/mem_manager.h (100%) rename src/{squick => }/core/memory_counter.cc (100%) rename src/{squick => }/core/memory_counter.h (100%) rename src/{squick => }/core/object.cc (100%) rename src/{squick => }/core/object.h (100%) rename src/{squick => }/core/performance.h (93%) rename src/{squick => }/core/platform.h (100%) rename src/{squick => }/core/plugin_manager.cc (99%) rename src/{squick => }/core/plugin_manager.h (100%) rename src/{squick => }/core/plugin_server.cc (98%) rename src/{squick => }/core/plugin_server.h (100%) rename src/{squick => }/core/property.cc (100%) rename src/{squick => }/core/property.h (100%) rename src/{squick => }/core/property_manager.cc (100%) rename src/{squick => }/core/property_manager.h (100%) rename src/{squick => }/core/queue.h (100%) rename src/{squick => }/core/record.cc (100%) rename src/{squick => }/core/record.h (100%) rename src/{squick => }/core/recordManager.cc (100%) rename src/{squick => }/core/record_manager.h (100%) rename src/{squick => }/core/smart_enum.h (100%) rename src/{squick => }/core/string_ring_buffer.h (100%) rename src/{squick => }/core/termcolor.h (100%) rename src/{squick => }/core/vector2.h (100%) rename src/{squick => }/core/vector3.h (100%) rename src/{squick => }/core/vector4.h (100%) create mode 100644 src/plugin/CMakeLists.txt rename src/{squick/plugin => plugin/core}/CMakeLists.txt (100%) rename src/{squick/plugin => plugin/core}/actor/CMakeLists.txt (100%) rename src/{squick/plugin => plugin/core}/actor/actor.cc (98%) rename src/{squick/plugin => plugin/core}/actor/actor.h (89%) rename src/{squick/plugin => plugin/core}/actor/actor_module.cc (100%) rename src/{squick/plugin => plugin/core}/actor/actor_module.h (94%) rename src/{squick/plugin => plugin/core}/actor/export.h (100%) rename src/{squick/plugin => plugin/core}/actor/i_actor_module.h (98%) rename src/{squick/plugin => plugin/core}/actor/i_component_module.h (96%) rename src/{squick/plugin => plugin/core}/actor/plugin.cc (94%) rename src/{squick/plugin => plugin/core}/actor/plugin.h (81%) rename src/{squick/plugin => plugin/core}/config/CMakeLists.txt (100%) rename src/{squick/plugin => plugin/core}/config/class_module.cc (100%) rename src/{squick/plugin => plugin/core}/config/class_module.cc~ (100%) rename src/{squick/plugin => plugin/core}/config/class_module.h (94%) rename src/{squick/plugin => plugin/core}/config/config_module.cc (100%) rename src/{squick/plugin => plugin/core}/config/config_module.h (94%) rename src/{squick/plugin => plugin/core}/config/element_module.cc (100%) rename src/{squick/plugin => plugin/core}/config/element_module.h (94%) rename src/{squick/plugin => plugin/core}/config/export.h (100%) rename src/{squick/plugin => plugin/core}/config/i_class_module.h (97%) rename src/{squick/plugin => plugin/core}/config/i_common_config_module.h (96%) rename src/{squick/plugin => plugin/core}/config/i_element_module.h (92%) rename src/{squick/plugin => plugin/core}/config/myrc4.cc (100%) rename src/{squick/plugin => plugin/core}/config/myrc4.h (100%) rename src/{squick/plugin => plugin/core}/config/plugin.cc (100%) rename src/{squick/plugin => plugin/core}/config/plugin.h (80%) rename src/{squick/plugin => plugin/core}/log/CMakeLists.txt (100%) rename src/{squick/plugin => plugin/core}/log/export.h (84%) rename src/{squick/plugin => plugin/core}/log/i_log_module.h (97%) rename src/{squick/plugin => plugin/core}/log/log_module.cc (97%) rename src/{squick/plugin => plugin/core}/log/log_module.h (95%) rename src/{squick/plugin => plugin/core}/log/plugin.cc (100%) rename src/{squick/plugin => plugin/core}/log/plugin.h (76%) rename src/{squick/plugin => plugin/core}/lua/CMakeLists.txt (100%) rename src/{squick/plugin => plugin/core}/lua/export.h (100%) rename src/{squick/plugin => plugin/core}/lua/lua_pb_module.cc (100%) rename src/{squick/plugin => plugin/core}/lua/lua_pb_module.h (97%) rename src/{squick/plugin => plugin/core}/lua/lua_script_module.cc (100%) rename src/{squick/plugin => plugin/core}/lua/lua_script_module.h (98%) rename src/{squick/plugin => plugin/core}/lua/plugin.cc (100%) rename src/{squick/plugin => plugin/core}/lua/plugin.h (78%) rename src/{squick/plugin => plugin/core}/navigation/CMakeLists.txt (100%) rename src/{squick/plugin => plugin/core}/navigation/export.h (100%) rename src/{squick/plugin => plugin/core}/navigation/i_navigation_data_module.h (96%) rename src/{squick/plugin => plugin/core}/navigation/i_navigation_module.h (94%) rename src/{squick/plugin => plugin/core}/navigation/navigation_data_module.cc (100%) rename src/{squick/plugin => plugin/core}/navigation/navigation_data_module.h (84%) rename src/{squick/plugin => plugin/core}/navigation/navigation_module.cc (100%) rename src/{squick/plugin => plugin/core}/navigation/navigation_module.h (98%) rename src/{squick/plugin => plugin/core}/navigation/plugin.cc (100%) rename src/{squick/plugin => plugin/core}/navigation/plugin.h (82%) rename src/{squick/plugin => plugin/core}/net/CMakeLists.txt (100%) rename src/{squick/plugin => plugin/core}/net/coroutine.h (100%) rename src/{squick/plugin => plugin/core}/net/export.h (100%) rename src/{squick/plugin => plugin/core}/net/http_client.cc (100%) rename src/{squick/plugin => plugin/core}/net/http_client.h (100%) rename src/{squick/plugin => plugin/core}/net/http_client_module.cc (100%) rename src/{squick/plugin => plugin/core}/net/http_client_module.h (96%) rename src/{squick/plugin => plugin/core}/net/http_server.cc (99%) rename src/{squick/plugin => plugin/core}/net/http_server.h (97%) rename src/{squick/plugin => plugin/core}/net/http_server_module.cc (99%) rename src/{squick/plugin => plugin/core}/net/http_server_module.h (92%) rename src/{squick/plugin => plugin/core}/net/i_http_client.h (98%) rename src/{squick/plugin => plugin/core}/net/i_http_client_module.h (99%) rename src/{squick/plugin => plugin/core}/net/i_http_server.h (98%) rename src/{squick/plugin => plugin/core}/net/i_http_server_module.h (97%) rename src/{squick/plugin => plugin/core}/net/i_net.h (99%) rename src/{squick/plugin => plugin/core}/net/i_net_client_module.h (98%) rename src/{squick/plugin => plugin/core}/net/i_net_module.h (97%) rename src/{squick/plugin => plugin/core}/net/i_pb_log_module.h (83%) rename src/{squick/plugin => plugin/core}/net/i_request.h (100%) rename src/{squick/plugin => plugin/core}/net/i_response.h (100%) rename src/{squick/plugin => plugin/core}/net/i_ws_module.h (93%) rename src/{squick/plugin => plugin/core}/net/net.cc (99%) rename src/{squick/plugin => plugin/core}/net/net.h (100%) rename src/{squick/plugin => plugin/core}/net/net_client_module.cc (100%) rename src/{squick/plugin => plugin/core}/net/net_client_module.h (96%) rename src/{squick/plugin => plugin/core}/net/net_module.cc (100%) rename src/{squick/plugin => plugin/core}/net/net_module.h (93%) rename src/{squick/plugin => plugin/core}/net/pb_log_module.cc (100%) rename src/{squick/plugin => plugin/core}/net/pb_log_module.h (97%) rename src/{squick/plugin => plugin/core}/net/plugin.cc (100%) rename src/{squick/plugin => plugin/core}/net/plugin.h (76%) rename src/{squick/plugin => plugin/core}/net/udp_module.cc (100%) rename src/{squick/plugin => plugin/core}/net/udp_module.h (100%) rename src/{squick/plugin => plugin/core}/net/ws_error.h (100%) rename src/{squick/plugin => plugin/core}/net/ws_module.cc (100%) rename src/{squick/plugin => plugin/core}/net/ws_module.h (100%) rename src/{squick/plugin => plugin/core}/node/CMakeLists.txt (100%) rename src/{squick/plugin => plugin/core}/node/export.h (100%) rename src/{squick/plugin => plugin/core}/node/i_node_module.h (84%) rename src/{squick/plugin => plugin/core}/node/node_module.cc (99%) rename src/{squick/plugin => plugin/core}/node/node_module.h (96%) rename src/{squick/plugin => plugin/core}/node/plugin.cc (100%) rename src/{squick/plugin => plugin/core}/node/plugin.h (75%) rename src/{squick/plugin => plugin/core}/thread/CMakeLists.txt (100%) rename src/{squick/plugin => plugin/core}/thread/export.h (100%) rename src/{squick/plugin => plugin/core}/thread/i_thread_pool_module.h (98%) rename src/{squick/plugin => plugin/core}/thread/plugin.cc (100%) rename src/{squick/plugin => plugin/core}/thread/plugin.h (91%) rename src/{squick/plugin => plugin/core}/thread/thread_pool_module.cc (100%) rename src/{squick/plugin => plugin/core}/thread/thread_pool_module.h (94%) rename src/{squick/plugin => plugin/core}/utils/CMakeLists.txt (100%) rename src/{squick/plugin => plugin/core}/utils/error_bus_module.cc (100%) rename src/{squick/plugin => plugin/core}/utils/error_bus_module.h (100%) rename src/{squick/plugin => plugin/core}/utils/event_module.cc (100%) rename src/{squick/plugin => plugin/core}/utils/event_module.h (100%) rename src/{squick/plugin => plugin/core}/utils/export.h (100%) rename src/{squick/plugin => plugin/core}/utils/i_error_bus_module.h (87%) rename src/{squick/plugin => plugin/core}/utils/i_event_module.h (93%) rename src/{squick/plugin => plugin/core}/utils/i_schedule_module.h (92%) rename src/{squick/plugin => plugin/core}/utils/plugin.cc (100%) rename src/{squick/plugin => plugin/core}/utils/plugin.h (90%) rename src/{squick/plugin => plugin/core}/utils/schedule_module.cc (100%) rename src/{squick/plugin => plugin/core}/utils/schedule_module.h (82%) rename src/{squick/plugin => plugin/core}/world/CMakeLists.txt (100%) rename src/{squick/plugin => plugin/core}/world/cell_module.cc (100%) rename src/{squick/plugin => plugin/core}/world/cell_module.h (97%) rename src/{squick/plugin => plugin/core}/world/data_tail_module.cc (99%) rename src/{squick/plugin => plugin/core}/world/data_tail_module.h (90%) rename src/{squick/plugin => plugin/core}/world/elo_module.cc (100%) rename src/{squick/plugin => plugin/core}/world/elo_module.h (100%) rename src/{squick/plugin => plugin/core}/world/export.h (100%) rename src/{squick/plugin => plugin/core}/world/i_cell_module.h (97%) rename src/{squick/plugin => plugin/core}/world/i_data_tail_module.h (85%) rename src/{squick/plugin => plugin/core}/world/i_elo_module.h (96%) rename src/{squick/plugin => plugin/core}/world/i_scene_module.h (98%) rename src/{squick/plugin => plugin/core}/world/i_world_module.h (98%) rename src/{squick/plugin => plugin/core}/world/plugin.cc (100%) rename src/{squick/plugin => plugin/core}/world/plugin.h (81%) rename src/{squick/plugin => plugin/core}/world/scene_module.cc (99%) rename src/{squick/plugin => plugin/core}/world/scene_module.h (99%) rename src/{squick/plugin => plugin/core}/world/world_module.cc (99%) rename src/{squick/plugin => plugin/core}/world/world_module.h (97%) rename src/{ => plugin}/node/CMakeLists.txt (100%) rename src/{ => plugin}/node/backstage/CMakeLists.txt (100%) rename src/{ => plugin}/node/backstage/golib/go.mod (100%) rename src/{ => plugin}/node/backstage/golib/go.sum (100%) rename src/{ => plugin}/node/backstage/golib/main.go (100%) rename src/{ => plugin}/node/backstage/logic/CMakeLists.txt (100%) rename src/{ => plugin}/node/backstage/logic/i_logic_module.h (79%) rename src/{ => plugin}/node/backstage/logic/logic_module.cc (100%) rename src/{ => plugin}/node/backstage/logic/logic_module.h (93%) rename src/{ => plugin}/node/backstage/logic/plugin.cc (100%) rename src/{ => plugin}/node/backstage/logic/plugin.h (91%) rename src/{ => plugin}/node/backstage/logic/struct.h (94%) rename src/{ => plugin}/node/db_proxy/CMakeLists.txt (100%) rename src/{ => plugin}/node/db_proxy/clickhouse/CMakeLists.txt (100%) rename src/{ => plugin}/node/db_proxy/clickhouse/clickhouse_module.cc (100%) rename src/{ => plugin}/node/db_proxy/clickhouse/clickhouse_module.h (91%) rename src/{ => plugin}/node/db_proxy/clickhouse/i_clickhouse_module.h (100%) rename src/{ => plugin}/node/db_proxy/clickhouse/plugin.cc (100%) rename src/{ => plugin}/node/db_proxy/clickhouse/plugin.h (91%) rename src/{ => plugin}/node/db_proxy/logic/CMakeLists.txt (100%) rename src/{ => plugin}/node/db_proxy/logic/i_db_module.h (94%) rename src/{ => plugin}/node/db_proxy/logic/i_logic_module.h (77%) rename src/{ => plugin}/node/db_proxy/logic/logic_module.cc (100%) rename src/{ => plugin}/node/db_proxy/logic/logic_module.h (80%) rename src/{ => plugin}/node/db_proxy/logic/plugin.cc (100%) rename src/{ => plugin}/node/db_proxy/logic/plugin.h (91%) rename src/{ => plugin}/node/db_proxy/mongo/CMakeLists.txt (100%) rename src/{ => plugin}/node/db_proxy/mongo/export.h (100%) rename src/{ => plugin}/node/db_proxy/mongo/i_mongo_module.h (100%) rename src/{ => plugin}/node/db_proxy/mongo/mongo_module.cc (100%) rename src/{ => plugin}/node/db_proxy/mongo/mongo_module.h (91%) rename src/{ => plugin}/node/db_proxy/mongo/plugin.cc (100%) rename src/{ => plugin}/node/db_proxy/mongo/plugin.h (91%) rename src/{ => plugin}/node/db_proxy/mysql/CMakeLists.txt (100%) rename src/{ => plugin}/node/db_proxy/mysql/i_mysql_module.h (100%) rename src/{ => plugin}/node/db_proxy/mysql/mysql_module.cc (100%) rename src/{ => plugin}/node/db_proxy/mysql/mysql_module.h (86%) rename src/{ => plugin}/node/db_proxy/mysql/plugin.cc (100%) rename src/{ => plugin}/node/db_proxy/mysql/plugin.h (91%) rename src/{ => plugin}/node/db_proxy/redis/CMakeLists.txt (100%) rename src/{ => plugin}/node/db_proxy/redis/i_redis_module.h (100%) rename src/{ => plugin}/node/db_proxy/redis/plugin.cc (100%) rename src/{ => plugin}/node/db_proxy/redis/plugin.h (91%) rename src/{ => plugin}/node/db_proxy/redis/redis_module.cc (100%) rename src/{ => plugin}/node/db_proxy/redis/redis_module.h (96%) rename src/{ => plugin}/node/ds_mgr/CMakeLists.txt (100%) rename src/{ => plugin}/node/ds_mgr/logic/CMakeLists.txt (100%) rename src/{ => plugin}/node/ds_mgr/logic/i_logic_module.h (84%) rename src/{ => plugin}/node/ds_mgr/logic/logic_module.cc (100%) rename src/{ => plugin}/node/ds_mgr/logic/logic_module.h (84%) rename src/{ => plugin}/node/ds_mgr/logic/manager_module.cc (100%) rename src/{ => plugin}/node/ds_mgr/logic/manager_module.h (78%) rename src/{ => plugin}/node/ds_mgr/logic/plugin.cc (100%) rename src/{ => plugin}/node/ds_mgr/logic/plugin.h (84%) rename src/{ => plugin}/node/game/CMakeLists.txt (100%) rename src/{ => plugin}/node/game/logic/CMakeLists.txt (100%) rename src/{ => plugin}/node/game/logic/game.cc (100%) rename src/{ => plugin}/node/game/logic/game.h (100%) rename src/{ => plugin}/node/game/logic/game_mgr_module.cc (100%) rename src/{ => plugin}/node/game/logic/game_mgr_module.h (97%) rename src/{ => plugin}/node/game/logic/i_game.h (99%) rename src/{ => plugin}/node/game/logic/i_game_mgr_module.h (92%) rename src/{ => plugin}/node/game/logic/plugin.cc (100%) rename src/{ => plugin}/node/game/logic/plugin.h (80%) rename src/{ => plugin}/node/global/CMakeLists.txt (100%) rename src/{ => plugin}/node/global/logic/CMakeLists.txt (100%) rename src/{ => plugin}/node/global/logic/i_logic_module.h (76%) rename src/{ => plugin}/node/global/logic/logic_module.cc (100%) rename src/{ => plugin}/node/global/logic/logic_module.h (80%) rename src/{ => plugin}/node/global/logic/plugin.cc (100%) rename src/{ => plugin}/node/global/logic/plugin.h (91%) rename src/{ => plugin}/node/master/CMakeLists.txt (100%) rename src/{ => plugin}/node/master/logic/CMakeLists.txt (100%) rename src/{ => plugin}/node/master/logic/i_logic_module.h (79%) rename src/{ => plugin}/node/master/logic/logic_module.cc (100%) rename src/{ => plugin}/node/master/logic/logic_module.h (94%) rename src/{ => plugin}/node/master/logic/plugin.cc (100%) rename src/{ => plugin}/node/master/logic/plugin.h (79%) rename src/{ => plugin}/node/match/CMakeLists.txt (100%) rename src/{ => plugin}/node/player/CMakeLists.txt (100%) rename src/{ => plugin}/node/player/logic/CMakeLists.txt (100%) rename src/{ => plugin}/node/player/logic/README.md (100%) rename src/{ => plugin}/node/player/logic/logic_module.cc (97%) rename src/{ => plugin}/node/player/logic/logic_module.h (73%) rename src/{ => plugin}/node/player/logic/plugin.cc (100%) rename src/{ => plugin}/node/player/logic/plugin.h (80%) rename src/{ => plugin}/node/proxy/CMakeLists.txt (100%) rename src/{ => plugin}/node/proxy/logic/CMakeLists.txt (100%) rename src/{ => plugin}/node/proxy/logic/i_logic_module.h (87%) rename src/{ => plugin}/node/proxy/logic/logic_module.cc (99%) rename src/{ => plugin}/node/proxy/logic/logic_module.h (93%) rename src/{ => plugin}/node/proxy/logic/plugin.cc (100%) rename src/{ => plugin}/node/proxy/logic/plugin.h (79%) rename src/{ => plugin}/node/room/CMakeLists.txt (100%) rename src/{ => plugin}/node/web/CMakeLists.txt (100%) rename src/{ => plugin}/node/web/logic/CMakeLists.txt (100%) rename src/{ => plugin}/node/web/logic/i_logic_module.h (77%) rename src/{ => plugin}/node/web/logic/logic_module.cc (100%) rename src/{ => plugin}/node/web/logic/logic_module.h (91%) rename src/{ => plugin}/node/web/logic/plugin.cc (100%) rename src/{ => plugin}/node/web/logic/plugin.h (90%) rename src/{ => plugin}/node/web/logic/struct.h (94%) rename src/{ => plugin}/node/world/CMakeLists.txt (100%) rename src/{ => plugin}/node/world/logic/CMakeLists.txt (100%) rename src/{ => plugin}/node/world/logic/i_logic_module.h (76%) rename src/{ => plugin}/node/world/logic/logic_module.cc (100%) rename src/{ => plugin}/node/world/logic/logic_module.h (80%) rename src/{ => plugin}/node/world/logic/plugin.cc (100%) rename src/{ => plugin}/node/world/logic/plugin.h (91%) rename src/{ => plugin}/tutorial/CMakeLists.txt (100%) rename src/{ => plugin}/tutorial/t1_plugin/CMakeLists.txt (100%) rename src/{ => plugin}/tutorial/t1_plugin/plugin.cc (100%) rename src/{tutorial/t3_event => plugin/tutorial/t1_plugin}/plugin.h (90%) rename src/{ => plugin}/tutorial/t1_plugin/simple_module.cc (100%) rename src/{ => plugin}/tutorial/t1_plugin/simple_module.h (97%) rename src/{ => plugin}/tutorial/t2_property/CMakeLists.txt (100%) rename src/{ => plugin}/tutorial/t2_property/plugin.cc (100%) rename src/{ => plugin}/tutorial/t2_property/plugin.h (90%) rename src/{ => plugin}/tutorial/t2_property/property_module.cc (96%) rename src/{ => plugin}/tutorial/t2_property/property_module.h (87%) rename src/{ => plugin}/tutorial/t3_event/CMakeLists.txt (100%) rename src/{ => plugin}/tutorial/t3_event/event_module.cc (100%) rename src/{ => plugin}/tutorial/t3_event/event_module.h (90%) rename src/{ => plugin}/tutorial/t3_event/plugin.cc (100%) rename src/{tutorial/t4_actor => plugin/tutorial/t3_event}/plugin.h (90%) rename src/{ => plugin}/tutorial/t4_actor/CMakeLists.txt (100%) rename src/{ => plugin}/tutorial/t4_actor/actor_module.cc (100%) rename src/{ => plugin}/tutorial/t4_actor/actor_module.h (96%) rename src/{ => plugin}/tutorial/t4_actor/plugin.cc (100%) rename src/{tutorial/t1_plugin => plugin/tutorial/t4_actor}/plugin.h (90%) rename src/{ => plugin}/tutorial/t5_http/CMakeLists.txt (100%) rename src/{ => plugin}/tutorial/t5_http/http_module.cc (100%) rename src/{ => plugin}/tutorial/t5_http/http_module.h (94%) rename src/{ => plugin}/tutorial/t5_http/plugin.cc (100%) create mode 100644 src/plugin/tutorial/t5_http/plugin.h rename src/{ => plugin}/tutorial/t6_rpc/CMakeLists.txt (100%) rename src/{ => plugin}/tutorial/t6_rpc/plugin.cc (100%) create mode 100644 src/plugin/tutorial/t6_rpc/plugin.h rename src/{ => plugin}/tutorial/t6_rpc/rpc_module.cc (100%) rename src/{ => plugin}/tutorial/t6_rpc/rpc_module.h (87%) rename src/{ => plugin}/tutorial/t7_config/CMakeLists.txt (100%) rename src/{ => plugin}/tutorial/t7_config/config_module.cc (100%) rename src/{ => plugin}/tutorial/t7_config/config_module.h (91%) rename src/{ => plugin}/tutorial/t7_config/plugin.cc (100%) create mode 100644 src/plugin/tutorial/t7_config/plugin.h rename src/{ => plugin}/tutorial/t8_thread/CMakeLists.txt (100%) rename src/{ => plugin}/tutorial/t8_thread/plugin.cc (100%) create mode 100644 src/plugin/tutorial/t8_thread/plugin.h rename src/{ => plugin}/tutorial/t8_thread/thread_module.cc (99%) rename src/{ => plugin}/tutorial/t8_thread/thread_module.h (88%) rename src/{ => plugin}/tutorial/t9_navigation/CMakeLists.txt (100%) rename src/{ => plugin}/tutorial/t9_navigation/navigation_module.cc (100%) rename src/{ => plugin}/tutorial/t9_navigation/navigation_module.h (82%) rename src/{ => plugin}/tutorial/t9_navigation/plugin.cc (100%) create mode 100644 src/plugin/tutorial/t9_navigation/plugin.h delete mode 100644 src/squick/CMakeLists.txt delete mode 100644 src/tutorial/t5_http/plugin.h delete mode 100644 src/tutorial/t6_rpc/plugin.h delete mode 100644 src/tutorial/t7_config/plugin.h delete mode 100644 src/tutorial/t8_thread/plugin.h delete mode 100644 src/tutorial/t9_navigation/plugin.h diff --git a/CMakeLists.txt b/CMakeLists.txt index cfea12d2..394523ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,9 +124,8 @@ add_definitions(-D_X64 -D_CONSOLE -DSQUICK_DYNAMIC_PLUGIN -DSQUICK_ENABLE_SSL) add_definitions(-DSQUICK_LOG_OPEN_STDOUT) # Log stdout print add_subdirectory(src/struct) -add_subdirectory(src/squick) -add_subdirectory(src/node) -add_subdirectory(src/tutorial) +add_subdirectory(src/core) +add_subdirectory(src/plugin) if( EXTRA STREQUAL "EXTRA" ) diff --git a/res b/res index 38e65acf..2ae1c318 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit 38e65acf45b79fbe33b0cc26d4130dd1ce2186b9 +Subproject commit 2ae1c3189a31089eaecd935df82e609c9a1f7a79 diff --git a/src/squick/core/CMakeLists.txt b/src/core/CMakeLists.txt similarity index 100% rename from src/squick/core/CMakeLists.txt rename to src/core/CMakeLists.txt diff --git a/src/squick/core/base.cc b/src/core/base.cc similarity index 100% rename from src/squick/core/base.cc rename to src/core/base.cc diff --git a/src/squick/core/base.h b/src/core/base.h similarity index 100% rename from src/squick/core/base.h rename to src/core/base.h diff --git a/src/squick/core/consistent_hash.h b/src/core/consistent_hash.h similarity index 100% rename from src/squick/core/consistent_hash.h rename to src/core/consistent_hash.h diff --git a/src/squick/core/data_list.h b/src/core/data_list.h similarity index 100% rename from src/squick/core/data_list.h rename to src/core/data_list.h diff --git a/src/squick/core/date_time.h b/src/core/date_time.h similarity index 100% rename from src/squick/core/date_time.h rename to src/core/date_time.h diff --git a/src/squick/core/dyn_lib.cc b/src/core/dyn_lib.cc similarity index 100% rename from src/squick/core/dyn_lib.cc rename to src/core/dyn_lib.cc diff --git a/src/squick/core/dyn_lib.h b/src/core/dyn_lib.h similarity index 100% rename from src/squick/core/dyn_lib.h rename to src/core/dyn_lib.h diff --git a/src/squick/core/exception.cc b/src/core/exception.cc similarity index 100% rename from src/squick/core/exception.cc rename to src/core/exception.cc diff --git a/src/squick/core/exception.h b/src/core/exception.h similarity index 100% rename from src/squick/core/exception.h rename to src/core/exception.h diff --git a/src/squick/core/guid.h b/src/core/guid.h similarity index 100% rename from src/squick/core/guid.h rename to src/core/guid.h diff --git a/src/squick/core/i_module.h b/src/core/i_module.h similarity index 100% rename from src/squick/core/i_module.h rename to src/core/i_module.h diff --git a/src/squick/core/i_object.h b/src/core/i_object.h similarity index 100% rename from src/squick/core/i_object.h rename to src/core/i_object.h diff --git a/src/squick/core/i_plugin.h b/src/core/i_plugin.h similarity index 100% rename from src/squick/core/i_plugin.h rename to src/core/i_plugin.h diff --git a/src/squick/core/i_plugin_manager.h b/src/core/i_plugin_manager.h similarity index 99% rename from src/squick/core/i_plugin_manager.h rename to src/core/i_plugin_manager.h index 55fc468d..b8f93a67 100644 --- a/src/squick/core/i_plugin_manager.h +++ b/src/core/i_plugin_manager.h @@ -3,7 +3,7 @@ #include "platform.h" #include #include -#include +#include #include class IPlugin; diff --git a/src/squick/core/i_property.h b/src/core/i_property.h similarity index 100% rename from src/squick/core/i_property.h rename to src/core/i_property.h diff --git a/src/squick/core/i_property_manager.h b/src/core/i_property_manager.h similarity index 100% rename from src/squick/core/i_property_manager.h rename to src/core/i_property_manager.h diff --git a/src/squick/core/i_record.h b/src/core/i_record.h similarity index 100% rename from src/squick/core/i_record.h rename to src/core/i_record.h diff --git a/src/squick/core/i_record_manager.h b/src/core/i_record_manager.h similarity index 100% rename from src/squick/core/i_record_manager.h rename to src/core/i_record_manager.h diff --git a/src/squick/core/i_tag_module.h b/src/core/i_tag_module.h similarity index 100% rename from src/squick/core/i_tag_module.h rename to src/core/i_tag_module.h diff --git a/src/squick/core/list.h b/src/core/list.h similarity index 100% rename from src/squick/core/list.h rename to src/core/list.h diff --git a/src/squick/core/map.h b/src/core/map.h similarity index 100% rename from src/squick/core/map.h rename to src/core/map.h diff --git a/src/squick/core/map_ex.h b/src/core/map_ex.h similarity index 100% rename from src/squick/core/map_ex.h rename to src/core/map_ex.h diff --git a/src/squick/core/math.h b/src/core/math.h similarity index 100% rename from src/squick/core/math.h rename to src/core/math.h diff --git a/src/squick/core/mem_manager.h b/src/core/mem_manager.h similarity index 100% rename from src/squick/core/mem_manager.h rename to src/core/mem_manager.h diff --git a/src/squick/core/memory_counter.cc b/src/core/memory_counter.cc similarity index 100% rename from src/squick/core/memory_counter.cc rename to src/core/memory_counter.cc diff --git a/src/squick/core/memory_counter.h b/src/core/memory_counter.h similarity index 100% rename from src/squick/core/memory_counter.h rename to src/core/memory_counter.h diff --git a/src/squick/core/object.cc b/src/core/object.cc similarity index 100% rename from src/squick/core/object.cc rename to src/core/object.cc diff --git a/src/squick/core/object.h b/src/core/object.h similarity index 100% rename from src/squick/core/object.h rename to src/core/object.h diff --git a/src/squick/core/performance.h b/src/core/performance.h similarity index 93% rename from src/squick/core/performance.h rename to src/core/performance.h index 6e04195b..9f0bdf71 100644 --- a/src/squick/core/performance.h +++ b/src/core/performance.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include class Performance { private: diff --git a/src/squick/core/platform.h b/src/core/platform.h similarity index 100% rename from src/squick/core/platform.h rename to src/core/platform.h diff --git a/src/squick/core/plugin_manager.cc b/src/core/plugin_manager.cc similarity index 99% rename from src/squick/core/plugin_manager.cc rename to src/core/plugin_manager.cc index f478d360..9d79fee4 100644 --- a/src/squick/core/plugin_manager.cc +++ b/src/core/plugin_manager.cc @@ -5,7 +5,7 @@ #include "third_party/rapidxml/rapidxml_iterators.hpp" #include "third_party/rapidxml/rapidxml_print.hpp" #include "third_party/rapidxml/rapidxml_utils.hpp" -#include +#include PluginManager::PluginManager() : IPluginManager() { appID = 0; @@ -20,7 +20,7 @@ PluginManager::PluginManager() : IPluginManager() { mGetFileContentFunctor = nullptr; configPath = ".."; // 主要服务路径 - configName = "config/plugin/plugin.xml"; // 默认插件加载路径 + configName = "config/plugin.xml"; // 默认插件加载路径 } PluginManager::~PluginManager() {} @@ -64,7 +64,7 @@ bool PluginManager::LoadPluginConfig() { rapidxml::xml_node<> *pRoot = xDoc.first_node(); if (pRoot == nullptr) { SQUICK_PRINT("Cannot load plugin config from :" + strFilePath); - SQUICK_PRINT("Please check your working directory, make sure config file in the [../config/plugin/] directory."); + SQUICK_PRINT("Please check your working directory, make sure config file in the [../config/] directory."); return false; } rapidxml::xml_node<> *pAppNameNode = pRoot->first_node(appName.c_str()); diff --git a/src/squick/core/plugin_manager.h b/src/core/plugin_manager.h similarity index 100% rename from src/squick/core/plugin_manager.h rename to src/core/plugin_manager.h diff --git a/src/squick/core/plugin_server.cc b/src/core/plugin_server.cc similarity index 98% rename from src/squick/core/plugin_server.cc rename to src/core/plugin_server.cc index 1c2252b0..e8aa86de 100644 --- a/src/squick/core/plugin_server.cc +++ b/src/core/plugin_server.cc @@ -1,6 +1,6 @@ #include "plugin_server.h" -#include -#include +#include +#include #include PluginServer::PluginServer(const std::string &strArgv) { diff --git a/src/squick/core/plugin_server.h b/src/core/plugin_server.h similarity index 100% rename from src/squick/core/plugin_server.h rename to src/core/plugin_server.h diff --git a/src/squick/core/property.cc b/src/core/property.cc similarity index 100% rename from src/squick/core/property.cc rename to src/core/property.cc diff --git a/src/squick/core/property.h b/src/core/property.h similarity index 100% rename from src/squick/core/property.h rename to src/core/property.h diff --git a/src/squick/core/property_manager.cc b/src/core/property_manager.cc similarity index 100% rename from src/squick/core/property_manager.cc rename to src/core/property_manager.cc diff --git a/src/squick/core/property_manager.h b/src/core/property_manager.h similarity index 100% rename from src/squick/core/property_manager.h rename to src/core/property_manager.h diff --git a/src/squick/core/queue.h b/src/core/queue.h similarity index 100% rename from src/squick/core/queue.h rename to src/core/queue.h diff --git a/src/squick/core/record.cc b/src/core/record.cc similarity index 100% rename from src/squick/core/record.cc rename to src/core/record.cc diff --git a/src/squick/core/record.h b/src/core/record.h similarity index 100% rename from src/squick/core/record.h rename to src/core/record.h diff --git a/src/squick/core/recordManager.cc b/src/core/recordManager.cc similarity index 100% rename from src/squick/core/recordManager.cc rename to src/core/recordManager.cc diff --git a/src/squick/core/record_manager.h b/src/core/record_manager.h similarity index 100% rename from src/squick/core/record_manager.h rename to src/core/record_manager.h diff --git a/src/squick/core/smart_enum.h b/src/core/smart_enum.h similarity index 100% rename from src/squick/core/smart_enum.h rename to src/core/smart_enum.h diff --git a/src/squick/core/string_ring_buffer.h b/src/core/string_ring_buffer.h similarity index 100% rename from src/squick/core/string_ring_buffer.h rename to src/core/string_ring_buffer.h diff --git a/src/squick/core/termcolor.h b/src/core/termcolor.h similarity index 100% rename from src/squick/core/termcolor.h rename to src/core/termcolor.h diff --git a/src/squick/core/vector2.h b/src/core/vector2.h similarity index 100% rename from src/squick/core/vector2.h rename to src/core/vector2.h diff --git a/src/squick/core/vector3.h b/src/core/vector3.h similarity index 100% rename from src/squick/core/vector3.h rename to src/core/vector3.h diff --git a/src/squick/core/vector4.h b/src/core/vector4.h similarity index 100% rename from src/squick/core/vector4.h rename to src/core/vector4.h diff --git a/src/main.cc b/src/main.cc index 77abba66..38fdfc36 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #if PLATFORM == PLATFORM_WIN diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt new file mode 100644 index 00000000..b6dcb732 --- /dev/null +++ b/src/plugin/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory(core) +add_subdirectory(node) + +if( MODE STREQUAL "dev" ) + add_subdirectory(tutorial) +endif() diff --git a/src/squick/plugin/CMakeLists.txt b/src/plugin/core/CMakeLists.txt similarity index 100% rename from src/squick/plugin/CMakeLists.txt rename to src/plugin/core/CMakeLists.txt diff --git a/src/squick/plugin/actor/CMakeLists.txt b/src/plugin/core/actor/CMakeLists.txt similarity index 100% rename from src/squick/plugin/actor/CMakeLists.txt rename to src/plugin/core/actor/CMakeLists.txt diff --git a/src/squick/plugin/actor/actor.cc b/src/plugin/core/actor/actor.cc similarity index 98% rename from src/squick/plugin/actor/actor.cc rename to src/plugin/core/actor/actor.cc index b2087166..fee1e11d 100644 --- a/src/squick/plugin/actor/actor.cc +++ b/src/plugin/core/actor/actor.cc @@ -1,5 +1,5 @@ #include "actor.h" -#include +#include Actor::Actor(const Guid id, IActorModule *pModule) { this->id = id; diff --git a/src/squick/plugin/actor/actor.h b/src/plugin/core/actor/actor.h similarity index 89% rename from src/squick/plugin/actor/actor.h rename to src/plugin/core/actor/actor.h index 905023cf..f7d57cab 100644 --- a/src/squick/plugin/actor/actor.h +++ b/src/plugin/core/actor/actor.h @@ -3,10 +3,10 @@ #include "i_actor_module.h" #include "i_component_module.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include class Actor : public IActor { diff --git a/src/squick/plugin/actor/actor_module.cc b/src/plugin/core/actor/actor_module.cc similarity index 100% rename from src/squick/plugin/actor/actor_module.cc rename to src/plugin/core/actor/actor_module.cc diff --git a/src/squick/plugin/actor/actor_module.h b/src/plugin/core/actor/actor_module.h similarity index 94% rename from src/squick/plugin/actor/actor_module.h rename to src/plugin/core/actor/actor_module.h index ab9b5b68..3dd23232 100644 --- a/src/squick/plugin/actor/actor_module.h +++ b/src/plugin/core/actor/actor_module.h @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include "actor.h" #include "i_actor_module.h" diff --git a/src/squick/plugin/actor/export.h b/src/plugin/core/actor/export.h similarity index 100% rename from src/squick/plugin/actor/export.h rename to src/plugin/core/actor/export.h diff --git a/src/squick/plugin/actor/i_actor_module.h b/src/plugin/core/actor/i_actor_module.h similarity index 98% rename from src/squick/plugin/actor/i_actor_module.h rename to src/plugin/core/actor/i_actor_module.h index e3c2836f..3bc1b237 100644 --- a/src/squick/plugin/actor/i_actor_module.h +++ b/src/plugin/core/actor/i_actor_module.h @@ -1,6 +1,6 @@ #pragma once #include "i_component_module.h" -#include +#include class IActorModule : public IModule { public: diff --git a/src/squick/plugin/actor/i_component_module.h b/src/plugin/core/actor/i_component_module.h similarity index 96% rename from src/squick/plugin/actor/i_component_module.h rename to src/plugin/core/actor/i_component_module.h index 5c804f17..9b7bcfe4 100644 --- a/src/squick/plugin/actor/i_component_module.h +++ b/src/plugin/core/actor/i_component_module.h @@ -1,9 +1,9 @@ #pragma once #include -#include -#include -#include -#include +#include +#include +#include +#include class ActorMessage; class IComponent; diff --git a/src/squick/plugin/actor/plugin.cc b/src/plugin/core/actor/plugin.cc similarity index 94% rename from src/squick/plugin/actor/plugin.cc rename to src/plugin/core/actor/plugin.cc index 5f2ff8a8..6950d9ad 100644 --- a/src/squick/plugin/actor/plugin.cc +++ b/src/plugin/core/actor/plugin.cc @@ -1,6 +1,6 @@ #include "plugin.h" #include "actor_module.h" -#include +#include SQUICK_EXPORT void SquickPluginLoad(IPluginManager *pm){CREATE_PLUGIN(pm, ActorPlugin)}; diff --git a/src/squick/plugin/actor/plugin.h b/src/plugin/core/actor/plugin.h similarity index 81% rename from src/squick/plugin/actor/plugin.h rename to src/plugin/core/actor/plugin.h index 5117fc27..87e4973c 100644 --- a/src/squick/plugin/actor/plugin.h +++ b/src/plugin/core/actor/plugin.h @@ -1,6 +1,6 @@ -#include -#include +#include +#include ////////////////////////////////////////////////////////////////////////// class ActorPlugin : public IPlugin { diff --git a/src/squick/plugin/config/CMakeLists.txt b/src/plugin/core/config/CMakeLists.txt similarity index 100% rename from src/squick/plugin/config/CMakeLists.txt rename to src/plugin/core/config/CMakeLists.txt diff --git a/src/squick/plugin/config/class_module.cc b/src/plugin/core/config/class_module.cc similarity index 100% rename from src/squick/plugin/config/class_module.cc rename to src/plugin/core/config/class_module.cc diff --git a/src/squick/plugin/config/class_module.cc~ b/src/plugin/core/config/class_module.cc~ similarity index 100% rename from src/squick/plugin/config/class_module.cc~ rename to src/plugin/core/config/class_module.cc~ diff --git a/src/squick/plugin/config/class_module.h b/src/plugin/core/config/class_module.h similarity index 94% rename from src/squick/plugin/config/class_module.h rename to src/plugin/core/config/class_module.h index 43744f34..1281b024 100644 --- a/src/squick/plugin/config/class_module.h +++ b/src/plugin/core/config/class_module.h @@ -5,13 +5,13 @@ #include "i_element_module.h" #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/squick/plugin/config/config_module.cc b/src/plugin/core/config/config_module.cc similarity index 100% rename from src/squick/plugin/config/config_module.cc rename to src/plugin/core/config/config_module.cc diff --git a/src/squick/plugin/config/config_module.h b/src/plugin/core/config/config_module.h similarity index 94% rename from src/squick/plugin/config/config_module.h rename to src/plugin/core/config/config_module.h index a034d906..3544fdbc 100644 --- a/src/squick/plugin/config/config_module.h +++ b/src/plugin/core/config/config_module.h @@ -1,9 +1,9 @@ #pragma once #include "i_common_config_module.h" -#include -#include -#include +#include +#include +#include class ConfigModule : public ICommonConfigModule { public: public: diff --git a/src/squick/plugin/config/element_module.cc b/src/plugin/core/config/element_module.cc similarity index 100% rename from src/squick/plugin/config/element_module.cc rename to src/plugin/core/config/element_module.cc diff --git a/src/squick/plugin/config/element_module.h b/src/plugin/core/config/element_module.h similarity index 94% rename from src/squick/plugin/config/element_module.h rename to src/plugin/core/config/element_module.h index c546503e..3dba894c 100644 --- a/src/squick/plugin/config/element_module.h +++ b/src/plugin/core/config/element_module.h @@ -4,13 +4,13 @@ #include "i_element_module.h" #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/squick/plugin/config/export.h b/src/plugin/core/config/export.h similarity index 100% rename from src/squick/plugin/config/export.h rename to src/plugin/core/config/export.h diff --git a/src/squick/plugin/config/i_class_module.h b/src/plugin/core/config/i_class_module.h similarity index 97% rename from src/squick/plugin/config/i_class_module.h rename to src/plugin/core/config/i_class_module.h index 72cf7b48..1682d862 100644 --- a/src/squick/plugin/config/i_class_module.h +++ b/src/plugin/core/config/i_class_module.h @@ -3,8 +3,8 @@ #define SQUICK_INTF_LOGICCLASS_MODULE_H #include -#include -#include +#include +#include typedef std::function CLASS_EVENT_FUNCTOR; typedef std::shared_ptr CLASS_EVENT_FUNCTOR_PTR; // EVENT diff --git a/src/squick/plugin/config/i_common_config_module.h b/src/plugin/core/config/i_common_config_module.h similarity index 96% rename from src/squick/plugin/config/i_common_config_module.h rename to src/plugin/core/config/i_common_config_module.h index 2f773900..b55d97af 100644 --- a/src/squick/plugin/config/i_common_config_module.h +++ b/src/plugin/core/config/i_common_config_module.h @@ -4,7 +4,7 @@ #define SQUICK_INTF_COMMONCONFIG_MODULE_H #include -#include +#include class ICommonConfigModule : public IModule { public: diff --git a/src/squick/plugin/config/i_element_module.h b/src/plugin/core/config/i_element_module.h similarity index 92% rename from src/squick/plugin/config/i_element_module.h rename to src/plugin/core/config/i_element_module.h index 168aca9f..a96ef5cc 100644 --- a/src/squick/plugin/config/i_element_module.h +++ b/src/plugin/core/config/i_element_module.h @@ -1,10 +1,10 @@ #pragma once #include -#include -#include -#include -#include +#include +#include +#include +#include class IElementModule : public IModule { public: diff --git a/src/squick/plugin/config/myrc4.cc b/src/plugin/core/config/myrc4.cc similarity index 100% rename from src/squick/plugin/config/myrc4.cc rename to src/plugin/core/config/myrc4.cc diff --git a/src/squick/plugin/config/myrc4.h b/src/plugin/core/config/myrc4.h similarity index 100% rename from src/squick/plugin/config/myrc4.h rename to src/plugin/core/config/myrc4.h diff --git a/src/squick/plugin/config/plugin.cc b/src/plugin/core/config/plugin.cc similarity index 100% rename from src/squick/plugin/config/plugin.cc rename to src/plugin/core/config/plugin.cc diff --git a/src/squick/plugin/config/plugin.h b/src/plugin/core/config/plugin.h similarity index 80% rename from src/squick/plugin/config/plugin.h rename to src/plugin/core/config/plugin.h index 24ea94f7..d26a4fd2 100644 --- a/src/squick/plugin/config/plugin.h +++ b/src/plugin/core/config/plugin.h @@ -1,6 +1,6 @@ -#include -#include +#include +#include ////////////////////////////////////////////////////////////////////////// class ConfigPlugin : public IPlugin { public: diff --git a/src/squick/plugin/log/CMakeLists.txt b/src/plugin/core/log/CMakeLists.txt similarity index 100% rename from src/squick/plugin/log/CMakeLists.txt rename to src/plugin/core/log/CMakeLists.txt diff --git a/src/squick/plugin/log/export.h b/src/plugin/core/log/export.h similarity index 84% rename from src/squick/plugin/log/export.h rename to src/plugin/core/log/export.h index 95e7ce57..5f558433 100644 --- a/src/squick/plugin/log/export.h +++ b/src/plugin/core/log/export.h @@ -4,5 +4,5 @@ // Github: https://github.com/pwnsky/squick // Description: Export current plugin's all modules in a single header file #pragma once -// #include +// #include #include "i_log_module.h" diff --git a/src/squick/plugin/log/i_log_module.h b/src/plugin/core/log/i_log_module.h similarity index 97% rename from src/squick/plugin/log/i_log_module.h rename to src/plugin/core/log/i_log_module.h index b9f18987..8225d949 100644 --- a/src/squick/plugin/log/i_log_module.h +++ b/src/plugin/core/log/i_log_module.h @@ -1,8 +1,8 @@ #pragma once -#include -#include +#include +#include #include #ifdef SQUICK_DEV diff --git a/src/squick/plugin/log/log_module.cc b/src/plugin/core/log/log_module.cc similarity index 97% rename from src/squick/plugin/log/log_module.cc rename to src/plugin/core/log/log_module.cc index 45a45c99..e2c27f06 100644 --- a/src/squick/plugin/log/log_module.cc +++ b/src/plugin/core/log/log_module.cc @@ -3,8 +3,8 @@ #include "log_module.h" #include "plugin.h" -#include "squick/core/exception.h" -#include +#include "core/exception.h" +#include #include // Ref https://github.com/abumq/easyloggingpp; diff --git a/src/squick/plugin/log/log_module.h b/src/plugin/core/log/log_module.h similarity index 95% rename from src/squick/plugin/log/log_module.h rename to src/plugin/core/log/log_module.h index a4e47889..e0e67d5a 100644 --- a/src/squick/plugin/log/log_module.h +++ b/src/plugin/core/log/log_module.h @@ -1,7 +1,7 @@ #pragma once #include "i_log_module.h" -#include +#include class LogModule : public ILogModule { public: diff --git a/src/squick/plugin/log/plugin.cc b/src/plugin/core/log/plugin.cc similarity index 100% rename from src/squick/plugin/log/plugin.cc rename to src/plugin/core/log/plugin.cc diff --git a/src/squick/plugin/log/plugin.h b/src/plugin/core/log/plugin.h similarity index 76% rename from src/squick/plugin/log/plugin.h rename to src/plugin/core/log/plugin.h index 7f7af9d2..43ddb419 100644 --- a/src/squick/plugin/log/plugin.h +++ b/src/plugin/core/log/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include class LogPlugin : public IPlugin { public: LogPlugin(IPluginManager *p) { pm_ = p; } diff --git a/src/squick/plugin/lua/CMakeLists.txt b/src/plugin/core/lua/CMakeLists.txt similarity index 100% rename from src/squick/plugin/lua/CMakeLists.txt rename to src/plugin/core/lua/CMakeLists.txt diff --git a/src/squick/plugin/lua/export.h b/src/plugin/core/lua/export.h similarity index 100% rename from src/squick/plugin/lua/export.h rename to src/plugin/core/lua/export.h diff --git a/src/squick/plugin/lua/lua_pb_module.cc b/src/plugin/core/lua/lua_pb_module.cc similarity index 100% rename from src/squick/plugin/lua/lua_pb_module.cc rename to src/plugin/core/lua/lua_pb_module.cc diff --git a/src/squick/plugin/lua/lua_pb_module.h b/src/plugin/core/lua/lua_pb_module.h similarity index 97% rename from src/squick/plugin/lua/lua_pb_module.h rename to src/plugin/core/lua/lua_pb_module.h index 2323922c..018de217 100644 --- a/src/squick/plugin/lua/lua_pb_module.h +++ b/src/plugin/core/lua/lua_pb_module.h @@ -11,10 +11,10 @@ #include #include #include -#include -#include +#include +#include #if PLATFORM != PLATFORM_WIN -#include "squick/core/exception.h" +#include "core/exception.h" #endif class MultiFileErrorCollector : public google::protobuf::compiler::MultiFileErrorCollector { diff --git a/src/squick/plugin/lua/lua_script_module.cc b/src/plugin/core/lua/lua_script_module.cc similarity index 100% rename from src/squick/plugin/lua/lua_script_module.cc rename to src/plugin/core/lua/lua_script_module.cc diff --git a/src/squick/plugin/lua/lua_script_module.h b/src/plugin/core/lua/lua_script_module.h similarity index 98% rename from src/squick/plugin/lua/lua_script_module.h rename to src/plugin/core/lua/lua_script_module.h index ff2a71c5..83fe0c5e 100644 --- a/src/squick/plugin/lua/lua_script_module.h +++ b/src/plugin/core/lua/lua_script_module.h @@ -8,11 +8,11 @@ // #define LUAINTF_LINK_LUA_COMPILED_IN_CXX 0 #include "lua_pb_module.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define LUA_UPDATE_INTERVAL_TIME 100 // ms #if PLATFORM == PLATFORM_WIN diff --git a/src/squick/plugin/lua/plugin.cc b/src/plugin/core/lua/plugin.cc similarity index 100% rename from src/squick/plugin/lua/plugin.cc rename to src/plugin/core/lua/plugin.cc diff --git a/src/squick/plugin/lua/plugin.h b/src/plugin/core/lua/plugin.h similarity index 78% rename from src/squick/plugin/lua/plugin.h rename to src/plugin/core/lua/plugin.h index 1dac3773..c070ba7e 100644 --- a/src/squick/plugin/lua/plugin.h +++ b/src/plugin/core/lua/plugin.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include class LuaScriptPlugin : public IPlugin { public: diff --git a/src/squick/plugin/navigation/CMakeLists.txt b/src/plugin/core/navigation/CMakeLists.txt similarity index 100% rename from src/squick/plugin/navigation/CMakeLists.txt rename to src/plugin/core/navigation/CMakeLists.txt diff --git a/src/squick/plugin/navigation/export.h b/src/plugin/core/navigation/export.h similarity index 100% rename from src/squick/plugin/navigation/export.h rename to src/plugin/core/navigation/export.h diff --git a/src/squick/plugin/navigation/i_navigation_data_module.h b/src/plugin/core/navigation/i_navigation_data_module.h similarity index 96% rename from src/squick/plugin/navigation/i_navigation_data_module.h rename to src/plugin/core/navigation/i_navigation_data_module.h index 5735b0fd..7774e2ab 100644 --- a/src/squick/plugin/navigation/i_navigation_data_module.h +++ b/src/plugin/core/navigation/i_navigation_data_module.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include using json = nlohmann::json; diff --git a/src/squick/plugin/navigation/i_navigation_module.h b/src/plugin/core/navigation/i_navigation_module.h similarity index 94% rename from src/squick/plugin/navigation/i_navigation_module.h rename to src/plugin/core/navigation/i_navigation_module.h index 4ff2b99e..06bdaf07 100644 --- a/src/squick/plugin/navigation/i_navigation_module.h +++ b/src/plugin/core/navigation/i_navigation_module.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class INavigationModule : public IModule { public: diff --git a/src/squick/plugin/navigation/navigation_data_module.cc b/src/plugin/core/navigation/navigation_data_module.cc similarity index 100% rename from src/squick/plugin/navigation/navigation_data_module.cc rename to src/plugin/core/navigation/navigation_data_module.cc diff --git a/src/squick/plugin/navigation/navigation_data_module.h b/src/plugin/core/navigation/navigation_data_module.h similarity index 84% rename from src/squick/plugin/navigation/navigation_data_module.h rename to src/plugin/core/navigation/navigation_data_module.h index 894b8331..370dfbe0 100644 --- a/src/squick/plugin/navigation/navigation_data_module.h +++ b/src/plugin/core/navigation/navigation_data_module.h @@ -1,15 +1,15 @@ #pragma once #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // #include "squick/base/no_sql.h" #include "i_navigation_data_module.h" -// #include "server/game/plugin/server/if_server_module.h" -// #include "server/game/plugin/client/if_world_module.h" +// #include "server/game/plugin/core/server/if_server_module.h" +// #include "server/game/plugin/core/client/if_world_module.h" //////////////////////////////////////////////////////////////////////////// class NavigationDataModule : public INavigationDataModule { diff --git a/src/squick/plugin/navigation/navigation_module.cc b/src/plugin/core/navigation/navigation_module.cc similarity index 100% rename from src/squick/plugin/navigation/navigation_module.cc rename to src/plugin/core/navigation/navigation_module.cc diff --git a/src/squick/plugin/navigation/navigation_module.h b/src/plugin/core/navigation/navigation_module.h similarity index 98% rename from src/squick/plugin/navigation/navigation_module.h rename to src/plugin/core/navigation/navigation_module.h index 4834553d..1d4c4da3 100644 --- a/src/squick/plugin/navigation/navigation_module.h +++ b/src/plugin/core/navigation/navigation_module.h @@ -5,15 +5,15 @@ #include "third_party/recastnavigation/DetourNavMeshBuilder.h" #include "third_party/recastnavigation/DetourNavMeshQuery.h" #include -#include -#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "i_navigation_module.h" diff --git a/src/squick/plugin/navigation/plugin.cc b/src/plugin/core/navigation/plugin.cc similarity index 100% rename from src/squick/plugin/navigation/plugin.cc rename to src/plugin/core/navigation/plugin.cc diff --git a/src/squick/plugin/navigation/plugin.h b/src/plugin/core/navigation/plugin.h similarity index 82% rename from src/squick/plugin/navigation/plugin.h rename to src/plugin/core/navigation/plugin.h index 669a974c..82cd4cdb 100644 --- a/src/squick/plugin/navigation/plugin.h +++ b/src/plugin/core/navigation/plugin.h @@ -1,8 +1,8 @@ #pragma once -#include -#include +#include +#include ////////////////////////////////////////////////////////////////////////// class NavigationPlugin : public IPlugin { diff --git a/src/squick/plugin/net/CMakeLists.txt b/src/plugin/core/net/CMakeLists.txt similarity index 100% rename from src/squick/plugin/net/CMakeLists.txt rename to src/plugin/core/net/CMakeLists.txt diff --git a/src/squick/plugin/net/coroutine.h b/src/plugin/core/net/coroutine.h similarity index 100% rename from src/squick/plugin/net/coroutine.h rename to src/plugin/core/net/coroutine.h diff --git a/src/squick/plugin/net/export.h b/src/plugin/core/net/export.h similarity index 100% rename from src/squick/plugin/net/export.h rename to src/plugin/core/net/export.h diff --git a/src/squick/plugin/net/http_client.cc b/src/plugin/core/net/http_client.cc similarity index 100% rename from src/squick/plugin/net/http_client.cc rename to src/plugin/core/net/http_client.cc diff --git a/src/squick/plugin/net/http_client.h b/src/plugin/core/net/http_client.h similarity index 100% rename from src/squick/plugin/net/http_client.h rename to src/plugin/core/net/http_client.h diff --git a/src/squick/plugin/net/http_client_module.cc b/src/plugin/core/net/http_client_module.cc similarity index 100% rename from src/squick/plugin/net/http_client_module.cc rename to src/plugin/core/net/http_client_module.cc diff --git a/src/squick/plugin/net/http_client_module.h b/src/plugin/core/net/http_client_module.h similarity index 96% rename from src/squick/plugin/net/http_client_module.h rename to src/plugin/core/net/http_client_module.h index f6ecb604..31b88349 100644 --- a/src/squick/plugin/net/http_client_module.h +++ b/src/plugin/core/net/http_client_module.h @@ -3,8 +3,8 @@ #include "i_http_client.h" #include "i_http_client_module.h" #include -#include -#include +#include +#include class HttpClientModule : public IHttpClientModule { public: diff --git a/src/squick/plugin/net/http_server.cc b/src/plugin/core/net/http_server.cc similarity index 99% rename from src/squick/plugin/net/http_server.cc rename to src/plugin/core/net/http_server.cc index a5ff20a9..2ec4336e 100644 --- a/src/squick/plugin/net/http_server.cc +++ b/src/plugin/core/net/http_server.cc @@ -1,7 +1,7 @@ #include "http_server.h" #include #include -#include +#include #include bool HttpServer::Update() { if (mxBase) { diff --git a/src/squick/plugin/net/http_server.h b/src/plugin/core/net/http_server.h similarity index 97% rename from src/squick/plugin/net/http_server.h rename to src/plugin/core/net/http_server.h index a6f5d3c1..eab67b4c 100644 --- a/src/squick/plugin/net/http_server.h +++ b/src/plugin/core/net/http_server.h @@ -4,7 +4,7 @@ #define SQUICK_HTTP_SERVER_H #include "i_http_server.h" -#include +#include #if PLATFORM == PLATFORM_WIN #include @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/squick/plugin/net/http_server_module.cc b/src/plugin/core/net/http_server_module.cc similarity index 99% rename from src/squick/plugin/net/http_server_module.cc rename to src/plugin/core/net/http_server_module.cc index e3f06d66..0544c0d6 100644 --- a/src/squick/plugin/net/http_server_module.cc +++ b/src/plugin/core/net/http_server_module.cc @@ -1,7 +1,7 @@ #include "http_server_module.h" #include "http_server.h" -#include +#include HttpServerModule::HttpServerModule(IPluginManager *p) { pm_ = p; diff --git a/src/squick/plugin/net/http_server_module.h b/src/plugin/core/net/http_server_module.h similarity index 92% rename from src/squick/plugin/net/http_server_module.h rename to src/plugin/core/net/http_server_module.h index 9eda759c..06d688bb 100644 --- a/src/squick/plugin/net/http_server_module.h +++ b/src/plugin/core/net/http_server_module.h @@ -2,11 +2,11 @@ #include "i_http_server.h" #include "i_http_server_module.h" -#include "squick/core/map_ex.h" -#include "squick/core/performance.h" +#include "core/map_ex.h" +#include "core/performance.h" #include -#include -#include +#include +#include #include diff --git a/src/squick/plugin/net/i_http_client.h b/src/plugin/core/net/i_http_client.h similarity index 98% rename from src/squick/plugin/net/i_http_client.h rename to src/plugin/core/net/i_http_client.h index a2ff94bd..9d29fc7c 100644 --- a/src/squick/plugin/net/i_http_client.h +++ b/src/plugin/core/net/i_http_client.h @@ -16,7 +16,7 @@ #include "coroutine.h" #include "i_net.h" -#include +#include #if PLATFORM == PLATFORM_WIN #include diff --git a/src/squick/plugin/net/i_http_client_module.h b/src/plugin/core/net/i_http_client_module.h similarity index 99% rename from src/squick/plugin/net/i_http_client_module.h rename to src/plugin/core/net/i_http_client_module.h index 566e752b..02f5c011 100644 --- a/src/squick/plugin/net/i_http_client_module.h +++ b/src/plugin/core/net/i_http_client_module.h @@ -1,7 +1,7 @@ #pragma once #include "i_http_client.h" -#include +#include class IHttpClientModule : public IModule { public: diff --git a/src/squick/plugin/net/i_http_server.h b/src/plugin/core/net/i_http_server.h similarity index 98% rename from src/squick/plugin/net/i_http_server.h rename to src/plugin/core/net/i_http_server.h index 208d5d6d..604fa8a2 100644 --- a/src/squick/plugin/net/i_http_server.h +++ b/src/plugin/core/net/i_http_server.h @@ -16,7 +16,7 @@ #include "coroutine.h" #include "i_net.h" -#include +#include #if PLATFORM == PLATFORM_WIN #include diff --git a/src/squick/plugin/net/i_http_server_module.h b/src/plugin/core/net/i_http_server_module.h similarity index 97% rename from src/squick/plugin/net/i_http_server_module.h rename to src/plugin/core/net/i_http_server_module.h index 45665e58..89726485 100644 --- a/src/squick/plugin/net/i_http_server_module.h +++ b/src/plugin/core/net/i_http_server_module.h @@ -2,8 +2,8 @@ #include "coroutine.h" #include "i_http_server.h" -#include -#include +#include +#include #define HTTP_SERVER_COROTINE_MAX_SURVIVAL_TIME 10 diff --git a/src/squick/plugin/net/i_net.h b/src/plugin/core/net/i_net.h similarity index 99% rename from src/squick/plugin/net/i_net.h rename to src/plugin/core/net/i_net.h index fb2e54cd..f4289796 100644 --- a/src/squick/plugin/net/i_net.h +++ b/src/plugin/core/net/i_net.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #if PLATFORM == PLATFORM_WIN #include diff --git a/src/squick/plugin/net/i_net_client_module.h b/src/plugin/core/net/i_net_client_module.h similarity index 98% rename from src/squick/plugin/net/i_net_client_module.h rename to src/plugin/core/net/i_net_client_module.h index 3835a356..4caeb87d 100644 --- a/src/squick/plugin/net/i_net_client_module.h +++ b/src/plugin/core/net/i_net_client_module.h @@ -3,8 +3,8 @@ #include "coroutine.h" #include "i_net_module.h" #include -#include -#include +#include +#include enum ConnectDataState { DISCONNECT, diff --git a/src/squick/plugin/net/i_net_module.h b/src/plugin/core/net/i_net_module.h similarity index 97% rename from src/squick/plugin/net/i_net_module.h rename to src/plugin/core/net/i_net_module.h index d2f2350b..dcb53172 100644 --- a/src/squick/plugin/net/i_net_module.h +++ b/src/plugin/core/net/i_net_module.h @@ -5,12 +5,12 @@ #include "coroutine.h" #include "i_net.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #define NET_COROTINE_MAX_SURVIVAL_TIME 10 diff --git a/src/squick/plugin/net/i_pb_log_module.h b/src/plugin/core/net/i_pb_log_module.h similarity index 83% rename from src/squick/plugin/net/i_pb_log_module.h rename to src/plugin/core/net/i_pb_log_module.h index 71683c0d..99edf32f 100644 --- a/src/squick/plugin/net/i_pb_log_module.h +++ b/src/plugin/core/net/i_pb_log_module.h @@ -1,5 +1,5 @@ #pragma once -#include +#include class IPbLogModule : public IModule { public: diff --git a/src/squick/plugin/net/i_request.h b/src/plugin/core/net/i_request.h similarity index 100% rename from src/squick/plugin/net/i_request.h rename to src/plugin/core/net/i_request.h diff --git a/src/squick/plugin/net/i_response.h b/src/plugin/core/net/i_response.h similarity index 100% rename from src/squick/plugin/net/i_response.h rename to src/plugin/core/net/i_response.h diff --git a/src/squick/plugin/net/i_ws_module.h b/src/plugin/core/net/i_ws_module.h similarity index 93% rename from src/squick/plugin/net/i_ws_module.h rename to src/plugin/core/net/i_ws_module.h index 23c38ee5..97cbe605 100644 --- a/src/squick/plugin/net/i_ws_module.h +++ b/src/plugin/core/net/i_ws_module.h @@ -3,11 +3,11 @@ #include "i_net.h" #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include class IWSModule : public IModule { diff --git a/src/squick/plugin/net/net.cc b/src/plugin/core/net/net.cc similarity index 99% rename from src/squick/plugin/net/net.cc rename to src/plugin/core/net/net.cc index 63788714..f3c889f8 100644 --- a/src/squick/plugin/net/net.cc +++ b/src/plugin/core/net/net.cc @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include #include #include "net.h" diff --git a/src/squick/plugin/net/net.h b/src/plugin/core/net/net.h similarity index 100% rename from src/squick/plugin/net/net.h rename to src/plugin/core/net/net.h diff --git a/src/squick/plugin/net/net_client_module.cc b/src/plugin/core/net/net_client_module.cc similarity index 100% rename from src/squick/plugin/net/net_client_module.cc rename to src/plugin/core/net/net_client_module.cc diff --git a/src/squick/plugin/net/net_client_module.h b/src/plugin/core/net/net_client_module.h similarity index 96% rename from src/squick/plugin/net/net_client_module.h rename to src/plugin/core/net/net_client_module.h index 28519066..f4949a64 100644 --- a/src/squick/plugin/net/net_client_module.h +++ b/src/plugin/core/net/net_client_module.h @@ -2,10 +2,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "i_net_client_module.h" diff --git a/src/squick/plugin/net/net_module.cc b/src/plugin/core/net/net_module.cc similarity index 100% rename from src/squick/plugin/net/net_module.cc rename to src/plugin/core/net/net_module.cc diff --git a/src/squick/plugin/net/net_module.h b/src/plugin/core/net/net_module.h similarity index 93% rename from src/squick/plugin/net/net_module.h rename to src/plugin/core/net/net_module.h index 3c511865..f24034ae 100644 --- a/src/squick/plugin/net/net_module.h +++ b/src/plugin/core/net/net_module.h @@ -3,15 +3,15 @@ #include "net.h" #include #include -#include -#include +#include +#include #include #include "i_net_module.h" #include "i_pb_log_module.h" -#include -#include -#include +#include +#include +#include class NetModule : public INetModule { public: diff --git a/src/squick/plugin/net/pb_log_module.cc b/src/plugin/core/net/pb_log_module.cc similarity index 100% rename from src/squick/plugin/net/pb_log_module.cc rename to src/plugin/core/net/pb_log_module.cc diff --git a/src/squick/plugin/net/pb_log_module.h b/src/plugin/core/net/pb_log_module.h similarity index 97% rename from src/squick/plugin/net/pb_log_module.h rename to src/plugin/core/net/pb_log_module.h index 8efb0686..1a85bc41 100644 --- a/src/squick/plugin/net/pb_log_module.h +++ b/src/plugin/core/net/pb_log_module.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include class PbLogModule : public IPbLogModule { class MultiFileErrorCollector : public google::protobuf::compiler::MultiFileErrorCollector { diff --git a/src/squick/plugin/net/plugin.cc b/src/plugin/core/net/plugin.cc similarity index 100% rename from src/squick/plugin/net/plugin.cc rename to src/plugin/core/net/plugin.cc diff --git a/src/squick/plugin/net/plugin.h b/src/plugin/core/net/plugin.h similarity index 76% rename from src/squick/plugin/net/plugin.h rename to src/plugin/core/net/plugin.h index cc92c78a..f41efa6d 100644 --- a/src/squick/plugin/net/plugin.h +++ b/src/plugin/core/net/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include class NetPlugin : public IPlugin { public: diff --git a/src/squick/plugin/net/udp_module.cc b/src/plugin/core/net/udp_module.cc similarity index 100% rename from src/squick/plugin/net/udp_module.cc rename to src/plugin/core/net/udp_module.cc diff --git a/src/squick/plugin/net/udp_module.h b/src/plugin/core/net/udp_module.h similarity index 100% rename from src/squick/plugin/net/udp_module.h rename to src/plugin/core/net/udp_module.h diff --git a/src/squick/plugin/net/ws_error.h b/src/plugin/core/net/ws_error.h similarity index 100% rename from src/squick/plugin/net/ws_error.h rename to src/plugin/core/net/ws_error.h diff --git a/src/squick/plugin/net/ws_module.cc b/src/plugin/core/net/ws_module.cc similarity index 100% rename from src/squick/plugin/net/ws_module.cc rename to src/plugin/core/net/ws_module.cc diff --git a/src/squick/plugin/net/ws_module.h b/src/plugin/core/net/ws_module.h similarity index 100% rename from src/squick/plugin/net/ws_module.h rename to src/plugin/core/net/ws_module.h diff --git a/src/squick/plugin/node/CMakeLists.txt b/src/plugin/core/node/CMakeLists.txt similarity index 100% rename from src/squick/plugin/node/CMakeLists.txt rename to src/plugin/core/node/CMakeLists.txt diff --git a/src/squick/plugin/node/export.h b/src/plugin/core/node/export.h similarity index 100% rename from src/squick/plugin/node/export.h rename to src/plugin/core/node/export.h diff --git a/src/squick/plugin/node/i_node_module.h b/src/plugin/core/node/i_node_module.h similarity index 84% rename from src/squick/plugin/node/i_node_module.h rename to src/plugin/core/node/i_node_module.h index 70a65aba..b83a0683 100644 --- a/src/squick/plugin/node/i_node_module.h +++ b/src/plugin/core/node/i_node_module.h @@ -3,8 +3,8 @@ // Date : 2024-04-27 // Description: node plugin module #pragma once -#include -#include +#include +#include #include #define ONE_CONNECTION_WORKLOAD_VALUE 100 diff --git a/src/squick/plugin/node/node_module.cc b/src/plugin/core/node/node_module.cc similarity index 99% rename from src/squick/plugin/node/node_module.cc rename to src/plugin/core/node/node_module.cc index d173f4fd..9f230120 100644 --- a/src/squick/plugin/node/node_module.cc +++ b/src/plugin/core/node/node_module.cc @@ -1,6 +1,6 @@ #include "node_module.h" -#include +#include NodeModule::NodeModule(IPluginManager *p) { pm_ = p; diff --git a/src/squick/plugin/node/node_module.h b/src/plugin/core/node/node_module.h similarity index 96% rename from src/squick/plugin/node/node_module.h rename to src/plugin/core/node/node_module.h index 71f711b6..f936f5c7 100644 --- a/src/squick/plugin/node/node_module.h +++ b/src/plugin/core/node/node_module.h @@ -1,9 +1,9 @@ #pragma once #include "i_node_module.h" -#include -#include -#include +#include +#include +#include #include #define NODE_REPORT_TIME 10 diff --git a/src/squick/plugin/node/plugin.cc b/src/plugin/core/node/plugin.cc similarity index 100% rename from src/squick/plugin/node/plugin.cc rename to src/plugin/core/node/plugin.cc diff --git a/src/squick/plugin/node/plugin.h b/src/plugin/core/node/plugin.h similarity index 75% rename from src/squick/plugin/node/plugin.h rename to src/plugin/core/node/plugin.h index eb2878d8..e57d2093 100644 --- a/src/squick/plugin/node/plugin.h +++ b/src/plugin/core/node/plugin.h @@ -1,5 +1,5 @@ -#include -#include +#include +#include class Plugin : public IPlugin { public: diff --git a/src/squick/plugin/thread/CMakeLists.txt b/src/plugin/core/thread/CMakeLists.txt similarity index 100% rename from src/squick/plugin/thread/CMakeLists.txt rename to src/plugin/core/thread/CMakeLists.txt diff --git a/src/squick/plugin/thread/export.h b/src/plugin/core/thread/export.h similarity index 100% rename from src/squick/plugin/thread/export.h rename to src/plugin/core/thread/export.h diff --git a/src/squick/plugin/thread/i_thread_pool_module.h b/src/plugin/core/thread/i_thread_pool_module.h similarity index 98% rename from src/squick/plugin/thread/i_thread_pool_module.h rename to src/plugin/core/thread/i_thread_pool_module.h index f7d08d07..34b9bc09 100644 --- a/src/squick/plugin/thread/i_thread_pool_module.h +++ b/src/plugin/core/thread/i_thread_pool_module.h @@ -1,6 +1,6 @@ #pragma once #include -#include +#include #include class ThreadTask; diff --git a/src/squick/plugin/thread/plugin.cc b/src/plugin/core/thread/plugin.cc similarity index 100% rename from src/squick/plugin/thread/plugin.cc rename to src/plugin/core/thread/plugin.cc diff --git a/src/squick/plugin/thread/plugin.h b/src/plugin/core/thread/plugin.h similarity index 91% rename from src/squick/plugin/thread/plugin.h rename to src/plugin/core/thread/plugin.h index cb0725a7..64161b9f 100644 --- a/src/squick/plugin/thread/plugin.h +++ b/src/plugin/core/thread/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace squick::thread { class Plugin : public IPlugin { public: diff --git a/src/squick/plugin/thread/thread_pool_module.cc b/src/plugin/core/thread/thread_pool_module.cc similarity index 100% rename from src/squick/plugin/thread/thread_pool_module.cc rename to src/plugin/core/thread/thread_pool_module.cc diff --git a/src/squick/plugin/thread/thread_pool_module.h b/src/plugin/core/thread/thread_pool_module.h similarity index 94% rename from src/squick/plugin/thread/thread_pool_module.h rename to src/plugin/core/thread/thread_pool_module.h index 15d73fa9..22864681 100644 --- a/src/squick/plugin/thread/thread_pool_module.h +++ b/src/plugin/core/thread/thread_pool_module.h @@ -4,10 +4,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include class ThreadCell : MemoryCounter { diff --git a/src/squick/plugin/utils/CMakeLists.txt b/src/plugin/core/utils/CMakeLists.txt similarity index 100% rename from src/squick/plugin/utils/CMakeLists.txt rename to src/plugin/core/utils/CMakeLists.txt diff --git a/src/squick/plugin/utils/error_bus_module.cc b/src/plugin/core/utils/error_bus_module.cc similarity index 100% rename from src/squick/plugin/utils/error_bus_module.cc rename to src/plugin/core/utils/error_bus_module.cc diff --git a/src/squick/plugin/utils/error_bus_module.h b/src/plugin/core/utils/error_bus_module.h similarity index 100% rename from src/squick/plugin/utils/error_bus_module.h rename to src/plugin/core/utils/error_bus_module.h diff --git a/src/squick/plugin/utils/event_module.cc b/src/plugin/core/utils/event_module.cc similarity index 100% rename from src/squick/plugin/utils/event_module.cc rename to src/plugin/core/utils/event_module.cc diff --git a/src/squick/plugin/utils/event_module.h b/src/plugin/core/utils/event_module.h similarity index 100% rename from src/squick/plugin/utils/event_module.h rename to src/plugin/core/utils/event_module.h diff --git a/src/squick/plugin/utils/export.h b/src/plugin/core/utils/export.h similarity index 100% rename from src/squick/plugin/utils/export.h rename to src/plugin/core/utils/export.h diff --git a/src/squick/plugin/utils/i_error_bus_module.h b/src/plugin/core/utils/i_error_bus_module.h similarity index 87% rename from src/squick/plugin/utils/i_error_bus_module.h rename to src/plugin/core/utils/i_error_bus_module.h index 4d0760a5..c13897f7 100644 --- a/src/squick/plugin/utils/i_error_bus_module.h +++ b/src/plugin/core/utils/i_error_bus_module.h @@ -1,8 +1,8 @@ #pragma once #include -#include -#include +#include +#include class IErrorBusModule : public IModule { diff --git a/src/squick/plugin/utils/i_event_module.h b/src/plugin/core/utils/i_event_module.h similarity index 93% rename from src/squick/plugin/utils/i_event_module.h rename to src/plugin/core/utils/i_event_module.h index 4565390c..130b5a2c 100644 --- a/src/squick/plugin/utils/i_event_module.h +++ b/src/plugin/core/utils/i_event_module.h @@ -1,11 +1,11 @@ #pragma once #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class IEventModule : public IModule { public: protected: diff --git a/src/squick/plugin/utils/i_schedule_module.h b/src/plugin/core/utils/i_schedule_module.h similarity index 92% rename from src/squick/plugin/utils/i_schedule_module.h rename to src/plugin/core/utils/i_schedule_module.h index 25b7c500..9e0a7129 100644 --- a/src/squick/plugin/utils/i_schedule_module.h +++ b/src/plugin/core/utils/i_schedule_module.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include // int ScheduleFunction(const Guid& self, const std::string& name, const float time, const int count); typedef std::function OBJECT_SCHEDULE_FUNCTOR; diff --git a/src/squick/plugin/utils/plugin.cc b/src/plugin/core/utils/plugin.cc similarity index 100% rename from src/squick/plugin/utils/plugin.cc rename to src/plugin/core/utils/plugin.cc diff --git a/src/squick/plugin/utils/plugin.h b/src/plugin/core/utils/plugin.h similarity index 90% rename from src/squick/plugin/utils/plugin.h rename to src/plugin/core/utils/plugin.h index b3ad2d1c..1e2992b5 100644 --- a/src/squick/plugin/utils/plugin.h +++ b/src/plugin/core/utils/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace squick::utils { class Plugin : public IPlugin { public: diff --git a/src/squick/plugin/utils/schedule_module.cc b/src/plugin/core/utils/schedule_module.cc similarity index 100% rename from src/squick/plugin/utils/schedule_module.cc rename to src/plugin/core/utils/schedule_module.cc diff --git a/src/squick/plugin/utils/schedule_module.h b/src/plugin/core/utils/schedule_module.h similarity index 82% rename from src/squick/plugin/utils/schedule_module.h rename to src/plugin/core/utils/schedule_module.h index 6acb9aee..42f7e9ec 100644 --- a/src/squick/plugin/utils/schedule_module.h +++ b/src/plugin/core/utils/schedule_module.h @@ -4,15 +4,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #if PLATFORM != PLATFORM_WIN -#include "squick/core/exception.h" +#include "core/exception.h" #endif class TickElement { diff --git a/src/squick/plugin/world/CMakeLists.txt b/src/plugin/core/world/CMakeLists.txt similarity index 100% rename from src/squick/plugin/world/CMakeLists.txt rename to src/plugin/core/world/CMakeLists.txt diff --git a/src/squick/plugin/world/cell_module.cc b/src/plugin/core/world/cell_module.cc similarity index 100% rename from src/squick/plugin/world/cell_module.cc rename to src/plugin/core/world/cell_module.cc diff --git a/src/squick/plugin/world/cell_module.h b/src/plugin/core/world/cell_module.h similarity index 97% rename from src/squick/plugin/world/cell_module.h rename to src/plugin/core/world/cell_module.h index 2c7caedf..c7300248 100644 --- a/src/squick/plugin/world/cell_module.h +++ b/src/plugin/core/world/cell_module.h @@ -6,11 +6,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class SceneCellInfo : public List { public: SceneCellInfo(const SceneCellInfo &cell) { diff --git a/src/squick/plugin/world/data_tail_module.cc b/src/plugin/core/world/data_tail_module.cc similarity index 99% rename from src/squick/plugin/world/data_tail_module.cc rename to src/plugin/core/world/data_tail_module.cc index 4ff42264..08ca4ef8 100644 --- a/src/squick/plugin/world/data_tail_module.cc +++ b/src/plugin/core/world/data_tail_module.cc @@ -1,6 +1,6 @@ #include "data_tail_module.h" -#include +#include #include #if PLATFORM != PLATFORM_WIN diff --git a/src/squick/plugin/world/data_tail_module.h b/src/plugin/core/world/data_tail_module.h similarity index 90% rename from src/squick/plugin/world/data_tail_module.h rename to src/plugin/core/world/data_tail_module.h index 4c785d60..8a830980 100644 --- a/src/squick/plugin/world/data_tail_module.h +++ b/src/plugin/core/world/data_tail_module.h @@ -3,9 +3,9 @@ #include "i_world_module.h" #include "i_data_tail_module.h" -#include -#include -#include +#include +#include +#include class DataTailModule : public IDataTailModule { public: diff --git a/src/squick/plugin/world/elo_module.cc b/src/plugin/core/world/elo_module.cc similarity index 100% rename from src/squick/plugin/world/elo_module.cc rename to src/plugin/core/world/elo_module.cc diff --git a/src/squick/plugin/world/elo_module.h b/src/plugin/core/world/elo_module.h similarity index 100% rename from src/squick/plugin/world/elo_module.h rename to src/plugin/core/world/elo_module.h diff --git a/src/squick/plugin/world/export.h b/src/plugin/core/world/export.h similarity index 100% rename from src/squick/plugin/world/export.h rename to src/plugin/core/world/export.h diff --git a/src/squick/plugin/world/i_cell_module.h b/src/plugin/core/world/i_cell_module.h similarity index 97% rename from src/squick/plugin/world/i_cell_module.h rename to src/plugin/core/world/i_cell_module.h index a09760de..45256506 100644 --- a/src/squick/plugin/world/i_cell_module.h +++ b/src/plugin/core/world/i_cell_module.h @@ -4,10 +4,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include class SceneCellInfo; enum ECELL_DIRECTION { diff --git a/src/squick/plugin/world/i_data_tail_module.h b/src/plugin/core/world/i_data_tail_module.h similarity index 85% rename from src/squick/plugin/world/i_data_tail_module.h rename to src/plugin/core/world/i_data_tail_module.h index 13d0b1a7..b485eee2 100644 --- a/src/squick/plugin/world/i_data_tail_module.h +++ b/src/plugin/core/world/i_data_tail_module.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include class IDataTailModule : public IModule { public: diff --git a/src/squick/plugin/world/i_elo_module.h b/src/plugin/core/world/i_elo_module.h similarity index 96% rename from src/squick/plugin/world/i_elo_module.h rename to src/plugin/core/world/i_elo_module.h index 6218b4e1..f5868ef1 100644 --- a/src/squick/plugin/world/i_elo_module.h +++ b/src/plugin/core/world/i_elo_module.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include class IELOModule : public IModule { public: diff --git a/src/squick/plugin/world/i_scene_module.h b/src/plugin/core/world/i_scene_module.h similarity index 98% rename from src/squick/plugin/world/i_scene_module.h rename to src/plugin/core/world/i_scene_module.h index 10d55d0a..571c06b9 100644 --- a/src/squick/plugin/world/i_scene_module.h +++ b/src/plugin/core/world/i_scene_module.h @@ -4,16 +4,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include typedef std::function OBJECT_ENTER_EVENT_FUNCTOR; typedef std::shared_ptr OBJECT_ENTER_EVENT_FUNCTOR_PTR; // ObjectEnterCallBack diff --git a/src/squick/plugin/world/i_world_module.h b/src/plugin/core/world/i_world_module.h similarity index 98% rename from src/squick/plugin/world/i_world_module.h rename to src/plugin/core/world/i_world_module.h index 19b52e93..412771fb 100644 --- a/src/squick/plugin/world/i_world_module.h +++ b/src/plugin/core/world/i_world_module.h @@ -2,11 +2,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include class IWorldModule : public IModule { diff --git a/src/squick/plugin/world/plugin.cc b/src/plugin/core/world/plugin.cc similarity index 100% rename from src/squick/plugin/world/plugin.cc rename to src/plugin/core/world/plugin.cc diff --git a/src/squick/plugin/world/plugin.h b/src/plugin/core/world/plugin.h similarity index 81% rename from src/squick/plugin/world/plugin.h rename to src/plugin/core/world/plugin.h index 7e944b8c..01ee08fd 100644 --- a/src/squick/plugin/world/plugin.h +++ b/src/plugin/core/world/plugin.h @@ -1,6 +1,6 @@ -#include -#include +#include +#include ////////////////////////////////////////////////////////////////////////// class WorldPlugin : public IPlugin { diff --git a/src/squick/plugin/world/scene_module.cc b/src/plugin/core/world/scene_module.cc similarity index 99% rename from src/squick/plugin/world/scene_module.cc rename to src/plugin/core/world/scene_module.cc index 3e3a214f..5f521aae 100644 --- a/src/squick/plugin/world/scene_module.cc +++ b/src/plugin/core/world/scene_module.cc @@ -1,8 +1,8 @@ #include "scene_module.h" -#include -#include +#include +#include #include bool SceneModule::Start() { diff --git a/src/squick/plugin/world/scene_module.h b/src/plugin/core/world/scene_module.h similarity index 99% rename from src/squick/plugin/world/scene_module.h rename to src/plugin/core/world/scene_module.h index 008f230e..3a3c3d0f 100644 --- a/src/squick/plugin/world/scene_module.h +++ b/src/plugin/core/world/scene_module.h @@ -1,16 +1,16 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include "i_cell_module.h" #include "i_scene_module.h" #include "i_world_module.h" #include -#include -#include +#include +#include // all object in this group /* if a object in the group of '0', them it can be see by all object in this scene. diff --git a/src/squick/plugin/world/world_module.cc b/src/plugin/core/world/world_module.cc similarity index 99% rename from src/squick/plugin/world/world_module.cc rename to src/plugin/core/world/world_module.cc index a972deed..08da6fc7 100644 --- a/src/squick/plugin/world/world_module.cc +++ b/src/plugin/core/world/world_module.cc @@ -1,14 +1,14 @@ #include "world_module.h" #include "scene_module.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include WorldModule::WorldModule(IPluginManager *p) { diff --git a/src/squick/plugin/world/world_module.h b/src/plugin/core/world/world_module.h similarity index 97% rename from src/squick/plugin/world/world_module.h rename to src/plugin/core/world/world_module.h index d6fd5b60..d95a8449 100644 --- a/src/squick/plugin/world/world_module.h +++ b/src/plugin/core/world/world_module.h @@ -4,14 +4,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include "i_cell_module.h" diff --git a/src/node/CMakeLists.txt b/src/plugin/node/CMakeLists.txt similarity index 100% rename from src/node/CMakeLists.txt rename to src/plugin/node/CMakeLists.txt diff --git a/src/node/backstage/CMakeLists.txt b/src/plugin/node/backstage/CMakeLists.txt similarity index 100% rename from src/node/backstage/CMakeLists.txt rename to src/plugin/node/backstage/CMakeLists.txt diff --git a/src/node/backstage/golib/go.mod b/src/plugin/node/backstage/golib/go.mod similarity index 100% rename from src/node/backstage/golib/go.mod rename to src/plugin/node/backstage/golib/go.mod diff --git a/src/node/backstage/golib/go.sum b/src/plugin/node/backstage/golib/go.sum similarity index 100% rename from src/node/backstage/golib/go.sum rename to src/plugin/node/backstage/golib/go.sum diff --git a/src/node/backstage/golib/main.go b/src/plugin/node/backstage/golib/main.go similarity index 100% rename from src/node/backstage/golib/main.go rename to src/plugin/node/backstage/golib/main.go diff --git a/src/node/backstage/logic/CMakeLists.txt b/src/plugin/node/backstage/logic/CMakeLists.txt similarity index 100% rename from src/node/backstage/logic/CMakeLists.txt rename to src/plugin/node/backstage/logic/CMakeLists.txt diff --git a/src/node/backstage/logic/i_logic_module.h b/src/plugin/node/backstage/logic/i_logic_module.h similarity index 79% rename from src/node/backstage/logic/i_logic_module.h rename to src/plugin/node/backstage/logic/i_logic_module.h index dd2a9fae..9773f524 100644 --- a/src/node/backstage/logic/i_logic_module.h +++ b/src/plugin/node/backstage/logic/i_logic_module.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace backstage::logic { class ILogicModule : public IModule {}; diff --git a/src/node/backstage/logic/logic_module.cc b/src/plugin/node/backstage/logic/logic_module.cc similarity index 100% rename from src/node/backstage/logic/logic_module.cc rename to src/plugin/node/backstage/logic/logic_module.cc diff --git a/src/node/backstage/logic/logic_module.h b/src/plugin/node/backstage/logic/logic_module.h similarity index 93% rename from src/node/backstage/logic/logic_module.h rename to src/plugin/node/backstage/logic/logic_module.h index 7607f651..2582144d 100644 --- a/src/node/backstage/logic/logic_module.h +++ b/src/plugin/node/backstage/logic/logic_module.h @@ -3,10 +3,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/node/backstage/logic/plugin.cc b/src/plugin/node/backstage/logic/plugin.cc similarity index 100% rename from src/node/backstage/logic/plugin.cc rename to src/plugin/node/backstage/logic/plugin.cc diff --git a/src/node/backstage/logic/plugin.h b/src/plugin/node/backstage/logic/plugin.h similarity index 91% rename from src/node/backstage/logic/plugin.h rename to src/plugin/node/backstage/logic/plugin.h index c04cab3a..7f20c0fa 100644 --- a/src/node/backstage/logic/plugin.h +++ b/src/plugin/node/backstage/logic/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace backstage::logic { class Plugin : public IPlugin { diff --git a/src/node/backstage/logic/struct.h b/src/plugin/node/backstage/logic/struct.h similarity index 94% rename from src/node/backstage/logic/struct.h rename to src/plugin/node/backstage/logic/struct.h index 79e18ebf..40821145 100644 --- a/src/node/backstage/logic/struct.h +++ b/src/plugin/node/backstage/logic/struct.h @@ -1,7 +1,7 @@ #pragma once #include -#include -#include +#include +#include #include #include using namespace std; diff --git a/src/node/db_proxy/CMakeLists.txt b/src/plugin/node/db_proxy/CMakeLists.txt similarity index 100% rename from src/node/db_proxy/CMakeLists.txt rename to src/plugin/node/db_proxy/CMakeLists.txt diff --git a/src/node/db_proxy/clickhouse/CMakeLists.txt b/src/plugin/node/db_proxy/clickhouse/CMakeLists.txt similarity index 100% rename from src/node/db_proxy/clickhouse/CMakeLists.txt rename to src/plugin/node/db_proxy/clickhouse/CMakeLists.txt diff --git a/src/node/db_proxy/clickhouse/clickhouse_module.cc b/src/plugin/node/db_proxy/clickhouse/clickhouse_module.cc similarity index 100% rename from src/node/db_proxy/clickhouse/clickhouse_module.cc rename to src/plugin/node/db_proxy/clickhouse/clickhouse_module.cc diff --git a/src/node/db_proxy/clickhouse/clickhouse_module.h b/src/plugin/node/db_proxy/clickhouse/clickhouse_module.h similarity index 91% rename from src/node/db_proxy/clickhouse/clickhouse_module.h rename to src/plugin/node/db_proxy/clickhouse/clickhouse_module.h index 3e2c4c52..f76b22c8 100644 --- a/src/node/db_proxy/clickhouse/clickhouse_module.h +++ b/src/plugin/node/db_proxy/clickhouse/clickhouse_module.h @@ -1,6 +1,6 @@ #include "i_clickhouse_module.h" -#include -#include +#include +#include #include using namespace clickhouse; diff --git a/src/node/db_proxy/clickhouse/i_clickhouse_module.h b/src/plugin/node/db_proxy/clickhouse/i_clickhouse_module.h similarity index 100% rename from src/node/db_proxy/clickhouse/i_clickhouse_module.h rename to src/plugin/node/db_proxy/clickhouse/i_clickhouse_module.h diff --git a/src/node/db_proxy/clickhouse/plugin.cc b/src/plugin/node/db_proxy/clickhouse/plugin.cc similarity index 100% rename from src/node/db_proxy/clickhouse/plugin.cc rename to src/plugin/node/db_proxy/clickhouse/plugin.cc diff --git a/src/node/db_proxy/clickhouse/plugin.h b/src/plugin/node/db_proxy/clickhouse/plugin.h similarity index 91% rename from src/node/db_proxy/clickhouse/plugin.h rename to src/plugin/node/db_proxy/clickhouse/plugin.h index c721b2c7..7247e2d3 100644 --- a/src/node/db_proxy/clickhouse/plugin.h +++ b/src/plugin/node/db_proxy/clickhouse/plugin.h @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace db_proxy::clickhouse { class Plugin : public IPlugin { diff --git a/src/node/db_proxy/logic/CMakeLists.txt b/src/plugin/node/db_proxy/logic/CMakeLists.txt similarity index 100% rename from src/node/db_proxy/logic/CMakeLists.txt rename to src/plugin/node/db_proxy/logic/CMakeLists.txt diff --git a/src/node/db_proxy/logic/i_db_module.h b/src/plugin/node/db_proxy/logic/i_db_module.h similarity index 94% rename from src/node/db_proxy/logic/i_db_module.h rename to src/plugin/node/db_proxy/logic/i_db_module.h index 27f13b22..d8b4427b 100644 --- a/src/node/db_proxy/logic/i_db_module.h +++ b/src/plugin/node/db_proxy/logic/i_db_module.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include -// #include +// #include using namespace nlohmann; diff --git a/src/node/db_proxy/logic/i_logic_module.h b/src/plugin/node/db_proxy/logic/i_logic_module.h similarity index 77% rename from src/node/db_proxy/logic/i_logic_module.h rename to src/plugin/node/db_proxy/logic/i_logic_module.h index 93a3acd2..57934029 100644 --- a/src/node/db_proxy/logic/i_logic_module.h +++ b/src/plugin/node/db_proxy/logic/i_logic_module.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace db_proxy::logic { class ILogicModule : public IModule {}; diff --git a/src/node/db_proxy/logic/logic_module.cc b/src/plugin/node/db_proxy/logic/logic_module.cc similarity index 100% rename from src/node/db_proxy/logic/logic_module.cc rename to src/plugin/node/db_proxy/logic/logic_module.cc diff --git a/src/node/db_proxy/logic/logic_module.h b/src/plugin/node/db_proxy/logic/logic_module.h similarity index 80% rename from src/node/db_proxy/logic/logic_module.h rename to src/plugin/node/db_proxy/logic/logic_module.h index 125a57a9..7cacac56 100644 --- a/src/node/db_proxy/logic/logic_module.h +++ b/src/plugin/node/db_proxy/logic/logic_module.h @@ -1,7 +1,7 @@ #pragma once #include "i_logic_module.h" -#include -#include +#include +#include namespace db_proxy::logic { class LogicModule : public ILogicModule { diff --git a/src/node/db_proxy/logic/plugin.cc b/src/plugin/node/db_proxy/logic/plugin.cc similarity index 100% rename from src/node/db_proxy/logic/plugin.cc rename to src/plugin/node/db_proxy/logic/plugin.cc diff --git a/src/node/db_proxy/logic/plugin.h b/src/plugin/node/db_proxy/logic/plugin.h similarity index 91% rename from src/node/db_proxy/logic/plugin.h rename to src/plugin/node/db_proxy/logic/plugin.h index df5773a7..cdbc703f 100644 --- a/src/node/db_proxy/logic/plugin.h +++ b/src/plugin/node/db_proxy/logic/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace db_proxy::logic { class Plugin : public IPlugin { public: diff --git a/src/node/db_proxy/mongo/CMakeLists.txt b/src/plugin/node/db_proxy/mongo/CMakeLists.txt similarity index 100% rename from src/node/db_proxy/mongo/CMakeLists.txt rename to src/plugin/node/db_proxy/mongo/CMakeLists.txt diff --git a/src/node/db_proxy/mongo/export.h b/src/plugin/node/db_proxy/mongo/export.h similarity index 100% rename from src/node/db_proxy/mongo/export.h rename to src/plugin/node/db_proxy/mongo/export.h diff --git a/src/node/db_proxy/mongo/i_mongo_module.h b/src/plugin/node/db_proxy/mongo/i_mongo_module.h similarity index 100% rename from src/node/db_proxy/mongo/i_mongo_module.h rename to src/plugin/node/db_proxy/mongo/i_mongo_module.h diff --git a/src/node/db_proxy/mongo/mongo_module.cc b/src/plugin/node/db_proxy/mongo/mongo_module.cc similarity index 100% rename from src/node/db_proxy/mongo/mongo_module.cc rename to src/plugin/node/db_proxy/mongo/mongo_module.cc diff --git a/src/node/db_proxy/mongo/mongo_module.h b/src/plugin/node/db_proxy/mongo/mongo_module.h similarity index 91% rename from src/node/db_proxy/mongo/mongo_module.h rename to src/plugin/node/db_proxy/mongo/mongo_module.h index d619ac7b..80742b53 100644 --- a/src/node/db_proxy/mongo/mongo_module.h +++ b/src/plugin/node/db_proxy/mongo/mongo_module.h @@ -1,7 +1,7 @@ #include "i_mongo_module.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/node/db_proxy/mongo/plugin.cc b/src/plugin/node/db_proxy/mongo/plugin.cc similarity index 100% rename from src/node/db_proxy/mongo/plugin.cc rename to src/plugin/node/db_proxy/mongo/plugin.cc diff --git a/src/node/db_proxy/mongo/plugin.h b/src/plugin/node/db_proxy/mongo/plugin.h similarity index 91% rename from src/node/db_proxy/mongo/plugin.h rename to src/plugin/node/db_proxy/mongo/plugin.h index 73d7be2a..d3cd9484 100644 --- a/src/node/db_proxy/mongo/plugin.h +++ b/src/plugin/node/db_proxy/mongo/plugin.h @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace db_proxy::mongo { class Plugin : public IPlugin { diff --git a/src/node/db_proxy/mysql/CMakeLists.txt b/src/plugin/node/db_proxy/mysql/CMakeLists.txt similarity index 100% rename from src/node/db_proxy/mysql/CMakeLists.txt rename to src/plugin/node/db_proxy/mysql/CMakeLists.txt diff --git a/src/node/db_proxy/mysql/i_mysql_module.h b/src/plugin/node/db_proxy/mysql/i_mysql_module.h similarity index 100% rename from src/node/db_proxy/mysql/i_mysql_module.h rename to src/plugin/node/db_proxy/mysql/i_mysql_module.h diff --git a/src/node/db_proxy/mysql/mysql_module.cc b/src/plugin/node/db_proxy/mysql/mysql_module.cc similarity index 100% rename from src/node/db_proxy/mysql/mysql_module.cc rename to src/plugin/node/db_proxy/mysql/mysql_module.cc diff --git a/src/node/db_proxy/mysql/mysql_module.h b/src/plugin/node/db_proxy/mysql/mysql_module.h similarity index 86% rename from src/node/db_proxy/mysql/mysql_module.h rename to src/plugin/node/db_proxy/mysql/mysql_module.h index 5c488614..ca89f7b6 100644 --- a/src/node/db_proxy/mysql/mysql_module.h +++ b/src/plugin/node/db_proxy/mysql/mysql_module.h @@ -1,10 +1,10 @@ #pragma once #include "i_mysql_module.h" -#include "squick/core/map.h" -#include -#include -#include +#include "core/map.h" +#include +#include +#include #include #include diff --git a/src/node/db_proxy/mysql/plugin.cc b/src/plugin/node/db_proxy/mysql/plugin.cc similarity index 100% rename from src/node/db_proxy/mysql/plugin.cc rename to src/plugin/node/db_proxy/mysql/plugin.cc diff --git a/src/node/db_proxy/mysql/plugin.h b/src/plugin/node/db_proxy/mysql/plugin.h similarity index 91% rename from src/node/db_proxy/mysql/plugin.h rename to src/plugin/node/db_proxy/mysql/plugin.h index d6ce3ce4..43b0ffc4 100644 --- a/src/node/db_proxy/mysql/plugin.h +++ b/src/plugin/node/db_proxy/mysql/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace db_proxy::mysql { class Plugin : public IPlugin { diff --git a/src/node/db_proxy/redis/CMakeLists.txt b/src/plugin/node/db_proxy/redis/CMakeLists.txt similarity index 100% rename from src/node/db_proxy/redis/CMakeLists.txt rename to src/plugin/node/db_proxy/redis/CMakeLists.txt diff --git a/src/node/db_proxy/redis/i_redis_module.h b/src/plugin/node/db_proxy/redis/i_redis_module.h similarity index 100% rename from src/node/db_proxy/redis/i_redis_module.h rename to src/plugin/node/db_proxy/redis/i_redis_module.h diff --git a/src/node/db_proxy/redis/plugin.cc b/src/plugin/node/db_proxy/redis/plugin.cc similarity index 100% rename from src/node/db_proxy/redis/plugin.cc rename to src/plugin/node/db_proxy/redis/plugin.cc diff --git a/src/node/db_proxy/redis/plugin.h b/src/plugin/node/db_proxy/redis/plugin.h similarity index 91% rename from src/node/db_proxy/redis/plugin.h rename to src/plugin/node/db_proxy/redis/plugin.h index 5341f313..5d6f660e 100644 --- a/src/node/db_proxy/redis/plugin.h +++ b/src/plugin/node/db_proxy/redis/plugin.h @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace db_proxy::redis { class Plugin : public IPlugin { diff --git a/src/node/db_proxy/redis/redis_module.cc b/src/plugin/node/db_proxy/redis/redis_module.cc similarity index 100% rename from src/node/db_proxy/redis/redis_module.cc rename to src/plugin/node/db_proxy/redis/redis_module.cc diff --git a/src/node/db_proxy/redis/redis_module.h b/src/plugin/node/db_proxy/redis/redis_module.h similarity index 96% rename from src/node/db_proxy/redis/redis_module.h rename to src/plugin/node/db_proxy/redis/redis_module.h index ce4dbcba..26350098 100644 --- a/src/node/db_proxy/redis/redis_module.h +++ b/src/plugin/node/db_proxy/redis/redis_module.h @@ -1,5 +1,5 @@ #include "i_redis_module.h" -#include +#include #include namespace db_proxy::redis { diff --git a/src/node/ds_mgr/CMakeLists.txt b/src/plugin/node/ds_mgr/CMakeLists.txt similarity index 100% rename from src/node/ds_mgr/CMakeLists.txt rename to src/plugin/node/ds_mgr/CMakeLists.txt diff --git a/src/node/ds_mgr/logic/CMakeLists.txt b/src/plugin/node/ds_mgr/logic/CMakeLists.txt similarity index 100% rename from src/node/ds_mgr/logic/CMakeLists.txt rename to src/plugin/node/ds_mgr/logic/CMakeLists.txt diff --git a/src/node/ds_mgr/logic/i_logic_module.h b/src/plugin/node/ds_mgr/logic/i_logic_module.h similarity index 84% rename from src/node/ds_mgr/logic/i_logic_module.h rename to src/plugin/node/ds_mgr/logic/i_logic_module.h index 57f6950c..f323bdcc 100644 --- a/src/node/ds_mgr/logic/i_logic_module.h +++ b/src/plugin/node/ds_mgr/logic/i_logic_module.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace gameplay_manager::logic { class ILogicModule : public IModule { public: diff --git a/src/node/ds_mgr/logic/logic_module.cc b/src/plugin/node/ds_mgr/logic/logic_module.cc similarity index 100% rename from src/node/ds_mgr/logic/logic_module.cc rename to src/plugin/node/ds_mgr/logic/logic_module.cc diff --git a/src/node/ds_mgr/logic/logic_module.h b/src/plugin/node/ds_mgr/logic/logic_module.h similarity index 84% rename from src/node/ds_mgr/logic/logic_module.h rename to src/plugin/node/ds_mgr/logic/logic_module.h index 8d572743..6e7f08d4 100644 --- a/src/node/ds_mgr/logic/logic_module.h +++ b/src/plugin/node/ds_mgr/logic/logic_module.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include "i_logic_module.h" diff --git a/src/node/ds_mgr/logic/manager_module.cc b/src/plugin/node/ds_mgr/logic/manager_module.cc similarity index 100% rename from src/node/ds_mgr/logic/manager_module.cc rename to src/plugin/node/ds_mgr/logic/manager_module.cc diff --git a/src/node/ds_mgr/logic/manager_module.h b/src/plugin/node/ds_mgr/logic/manager_module.h similarity index 78% rename from src/node/ds_mgr/logic/manager_module.h rename to src/plugin/node/ds_mgr/logic/manager_module.h index 8b56eb0b..51c89da2 100644 --- a/src/node/ds_mgr/logic/manager_module.h +++ b/src/plugin/node/ds_mgr/logic/manager_module.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace gameplay_manager::logic { diff --git a/src/node/ds_mgr/logic/plugin.cc b/src/plugin/node/ds_mgr/logic/plugin.cc similarity index 100% rename from src/node/ds_mgr/logic/plugin.cc rename to src/plugin/node/ds_mgr/logic/plugin.cc diff --git a/src/node/ds_mgr/logic/plugin.h b/src/plugin/node/ds_mgr/logic/plugin.h similarity index 84% rename from src/node/ds_mgr/logic/plugin.h rename to src/plugin/node/ds_mgr/logic/plugin.h index 1abe45d2..d106e549 100644 --- a/src/node/ds_mgr/logic/plugin.h +++ b/src/plugin/node/ds_mgr/logic/plugin.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace gameplay_manager::logic { ////////////////////////////////////////////////////////////////////////// diff --git a/src/node/game/CMakeLists.txt b/src/plugin/node/game/CMakeLists.txt similarity index 100% rename from src/node/game/CMakeLists.txt rename to src/plugin/node/game/CMakeLists.txt diff --git a/src/node/game/logic/CMakeLists.txt b/src/plugin/node/game/logic/CMakeLists.txt similarity index 100% rename from src/node/game/logic/CMakeLists.txt rename to src/plugin/node/game/logic/CMakeLists.txt diff --git a/src/node/game/logic/game.cc b/src/plugin/node/game/logic/game.cc similarity index 100% rename from src/node/game/logic/game.cc rename to src/plugin/node/game/logic/game.cc diff --git a/src/node/game/logic/game.h b/src/plugin/node/game/logic/game.h similarity index 100% rename from src/node/game/logic/game.h rename to src/plugin/node/game/logic/game.h diff --git a/src/node/game/logic/game_mgr_module.cc b/src/plugin/node/game/logic/game_mgr_module.cc similarity index 100% rename from src/node/game/logic/game_mgr_module.cc rename to src/plugin/node/game/logic/game_mgr_module.cc diff --git a/src/node/game/logic/game_mgr_module.h b/src/plugin/node/game/logic/game_mgr_module.h similarity index 97% rename from src/node/game/logic/game_mgr_module.h rename to src/plugin/node/game/logic/game_mgr_module.h index a2f43bf1..09e2d33d 100644 --- a/src/node/game/logic/game_mgr_module.h +++ b/src/plugin/node/game/logic/game_mgr_module.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "game.h" #include "i_game_mgr_module.h" diff --git a/src/node/game/logic/i_game.h b/src/plugin/node/game/logic/i_game.h similarity index 99% rename from src/node/game/logic/i_game.h rename to src/plugin/node/game/logic/i_game.h index fe43ac3c..e2f7fa8d 100644 --- a/src/node/game/logic/i_game.h +++ b/src/plugin/node/game/logic/i_game.h @@ -6,7 +6,7 @@ #pragma once #include "i_game_mgr_module.h" -#include +#include namespace game::logic { using namespace rpc; diff --git a/src/node/game/logic/i_game_mgr_module.h b/src/plugin/node/game/logic/i_game_mgr_module.h similarity index 92% rename from src/node/game/logic/i_game_mgr_module.h rename to src/plugin/node/game/logic/i_game_mgr_module.h index 91d6de0f..111ce14f 100644 --- a/src/node/game/logic/i_game_mgr_module.h +++ b/src/plugin/node/game/logic/i_game_mgr_module.h @@ -1,12 +1,12 @@ #pragma once #include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace game::logic { diff --git a/src/node/game/logic/plugin.cc b/src/plugin/node/game/logic/plugin.cc similarity index 100% rename from src/node/game/logic/plugin.cc rename to src/plugin/node/game/logic/plugin.cc diff --git a/src/node/game/logic/plugin.h b/src/plugin/node/game/logic/plugin.h similarity index 80% rename from src/node/game/logic/plugin.h rename to src/plugin/node/game/logic/plugin.h index ca391f17..4ee4e828 100644 --- a/src/node/game/logic/plugin.h +++ b/src/plugin/node/game/logic/plugin.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace game::logic { class Plugin : public IPlugin { diff --git a/src/node/global/CMakeLists.txt b/src/plugin/node/global/CMakeLists.txt similarity index 100% rename from src/node/global/CMakeLists.txt rename to src/plugin/node/global/CMakeLists.txt diff --git a/src/node/global/logic/CMakeLists.txt b/src/plugin/node/global/logic/CMakeLists.txt similarity index 100% rename from src/node/global/logic/CMakeLists.txt rename to src/plugin/node/global/logic/CMakeLists.txt diff --git a/src/node/global/logic/i_logic_module.h b/src/plugin/node/global/logic/i_logic_module.h similarity index 76% rename from src/node/global/logic/i_logic_module.h rename to src/plugin/node/global/logic/i_logic_module.h index 239669e6..5672a669 100644 --- a/src/node/global/logic/i_logic_module.h +++ b/src/plugin/node/global/logic/i_logic_module.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace global::logic { class ILogicModule : public IModule {}; diff --git a/src/node/global/logic/logic_module.cc b/src/plugin/node/global/logic/logic_module.cc similarity index 100% rename from src/node/global/logic/logic_module.cc rename to src/plugin/node/global/logic/logic_module.cc diff --git a/src/node/global/logic/logic_module.h b/src/plugin/node/global/logic/logic_module.h similarity index 80% rename from src/node/global/logic/logic_module.h rename to src/plugin/node/global/logic/logic_module.h index 146a494f..5a24358f 100644 --- a/src/node/global/logic/logic_module.h +++ b/src/plugin/node/global/logic/logic_module.h @@ -1,7 +1,7 @@ #pragma once #include "i_logic_module.h" -#include -#include +#include +#include namespace global::logic { class LogicModule : public ILogicModule { diff --git a/src/node/global/logic/plugin.cc b/src/plugin/node/global/logic/plugin.cc similarity index 100% rename from src/node/global/logic/plugin.cc rename to src/plugin/node/global/logic/plugin.cc diff --git a/src/node/global/logic/plugin.h b/src/plugin/node/global/logic/plugin.h similarity index 91% rename from src/node/global/logic/plugin.h rename to src/plugin/node/global/logic/plugin.h index 047e495b..7055e553 100644 --- a/src/node/global/logic/plugin.h +++ b/src/plugin/node/global/logic/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace global::logic { class Plugin : public IPlugin { public: diff --git a/src/node/master/CMakeLists.txt b/src/plugin/node/master/CMakeLists.txt similarity index 100% rename from src/node/master/CMakeLists.txt rename to src/plugin/node/master/CMakeLists.txt diff --git a/src/node/master/logic/CMakeLists.txt b/src/plugin/node/master/logic/CMakeLists.txt similarity index 100% rename from src/node/master/logic/CMakeLists.txt rename to src/plugin/node/master/logic/CMakeLists.txt diff --git a/src/node/master/logic/i_logic_module.h b/src/plugin/node/master/logic/i_logic_module.h similarity index 79% rename from src/node/master/logic/i_logic_module.h rename to src/plugin/node/master/logic/i_logic_module.h index cc6e1afd..98c0b6ed 100644 --- a/src/node/master/logic/i_logic_module.h +++ b/src/plugin/node/master/logic/i_logic_module.h @@ -2,7 +2,7 @@ #pragma once #include -#include +#include namespace master::logic { class ILogicModule : public IModule {}; } // namespace master::logic \ No newline at end of file diff --git a/src/node/master/logic/logic_module.cc b/src/plugin/node/master/logic/logic_module.cc similarity index 100% rename from src/node/master/logic/logic_module.cc rename to src/plugin/node/master/logic/logic_module.cc diff --git a/src/node/master/logic/logic_module.h b/src/plugin/node/master/logic/logic_module.h similarity index 94% rename from src/node/master/logic/logic_module.h rename to src/plugin/node/master/logic/logic_module.h index e63a11ae..7a25fc95 100644 --- a/src/node/master/logic/logic_module.h +++ b/src/plugin/node/master/logic/logic_module.h @@ -1,9 +1,9 @@ #pragma once #include "i_logic_module.h" -#include -#include -#include +#include +#include +#include #include namespace master::logic { class LogicModule : public ILogicModule { diff --git a/src/node/master/logic/plugin.cc b/src/plugin/node/master/logic/plugin.cc similarity index 100% rename from src/node/master/logic/plugin.cc rename to src/plugin/node/master/logic/plugin.cc diff --git a/src/node/master/logic/plugin.h b/src/plugin/node/master/logic/plugin.h similarity index 79% rename from src/node/master/logic/plugin.h rename to src/plugin/node/master/logic/plugin.h index d549e272..0eb1c931 100644 --- a/src/node/master/logic/plugin.h +++ b/src/plugin/node/master/logic/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include namespace master::logic { class Plugin : public IPlugin { public: diff --git a/src/node/match/CMakeLists.txt b/src/plugin/node/match/CMakeLists.txt similarity index 100% rename from src/node/match/CMakeLists.txt rename to src/plugin/node/match/CMakeLists.txt diff --git a/src/node/player/CMakeLists.txt b/src/plugin/node/player/CMakeLists.txt similarity index 100% rename from src/node/player/CMakeLists.txt rename to src/plugin/node/player/CMakeLists.txt diff --git a/src/node/player/logic/CMakeLists.txt b/src/plugin/node/player/logic/CMakeLists.txt similarity index 100% rename from src/node/player/logic/CMakeLists.txt rename to src/plugin/node/player/logic/CMakeLists.txt diff --git a/src/node/player/logic/README.md b/src/plugin/node/player/logic/README.md similarity index 100% rename from src/node/player/logic/README.md rename to src/plugin/node/player/logic/README.md diff --git a/src/node/player/logic/logic_module.cc b/src/plugin/node/player/logic/logic_module.cc similarity index 97% rename from src/node/player/logic/logic_module.cc rename to src/plugin/node/player/logic/logic_module.cc index 7b40d994..f5e86c10 100644 --- a/src/node/player/logic/logic_module.cc +++ b/src/plugin/node/player/logic/logic_module.cc @@ -1,7 +1,7 @@ #include "logic_module.h" -#include +#include // #include namespace player::logic { bool LogicModule::Start() { diff --git a/src/node/player/logic/logic_module.h b/src/plugin/node/player/logic/logic_module.h similarity index 73% rename from src/node/player/logic/logic_module.h rename to src/plugin/node/player/logic/logic_module.h index ff58497c..5301570a 100644 --- a/src/node/player/logic/logic_module.h +++ b/src/plugin/node/player/logic/logic_module.h @@ -3,12 +3,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace player::logic { diff --git a/src/node/player/logic/plugin.cc b/src/plugin/node/player/logic/plugin.cc similarity index 100% rename from src/node/player/logic/plugin.cc rename to src/plugin/node/player/logic/plugin.cc diff --git a/src/node/player/logic/plugin.h b/src/plugin/node/player/logic/plugin.h similarity index 80% rename from src/node/player/logic/plugin.h rename to src/plugin/node/player/logic/plugin.h index be0797f4..78f4dfca 100644 --- a/src/node/player/logic/plugin.h +++ b/src/plugin/node/player/logic/plugin.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace player::logic { class Plugin : public IPlugin { diff --git a/src/node/proxy/CMakeLists.txt b/src/plugin/node/proxy/CMakeLists.txt similarity index 100% rename from src/node/proxy/CMakeLists.txt rename to src/plugin/node/proxy/CMakeLists.txt diff --git a/src/node/proxy/logic/CMakeLists.txt b/src/plugin/node/proxy/logic/CMakeLists.txt similarity index 100% rename from src/node/proxy/logic/CMakeLists.txt rename to src/plugin/node/proxy/logic/CMakeLists.txt diff --git a/src/node/proxy/logic/i_logic_module.h b/src/plugin/node/proxy/logic/i_logic_module.h similarity index 87% rename from src/node/proxy/logic/i_logic_module.h rename to src/plugin/node/proxy/logic/i_logic_module.h index 96a8ddfb..b8f43f97 100644 --- a/src/node/proxy/logic/i_logic_module.h +++ b/src/plugin/node/proxy/logic/i_logic_module.h @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace proxy::logic { class ILogicModule : public IModule { public: diff --git a/src/node/proxy/logic/logic_module.cc b/src/plugin/node/proxy/logic/logic_module.cc similarity index 99% rename from src/node/proxy/logic/logic_module.cc rename to src/plugin/node/proxy/logic/logic_module.cc index 9071120f..e7ceb63a 100644 --- a/src/node/proxy/logic/logic_module.cc +++ b/src/plugin/node/proxy/logic/logic_module.cc @@ -1,6 +1,6 @@ #include "logic_module.h" -#include +#include namespace proxy::logic { diff --git a/src/node/proxy/logic/logic_module.h b/src/plugin/node/proxy/logic/logic_module.h similarity index 93% rename from src/node/proxy/logic/logic_module.h rename to src/plugin/node/proxy/logic/logic_module.h index 10cecf06..f99449f3 100644 --- a/src/node/proxy/logic/logic_module.h +++ b/src/plugin/node/proxy/logic/logic_module.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "i_logic_module.h" #include diff --git a/src/node/proxy/logic/plugin.cc b/src/plugin/node/proxy/logic/plugin.cc similarity index 100% rename from src/node/proxy/logic/plugin.cc rename to src/plugin/node/proxy/logic/plugin.cc diff --git a/src/node/proxy/logic/plugin.h b/src/plugin/node/proxy/logic/plugin.h similarity index 79% rename from src/node/proxy/logic/plugin.h rename to src/plugin/node/proxy/logic/plugin.h index 0f1617f3..6a2e188f 100644 --- a/src/node/proxy/logic/plugin.h +++ b/src/plugin/node/proxy/logic/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include namespace proxy::logic { class Plugin : public IPlugin { diff --git a/src/node/room/CMakeLists.txt b/src/plugin/node/room/CMakeLists.txt similarity index 100% rename from src/node/room/CMakeLists.txt rename to src/plugin/node/room/CMakeLists.txt diff --git a/src/node/web/CMakeLists.txt b/src/plugin/node/web/CMakeLists.txt similarity index 100% rename from src/node/web/CMakeLists.txt rename to src/plugin/node/web/CMakeLists.txt diff --git a/src/node/web/logic/CMakeLists.txt b/src/plugin/node/web/logic/CMakeLists.txt similarity index 100% rename from src/node/web/logic/CMakeLists.txt rename to src/plugin/node/web/logic/CMakeLists.txt diff --git a/src/node/web/logic/i_logic_module.h b/src/plugin/node/web/logic/i_logic_module.h similarity index 77% rename from src/node/web/logic/i_logic_module.h rename to src/plugin/node/web/logic/i_logic_module.h index eda77b9a..0eca2cd6 100644 --- a/src/node/web/logic/i_logic_module.h +++ b/src/plugin/node/web/logic/i_logic_module.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace web::logic { class ILogicModule : public IModule {}; diff --git a/src/node/web/logic/logic_module.cc b/src/plugin/node/web/logic/logic_module.cc similarity index 100% rename from src/node/web/logic/logic_module.cc rename to src/plugin/node/web/logic/logic_module.cc diff --git a/src/node/web/logic/logic_module.h b/src/plugin/node/web/logic/logic_module.h similarity index 91% rename from src/node/web/logic/logic_module.h rename to src/plugin/node/web/logic/logic_module.h index 334eb45e..608e96d2 100644 --- a/src/node/web/logic/logic_module.h +++ b/src/plugin/node/web/logic/logic_module.h @@ -2,10 +2,10 @@ #include "i_logic_module.h" #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/node/web/logic/plugin.cc b/src/plugin/node/web/logic/plugin.cc similarity index 100% rename from src/node/web/logic/plugin.cc rename to src/plugin/node/web/logic/plugin.cc diff --git a/src/node/web/logic/plugin.h b/src/plugin/node/web/logic/plugin.h similarity index 90% rename from src/node/web/logic/plugin.h rename to src/plugin/node/web/logic/plugin.h index 1c59e64c..3bc5acdc 100644 --- a/src/node/web/logic/plugin.h +++ b/src/plugin/node/web/logic/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace web::logic { class Plugin : public IPlugin { diff --git a/src/node/web/logic/struct.h b/src/plugin/node/web/logic/struct.h similarity index 94% rename from src/node/web/logic/struct.h rename to src/plugin/node/web/logic/struct.h index dc1be5f3..5fbfe89e 100644 --- a/src/node/web/logic/struct.h +++ b/src/plugin/node/web/logic/struct.h @@ -1,7 +1,7 @@ #pragma once #include -#include -#include +#include +#include #include #include using namespace std; diff --git a/src/node/world/CMakeLists.txt b/src/plugin/node/world/CMakeLists.txt similarity index 100% rename from src/node/world/CMakeLists.txt rename to src/plugin/node/world/CMakeLists.txt diff --git a/src/node/world/logic/CMakeLists.txt b/src/plugin/node/world/logic/CMakeLists.txt similarity index 100% rename from src/node/world/logic/CMakeLists.txt rename to src/plugin/node/world/logic/CMakeLists.txt diff --git a/src/node/world/logic/i_logic_module.h b/src/plugin/node/world/logic/i_logic_module.h similarity index 76% rename from src/node/world/logic/i_logic_module.h rename to src/plugin/node/world/logic/i_logic_module.h index 62321533..6bd4ae61 100644 --- a/src/node/world/logic/i_logic_module.h +++ b/src/plugin/node/world/logic/i_logic_module.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace world::logic { class ILogicModule : public IModule {}; diff --git a/src/node/world/logic/logic_module.cc b/src/plugin/node/world/logic/logic_module.cc similarity index 100% rename from src/node/world/logic/logic_module.cc rename to src/plugin/node/world/logic/logic_module.cc diff --git a/src/node/world/logic/logic_module.h b/src/plugin/node/world/logic/logic_module.h similarity index 80% rename from src/node/world/logic/logic_module.h rename to src/plugin/node/world/logic/logic_module.h index 0da64724..1120ee2b 100644 --- a/src/node/world/logic/logic_module.h +++ b/src/plugin/node/world/logic/logic_module.h @@ -1,7 +1,7 @@ #pragma once #include "i_logic_module.h" -#include -#include +#include +#include namespace world::logic { class LogicModule : public ILogicModule { diff --git a/src/node/world/logic/plugin.cc b/src/plugin/node/world/logic/plugin.cc similarity index 100% rename from src/node/world/logic/plugin.cc rename to src/plugin/node/world/logic/plugin.cc diff --git a/src/node/world/logic/plugin.h b/src/plugin/node/world/logic/plugin.h similarity index 91% rename from src/node/world/logic/plugin.h rename to src/plugin/node/world/logic/plugin.h index 3a4cdeec..6b9b2cd8 100644 --- a/src/node/world/logic/plugin.h +++ b/src/plugin/node/world/logic/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace world::logic { class Plugin : public IPlugin { public: diff --git a/src/tutorial/CMakeLists.txt b/src/plugin/tutorial/CMakeLists.txt similarity index 100% rename from src/tutorial/CMakeLists.txt rename to src/plugin/tutorial/CMakeLists.txt diff --git a/src/tutorial/t1_plugin/CMakeLists.txt b/src/plugin/tutorial/t1_plugin/CMakeLists.txt similarity index 100% rename from src/tutorial/t1_plugin/CMakeLists.txt rename to src/plugin/tutorial/t1_plugin/CMakeLists.txt diff --git a/src/tutorial/t1_plugin/plugin.cc b/src/plugin/tutorial/t1_plugin/plugin.cc similarity index 100% rename from src/tutorial/t1_plugin/plugin.cc rename to src/plugin/tutorial/t1_plugin/plugin.cc diff --git a/src/tutorial/t3_event/plugin.h b/src/plugin/tutorial/t1_plugin/plugin.h similarity index 90% rename from src/tutorial/t3_event/plugin.h rename to src/plugin/tutorial/t1_plugin/plugin.h index c9d75bb9..73b5796c 100644 --- a/src/tutorial/t3_event/plugin.h +++ b/src/plugin/tutorial/t1_plugin/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace tutorial { class Plugin : public IPlugin { public: diff --git a/src/tutorial/t1_plugin/simple_module.cc b/src/plugin/tutorial/t1_plugin/simple_module.cc similarity index 100% rename from src/tutorial/t1_plugin/simple_module.cc rename to src/plugin/tutorial/t1_plugin/simple_module.cc diff --git a/src/tutorial/t1_plugin/simple_module.h b/src/plugin/tutorial/t1_plugin/simple_module.h similarity index 97% rename from src/tutorial/t1_plugin/simple_module.h rename to src/plugin/tutorial/t1_plugin/simple_module.h index c0e2b5a2..bc0e1cd2 100644 --- a/src/tutorial/t1_plugin/simple_module.h +++ b/src/plugin/tutorial/t1_plugin/simple_module.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace tutorial { // You can use this class export your function, Other module can call your module's function class ISimpleModule : public IModule { diff --git a/src/tutorial/t2_property/CMakeLists.txt b/src/plugin/tutorial/t2_property/CMakeLists.txt similarity index 100% rename from src/tutorial/t2_property/CMakeLists.txt rename to src/plugin/tutorial/t2_property/CMakeLists.txt diff --git a/src/tutorial/t2_property/plugin.cc b/src/plugin/tutorial/t2_property/plugin.cc similarity index 100% rename from src/tutorial/t2_property/plugin.cc rename to src/plugin/tutorial/t2_property/plugin.cc diff --git a/src/tutorial/t2_property/plugin.h b/src/plugin/tutorial/t2_property/plugin.h similarity index 90% rename from src/tutorial/t2_property/plugin.h rename to src/plugin/tutorial/t2_property/plugin.h index c9d75bb9..73b5796c 100644 --- a/src/tutorial/t2_property/plugin.h +++ b/src/plugin/tutorial/t2_property/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace tutorial { class Plugin : public IPlugin { public: diff --git a/src/tutorial/t2_property/property_module.cc b/src/plugin/tutorial/t2_property/property_module.cc similarity index 96% rename from src/tutorial/t2_property/property_module.cc rename to src/plugin/tutorial/t2_property/property_module.cc index 90821cc2..6767a106 100644 --- a/src/tutorial/t2_property/property_module.cc +++ b/src/plugin/tutorial/t2_property/property_module.cc @@ -1,7 +1,7 @@ #include "property_module.h" -#include -#include +#include +#include namespace tutorial { diff --git a/src/tutorial/t2_property/property_module.h b/src/plugin/tutorial/t2_property/property_module.h similarity index 87% rename from src/tutorial/t2_property/property_module.h rename to src/plugin/tutorial/t2_property/property_module.h index 7ce9131a..e1c8f24c 100644 --- a/src/tutorial/t2_property/property_module.h +++ b/src/plugin/tutorial/t2_property/property_module.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace tutorial { class IPropertyModule : public IModule {}; diff --git a/src/tutorial/t3_event/CMakeLists.txt b/src/plugin/tutorial/t3_event/CMakeLists.txt similarity index 100% rename from src/tutorial/t3_event/CMakeLists.txt rename to src/plugin/tutorial/t3_event/CMakeLists.txt diff --git a/src/tutorial/t3_event/event_module.cc b/src/plugin/tutorial/t3_event/event_module.cc similarity index 100% rename from src/tutorial/t3_event/event_module.cc rename to src/plugin/tutorial/t3_event/event_module.cc diff --git a/src/tutorial/t3_event/event_module.h b/src/plugin/tutorial/t3_event/event_module.h similarity index 90% rename from src/tutorial/t3_event/event_module.h rename to src/plugin/tutorial/t3_event/event_module.h index ad7c5580..302dfa96 100644 --- a/src/tutorial/t3_event/event_module.h +++ b/src/plugin/tutorial/t3_event/event_module.h @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace tutorial { class IEventModule : public IModule {}; diff --git a/src/tutorial/t3_event/plugin.cc b/src/plugin/tutorial/t3_event/plugin.cc similarity index 100% rename from src/tutorial/t3_event/plugin.cc rename to src/plugin/tutorial/t3_event/plugin.cc diff --git a/src/tutorial/t4_actor/plugin.h b/src/plugin/tutorial/t3_event/plugin.h similarity index 90% rename from src/tutorial/t4_actor/plugin.h rename to src/plugin/tutorial/t3_event/plugin.h index c9d75bb9..73b5796c 100644 --- a/src/tutorial/t4_actor/plugin.h +++ b/src/plugin/tutorial/t3_event/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace tutorial { class Plugin : public IPlugin { public: diff --git a/src/tutorial/t4_actor/CMakeLists.txt b/src/plugin/tutorial/t4_actor/CMakeLists.txt similarity index 100% rename from src/tutorial/t4_actor/CMakeLists.txt rename to src/plugin/tutorial/t4_actor/CMakeLists.txt diff --git a/src/tutorial/t4_actor/actor_module.cc b/src/plugin/tutorial/t4_actor/actor_module.cc similarity index 100% rename from src/tutorial/t4_actor/actor_module.cc rename to src/plugin/tutorial/t4_actor/actor_module.cc diff --git a/src/tutorial/t4_actor/actor_module.h b/src/plugin/tutorial/t4_actor/actor_module.h similarity index 96% rename from src/tutorial/t4_actor/actor_module.h rename to src/plugin/tutorial/t4_actor/actor_module.h index cfd76c56..f4127fad 100644 --- a/src/tutorial/t4_actor/actor_module.h +++ b/src/plugin/tutorial/t4_actor/actor_module.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include namespace tutorial { diff --git a/src/tutorial/t4_actor/plugin.cc b/src/plugin/tutorial/t4_actor/plugin.cc similarity index 100% rename from src/tutorial/t4_actor/plugin.cc rename to src/plugin/tutorial/t4_actor/plugin.cc diff --git a/src/tutorial/t1_plugin/plugin.h b/src/plugin/tutorial/t4_actor/plugin.h similarity index 90% rename from src/tutorial/t1_plugin/plugin.h rename to src/plugin/tutorial/t4_actor/plugin.h index c9d75bb9..73b5796c 100644 --- a/src/tutorial/t1_plugin/plugin.h +++ b/src/plugin/tutorial/t4_actor/plugin.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace tutorial { class Plugin : public IPlugin { public: diff --git a/src/tutorial/t5_http/CMakeLists.txt b/src/plugin/tutorial/t5_http/CMakeLists.txt similarity index 100% rename from src/tutorial/t5_http/CMakeLists.txt rename to src/plugin/tutorial/t5_http/CMakeLists.txt diff --git a/src/tutorial/t5_http/http_module.cc b/src/plugin/tutorial/t5_http/http_module.cc similarity index 100% rename from src/tutorial/t5_http/http_module.cc rename to src/plugin/tutorial/t5_http/http_module.cc diff --git a/src/tutorial/t5_http/http_module.h b/src/plugin/tutorial/t5_http/http_module.h similarity index 94% rename from src/tutorial/t5_http/http_module.h rename to src/plugin/tutorial/t5_http/http_module.h index 82aec7ca..45fb7e82 100644 --- a/src/tutorial/t5_http/http_module.h +++ b/src/plugin/tutorial/t5_http/http_module.h @@ -1,8 +1,8 @@ #pragma once #include -#include -#include +#include +#include namespace tutorial { class IHttpModule : public IModule {}; class HttpModule : public IHttpModule { diff --git a/src/tutorial/t5_http/plugin.cc b/src/plugin/tutorial/t5_http/plugin.cc similarity index 100% rename from src/tutorial/t5_http/plugin.cc rename to src/plugin/tutorial/t5_http/plugin.cc diff --git a/src/plugin/tutorial/t5_http/plugin.h b/src/plugin/tutorial/t5_http/plugin.h new file mode 100644 index 00000000..73b5796c --- /dev/null +++ b/src/plugin/tutorial/t5_http/plugin.h @@ -0,0 +1,13 @@ +#pragma once + +#include +namespace tutorial { +class Plugin : public IPlugin { + public: + Plugin(IPluginManager *p) { pm_ = p; } + virtual const int GetPluginVersion(); + virtual const std::string GetPluginName(); + virtual void Install(); + virtual void Uninstall(); +}; +} // namespace tutorial \ No newline at end of file diff --git a/src/tutorial/t6_rpc/CMakeLists.txt b/src/plugin/tutorial/t6_rpc/CMakeLists.txt similarity index 100% rename from src/tutorial/t6_rpc/CMakeLists.txt rename to src/plugin/tutorial/t6_rpc/CMakeLists.txt diff --git a/src/tutorial/t6_rpc/plugin.cc b/src/plugin/tutorial/t6_rpc/plugin.cc similarity index 100% rename from src/tutorial/t6_rpc/plugin.cc rename to src/plugin/tutorial/t6_rpc/plugin.cc diff --git a/src/plugin/tutorial/t6_rpc/plugin.h b/src/plugin/tutorial/t6_rpc/plugin.h new file mode 100644 index 00000000..73b5796c --- /dev/null +++ b/src/plugin/tutorial/t6_rpc/plugin.h @@ -0,0 +1,13 @@ +#pragma once + +#include +namespace tutorial { +class Plugin : public IPlugin { + public: + Plugin(IPluginManager *p) { pm_ = p; } + virtual const int GetPluginVersion(); + virtual const std::string GetPluginName(); + virtual void Install(); + virtual void Uninstall(); +}; +} // namespace tutorial \ No newline at end of file diff --git a/src/tutorial/t6_rpc/rpc_module.cc b/src/plugin/tutorial/t6_rpc/rpc_module.cc similarity index 100% rename from src/tutorial/t6_rpc/rpc_module.cc rename to src/plugin/tutorial/t6_rpc/rpc_module.cc diff --git a/src/tutorial/t6_rpc/rpc_module.h b/src/plugin/tutorial/t6_rpc/rpc_module.h similarity index 87% rename from src/tutorial/t6_rpc/rpc_module.h rename to src/plugin/tutorial/t6_rpc/rpc_module.h index 0dc26070..9718c788 100644 --- a/src/tutorial/t6_rpc/rpc_module.h +++ b/src/plugin/tutorial/t6_rpc/rpc_module.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace tutorial { class ISimpleModule : public IModule {}; diff --git a/src/tutorial/t7_config/CMakeLists.txt b/src/plugin/tutorial/t7_config/CMakeLists.txt similarity index 100% rename from src/tutorial/t7_config/CMakeLists.txt rename to src/plugin/tutorial/t7_config/CMakeLists.txt diff --git a/src/tutorial/t7_config/config_module.cc b/src/plugin/tutorial/t7_config/config_module.cc similarity index 100% rename from src/tutorial/t7_config/config_module.cc rename to src/plugin/tutorial/t7_config/config_module.cc diff --git a/src/tutorial/t7_config/config_module.h b/src/plugin/tutorial/t7_config/config_module.h similarity index 91% rename from src/tutorial/t7_config/config_module.h rename to src/plugin/tutorial/t7_config/config_module.h index 1dc6fecd..4f08d833 100644 --- a/src/tutorial/t7_config/config_module.h +++ b/src/plugin/tutorial/t7_config/config_module.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace tutorial { class ISimpleModule : public IModule {}; diff --git a/src/tutorial/t7_config/plugin.cc b/src/plugin/tutorial/t7_config/plugin.cc similarity index 100% rename from src/tutorial/t7_config/plugin.cc rename to src/plugin/tutorial/t7_config/plugin.cc diff --git a/src/plugin/tutorial/t7_config/plugin.h b/src/plugin/tutorial/t7_config/plugin.h new file mode 100644 index 00000000..73b5796c --- /dev/null +++ b/src/plugin/tutorial/t7_config/plugin.h @@ -0,0 +1,13 @@ +#pragma once + +#include +namespace tutorial { +class Plugin : public IPlugin { + public: + Plugin(IPluginManager *p) { pm_ = p; } + virtual const int GetPluginVersion(); + virtual const std::string GetPluginName(); + virtual void Install(); + virtual void Uninstall(); +}; +} // namespace tutorial \ No newline at end of file diff --git a/src/tutorial/t8_thread/CMakeLists.txt b/src/plugin/tutorial/t8_thread/CMakeLists.txt similarity index 100% rename from src/tutorial/t8_thread/CMakeLists.txt rename to src/plugin/tutorial/t8_thread/CMakeLists.txt diff --git a/src/tutorial/t8_thread/plugin.cc b/src/plugin/tutorial/t8_thread/plugin.cc similarity index 100% rename from src/tutorial/t8_thread/plugin.cc rename to src/plugin/tutorial/t8_thread/plugin.cc diff --git a/src/plugin/tutorial/t8_thread/plugin.h b/src/plugin/tutorial/t8_thread/plugin.h new file mode 100644 index 00000000..73b5796c --- /dev/null +++ b/src/plugin/tutorial/t8_thread/plugin.h @@ -0,0 +1,13 @@ +#pragma once + +#include +namespace tutorial { +class Plugin : public IPlugin { + public: + Plugin(IPluginManager *p) { pm_ = p; } + virtual const int GetPluginVersion(); + virtual const std::string GetPluginName(); + virtual void Install(); + virtual void Uninstall(); +}; +} // namespace tutorial \ No newline at end of file diff --git a/src/tutorial/t8_thread/thread_module.cc b/src/plugin/tutorial/t8_thread/thread_module.cc similarity index 99% rename from src/tutorial/t8_thread/thread_module.cc rename to src/plugin/tutorial/t8_thread/thread_module.cc index 196fff93..04a1fa13 100644 --- a/src/tutorial/t8_thread/thread_module.cc +++ b/src/plugin/tutorial/t8_thread/thread_module.cc @@ -1,5 +1,5 @@ #include "thread_module.h" -#include +#include #include #include diff --git a/src/tutorial/t8_thread/thread_module.h b/src/plugin/tutorial/t8_thread/thread_module.h similarity index 88% rename from src/tutorial/t8_thread/thread_module.h rename to src/plugin/tutorial/t8_thread/thread_module.h index 24434c33..98ca63f6 100644 --- a/src/tutorial/t8_thread/thread_module.h +++ b/src/plugin/tutorial/t8_thread/thread_module.h @@ -1,5 +1,5 @@ #pragma -#include +#include #include class IThreadModule : public IModule {}; diff --git a/src/tutorial/t9_navigation/CMakeLists.txt b/src/plugin/tutorial/t9_navigation/CMakeLists.txt similarity index 100% rename from src/tutorial/t9_navigation/CMakeLists.txt rename to src/plugin/tutorial/t9_navigation/CMakeLists.txt diff --git a/src/tutorial/t9_navigation/navigation_module.cc b/src/plugin/tutorial/t9_navigation/navigation_module.cc similarity index 100% rename from src/tutorial/t9_navigation/navigation_module.cc rename to src/plugin/tutorial/t9_navigation/navigation_module.cc diff --git a/src/tutorial/t9_navigation/navigation_module.h b/src/plugin/tutorial/t9_navigation/navigation_module.h similarity index 82% rename from src/tutorial/t9_navigation/navigation_module.h rename to src/plugin/tutorial/t9_navigation/navigation_module.h index bcfda398..b6123fd7 100644 --- a/src/tutorial/t9_navigation/navigation_module.h +++ b/src/plugin/tutorial/t9_navigation/navigation_module.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include /* IN THIS PLUGIN: diff --git a/src/tutorial/t9_navigation/plugin.cc b/src/plugin/tutorial/t9_navigation/plugin.cc similarity index 100% rename from src/tutorial/t9_navigation/plugin.cc rename to src/plugin/tutorial/t9_navigation/plugin.cc diff --git a/src/plugin/tutorial/t9_navigation/plugin.h b/src/plugin/tutorial/t9_navigation/plugin.h new file mode 100644 index 00000000..73b5796c --- /dev/null +++ b/src/plugin/tutorial/t9_navigation/plugin.h @@ -0,0 +1,13 @@ +#pragma once + +#include +namespace tutorial { +class Plugin : public IPlugin { + public: + Plugin(IPluginManager *p) { pm_ = p; } + virtual const int GetPluginVersion(); + virtual const std::string GetPluginName(); + virtual void Install(); + virtual void Uninstall(); +}; +} // namespace tutorial \ No newline at end of file diff --git a/src/squick/CMakeLists.txt b/src/squick/CMakeLists.txt deleted file mode 100644 index 7f8fc2e7..00000000 --- a/src/squick/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(core) -add_subdirectory(plugin) \ No newline at end of file diff --git a/src/struct/limit.h b/src/struct/limit.h index ff5fef65..99a6552b 100644 --- a/src/struct/limit.h +++ b/src/struct/limit.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #define SQUICK_NAME_MAXLEN 32 #define SQUICK_BROAD_MAXLEN 64 diff --git a/src/struct/struct.h b/src/struct/struct.h index 9847d550..0c103360 100644 --- a/src/struct/struct.h +++ b/src/struct/struct.h @@ -1,10 +1,10 @@ #pragma once #include "limit.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "excel.h" #include "msg_id.h" diff --git a/src/tutorial/t5_http/plugin.h b/src/tutorial/t5_http/plugin.h deleted file mode 100644 index c9d75bb9..00000000 --- a/src/tutorial/t5_http/plugin.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include -namespace tutorial { -class Plugin : public IPlugin { - public: - Plugin(IPluginManager *p) { pm_ = p; } - virtual const int GetPluginVersion(); - virtual const std::string GetPluginName(); - virtual void Install(); - virtual void Uninstall(); -}; -} // namespace tutorial \ No newline at end of file diff --git a/src/tutorial/t6_rpc/plugin.h b/src/tutorial/t6_rpc/plugin.h deleted file mode 100644 index c9d75bb9..00000000 --- a/src/tutorial/t6_rpc/plugin.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include -namespace tutorial { -class Plugin : public IPlugin { - public: - Plugin(IPluginManager *p) { pm_ = p; } - virtual const int GetPluginVersion(); - virtual const std::string GetPluginName(); - virtual void Install(); - virtual void Uninstall(); -}; -} // namespace tutorial \ No newline at end of file diff --git a/src/tutorial/t7_config/plugin.h b/src/tutorial/t7_config/plugin.h deleted file mode 100644 index c9d75bb9..00000000 --- a/src/tutorial/t7_config/plugin.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include -namespace tutorial { -class Plugin : public IPlugin { - public: - Plugin(IPluginManager *p) { pm_ = p; } - virtual const int GetPluginVersion(); - virtual const std::string GetPluginName(); - virtual void Install(); - virtual void Uninstall(); -}; -} // namespace tutorial \ No newline at end of file diff --git a/src/tutorial/t8_thread/plugin.h b/src/tutorial/t8_thread/plugin.h deleted file mode 100644 index c9d75bb9..00000000 --- a/src/tutorial/t8_thread/plugin.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include -namespace tutorial { -class Plugin : public IPlugin { - public: - Plugin(IPluginManager *p) { pm_ = p; } - virtual const int GetPluginVersion(); - virtual const std::string GetPluginName(); - virtual void Install(); - virtual void Uninstall(); -}; -} // namespace tutorial \ No newline at end of file diff --git a/src/tutorial/t9_navigation/plugin.h b/src/tutorial/t9_navigation/plugin.h deleted file mode 100644 index c9d75bb9..00000000 --- a/src/tutorial/t9_navigation/plugin.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include -namespace tutorial { -class Plugin : public IPlugin { - public: - Plugin(IPluginManager *p) { pm_ = p; } - virtual const int GetPluginVersion(); - virtual const std::string GetPluginName(); - virtual void Install(); - virtual void Uninstall(); -}; -} // namespace tutorial \ No newline at end of file diff --git a/tools/build_all.sh b/tools/build_all.sh index d5d45533..0ff6a358 100755 --- a/tools/build_all.sh +++ b/tools/build_all.sh @@ -5,7 +5,16 @@ # Github: https://github.com/pwnsky/squick # Description: build script for squick cd $(dirname $0) + bash ./clean_all.sh + +if [ -d ../res ]; then + "Not need to clone res" +else + git submodule update --init +fi + +# build third party libary bash ./build_third_party.sh cur_path=`pwd` diff --git a/tools/clean_all.sh b/tools/clean_all.sh index e99bfeaf..13c23355 100755 --- a/tools/clean_all.sh +++ b/tools/clean_all.sh @@ -6,6 +6,8 @@ # Description: Clean all generated files cd $(dirname $0) source common.sh +third_party_path=`pwd`/../third_party + cd .. rm -rf ./cache @@ -26,9 +28,10 @@ rm -rf ./src/struct/*.pb.h rm -rf ./src/struct/*.pb.cc rm -rf ./src/struct/excel.h rm -rf ./third_party/build +rm -rf ./res +rm -rf ./pycli/proto # clean third party -third_party_path=`pwd`/../third_party cd $third_party_path rm -rf ./build @@ -36,4 +39,5 @@ find . -name "*.o" | xargs rm -rf rm -rf ./lua/src/lua rm -rf ./lua/src/luac rm -rf ./lua/src/liblua.so -rm -rf ./lua/src/liblua.a \ No newline at end of file +rm -rf ./lua/src/liblua.a + diff --git a/tools/format/change_name.sh b/tools/format/change_name.sh index b1555403..fb0f4d9b 100755 --- a/tools/format/change_name.sh +++ b/tools/format/change_name.sh @@ -1,10 +1,11 @@ #! /bin/bash -dir=../../src/node/backstage +dir=../../src/ echo "This script will rename in [$dir] directory" if [[ $# < 2 ]];then echo "Usage: ./change_name.sh old_string new_string" + exit fi sed -i "s/$1/$2/g" `grep $1 -rl $dir`