update:修改目录结构

GengGode · Dec 3, 2023 · e87a741 · e87a741
1 parent 69cf4d5
commit e87a741
Show file tree

Hide file tree

Showing 104 changed files with 58 additions and 63 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,9 @@ include(cmake/add_pch_configure.cmake)
 
 # 设置第三方目录
 set(ThridPatryDir ${CMAKE_SOURCE_DIR}/third_party)
-set(SourceDir ${CMAKE_SOURCE_DIR}/source/src)
+set(IncludeDir ${CMAKE_SOURCE_DIR}/include)
+set(SourceDir ${CMAKE_SOURCE_DIR}/source)
+
 # 设置输出目录
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

diff --git a/source/include/cvAutoTrack.h → include/cvAutoTrack.h b/source/include/cvAutoTrack.h → include/cvAutoTrack.h
diff --git a/source/src/AutoTrack.cpp → source/AutoTrack.cpp b/source/src/AutoTrack.cpp → source/AutoTrack.cpp
@@ -20,7 +20,10 @@
 #include "version/Version.h"
 #include "utils/convect.string.h"
 
-AutoTrack::AutoTrack() : res(Resources::getInstance()), err(ErrorCode::getInstance())
+ErrorCode &err = ErrorCode::getInstance();
+Resources &res = Resources::getInstance();
+
+AutoTrack::AutoTrack() 
 {
     err.enableWirteFile();
 

diff --git a/source/src/AutoTrack.h → source/AutoTrack.h b/source/src/AutoTrack.h → source/AutoTrack.h
@@ -1,20 +1,10 @@
 #pragma once
 #include "match/type/MatchType.h"
 
-class Resources;
-class ErrorCode;
 class AutoTrack
 {
-    Resources& res;
-    ErrorCode& err;
-
-private:
-    AutoTrack();
 public:
-    static AutoTrack& Instance() {
-        static AutoTrack _instance;
-        return _instance;
-    }
+    AutoTrack();
 
 #pragma region 外部接口
     bool init();

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -13,14 +13,13 @@ endif()
 find_package(OpenCV REQUIRED)
 include_directories(${OpenCV_INCLUDE_DIRS})
 
-include_directories(include)
-include_directories(src)
 
 
-file(GLOB_RECURSE CppFiles "src/*.cpp")
-file(GLOB_RECURSE HppFiles "src/*.h")
+file(GLOB_RECURSE CppFiles "*.cpp")
+file(GLOB_RECURSE HppFiles "*.h")
 set(VerRcFile "${CMAKE_CURRENT_SOURCE_DIR}/resource/version.rc")
 set(VerHppFile "${CMAKE_CURRENT_SOURCE_DIR}/resource/version.h")
+set(InfaceHppFile "${IncludeDir}/cvAutoTrack.h")
 
 auto_increment_version_file("resource/version_hash.hash" "resource/version.ver")
 parse_version_file("resource/version.ver")
@@ -42,26 +41,24 @@ if(BUILD_CAPTURE_DXGI)
     add_definitions(-DBUILD_CAPTURE_DXGI)
 endif()
 
-source_group("include" FILES include/cvAutoTrack.h)
+source_group("include" FILES ${InfaceHppFile})
 source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${CppFiles} ${HppFiles} ${RcFiles} ${RcFile} ${VerRcFile})
 source_group("version" FILES ${VerRcFile})
 
-add_library(cvAutoTrack SHARED
-    include/cvAutoTrack.h
-    src/cvAutoTrack.cpp
-    ${CppFiles}
+include_directories(${IncludeDir})
+include_directories(${SourceDir})
+add_library(cvAutoTrack SHARED ${InfaceHppFile}
     ${HppFiles}
-    #${RcFiles}
+    ${CppFiles}
+    cvAutoTrack.cpp
     ${RcFile}
     ${VerRcFile}
 )
 
-
-
 set_target_properties(cvAutoTrack PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 set_target_properties(cvAutoTrack PROPERTIES FOLDER "cvAutoTrack")
 
-add_pch_define(cvAutoTrack ${CMAKE_CURRENT_SOURCE_DIR}/src/pch.h ${CMAKE_CURRENT_SOURCE_DIR}/src/pch.cpp)
+add_pch_define(cvAutoTrack ${SourceDir}/pch.h ${SourceDir}/pch.cpp)
 
 add_compile_options(/MP)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")

diff --git a/source/src/ErrorCode.cpp → source/ErrorCode.cpp b/source/src/ErrorCode.cpp → source/ErrorCode.cpp
diff --git a/source/src/ErrorCode.h → source/ErrorCode.h b/source/src/ErrorCode.h → source/ErrorCode.h
diff --git a/source/src/Ver.cpp → source/Ver.cpp b/source/src/Ver.cpp → source/Ver.cpp
diff --git a/source/src/Ver.h → source/Ver.h b/source/src/Ver.h → source/Ver.h
diff --git a/source/src/algorithms/algorithms.direction.h → source/algorithms/algorithms.direction.h b/source/src/algorithms/algorithms.direction.h → source/algorithms/algorithms.direction.h
diff --git a/source/src/algorithms/algorithms.include.h → source/algorithms/algorithms.include.h b/source/src/algorithms/algorithms.include.h → source/algorithms/algorithms.include.h
diff --git a/source/src/algorithms/algorithms.position.h → source/algorithms/algorithms.position.h b/source/src/algorithms/algorithms.position.h → source/algorithms/algorithms.position.h
diff --git a/...algorithms/algorithms.position.inertial.h → ...algorithms/algorithms.position.inertial.h b/...algorithms/algorithms.position.inertial.h → ...algorithms/algorithms.position.inertial.h
diff --git a/...algorithms/algorithms.position.keymatch.h → ...algorithms/algorithms.position.keymatch.h b/...algorithms/algorithms.position.keymatch.h → ...algorithms/algorithms.position.keymatch.h
diff --git a/source/src/algorithms/algorithms.rotation.h → source/algorithms/algorithms.rotation.h b/source/src/algorithms/algorithms.rotation.h → source/algorithms/algorithms.rotation.h
diff --git a/...c/algorithms/algorithms.visual.odometer.h → ...e/algorithms/algorithms.visual.odometer.h b/...c/algorithms/algorithms.visual.odometer.h → ...e/algorithms/algorithms.visual.odometer.h
diff --git a/source/src/capture/Capture.cpp → source/capture/Capture.cpp b/source/src/capture/Capture.cpp → source/capture/Capture.cpp
diff --git a/source/src/capture/Capture.h → source/capture/Capture.h b/source/src/capture/Capture.h → source/capture/Capture.h
diff --git a/source/src/capture/bitblt/Bitblt.cpp → source/capture/bitblt/Bitblt.cpp b/source/src/capture/bitblt/Bitblt.cpp → source/capture/bitblt/Bitblt.cpp
diff --git a/source/src/capture/bitblt/Bitblt.h → source/capture/bitblt/Bitblt.h b/source/src/capture/bitblt/Bitblt.h → source/capture/bitblt/Bitblt.h
diff --git a/source/src/capture/dxgi/Dxgi.cpp → source/capture/dxgi/Dxgi.cpp b/source/src/capture/dxgi/Dxgi.cpp → source/capture/dxgi/Dxgi.cpp
diff --git a/source/src/capture/dxgi/Dxgi.h → source/capture/dxgi/Dxgi.h b/source/src/capture/dxgi/Dxgi.h → source/capture/dxgi/Dxgi.h
diff --git a/...rc/capture/dxgi/include/capture.interop.h → ...ce/capture/dxgi/include/capture.interop.h b/...rc/capture/dxgi/include/capture.interop.h → ...ce/capture/dxgi/include/capture.interop.h
diff --git a/...apture/dxgi/include/composition.interop.h → ...apture/dxgi/include/composition.interop.h b/...apture/dxgi/include/composition.interop.h → ...apture/dxgi/include/composition.interop.h
diff --git a/source/src/capture/dxgi/include/d3dHelpers.h → source/capture/dxgi/include/d3dHelpers.h b/source/src/capture/dxgi/include/d3dHelpers.h → source/capture/dxgi/include/d3dHelpers.h
diff --git a/...capture/dxgi/include/direct3d11.interop.h → ...capture/dxgi/include/direct3d11.interop.h b/...capture/dxgi/include/direct3d11.interop.h → ...capture/dxgi/include/direct3d11.interop.h
diff --git a/source/src/capture/video/video.cpp → source/capture/video/video.cpp b/source/src/capture/video/video.cpp → source/capture/video/video.cpp
diff --git a/source/src/capture/video/video.h → source/capture/video/video.h b/source/src/capture/video/video.h → source/capture/video/video.h
diff --git a/source/src/cvAutoTrack.cpp → source/cvAutoTrack.cpp b/source/src/cvAutoTrack.cpp → source/cvAutoTrack.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "pch.h"
-#include "cvAutoTrack.h"
+#include <cvAutoTrack.h>
 #include "ErrorCode.h"
 #include "AutoTrack.h"
 #include <atomic>
@@ -12,119 +12,121 @@
 	return at_func
 #define UNINIT_RETURN()\
     if(_inited.load()==false) return false;
+
+static AutoTrack _at;
 static std::atomic<bool> _inited = true;
 
 bool __stdcall InitResource()
 {
-    INSTALL_DUMP(AutoTrack::Instance().init());
+    INSTALL_DUMP(_at.init());
     _inited = true;
 }
 bool __stdcall UnInitResource()
 {
-    INSTALL_DUMP(AutoTrack::Instance().uninit());
+    INSTALL_DUMP(_at.uninit());
 }
 bool __stdcall SetUseBitbltCaptureMode()
 {
-    INSTALL_DUMP(AutoTrack::Instance().SetUseBitbltCaptureMode());
+    INSTALL_DUMP(_at.SetUseBitbltCaptureMode());
 }
 bool __stdcall SetUseGraphicsCaptureMode()
 {
-    INSTALL_DUMP(AutoTrack::Instance().SetUseDx11CaptureMode());
+    INSTALL_DUMP(_at.SetUseDx11CaptureMode());
 }
 bool __stdcall SetHandle(long long int handle = 0)
 {
-    INSTALL_DUMP(AutoTrack::Instance().SetHandle(handle));
+    INSTALL_DUMP(_at.SetHandle(handle));
 }
 bool __stdcall SetWorldCenter(double x, double y)
 {
-    INSTALL_DUMP(AutoTrack::Instance().SetWorldCenter(x, y));
+    INSTALL_DUMP(_at.SetWorldCenter(x, y));
 }
 bool __stdcall SetWorldScale(double scale)
 {
-    INSTALL_DUMP(AutoTrack::Instance().SetWorldScale(scale));
+    INSTALL_DUMP(_at.SetWorldScale(scale));
 }
 bool __stdcall ImportMapBlock(int id_x, int id_y, const char* image_data, int image_data_size, int image_width, int image_height)
 {
-    INSTALL_DUMP(AutoTrack::Instance().ImportMapBlock(id_x, id_y, image_data, image_data_size, image_width, image_height));
+    INSTALL_DUMP(_at.ImportMapBlock(id_x, id_y, image_data, image_data_size, image_width, image_height));
 }
 bool __stdcall ImportMapBlockCenter(int x, int y)
 {
-    INSTALL_DUMP(AutoTrack::Instance().ImportMapBlockCenter(x, y));
+    INSTALL_DUMP(_at.ImportMapBlockCenter(x, y));
 }
 bool __stdcall ImportMapBlockCenterScale(int x, int y, double scale)
 {
-    INSTALL_DUMP(AutoTrack::Instance().ImportMapBlockCenterScale(x, y, scale));
+    INSTALL_DUMP(_at.ImportMapBlockCenterScale(x, y, scale));
 }
 bool __stdcall GetTransformOfMap(double& x, double& y, double& a, int& mapId)
 {
     UNINIT_RETURN();
-    INSTALL_DUMP(AutoTrack::Instance().GetTransformOfMap(x, y, a, mapId));
+    INSTALL_DUMP(_at.GetTransformOfMap(x, y, a, mapId));
 }
 bool __stdcall GetPositionOfMap(double& x, double& y, int& mapId)
 {
     UNINIT_RETURN();
-    INSTALL_DUMP(AutoTrack::Instance().GetPositionOfMap(x, y, mapId));
+    INSTALL_DUMP(_at.GetPositionOfMap(x, y, mapId));
 }
 bool __stdcall GetDirection(double& a)
 {
     UNINIT_RETURN();
-    INSTALL_DUMP(AutoTrack::Instance().GetDirection(a));
+    INSTALL_DUMP(_at.GetDirection(a));
 }
 bool __stdcall GetRotation(double& a)
 {
     UNINIT_RETURN();
-    INSTALL_DUMP(AutoTrack::Instance().GetRotation(a));
+    INSTALL_DUMP(_at.GetRotation(a));
 }
 bool __stdcall GetStar(double& x, double& y, bool& isEnd)
 {
     UNINIT_RETURN();
-    INSTALL_DUMP(AutoTrack::Instance().GetStar(x, y, isEnd));
+    INSTALL_DUMP(_at.GetStar(x, y, isEnd));
 }
 bool __stdcall GetStarJson(char* json_buff, int buff_size)
 {
     UNINIT_RETURN();
-    INSTALL_DUMP(AutoTrack::Instance().GetStarJson(json_buff));
+    INSTALL_DUMP(_at.GetStarJson(json_buff));
 }
 bool __stdcall GetUID(int& uid)
 {
     UNINIT_RETURN();
-    INSTALL_DUMP(AutoTrack::Instance().GetUID(uid));
+    INSTALL_DUMP(_at.GetUID(uid));
 }
 bool __stdcall GetAllInfo(double& x, double& y, int& mapId, double& a, double& r, int& uid)
 {
     UNINIT_RETURN();
-    INSTALL_DUMP(AutoTrack::Instance().GetAllInfo(x, y, mapId, a, r, uid));
-    return AutoTrack::Instance().GetAllInfo(x, y, mapId, a, r, uid);
+    INSTALL_DUMP(_at.GetAllInfo(x, y, mapId, a, r, uid));
+    return _at.GetAllInfo(x, y, mapId, a, r, uid);
 }
 bool __stdcall GetInfoLoadPicture(const char* path, int& uid, double& x, double& y, double& a)
 {
     UNINIT_RETURN();
-    INSTALL_DUMP(AutoTrack::Instance().GetInfoLoadPicture(path, uid, x, y, a));
+    INSTALL_DUMP(_at.GetInfoLoadPicture(path, uid, x, y, a));
 }
 bool __stdcall GetInfoLoadVideo(const char* path, const char* out_path)
 {
     UNINIT_RETURN();
-    INSTALL_DUMP(AutoTrack::Instance().GetInfoLoadVideo(path, out_path));
+    INSTALL_DUMP(_at.GetInfoLoadVideo(path, out_path));
 }
 int __stdcall GetLastErr()
 {
-    INSTALL_DUMP(AutoTrack::Instance().GetLastError());
+    INSTALL_DUMP(_at.GetLastError());
 }
 int __stdcall GetLastErrMsg(char* msg_buff, int buff_size)
 {
-    INSTALL_DUMP(AutoTrack::Instance().GetLastErrMsg(msg_buff, buff_size));
+    INSTALL_DUMP(_at.GetLastErrMsg(msg_buff, buff_size));
 }
 int __stdcall GetLastErrJson(char* json_buff, int buff_size)
 {
-    INSTALL_DUMP(AutoTrack::Instance().GetLastErrJson(json_buff, buff_size));
+    INSTALL_DUMP(_at.GetLastErrJson(json_buff, buff_size));
 }
 bool __stdcall SetDisableFileLog()
 {
-    INSTALL_DUMP(AutoTrack::Instance().SetDisableFileLog());
+    INSTALL_DUMP(_at.SetDisableFileLog());
 }
 bool __stdcall SetEnableFileLog()
 {
-    INSTALL_DUMP(AutoTrack::Instance().SetEnableFileLog());
+    INSTALL_DUMP(_at.SetEnableFileLog());
 }
 
 #include "Ver.h"
@@ -138,21 +140,21 @@ bool __stdcall GetCompileTime(char* time_buff, int buff_size)
 }
 bool __stdcall GetMapIsEmbedded()
 {
-    INSTALL_DUMP(AutoTrack::Instance().GetMapIsEmbedded());
+    INSTALL_DUMP(_at.GetMapIsEmbedded());
 }
 bool __stdcall DebugCapture()
 {
-    INSTALL_DUMP(AutoTrack::Instance().DebugCapture());
+    INSTALL_DUMP(_at.DebugCapture());
 }
 bool __stdcall DebugCapturePath(const char* path_buff, int buff_size)
 {
-    INSTALL_DUMP(AutoTrack::Instance().DebugCapturePath(path_buff, buff_size));
+    INSTALL_DUMP(_at.DebugCapturePath(path_buff, buff_size));
 }
 bool __stdcall startServe()
 {
-    INSTALL_DUMP(AutoTrack::Instance().startServe());
+    INSTALL_DUMP(_at.startServe());
 }
 bool __stdcall stopServe()
 {
-    INSTALL_DUMP(AutoTrack::Instance().stopServe());
+    INSTALL_DUMP(_at.stopServe());
 }
diff --git a/source/src/dllmain.cpp → source/dllmain.cpp b/source/src/dllmain.cpp → source/dllmain.cpp
diff --git a/source/src/filter/Filter.cpp → source/filter/Filter.cpp b/source/src/filter/Filter.cpp → source/filter/Filter.cpp
diff --git a/source/src/filter/Filter.h → source/filter/Filter.h b/source/src/filter/Filter.h → source/filter/Filter.h
diff --git a/source/src/filter/kalman/Kalman.cpp → source/filter/kalman/Kalman.cpp b/source/src/filter/kalman/Kalman.cpp → source/filter/kalman/Kalman.cpp
diff --git a/source/src/filter/kalman/Kalman.h → source/filter/kalman/Kalman.h b/source/src/filter/kalman/Kalman.h → source/filter/kalman/Kalman.h
diff --git a/source/src/filter/smooth/Smooth.cpp → source/filter/smooth/Smooth.cpp b/source/src/filter/smooth/Smooth.cpp → source/filter/smooth/Smooth.cpp
diff --git a/source/src/filter/smooth/Smooth.h → source/filter/smooth/Smooth.h b/source/src/filter/smooth/Smooth.h → source/filter/smooth/Smooth.h
diff --git a/source/src/filter/untouched/Untouched.cpp → source/filter/untouched/Untouched.cpp b/source/src/filter/untouched/Untouched.cpp → source/filter/untouched/Untouched.cpp
diff --git a/source/src/filter/untouched/Untouched.h → source/filter/untouched/Untouched.h b/source/src/filter/untouched/Untouched.h → source/filter/untouched/Untouched.h
diff --git a/...n/cailb/minimap/genshin.cailb.minimap.cpp → ...n/cailb/minimap/genshin.cailb.minimap.cpp b/...n/cailb/minimap/genshin.cailb.minimap.cpp → ...n/cailb/minimap/genshin.cailb.minimap.cpp
diff --git a/...hin/cailb/minimap/genshin.cailb.minimap.h → ...hin/cailb/minimap/genshin.cailb.minimap.h b/...hin/cailb/minimap/genshin.cailb.minimap.h → ...hin/cailb/minimap/genshin.cailb.minimap.h
diff --git a/...hin/check/paimon/genshin.check.paimon.cpp → ...hin/check/paimon/genshin.check.paimon.cpp b/...hin/check/paimon/genshin.check.paimon.cpp → ...hin/check/paimon/genshin.check.paimon.cpp
diff --git a/...nshin/check/paimon/genshin.check.paimon.h → ...nshin/check/paimon/genshin.check.paimon.h b/...nshin/check/paimon/genshin.check.paimon.h → ...nshin/check/paimon/genshin.check.paimon.h
diff --git a/source/src/genshin/genshin.h → source/genshin/genshin.h b/source/src/genshin/genshin.h → source/genshin/genshin.h
diff --git a/source/src/genshin/genshin.handle.cpp → source/genshin/genshin.handle.cpp b/source/src/genshin/genshin.handle.cpp → source/genshin/genshin.handle.cpp
diff --git a/source/src/genshin/genshin.handle.h → source/genshin/genshin.handle.h b/source/src/genshin/genshin.handle.h → source/genshin/genshin.handle.h
diff --git a/source/src/genshin/genshin.include.h → source/genshin/genshin.include.h b/source/src/genshin/genshin.include.h → source/genshin/genshin.include.h
diff --git a/source/src/genshin/genshin.screen.cpp → source/genshin/genshin.screen.cpp b/source/src/genshin/genshin.screen.cpp → source/genshin/genshin.screen.cpp
diff --git a/source/src/genshin/genshin.screen.h → source/genshin/genshin.screen.h b/source/src/genshin/genshin.screen.h → source/genshin/genshin.screen.h
diff --git a/...match/position/genshin.match.position.cpp → ...match/position/genshin.match.position.cpp b/...match/position/genshin.match.position.cpp → ...match/position/genshin.match.position.cpp
diff --git a/...n/match/position/genshin.match.position.h → ...n/match/position/genshin.match.position.h b/...n/match/position/genshin.match.position.h → ...n/match/position/genshin.match.position.h
diff --git a/source/src/match/diff/DiffMatch.cpp → source/match/diff/DiffMatch.cpp b/source/src/match/diff/DiffMatch.cpp → source/match/diff/DiffMatch.cpp
diff --git a/source/src/match/diff/DiffMatch.h → source/match/diff/DiffMatch.h b/source/src/match/diff/DiffMatch.h → source/match/diff/DiffMatch.h
diff --git a/source/src/match/match.include.h → source/match/match.include.h b/source/src/match/match.include.h → source/match/match.include.h
diff --git a/source/src/match/match.star.h → source/match/match.star.h b/source/src/match/match.star.h → source/match/match.star.h
diff --git a/source/src/match/match.uid.h → source/match/match.uid.h b/source/src/match/match.uid.h → source/match/match.uid.h
diff --git a/source/src/match/surf/SurfMatch.cpp → source/match/surf/SurfMatch.cpp b/source/src/match/surf/SurfMatch.cpp → source/match/surf/SurfMatch.cpp
diff --git a/source/src/match/surf/SurfMatch.h → source/match/surf/SurfMatch.h b/source/src/match/surf/SurfMatch.h → source/match/surf/SurfMatch.h
diff --git a/source/src/match/type/MatchType.h → source/match/type/MatchType.h b/source/src/match/type/MatchType.h → source/match/type/MatchType.h
diff --git a/source/src/pch.cpp → source/pch.cpp b/source/src/pch.cpp → source/pch.cpp
diff --git a/source/src/pch.h → source/pch.h b/source/src/pch.h → source/pch.h
diff --git a/source/resource/version.ver b/source/resource/version.ver
@@ -1 +1 @@
-8.0.45
+8.1.0
diff --git a/source/resource/version_hash.hash b/source/resource/version_hash.hash
@@ -1 +1 @@
-4b629b2
+69cf4d5
diff --git a/source/src/resources/Resources.cpp → source/resources/Resources.cpp b/source/src/resources/Resources.cpp → source/resources/Resources.cpp
diff --git a/source/src/resources/Resources.h → source/resources/Resources.h b/source/src/resources/Resources.h → source/resources/Resources.h
diff --git a/...mage/cailb/resources.binary.image.cailb.h → ...mage/cailb/resources.binary.image.cailb.h b/...mage/cailb/resources.binary.image.cailb.h → ...mage/cailb/resources.binary.image.cailb.h
diff --git a/...lb/resources.binary.image.minimap_cailb.h → ...lb/resources.binary.image.minimap_cailb.h b/...lb/resources.binary.image.minimap_cailb.h → ...lb/resources.binary.image.minimap_cailb.h
diff --git a/...ge/paimon/resources.binary.image.paimon.h → ...ge/paimon/resources.binary.image.paimon.h b/...ge/paimon/resources.binary.image.paimon.h → ...ge/paimon/resources.binary.image.paimon.h
diff --git a/...ces/binary/image/resources.binary.image.h → ...ces/binary/image/resources.binary.image.h b/...ces/binary/image/resources.binary.image.h → ...ces/binary/image/resources.binary.image.h
diff --git a/.../image/star/resources.binary.image.star.h → .../image/star/resources.binary.image.star.h b/.../image/star/resources.binary.image.star.h → .../image/star/resources.binary.image.star.h
diff --git a/...y/image/uid/resources.binary.image.uid0.h → ...y/image/uid/resources.binary.image.uid0.h b/...y/image/uid/resources.binary.image.uid0.h → ...y/image/uid/resources.binary.image.uid0.h
diff --git a/...y/image/uid/resources.binary.image.uid1.h → ...y/image/uid/resources.binary.image.uid1.h b/...y/image/uid/resources.binary.image.uid1.h → ...y/image/uid/resources.binary.image.uid1.h
diff --git a/...y/image/uid/resources.binary.image.uid2.h → ...y/image/uid/resources.binary.image.uid2.h b/...y/image/uid/resources.binary.image.uid2.h → ...y/image/uid/resources.binary.image.uid2.h
diff --git a/...y/image/uid/resources.binary.image.uid3.h → ...y/image/uid/resources.binary.image.uid3.h b/...y/image/uid/resources.binary.image.uid3.h → ...y/image/uid/resources.binary.image.uid3.h
diff --git a/...y/image/uid/resources.binary.image.uid4.h → ...y/image/uid/resources.binary.image.uid4.h b/...y/image/uid/resources.binary.image.uid4.h → ...y/image/uid/resources.binary.image.uid4.h
diff --git a/...y/image/uid/resources.binary.image.uid5.h → ...y/image/uid/resources.binary.image.uid5.h b/...y/image/uid/resources.binary.image.uid5.h → ...y/image/uid/resources.binary.image.uid5.h
diff --git a/...y/image/uid/resources.binary.image.uid6.h → ...y/image/uid/resources.binary.image.uid6.h b/...y/image/uid/resources.binary.image.uid6.h → ...y/image/uid/resources.binary.image.uid6.h
diff --git a/...y/image/uid/resources.binary.image.uid7.h → ...y/image/uid/resources.binary.image.uid7.h b/...y/image/uid/resources.binary.image.uid7.h → ...y/image/uid/resources.binary.image.uid7.h
diff --git a/...y/image/uid/resources.binary.image.uid8.h → ...y/image/uid/resources.binary.image.uid8.h b/...y/image/uid/resources.binary.image.uid8.h → ...y/image/uid/resources.binary.image.uid8.h
diff --git a/...y/image/uid/resources.binary.image.uid9.h → ...y/image/uid/resources.binary.image.uid9.h b/...y/image/uid/resources.binary.image.uid9.h → ...y/image/uid/resources.binary.image.uid9.h
diff --git a/...y/image/uid/resources.binary.image.uid_.h → ...y/image/uid/resources.binary.image.uid_.h b/...y/image/uid/resources.binary.image.uid_.h → ...y/image/uid/resources.binary.image.uid_.h
diff --git a/.../src/resources/binary/image_to_binary.bat → source/resources/binary/image_to_binary.bat b/.../src/resources/binary/image_to_binary.bat → source/resources/binary/image_to_binary.bat
diff --git a/.../src/resources/binary/image_to_binary.ps1 → source/resources/binary/image_to_binary.ps1 b/.../src/resources/binary/image_to_binary.ps1 → source/resources/binary/image_to_binary.ps1
diff --git a/...src/resources/binary/resources.binary.cpp → source/resources/binary/resources.binary.cpp b/...src/resources/binary/resources.binary.cpp → source/resources/binary/resources.binary.cpp
diff --git a/...e/src/resources/binary/resources.binary.h → source/resources/binary/resources.binary.h b/...e/src/resources/binary/resources.binary.h → source/resources/binary/resources.binary.h
diff --git a/...src/resources/import/resources.import.cpp → source/resources/import/resources.import.cpp b/...src/resources/import/resources.import.cpp → source/resources/import/resources.import.cpp
diff --git a/...e/src/resources/import/resources.import.h → source/resources/import/resources.import.h b/...e/src/resources/import/resources.import.h → source/resources/import/resources.import.h
diff --git a/source/src/resources/resources.load.cpp → source/resources/resources.load.cpp b/source/src/resources/resources.load.cpp → source/resources/resources.load.cpp
diff --git a/source/src/resources/resources.load.h → source/resources/resources.load.h b/source/src/resources/resources.load.h → source/resources/resources.load.h
diff --git a/source/src/resources/trackCache.h → source/resources/trackCache.h b/source/src/resources/trackCache.h → source/resources/trackCache.h
diff --git a/source/src/utils/Logger.cpp → source/utils/Logger.cpp b/source/src/utils/Logger.cpp → source/utils/Logger.cpp
diff --git a/source/src/utils/Logger.h → source/utils/Logger.h b/source/src/utils/Logger.h → source/utils/Logger.h
diff --git a/source/src/utils/Utils.cpp → source/utils/Utils.cpp b/source/src/utils/Utils.cpp → source/utils/Utils.cpp
diff --git a/source/src/utils/Utils.h → source/utils/Utils.h b/source/src/utils/Utils.h → source/utils/Utils.h
diff --git a/source/src/utils/convect.string.h → source/utils/convect.string.h b/source/src/utils/convect.string.h → source/utils/convect.string.h
diff --git a/source/src/version/GetNextBuildVersion.ps1 → source/version/GetNextBuildVersion.ps1 b/source/src/version/GetNextBuildVersion.ps1 → source/version/GetNextBuildVersion.ps1
diff --git a/source/src/version/Version.h → source/version/Version.h b/source/src/version/Version.h → source/version/Version.h
diff --git a/source/src/version/build_version_before.bat → source/version/build_version_before.bat b/source/src/version/build_version_before.bat → source/version/build_version_before.bat
diff --git a/source/src/version/version.branch → source/version/version.branch b/source/src/version/version.branch → source/version/version.branch
diff --git a/source/src/version/version_next.number → source/version/version_next.number b/source/src/version/version_next.number → source/version/version_next.number
diff --git a/source/src/version/version_tag.tag → source/version/version_tag.tag b/source/src/version/version_tag.tag → source/version/version_tag.tag
diff --git a/tests/api_GetCompileVersion/CMakeLists.txt b/tests/api_GetCompileVersion/CMakeLists.txt
@@ -1,6 +1,7 @@
 get_filename_component(dir_name ${CMAKE_CURRENT_SOURCE_DIR} NAME)
 set(test_name test_${dir_name})
 add_executable(${test_name} main.cpp)
+include_directories(${IncludeDir})
 set_property(TARGET ${test_name} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 set_target_properties(${test_name} PROPERTIES FOLDER "tests")
 target_link_libraries(${test_name} cvAutoTrack)

diff --git a/tests/api_GetCompileVersion/main.cpp b/tests/api_GetCompileVersion/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 //#include <gtest/gtest.h>
 #include <opencv2/opencv.hpp>
-#include "../../../source/include/cvAutoTrack.h"
+#include <cvAutoTrack.h>
 
 
 int main()

diff --git a/tests/impl_cpp/CMakeLists.txt b/tests/impl_cpp/CMakeLists.txt
@@ -1,6 +1,7 @@
 get_filename_component(dir_name ${CMAKE_CURRENT_SOURCE_DIR} NAME)
 set(test_name test_${dir_name})
 add_executable(${test_name} main.cpp)
+include_directories(${IncludeDir})
 set_property(TARGET ${test_name} PROPERTY  MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 set_target_properties(${test_name} PROPERTIES FOLDER "tests")
 target_link_libraries(${test_name} ${OpenCV_LIBS} cvAutoTrack fmt::fmt-header-only)

diff --git a/tests/impl_cpp/main.cpp b/tests/impl_cpp/main.cpp
@@ -1,6 +1,5 @@
 #include <iostream>
-// #include <cvAutoTrack.h>
-#include "../../../source/include/cvAutoTrack.h"
+#include <cvAutoTrack.h>
 #include <fmt/format.h>
 #include <Windows.h>
 #include <vector>