Merge remote-tracking branch 'origin/main' into fix/depth-submission

icosa-foundation · Apr 10, 2024 · 4084bf8 · 4084bf8
2 parents a75faba + e63ea08
commit 4084bf8
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -778,6 +778,12 @@ jobs:
           name: Android Pico
           path: build_android_pico
 
+      - name: Download Build Artifacts (Linux)
+        uses: actions/download-artifact@v4
+        with:
+          name: Linux
+          path: build_linux
+
       - name: Download Build Artifacts (Mac)
         uses: actions/download-artifact@v4
         with:
@@ -795,11 +801,13 @@ jobs:
           mv build_windows_openxr/StandaloneWindows64/ releases/OpenBrush_Desktop_$VERSION/
           mv build_windows_rift/StandaloneWindows64/ releases/OpenBrush_Rift_$VERSION/
           mv build_macos/*.dmg releases/OpenBrush_Mac_$VERSION.dmg
+          mv build_macos/StandaloneLinux64/ releases/OpenBrush_Linux_$VERSION/
           cd releases
           zip -r OpenBrush_Desktop_$VERSION.zip OpenBrush_Desktop_$VERSION/
-          zip -r OpenBrush_Rift_$VERSION.zip OpenBrush_Rift_$VERSION/
           rm -rf OpenBrush_Desktop_$VERSION
+          zip -r OpenBrush_Rift_$VERSION.zip OpenBrush_Rift_$VERSION/
           rm -rf OpenBrush_Rift_$VERSION
+          zip -r OpenBrush_Linux_$VERSION.zip OpenBrush_Linux_$VERSION/
 
       - name: Publish
         uses: softprops/action-gh-release@v2
@@ -917,6 +925,11 @@ jobs:
         with:
           name: MacOS (signed)
           path: build_macos
+      - name: Download Build Artifacts (Linux)
+        uses: actions/download-artifact@v4
+        with:
+          name: Linux
+          path: build_linux
       - name: Upload Build
         run: |
           cd build_macos
@@ -926,6 +939,7 @@ jobs:
           jinjanate Support/steam/app.vdf.j2 > app.vdf
           jinjanate Support/steam/main_depot.win.vdf.j2 > build_windows_openxr/main_depot.vdf
           jinjanate Support/steam/main_depot.mac.vdf.j2 > build_macos/main_depot.vdf
+          jinjanate Support/steam/main_depot.linux.vdf.j2 > build_linux/main_depot.vdf
           jinjanate Support/steam/installscript_win.vdf.j2 > build_windows_openxr/installscript_win.vdf
           steamcmd +login $STEAM_USERNAME +run_app_build $(pwd)/app.vdf +quit
         env:
@@ -935,7 +949,8 @@ jobs:
           OPEN_BRUSH_APP_ID: ${{ vars.STEAM_APP_ID }}
           OPEN_BRUSH_WINDOWS_DEPOT_ID: ${{ vars.STEAM_WINDOWS_DEPOT_ID }}
           OPEN_BRUSH_MAC_DEPOT_ID: ${{ vars.STEAM_MAC_DEPOT_ID }}
-          OPEN_BRUSH_EXECUTABLE: ${{ needs.configuration.outputs.basename}}.exe
+          OPEN_BRUSH_LINUX_DEPOT_ID: ${{ vars.STEAM_LINUX_DEPOT_ID }}
+          OPEN_BRUSH_WINDOWS_EXECUTABLE: ${{ needs.configuration.outputs.basename}}.exe
           CHANNEL: beta
       - name: Update steam login secret
         run: |

diff --git a/Assets/Scripts/PointerManager.cs b/Assets/Scripts/PointerManager.cs
@@ -1243,16 +1243,7 @@ void CheckGestures()
                             nextShape = StraightEdgeGuideScript.Shape.Circle;
                             break;
                         case StraightEdgeGuideScript.Shape.Circle:
-                            {
-                                if (App.Config.IsMobileHardware)
-                                {
-                                    nextShape = StraightEdgeGuideScript.Shape.Line;
-                                }
-                                else
-                                {
-                                    nextShape = StraightEdgeGuideScript.Shape.Sphere;
-                                }
-                            }
+                            nextShape = StraightEdgeGuideScript.Shape.Sphere;
                             break;
                         case StraightEdgeGuideScript.Shape.Sphere:
                             nextShape = StraightEdgeGuideScript.Shape.Line;

diff --git a/Support/steam/app.vdf.j2 b/Support/steam/app.vdf.j2
@@ -11,5 +11,6 @@
     {
         "{{ OPEN_BRUSH_WINDOWS_DEPOT_ID }}" build_windows_openxr/main_depot.vdf
         "{{ OPEN_BRUSH_MAC_DEPOT_ID }}" build_macos/main_depot.vdf
+        "{{ OPEN_BRUSH_LINUX_DEPOT_ID }}" build_linux/main_depot.vdf
     }
 }
diff --git a/Support/steam/installscript_win.vdf.j2 b/Support/steam/installscript_win.vdf.j2
@@ -12,12 +12,12 @@ InstallScript {
     }
     "HKEY_LOCAL_MACHINE\\SOFTWARE\\Classes\\Icosa.OpenBrush.File\\DefaultIcon" {
       string {
-        "(Default)"      "%INSTALLDIR%\\{{ OPEN_BRUSH_EXECUTABLE }}"
+        "(Default)"      "%INSTALLDIR%\\{{ OPEN_BRUSH_WINDOWS_EXECUTABLE }}"
       }
     }
     "HKEY_LOCAL_MACHINE\\SOFTWARE\\Classes\\Icosa.OpenBrush.File\\Shell\\Open\\Command" {
       string {
-        "(Default)"      "%WINDIR%\\System32\\WindowsPowershell\\v1.0\\powershell -windowstyle hidden -c \"try { $s=[uri]::EscapeDataString('%1'); (new-object System.Net.WebClient).DownloadString('http://localhost:40074/load?'+$s) } catch { & '%INSTALLDIR%\\{{ OPEN_BRUSH_EXECUTABLE }}' '%1' }\""
+        "(Default)"      "%WINDIR%\\System32\\WindowsPowershell\\v1.0\\powershell -windowstyle hidden -c \"try { $s=[uri]::EscapeDataString('%1'); (new-object System.Net.WebClient).DownloadString('http://localhost:40074/load?'+$s) } catch { & '%INSTALLDIR%\\{{ OPEN_BRUSH_WINDOWS_EXECUTABLE }}' '%1' }\""
       }
     }
     "HKEY_LOCAL_MACHINE\\SOFTWARE\\Classes\\tiltbrush" {
@@ -30,17 +30,17 @@ InstallScript {
     }
     "HKEY_LOCAL_MACHINE\\SOFTWARE\\Classes\\tiltbrush\\DefaultIcon" {
       string {
-        "(Default)"      "%INSTALLDIR%\\{{ OPEN_BRUSH_EXECUTABLE }}"
+        "(Default)"      "%INSTALLDIR%\\{{ OPEN_BRUSH_WINDOWS_EXECUTABLE }}"
       }
     }
     "HKEY_LOCAL_MACHINE\\SOFTWARE\\Classes\\tiltbrush\\Shell\\Open\\Command" {
       string {
-        "(Default)"      "%WINDIR%\\System32\\WindowsPowershell\\v1.0\\powershell -windowstyle hidden -c \"try { $s=[uri]::EscapeDataString('%1'); (new-object System.Net.WebClient).DownloadString('http://localhost:40074/load?'+$s) } catch { & '%INSTALLDIR%\\{{ OPEN_BRUSH_EXECUTABLE }}' '%1' }\""
+        "(Default)"      "%WINDIR%\\System32\\WindowsPowershell\\v1.0\\powershell -windowstyle hidden -c \"try { $s=[uri]::EscapeDataString('%1'); (new-object System.Net.WebClient).DownloadString('http://localhost:40074/load?'+$s) } catch { & '%INSTALLDIR%\\{{ OPEN_BRUSH_WINDOWS_EXECUTABLE }}' '%1' }\""
       }
     }
   }
 
   Firewall {
-    "Open Brush" "%INSTALLDIR%\\{{ OPEN_BRUSH_EXECUTABLE }}"
+    "Open Brush" "%INSTALLDIR%\\{{ OPEN_BRUSH_WINDOWS_EXECUTABLE }}"
   }
 }
diff --git a/Support/steam/main_depot.linux.vdf.j2 b/Support/steam/main_depot.linux.vdf.j2
@@ -0,0 +1,25 @@
+"DepotBuildConfig"
+{
+    // # Set your assigned depot ID here
+    "DepotID" "{{ OPEN_BRUSH_LINUX_DEPOT_ID }}"
+
+    "ContentRoot" "build_linux/StandaloneLinux64"
+
+    "FileMapping"
+    {
+        // Include all files in the build output directory (ContentRoot)
+        "LocalPath" "*"
+
+        // Destination is the main install directory
+        "DepotPath" "."
+
+        // If LocalPath contains wildcards, setting this means that all
+        // matching files within subdirectories of LocalPath will also
+        // be included.
+        "recursive" "1"
+    }
+
+    // but exclude all symbol files
+    "FileExclusion" "*.pdb"
+    "FileExclusion" "build_log.txt"
+}