clean up repo

RaidcoreGG · Apr 4, 2024 · a5ae80e · a5ae80e
1 parent a8f38b0
commit a5ae80e
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 94 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,12 @@
-[submodule "mumble"]
-	path = mumble
-	url = https://github.com/RaidcoreGG/RCGG-lib-mumble-api/
-[submodule "nexus"]
-	path = nexus
+[submodule "src/nexus"]
+	path = src/nexus
 	url = https://github.com/RaidcoreGG/RCGG-lib-nexus-api
-[submodule "imgui"]
-	path = imgui
-	url = https://github.com/ocornut/imgui/
+[submodule "src/mumble"]
+	path = src/mumble
+	url = https://github.com/RaidcoreGG/RCGG-lib-mumble-api/
+[submodule "src/imgui"]
+	path = src/imgui
+	url = https://github.com/RaidcoreGG/imgui
+[submodule "Scripts"]
+	path = Scripts
+	url = https://github.com/RaidcoreGG/RCGG-Scripts
diff --git a/MouseLookHandler.vcxproj b/MouseLookHandler.vcxproj
@@ -45,11 +45,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)$(Platform)\</OutDir>
-    <IntDir>$(Platform)\</IntDir>
+    <IntDir>$(SolutionDir)$(Platform)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)$(Platform)\</OutDir>
-    <IntDir>$(Platform)\</IntDir>
+    <IntDir>$(SolutionDir)$(Platform)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -64,26 +64,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PreBuildEvent>
-      <Command>:: Check WMIC is available
-WMIC.EXE Alias /? &gt;NUL 2&gt;&amp;1 || GOTO s_error
-
-:: Use WMIC to retrieve date and time
-FOR /F "skip=1 tokens=1-6" %%G IN ('WMIC Path Win32_LocalTime Get Day^,Hour^,Minute^,Month^,Second^,Year /Format:table') DO (
-   IF "%%~L"=="" goto s_done
-      Set _yyyy=%%L
-      Set _mm=%%J
-      Set _dd=%%G
-      Set _hour=%%H
-      SET _minute=%%I
-)
-:s_done
-
-echo #pragma once &gt; Version.h
-echo #define V_MAJOR %_yyyy% &gt;&gt; Version.h
-echo #define V_MINOR %_mm% &gt;&gt; Version.h
-echo #define V_BUILD %_dd% &gt;&gt; Version.h
-SET /A var_res = %_hour% * 60 + %_minute%
-echo #define V_REVISION %var_res% &gt;&gt; Version.h</Command>
+      <Command>CALL $(SolutionDir)Scripts\remoteurl.bat
+CALL $(SolutionDir)Scripts\version.bat</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -103,50 +85,37 @@ echo #define V_REVISION %var_res% &gt;&gt; Version.h</Command>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PreBuildEvent>
-      <Command>:: Check WMIC is available
-WMIC.EXE Alias /? &gt;NUL 2&gt;&amp;1 || GOTO s_error
-
-:: Use WMIC to retrieve date and time
-FOR /F "skip=1 tokens=1-6" %%G IN ('WMIC Path Win32_LocalTime Get Day^,Hour^,Minute^,Month^,Second^,Year /Format:table') DO (
-   IF "%%~L"=="" goto s_done
-      Set _yyyy=%%L
-      Set _mm=%%J
-      Set _dd=%%G
-      Set _hour=%%H
-      SET _minute=%%I
-)
-:s_done
-
-echo #pragma once &gt; Version.h
-echo #define V_MAJOR %_yyyy% &gt;&gt; Version.h
-echo #define V_MINOR %_mm% &gt;&gt; Version.h
-echo #define V_BUILD %_dd% &gt;&gt; Version.h
-SET /A var_res = %_hour% * 60 + %_minute%
-echo #define V_REVISION %var_res% &gt;&gt; Version.h</Command>
+      <Command>CALL $(SolutionDir)Scripts\remoteurl.bat
+CALL $(SolutionDir)Scripts\version.bat</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="imgui\imconfig.h" />
-    <ClInclude Include="imgui\imgui.h" />
-    <ClInclude Include="imgui\imgui_internal.h" />
-    <ClInclude Include="imgui\imstb_rectpack.h" />
-    <ClInclude Include="imgui\imstb_textedit.h" />
-    <ClInclude Include="imgui\imstb_truetype.h" />
-    <ClInclude Include="mumble\Mumble.h" />
-    <ClInclude Include="nexus\Nexus.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="Version.h" />
+    <ClInclude Include="src\imgui\imconfig.h" />
+    <ClInclude Include="src\imgui\imgui.h" />
+    <ClInclude Include="src\imgui\imgui_internal.h" />
+    <ClInclude Include="src\imgui\imstb_rectpack.h" />
+    <ClInclude Include="src\imgui\imstb_textedit.h" />
+    <ClInclude Include="src\imgui\imstb_truetype.h" />
+    <ClInclude Include="src\mumble\Mumble.h" />
+    <ClInclude Include="src\nexus\Nexus.h" />
+    <ClInclude Include="src\nlohmann\json.hpp" />
+    <ClInclude Include="src\Remote.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\Version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="entry.cpp" />
-    <ClCompile Include="imgui\imgui.cpp" />
-    <ClCompile Include="imgui\imgui_demo.cpp" />
-    <ClCompile Include="imgui\imgui_draw.cpp" />
-    <ClCompile Include="imgui\imgui_tables.cpp" />
-    <ClCompile Include="imgui\imgui_widgets.cpp" />
+    <ClCompile Include="src\entry.cpp" />
+    <ClCompile Include="src\imgui\imgui.cpp" />
+    <ClCompile Include="src\imgui\imgui_demo.cpp" />
+    <ClCompile Include="src\imgui\imgui_draw.cpp" />
+    <ClCompile Include="src\imgui\imgui_tables.cpp" />
+    <ClCompile Include="src\imgui\imgui_widgets.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="MouseLookHandler.rc" />
+    <ResourceCompile Include="src\MouseLookHandler.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="src\imgui\LICENSE.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/MouseLookHandler.vcxproj.filters b/MouseLookHandler.vcxproj.filters
@@ -18,60 +18,71 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="nexus\Nexus.h">
+    <ClInclude Include="src\Version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="mumble\Mumble.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="imgui\imconfig.h">
+    <ClInclude Include="src\Remote.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\imgui\imconfig.h">
       <Filter>imgui</Filter>
     </ClInclude>
-    <ClInclude Include="imgui\imgui.h">
+    <ClInclude Include="src\imgui\imgui.h">
       <Filter>imgui</Filter>
     </ClInclude>
-    <ClInclude Include="imgui\imgui_internal.h">
+    <ClInclude Include="src\imgui\imgui_internal.h">
       <Filter>imgui</Filter>
     </ClInclude>
-    <ClInclude Include="imgui\imstb_rectpack.h">
+    <ClInclude Include="src\imgui\imstb_rectpack.h">
       <Filter>imgui</Filter>
     </ClInclude>
-    <ClInclude Include="imgui\imstb_textedit.h">
+    <ClInclude Include="src\imgui\imstb_textedit.h">
       <Filter>imgui</Filter>
     </ClInclude>
-    <ClInclude Include="imgui\imstb_truetype.h">
+    <ClInclude Include="src\imgui\imstb_truetype.h">
       <Filter>imgui</Filter>
     </ClInclude>
-    <ClInclude Include="Version.h">
+    <ClInclude Include="src\mumble\Mumble.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\nexus\Nexus.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\nlohmann\json.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="imgui\imgui.cpp">
-      <Filter>imgui</Filter>
+    <ClCompile Include="src\entry.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="imgui\imgui_demo.cpp">
+    <ClCompile Include="src\imgui\imgui.cpp">
       <Filter>imgui</Filter>
     </ClCompile>
-    <ClCompile Include="imgui\imgui_draw.cpp">
+    <ClCompile Include="src\imgui\imgui_demo.cpp">
       <Filter>imgui</Filter>
     </ClCompile>
-    <ClCompile Include="imgui\imgui_tables.cpp">
+    <ClCompile Include="src\imgui\imgui_draw.cpp">
       <Filter>imgui</Filter>
     </ClCompile>
-    <ClCompile Include="imgui\imgui_widgets.cpp">
+    <ClCompile Include="src\imgui\imgui_tables.cpp">
       <Filter>imgui</Filter>
     </ClCompile>
-    <ClCompile Include="entry.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="src\imgui\imgui_widgets.cpp">
+      <Filter>imgui</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="MouseLookHandler.rc">
+    <ResourceCompile Include="src\MouseLookHandler.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="src\imgui\LICENSE.txt">
+      <Filter>imgui</Filter>
+    </Text>
+  </ItemGroup>
 </Project>
diff --git a/nexus b/nexus
diff --git a/MouseLookHandler.rc → src/MouseLookHandler.rc b/MouseLookHandler.rc → src/MouseLookHandler.rc
diff --git a/src/Remote.h b/src/Remote.h
@@ -0,0 +1,2 @@
+#pragma once 
+#define REMOTE_URL "https://github.com/RaidcoreGG/MouseLookHandler" 
diff --git a/entry.cpp → src/entry.cpp b/entry.cpp → src/entry.cpp
@@ -7,6 +7,7 @@
 #include "mumble/Mumble.h"
 #include "imgui/imgui.h"
 
+#include "Remote.h"
 #include "Version.h"
 
 #include "nlohmann/json.hpp"
@@ -264,15 +265,15 @@ extern "C" __declspec(dllexport) AddonDefinition* GetAddonDef()
 
 	/* not necessary if hosted on Raidcore, but shown anyway for the example also useful as a backup resource */
 	AddonDef.Provider = EUpdateProvider_GitHub;
-	AddonDef.UpdateLink = "https://github.com/RaidcoreGG/MouseLookHandler";
+	AddonDef.UpdateLink = REMOTE_URL;
 
 	return &AddonDef;
 }
 
 void AddonLoad(AddonAPI* aApi)
 {
 	APIDefs = aApi;
-	ImGui::SetCurrentContext(APIDefs->ImguiContext);
+	ImGui::SetCurrentContext((ImGuiContext*)APIDefs->ImguiContext);
 	ImGui::SetAllocatorFunctions((void* (*)(size_t, void*))APIDefs->ImguiMalloc, (void(*)(void*, void*))APIDefs->ImguiFree); // on imgui 1.80+
 
 	MumbleLink = (Mumble::Data*)APIDefs->GetResource("DL_MUMBLE_LINK");
@@ -312,10 +313,10 @@ void AddonLoad(AddonAPI* aApi)
 }
 void AddonUnload()
 {
-	APIDefs->UnregisterWndProc(AddonWndProc);
+	APIDefs->DeregisterWndProc(AddonWndProc);
 
-	APIDefs->UnregisterRender(AddonOptions);
-	APIDefs->UnregisterRender(AddonRender);
+	APIDefs->DeregisterRender(AddonOptions);
+	APIDefs->DeregisterRender(AddonRender);
 
 	MumbleLink = nullptr;
 	NexusLink = nullptr;
@@ -791,8 +792,8 @@ void LoadSettings(std::filesystem::path aPath)
 		}
 		catch (json::parse_error& ex)
 		{
-			APIDefs->Log(ELogLevel_WARNING, "MouseLookHandler: Settings.json could not be parsed.");
-			APIDefs->Log(ELogLevel_WARNING, ex.what());
+			APIDefs->Log(ELogLevel_WARNING, "MouseLookHandler", "Settings.json could not be parsed.");
+			APIDefs->Log(ELogLevel_WARNING, "MouseLookHandler", ex.what());
 		}
 	}
 	Mutex.unlock();

diff --git a/imgui → src/imgui b/imgui → src/imgui
diff --git a/mumble → src/mumble b/mumble → src/mumble
diff --git a/src/nexus b/src/nexus
diff --git a/nlohmann/json.hpp → src/nlohmann/json.hpp b/nlohmann/json.hpp → src/nlohmann/json.hpp
diff --git a/resource.h → src/resource.h b/resource.h → src/resource.h
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#pragma once
		#define REMOTE_URL "https://github.com/RaidcoreGG/MouseLookHandler"