language updates, dev-console polishing, internal time format cleanup

efroemling · Oct 28, 2023 · d35f479 · d35f479
1 parent 1115983
commit d35f479
Show file tree

Hide file tree

Showing 27 changed files with 293 additions and 189 deletions.
diff --git a/.efrocachemap b/.efrocachemap
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 1.7.28 (build 21528, api 8, 2023-10-27)
+### 1.7.28 (build 21531, api 8, 2023-10-27)
 
 - Massively cleaned up code related to rendering and window systems (OpenGL,
   SDL, etc). This code had been growing into a nasty tangle for 15 years
@@ -192,6 +192,16 @@
   technical users can still fix and restore their old configs. Note that the app
   still also writes .prev configs for extra security, though it no longer uses
   them for anything itself.
+- Converted more internal engine time values from milliseconds to microseconds,
+  including things like the internal EventLoop timeline. Please holler if you
+  notice anything running 1000x too fast or slow. In general my strategy going
+  forward is to use microseconds for exact internal time values but to mostly
+  expose float seconds to the user on the Python layer. There were starting to
+  be a few cases were integer milliseconds was not enough precision for internal
+  values. For instance, if we run with unclamped framerates and hit several
+  hundred FPS, milliseconds per frame would drop to 0 which could cause
+  problems. Note that scenev1 will be remaining on milliseconds internally for
+  compatibility reasons. Scenev2 should move to microseconds though.
 
 ### 1.7.27 (build 21282, api 8, 2023-08-30)
 

diff --git a/ballisticakit-cmake/CMakeLists.txt b/ballisticakit-cmake/CMakeLists.txt
@@ -441,6 +441,7 @@ set(BALLISTICA_SOURCES
   ${BA_SRC_ROOT}/ballistica/base/support/classic_soft.h
   ${BA_SRC_ROOT}/ballistica/base/support/context.cc
   ${BA_SRC_ROOT}/ballistica/base/support/context.h
+  ${BA_SRC_ROOT}/ballistica/base/support/display_timer.h
   ${BA_SRC_ROOT}/ballistica/base/support/huffman.cc
   ${BA_SRC_ROOT}/ballistica/base/support/huffman.h
   ${BA_SRC_ROOT}/ballistica/base/support/plus_soft.h

diff --git a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj
@@ -433,6 +433,7 @@
     <ClInclude Include="..\..\src\ballistica\base\support\classic_soft.h" />
     <ClCompile Include="..\..\src\ballistica\base\support\context.cc" />
     <ClInclude Include="..\..\src\ballistica\base\support\context.h" />
+    <ClInclude Include="..\..\src\ballistica\base\support\display_timer.h" />
     <ClCompile Include="..\..\src\ballistica\base\support\huffman.cc" />
     <ClInclude Include="..\..\src\ballistica\base\support\huffman.h" />
     <ClInclude Include="..\..\src\ballistica\base\support\plus_soft.h" />

diff --git a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj.filters b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj.filters
@@ -733,6 +733,9 @@
     <ClInclude Include="..\..\src\ballistica\base\support\context.h">
       <Filter>ballistica\base\support</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ballistica\base\support\display_timer.h">
+      <Filter>ballistica\base\support</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ballistica\base\support\huffman.cc">
       <Filter>ballistica\base\support</Filter>
     </ClCompile>

diff --git a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj
@@ -428,6 +428,7 @@
     <ClInclude Include="..\..\src\ballistica\base\support\classic_soft.h" />
     <ClCompile Include="..\..\src\ballistica\base\support\context.cc" />
     <ClInclude Include="..\..\src\ballistica\base\support\context.h" />
+    <ClInclude Include="..\..\src\ballistica\base\support\display_timer.h" />
     <ClCompile Include="..\..\src\ballistica\base\support\huffman.cc" />
     <ClInclude Include="..\..\src\ballistica\base\support\huffman.h" />
     <ClInclude Include="..\..\src\ballistica\base\support\plus_soft.h" />

diff --git a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj.filters b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj.filters
@@ -733,6 +733,9 @@
     <ClInclude Include="..\..\src\ballistica\base\support\context.h">
       <Filter>ballistica\base\support</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ballistica\base\support\display_timer.h">
+      <Filter>ballistica\base\support</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ballistica\base\support\huffman.cc">
       <Filter>ballistica\base\support</Filter>
     </ClCompile>

diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py
@@ -52,7 +52,7 @@
 
 # Build number and version of the ballistica binary we expect to be
 # using.
-TARGET_BALLISTICA_BUILD = 21528
+TARGET_BALLISTICA_BUILD = 21531
 TARGET_BALLISTICA_VERSION = '1.7.28'
 
 

diff --git a/src/ballistica/base/assets/assets_server.cc b/src/ballistica/base/assets/assets_server.cc
@@ -25,7 +25,7 @@ void AssetsServer::OnAppStartInThread() {
   // Ask our thread to give us periodic processing time (close to but
   // not *exactly* one second; try to avoid aliasing with similar updates).
   process_timer_ = event_loop()->NewTimer(
-      987, true, NewLambdaRunnable([this] { Process(); }).Get());
+      987 * 1000, true, NewLambdaRunnable([this] { Process(); }).Get());
 }
 
 void AssetsServer::PushPendingPreload(Object::Ref<Asset>* asset_ref_ptr) {
@@ -258,7 +258,7 @@ void AssetsServer::Process() {
   // we're writing a replay.. otherwise just sleep indefinitely.
   if (pending_preloads_.empty() && pending_preloads_audio_.empty()) {
     if (writing_replay_) {
-      process_timer_->SetLength(1000);
+      process_timer_->SetLength(1000 * 1000);
     } else {
       process_timer_->SetLength(-1);
     }

diff --git a/src/ballistica/base/audio/audio_server.cc b/src/ballistica/base/audio/audio_server.cc
@@ -32,9 +32,9 @@ LPALCDEVICEPAUSESOFT alcDevicePauseSOFT;
 LPALCDEVICERESUMESOFT alcDeviceResumeSOFT;
 #endif
 
-const int kAudioProcessIntervalNormal{500};
-const int kAudioProcessIntervalFade{50};
-const int kAudioProcessIntervalPendingLoad{1};
+const int kAudioProcessIntervalNormal{500 * 1000};
+const int kAudioProcessIntervalFade{50 * 1000};
+const int kAudioProcessIntervalPendingLoad{1 * 1000};
 
 #if BA_DEBUG_BUILD || BA_TEST_BUILD
 const bool kShowInUseSounds{};

diff --git a/src/ballistica/base/base.h b/src/ballistica/base/base.h
@@ -53,6 +53,7 @@ class ClassicSoftInterface;
 class CollisionMeshAsset;
 class CollisionCache;
 class DevConsole;
+class DisplayTimer;
 class Context;
 class ContextRef;
 class DataAsset;