- Added Task Event/Icon to Replay

BitCrackers · Feb 11, 2022 · 09291d8 · 09291d8
1 parent 1ed79c4
commit 09291d8
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 2 deletions.
diff --git a/AmongUsMenu.vcxproj b/AmongUsMenu.vcxproj
@@ -387,6 +387,7 @@
     <Image Include="resources\polus.png" />
     <Image Include="resources\report.png" />
     <Image Include="resources\the_skald.png" />
+    <Image Include="resources\tick.png" />
     <Image Include="resources\vent_in.png" />
     <Image Include="resources\vent_out.png" />
   </ItemGroup>

diff --git a/AmongUsMenu.vcxproj.filters b/AmongUsMenu.vcxproj.filters
@@ -486,6 +486,9 @@
     <Image Include="resources\report.png">
       <Filter>resources</Filter>
     </Image>
+    <Image Include="resources\tick.png">
+      <Filter>resources</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <None Include="framework\version.def">

diff --git a/gui/replay.cpp b/gui/replay.cpp
@@ -180,6 +180,22 @@ namespace Replay
 							ImVec2(0.0f, 1.0f),
 							ImVec2(1.0f, 0.0f));
 					}
+					else if (e->getType() == EVENT_TYPES::EVENT_TASK)
+					{
+						auto task_event = dynamic_cast<TaskCompletedEvent*>(e);
+						auto position = task_event->GetPosition();
+						IconTexture icon = icons.at(ICON_TYPES::TASK);
+						float mapX = maps[MapType].x_offset + (position.x - (icon.iconImage.imageWidth * icon.scale * 0.5f)) * maps[MapType].scale + winpos.x;
+						float mapY = maps[MapType].y_offset - (position.y - (icon.iconImage.imageHeight * icon.scale * 0.5f)) * maps[MapType].scale + winpos.y;
+						float mapXMax = maps[MapType].x_offset + (position.x + (icon.iconImage.imageWidth * icon.scale * 0.5f)) * maps[MapType].scale + winpos.x;
+						float mapYMax = maps[MapType].y_offset - (position.y + (icon.iconImage.imageHeight * icon.scale * 0.5f)) * maps[MapType].scale + winpos.y;
+
+						drawList->AddImage((void*)icon.iconImage.shaderResourceView,
+							ImVec2(mapX, mapY),
+							ImVec2(mapXMax, mapYMax),
+							ImVec2(0.0f, 1.0f),
+							ImVec2(1.0f, 0.0f));
+					}
 					else if (e->getType() == EVENT_TYPES::EVENT_REPORT || e->getType() == EVENT_TYPES::EVENT_MEETING)
 					{
 						auto report_event = dynamic_cast<ReportDeadBodyEvent*>(e);

diff --git a/hooks/DirectX.cpp b/hooks/DirectX.cpp
@@ -125,6 +125,7 @@ bool ImGuiInitialization(IDXGISwapChain* pSwapChain) {
         icons.insert({ ICON_TYPES::VENT_OUT, { D3D11Image(Resource(IDB_PNG6), pDevice), 0.02f }});
         icons.insert({ ICON_TYPES::KILL, { D3D11Image(Resource(IDB_PNG7), pDevice), 0.02f } });
         icons.insert({ ICON_TYPES::REPORT, { D3D11Image(Resource(IDB_PNG8), pDevice), 0.02f } });
+        icons.insert({ ICON_TYPES::TASK, { D3D11Image(Resource(IDB_PNG9), pDevice), 0.02f } });
 
         DirectX::hRenderSemaphore = CreateSemaphore(
             NULL,                                 // default security attributes

diff --git a/hooks/DirectX.h b/hooks/DirectX.h
@@ -9,7 +9,8 @@ enum ICON_TYPES {
 	VENT_IN,
 	VENT_OUT,
 	KILL,
-	REPORT
+	REPORT,
+	TASK
 };
 
 struct MapTexture {

diff --git a/resources/resource_data.h b/resources/resource_data.h
@@ -10,12 +10,13 @@
 #define IDB_PNG6                        106
 #define IDB_PNG7                        107
 #define IDB_PNG8                        108
+#define IDB_PNG9                        109
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        109
+#define _APS_NEXT_RESOURCE_VALUE        110
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1001
 #define _APS_NEXT_SYMED_VALUE           101

diff --git a/resources/resource_data.rc b/resources/resource_data.rc
@@ -66,6 +66,8 @@ IDB_PNG7                PNG                     "kill.png"
 
 IDB_PNG8                PNG                     "report.png"
 
+IDB_PNG9                PNG                     "tick.png"
+
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/resources/tick.png b/resources/tick.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,8 @@ enum ICON_TYPES { @@
     	VENT_IN,
     	VENT_OUT,
     	KILL,
-    	REPORT
+    	REPORT,
+    	TASK
     };
     struct MapTexture {
@@ Expand Down @@