build and simulator fixes

Author: NanoCodeBug

simulator/main.cpp

@@ -52,7 +52,14 @@ uint32_t ticksForNextKeyDown = 0;
 
 bool handle_events()
 {
-    loop();
+    if (sleepMillisRemain > 0)
+    {
+        sleepMillisRemain--;
+    }
+    else
+    {
+        loop();
+    }
 
     SDL_Event event;
     SDL_PollEvent(&event);
@@ -94,14 +101,15 @@ bool handle_events()
                 break;
             case SDLK_v:
                 keysState |= 0x8;
+                sleepMillisRemain = 0;
                 break;
             }
 
         }
     }
 
     redraw();
-    SDL_Delay(k_30_fpsSleepMs);
+    SDL_Delay(1);
     return true;
 }
 

simulator/pawos.cpp

@@ -3,6 +3,8 @@
 
 #include <chrono>
 
+int32_t sleepMillisRemain = 0;
+
 PetDisplay display(nullptr, 0, DISP_WIDTH, DISP_HEIGHT);
 
 // used by usb and button interrupts to keep the device awake when in use
@@ -98,19 +100,13 @@ void loop(void)
         g::g_keyReleased = prevKeysState & ~(keysState);
         g::g_keyHeld = prevKeysState & keysState;
 
-        uint32_t t1 = millis();
         GameState *nextState = currentState->update();
-        uint32_t d1 = millis() - t1;
-        peakUpdateTime = (d1 > peakUpdateTime) ? d1 : peakUpdateTime;
 
         if (nextState != currentState)
         {
             delete currentState;
             currentState = nextState;
 
-            peakDrawTime = 0;
-            peakUpdateTime = 0;
-
             switch (nextState->tick)
             {
             case k_tickTime30:
@@ -130,7 +126,6 @@ void loop(void)
             intBat = Util::batteryLevel();
         }
 
-        t1 = millis();
         if (currentState->redraw)
         {
             display.fillDisplayBuffer();
@@ -152,8 +147,6 @@ void loop(void)
             {
                 dirtyFrameBuffer = false;
 
-                d1 = millis() - t1;
-                peakDrawTime = (d1 > peakDrawTime) ? d1 : peakDrawTime;
                 display.refresh();
             }
         }

simulator/pawos.h

@@ -11,12 +11,15 @@
 #include <../../src/global.h>
 #include <../../src/states/gamestate.h>
 
+#include <SDL.h>
+#include <SDL_rect.h>
 
 void init();
 void loop(void);
 
 extern PetDisplay display;
 extern uint8_t keysState;
+extern int32_t sleepMillisRemain;
 
 class WatchdogSAMD {
 public:
@@ -36,7 +39,9 @@ class WatchdogSAMD {
     WATCHDOG_TIMER_128_S = 0xB
   };
 
-  void sleep(WatchdogSAMD::PawPet_WatchDog_Times m) {}
+  void sleep(WatchdogSAMD::PawPet_WatchDog_Times m) {
+        sleepMillisRemain = 64000;
+  }
 };
 
 #endif

tools/win/build.ps1

@@ -12,7 +12,9 @@ $projectRoot="$PSScriptRoot\..\.."
 $projectTools="$PSScriptRoot\..\..\tools"
 
 $cmakePath = 'C:\Program` Files\CMake\bin\cmake.exe'
-$emsdkPath = "C:\Users\nano\dev\emsdk"
+
+$ninjaPath = "$env:USERPROFILE\dev\ninja.exe"
+$emsdkPath = "$env:USERPROFILE\emsdk"
 
 $buildargs = @()
 
@@ -88,7 +90,7 @@ if ($webSimulator)
     $Env:SDL2_DIR="$projectRoot\simulator\SDL2"
 
     Invoke-Expression "$cmakePath $cmakeArgs"
-    Invoke-Expression "ninja.exe -C $buildFolder\html"
+    Invoke-Expression "$ninjaPath -C $buildFolder\html"
 }
 
 if ($simulator)
@@ -101,7 +103,7 @@ if ($simulator)
     New-Item -Path "$buildFolder\win32" -ItemType Directory -Force -ErrorAction Ignore
 
     $msvc = & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -property installationpath -version 16.0
-    
+    Write-Host $msvc
     Import-Module (Join-Path $msvc "Common7\Tools\Microsoft.VisualStudio.DevShell.dll")
 
     Enter-VsDevShell -VsInstallPath $msvc -SkipAutomaticLocation -DevCmdArguments '-arch=x64 -no_logo'
@@ -117,7 +119,7 @@ if ($simulator)
 
     # Start-Process -FilePath "$cmakePath" -ArgumentList $cmakeArgs -NoNewWindow -Wait
     Invoke-Expression "$cmakePath $cmakeArgs"
-    Invoke-Expression "ninja.exe -C $buildFolder\win32"
+    Invoke-Expression "$ninjaPath -C $buildFolder\win32"
 }