add PresentMon 2 support

BoringBoredom · Apr 8, 2024 · 9c48ee0 · 9c48ee0
1 parent 7c608e4
commit 9c48ee0
Show file tree

Hide file tree

Showing 6 changed files with 144 additions and 97 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/presentmon/Run.bat b/presentmon/Run.bat
@@ -1,3 +1,3 @@
 pushd %~dp0
 cd captures
-..\presentmon.exe -multi_csv -no_top -hotkey "f10"
+..\presentmon.exe --multi_csv --no_console_stats --hotkey "F10"
diff --git a/presentmon/version b/presentmon/version
@@ -1 +1 @@
-1.10.0
+2.0.1
diff --git a/src/components/Misc/Misc.tsx b/src/components/Misc/Misc.tsx
@@ -16,7 +16,11 @@ import { sortOptions } from "../static";
 async function aggregate(files: File[], resetRef: React.RefObject<() => void>) {
   let first = true;
   let content = "";
-  let indicator: "frametime" | "msbetweenpresents";
+  let indicator:
+    | "frametime"
+    | "msbetweenpresents"
+    | "cpubusy"
+    | "render latency(msec)";
 
   for (const file of files) {
     const text = await file.text();
@@ -35,6 +39,16 @@ async function aggregate(files: File[], resetRef: React.RefObject<() => void>) {
           indicator = "msbetweenpresents";
           break;
         }
+
+        if (lowerCaseLine.includes("cpubusy")) {
+          indicator = "cpubusy";
+          break;
+        }
+
+        if (lowerCaseLine.includes("render latency(msec)")) {
+          indicator = "render latency(msec)";
+          break;
+        }
       }
 
       content += text;

diff --git a/src/components/ReadMe/ReadMe.tsx b/src/components/ReadMe/ReadMe.tsx
@@ -131,15 +131,16 @@ export default function ReadMe() {
                   className={s.cursor}
                   onClick={() => {
                     void navigator.clipboard.writeText(
-                      `pushd %~dp0\ncd captures\n..\\presentmon.exe -multi_csv -no_top -hotkey "f10"`
+                      `pushd %~dp0\ncd captures\n..\\presentmon.exe --multi_csv --no_console_stats --hotkey "F10"`
                     );
                   }}
                 >
                   pushd %~dp0
                   <br />
                   cd captures
                   <br />
-                  ..\presentmon.exe -multi_csv -no_top -hotkey &quot;f10&quot;
+                  ..\presentmon.exe --multi_csv --no_console_stats --hotkey
+                  &quot;F10&quot;
                 </Code>
               </Tooltip>
               <Text>