cleaning up app-adapter

efroemling · Aug 22, 2023 · 26d5295 · 26d5295
1 parent bf94886
commit 26d5295
Show file tree

Hide file tree

Showing 71 changed files with 645 additions and 737 deletions.
diff --git a/.efrocachemap b/.efrocachemap
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 1.7.26 (build 21232, api 8, 2023-08-22)
+### 1.7.26 (build 21241, api 8, 2023-08-22)
 
 - Various general improvements to the pcommand (project command) system.
 - Modules containing pcommand functions are now named with an 's' - so
@@ -11,6 +11,11 @@
   that seem to be related to this, you can disable it by setting env var
   `BA_PCOMMANDBATCH_DISABLE=1`. See docs in `tools/efrotools/pcommandbatch.py`
   for more info.
+- Renamed the various `App` C++ classes to `AppAdapter` which better represents
+  their current intended role. They are not a general interface to app
+  functionality, but rather adapt the app to a particular paradigm or api (VR,
+  Headless, SDL GUI, etc.). Am trying to move any functionality out of those
+  classes that does not fit that definition.
 
 ### 1.7.25 (build 21211, api 8, 2023-08-03)
 

diff --git a/ballisticakit-cmake/CMakeLists.txt b/ballisticakit-cmake/CMakeLists.txt
@@ -203,14 +203,14 @@ endif ()
 set(BALLISTICA_SOURCES
   ${BA_SRC_ROOT}/external/qr_code_generator/QrCode.cpp
   # AUTOGENERATED_PUBLIC_BEGIN (this section is managed by the "update_project" tool)
-  ${BA_SRC_ROOT}/ballistica/base/app/app.cc
-  ${BA_SRC_ROOT}/ballistica/base/app/app.h
-  ${BA_SRC_ROOT}/ballistica/base/app/app_headless.cc
-  ${BA_SRC_ROOT}/ballistica/base/app/app_headless.h
-  ${BA_SRC_ROOT}/ballistica/base/app/app_sdl.cc
-  ${BA_SRC_ROOT}/ballistica/base/app/app_sdl.h
-  ${BA_SRC_ROOT}/ballistica/base/app/app_vr.cc
-  ${BA_SRC_ROOT}/ballistica/base/app/app_vr.h
+  ${BA_SRC_ROOT}/ballistica/base/app_adapter/app_adapter.cc
+  ${BA_SRC_ROOT}/ballistica/base/app_adapter/app_adapter.h
+  ${BA_SRC_ROOT}/ballistica/base/app_adapter/app_adapter_headless.cc
+  ${BA_SRC_ROOT}/ballistica/base/app_adapter/app_adapter_headless.h
+  ${BA_SRC_ROOT}/ballistica/base/app_adapter/app_adapter_sdl.cc
+  ${BA_SRC_ROOT}/ballistica/base/app_adapter/app_adapter_sdl.h
+  ${BA_SRC_ROOT}/ballistica/base/app_adapter/app_adapter_vr.cc
+  ${BA_SRC_ROOT}/ballistica/base/app_adapter/app_adapter_vr.h
   ${BA_SRC_ROOT}/ballistica/base/app_mode/app_mode.cc
   ${BA_SRC_ROOT}/ballistica/base/app_mode/app_mode.h
   ${BA_SRC_ROOT}/ballistica/base/app_mode/app_mode_empty.cc

diff --git a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj
@@ -189,14 +189,14 @@
     <None Include="BallisticaKit.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\ballistica\base\app\app.cc" />
-    <ClInclude Include="..\..\src\ballistica\base\app\app.h" />
-    <ClCompile Include="..\..\src\ballistica\base\app\app_headless.cc" />
-    <ClInclude Include="..\..\src\ballistica\base\app\app_headless.h" />
-    <ClCompile Include="..\..\src\ballistica\base\app\app_sdl.cc" />
-    <ClInclude Include="..\..\src\ballistica\base\app\app_sdl.h" />
-    <ClCompile Include="..\..\src\ballistica\base\app\app_vr.cc" />
-    <ClInclude Include="..\..\src\ballistica\base\app\app_vr.h" />
+    <ClCompile Include="..\..\src\ballistica\base\app_adapter\app_adapter.cc" />
+    <ClInclude Include="..\..\src\ballistica\base\app_adapter\app_adapter.h" />
+    <ClCompile Include="..\..\src\ballistica\base\app_adapter\app_adapter_headless.cc" />
+    <ClInclude Include="..\..\src\ballistica\base\app_adapter\app_adapter_headless.h" />
+    <ClCompile Include="..\..\src\ballistica\base\app_adapter\app_adapter_sdl.cc" />
+    <ClInclude Include="..\..\src\ballistica\base\app_adapter\app_adapter_sdl.h" />
+    <ClCompile Include="..\..\src\ballistica\base\app_adapter\app_adapter_vr.cc" />
+    <ClInclude Include="..\..\src\ballistica\base\app_adapter\app_adapter_vr.h" />
     <ClCompile Include="..\..\src\ballistica\base\app_mode\app_mode.cc" />
     <ClInclude Include="..\..\src\ballistica\base\app_mode\app_mode.h" />
     <ClCompile Include="..\..\src\ballistica\base\app_mode\app_mode_empty.cc" />

diff --git a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj.filters b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj.filters
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\src\ballistica\base\app\app.cc">
-      <Filter>ballistica\base\app</Filter>
+    <ClCompile Include="..\..\src\ballistica\base\app_adapter\app_adapter.cc">
+      <Filter>ballistica\base\app_adapter</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\src\ballistica\base\app\app.h">
-      <Filter>ballistica\base\app</Filter>
+    <ClInclude Include="..\..\src\ballistica\base\app_adapter\app_adapter.h">
+      <Filter>ballistica\base\app_adapter</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\ballistica\base\app\app_headless.cc">
-      <Filter>ballistica\base\app</Filter>
+    <ClCompile Include="..\..\src\ballistica\base\app_adapter\app_adapter_headless.cc">
+      <Filter>ballistica\base\app_adapter</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\src\ballistica\base\app\app_headless.h">
-      <Filter>ballistica\base\app</Filter>
+    <ClInclude Include="..\..\src\ballistica\base\app_adapter\app_adapter_headless.h">
+      <Filter>ballistica\base\app_adapter</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\ballistica\base\app\app_sdl.cc">
-      <Filter>ballistica\base\app</Filter>
+    <ClCompile Include="..\..\src\ballistica\base\app_adapter\app_adapter_sdl.cc">
+      <Filter>ballistica\base\app_adapter</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\src\ballistica\base\app\app_sdl.h">
-      <Filter>ballistica\base\app</Filter>
+    <ClInclude Include="..\..\src\ballistica\base\app_adapter\app_adapter_sdl.h">
+      <Filter>ballistica\base\app_adapter</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\ballistica\base\app\app_vr.cc">
-      <Filter>ballistica\base\app</Filter>
+    <ClCompile Include="..\..\src\ballistica\base\app_adapter\app_adapter_vr.cc">
+      <Filter>ballistica\base\app_adapter</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\src\ballistica\base\app\app_vr.h">
-      <Filter>ballistica\base\app</Filter>
+    <ClInclude Include="..\..\src\ballistica\base\app_adapter\app_adapter_vr.h">
+      <Filter>ballistica\base\app_adapter</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\ballistica\base\app_mode\app_mode.cc">
       <Filter>ballistica\base\app_mode</Filter>
@@ -1865,7 +1865,7 @@
   <ItemGroup>
     <Filter Include="ballistica" />
     <Filter Include="ballistica\base" />
-    <Filter Include="ballistica\base\app" />
+    <Filter Include="ballistica\base\app_adapter" />
     <Filter Include="ballistica\base\app_mode" />
     <Filter Include="ballistica\base\assets" />
     <Filter Include="ballistica\base\audio" />

diff --git a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj
@@ -184,14 +184,14 @@
     <Library Include="..\..\build\prefab\lib\windows\$(Configuration)_$(Platform)\$(MSBuildProjectName)Plus.lib" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\ballistica\base\app\app.cc" />
-    <ClInclude Include="..\..\src\ballistica\base\app\app.h" />
-    <ClCompile Include="..\..\src\ballistica\base\app\app_headless.cc" />
-    <ClInclude Include="..\..\src\ballistica\base\app\app_headless.h" />
-    <ClCompile Include="..\..\src\ballistica\base\app\app_sdl.cc" />
-    <ClInclude Include="..\..\src\ballistica\base\app\app_sdl.h" />
-    <ClCompile Include="..\..\src\ballistica\base\app\app_vr.cc" />
-    <ClInclude Include="..\..\src\ballistica\base\app\app_vr.h" />
+    <ClCompile Include="..\..\src\ballistica\base\app_adapter\app_adapter.cc" />
+    <ClInclude Include="..\..\src\ballistica\base\app_adapter\app_adapter.h" />
+    <ClCompile Include="..\..\src\ballistica\base\app_adapter\app_adapter_headless.cc" />
+    <ClInclude Include="..\..\src\ballistica\base\app_adapter\app_adapter_headless.h" />
+    <ClCompile Include="..\..\src\ballistica\base\app_adapter\app_adapter_sdl.cc" />
+    <ClInclude Include="..\..\src\ballistica\base\app_adapter\app_adapter_sdl.h" />
+    <ClCompile Include="..\..\src\ballistica\base\app_adapter\app_adapter_vr.cc" />
+    <ClInclude Include="..\..\src\ballistica\base\app_adapter\app_adapter_vr.h" />
     <ClCompile Include="..\..\src\ballistica\base\app_mode\app_mode.cc" />
     <ClInclude Include="..\..\src\ballistica\base\app_mode\app_mode.h" />
     <ClCompile Include="..\..\src\ballistica\base\app_mode\app_mode_empty.cc" />