Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pulling through updates from master #1857

Merged
merged 9 commits into from
Mar 20, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/linux_develop_workflow.yml
Original file line number Diff line number Diff line change
@@ -21,13 +21,15 @@ jobs:
env:
ASSISTANTKEYS: ${{ secrets.ASSISTANTKEYS }}
OAIKEYS: ${{ secrets.OAISECRET }}
SENTRYCFG: ${{ secrets.SENTRYCFG }}
run: |
echo -n "$ASSISTANTKEYS" > $GITHUB_WORKSPACE/ibm-credentials.env
echo "path of the credentials resource $GITHUB_WORKSPACE/ibm-credentials.txt"
export IBM_CREDENTIALS_FILE="$GITHUB_WORKSPACE/ibm-credentials.env"
echo -n "$OAIKEYS" > $GITHUB_WORKSPACE/Assets/Resources/openai.txt
echo "path of the OAI credentials resource $GITHUB_WORKSPACE/Assets/Resources/openai.txt"
ls -la $GITHUB_WORKSPACE/Assets/Resources/openai.txt
echo -n "$SENTRYCFG" > $GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset
echo "path of the Sentry options yaml file $GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset"

# Fonts
- name: Install fonts
@@ -79,12 +81,15 @@ jobs:
env:
ASSISTANTKEYS: ${{ secrets.ASSISTANTKEYS }}
OAIKEYS: ${{ secrets.OAISECRET }}
SENTRYCFG: ${{ secrets.SENTRYCFG }}
run: |
echo -n "$ASSISTANTKEYS" > $GITHUB_WORKSPACE/ibm-credentials.env
echo "path of the credentials resource $GITHUB_WORKSPACE/ibm-credentials.txt"
export IBM_CREDENTIALS_FILE="$GITHUB_WORKSPACE/ibm-credentials.env"
echo -n "$OAIKEYS" > $GITHUB_WORKSPACE/Assets/Resources/openai.txt
echo "path of the OAI credentials resource $GITHUB_WORKSPACE/Assets/Resources/openai.txt"
echo -n "$SENTRYCFG" > $GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset
echo "path of the Sentry options yaml file $GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset"
export TARGET_PLATFORM="Android"

# Fonts
6 changes: 6 additions & 0 deletions .github/workflows/linux_workflow.yml
Original file line number Diff line number Diff line change
@@ -22,12 +22,15 @@ jobs:
env:
ASSISTANTKEYS: ${{ secrets.ASSISTANTKEYS }}
OAIKEYS: ${{ secrets.OAISECRET }}
SENTRYCFG: ${{ secrets.SENTRYCFG }}
run: |
echo -n "$ASSISTANTKEYS" > $GITHUB_WORKSPACE/ibm-credentials.env
echo "path of the credentials resource $GITHUB_WORKSPACE/ibm-credentials.txt"
export IBM_CREDENTIALS_FILE="$GITHUB_WORKSPACE/ibm-credentials.env"
echo -n "$OAIKEYS" > $GITHUB_WORKSPACE/Assets/Resources/openai.txt
echo "path of the OAI credentials resource $GITHUB_WORKSPACE/Assets/Resources/openai.txt"
echo -n "$SENTRYCFG" > $GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset
echo "path of the Sentry options yaml file $GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset"

# Fonts
- name: Install fonts
@@ -81,12 +84,15 @@ jobs:
env:
ASSISTANTKEYS: ${{ secrets.ASSISTANTKEYS }}
OAIKEYS: ${{ secrets.OAISECRET }}
SENTRYCFG: ${{ secrets.SENTRYCFG }}
run: |
echo -n "$ASSISTANTKEYS" > $GITHUB_WORKSPACE/ibm-credentials.env
echo "path of the credentials resource $GITHUB_WORKSPACE/ibm-credentials.txt"
export IBM_CREDENTIALS_FILE="$GITHUB_WORKSPACE/ibm-credentials.env"
echo -n "$OAIKEYS" > $GITHUB_WORKSPACE/Assets/Resources/openai.txt
echo "path of the OAI credentials resource $GITHUB_WORKSPACE/Assets/Resources/openai.txt"
echo -n "$SENTRYCFG" > $GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset
echo "path of the Sentry options yaml file $GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset"
export TARGET_PLATFORM="Android"

# Fonts
24 changes: 23 additions & 1 deletion .github/workflows/windows_develop_workflow.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Windows Develop Workflow (HoloLens Builds)
on:
workflow_dispatch:
schedule:
- cron: 0 19 * * 5
jobs:
@@ -22,10 +23,16 @@ jobs:
- name: Set up IBM Watson credentials
env:
ASSISTANTKEYS: ${{ secrets.ASSISTANTKEYS }}
OAIKEYS: ${{ secrets.OAISECRET }}
SENTRYCFG: ${{ secrets.SENTRYCFG }}
run: |
echo -n "$env:ASSISTANTKEYS" > $env:GITHUB_WORKSPACE/ibm-credentials.env
echo "path of the credentials resource $env:GITHUB_WORKSPACE/Assets/Resources/ibm-credentials.txt"
$env:IBM_CREDENTIALS_FILE="$env:GITHUB_WORKSPACE/ibm-credentials.env"
echo -n "$OAIKEYS" > $env:GITHUB_WORKSPACE/Assets/Resources/openai.txt
echo "path of the OAI credentials resource $env:GITHUB_WORKSPACE/Assets/Resources/openai.txt"
echo -n "$SENTRYCFG" > $env:GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset
echo "path of the Sentry options yaml file $env:GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset"
$env:TARGET_PLATFORM="Hololens"

# Cache
@@ -93,6 +100,21 @@ jobs:
- name: LFS pull
run: git lfs pull

- name: Set up IBM Watson credentials
env:
ASSISTANTKEYS: ${{ secrets.ASSISTANTKEYS }}
OAIKEYS: ${{ secrets.OAISECRET }}
SENTRYCFG: ${{ secrets.SENTRYCFG }}
run: |
echo -n "$env:ASSISTANTKEYS" > $env:GITHUB_WORKSPACE/ibm-credentials.env
echo "path of the credentials resource $env:GITHUB_WORKSPACE/Assets/Resources/ibm-credentials.txt"
$env:IBM_CREDENTIALS_FILE="$env:GITHUB_WORKSPACE/ibm-credentials.env"
echo -n "$OAIKEYS" > $env:GITHUB_WORKSPACE/Assets/Resources/openai.txt
echo "path of the OAI credentials resource $env:GITHUB_WORKSPACE/Assets/Resources/openai.txt"
echo -n "$SENTRYCFG" > $env:GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset
echo "path of the Sentry options yaml file $env:GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset"
$env:TARGET_PLATFORM="Hololens"

- name: Setup Unity UWP
uses: kuler90/setup-unity@v1
with:
@@ -162,4 +184,4 @@ jobs:
run: |
echo $APP_VERSION
sudo apt-get update && sudo apt-get -y install curl
chmod +x ./ci/notify-preview.sh && ./ci/notify-preview.sh
chmod +x ./ci/notify-preview.sh && ./ci/notify-preview.sh
12 changes: 9 additions & 3 deletions .github/workflows/windows_workflow.yml
Original file line number Diff line number Diff line change
@@ -25,14 +25,17 @@ jobs:
env:
ASSISTANTKEYS: ${{ secrets.ASSISTANTKEYS }}
OAIKEYS: ${{ secrets.OAISECRET }}
SENTRYCFG: ${{ secrets.SENTRYCFG }}
run: |
echo -n "$env:ASSISTANTKEYS" > $env:GITHUB_WORKSPACE/ibm-credentials.env
echo "path of the credentials resource $env:GITHUB_WORKSPACE/Assets/Resources/ibm-credentials.txt"
$env:IBM_CREDENTIALS_FILE="$env:GITHUB_WORKSPACE/ibm-credentials.env"
$env:TARGET_PLATFORM="Hololens"
echo -n "$OAIKEYS" > $env:GITHUB_WORKSPACE/Assets/Resources/openai.txt
echo "path of the OAI credentials resource $env:GITHUB_WORKSPACE/Assets/Resources/openai.txt"

echo -n "$SENTRYCFG" > $env:GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset
echo "path of the Sentry options yaml file $env:GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset"
$env:TARGET_PLATFORM="Hololens"

# Cache
- name: Caching
uses: actions/cache@v3
@@ -103,13 +106,16 @@ jobs:
env:
ASSISTANTKEYS: ${{ secrets.ASSISTANTKEYS }}
OAIKEYS: ${{ secrets.OAISECRET }}
SENTRYCFG: ${{ secrets.SENTRYCFG }}
run: |
echo -n "$env:ASSISTANTKEYS" > $env:GITHUB_WORKSPACE/ibm-credentials.env
echo "path of the credentials resource $env:GITHUB_WORKSPACE/Assets/Resources/ibm-credentials.txt"
$env:IBM_CREDENTIALS_FILE="$env:GITHUB_WORKSPACE/ibm-credentials.env"
$env:TARGET_PLATFORM="Hololens"
echo -n "$OAIKEYS" > $env:GITHUB_WORKSPACE/Assets/Resources/openai.txt
echo "path of the OAI credentials resource $env:GITHUB_WORKSPACE/Assets/Resources/openai.txt"
echo -n "$SENTRYCFG" > $env:GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset
echo "path of the Sentry options yaml file $env:GITHUB_WORKSPACE/Assets/Resources/Sentry/SentryOptions.asset"
$env:TARGET_PLATFORM="Hololens"

- name: Setup Unity UWP
uses: kuler90/setup-unity@v1
2 changes: 2 additions & 0 deletions Assets/MirageXR/Managers/PointCloudManager.cs
Original file line number Diff line number Diff line change
@@ -39,7 +39,9 @@ public async Task<bool> InitializationAsync()

public void Unsubscribe()
{
#if UNITY_ANDROID || UNITY_IOS
EventManager.OnEditModeChanged -= SetAllPointCloudsActive;
#endif
}

public async Task<bool> ResetAsync()
33 changes: 5 additions & 28 deletions Assets/MirageXR/Managers/UiManager.cs
Original file line number Diff line number Diff line change
@@ -90,8 +90,6 @@ private void OnDisable()

private void PlayerReset()
{
ClearDebug();
HideDebug();
HideMenu();
WelcomeMessage = string.Empty;
RootObject.Instance.calibrationManager.DisableCalibration();
@@ -149,30 +147,6 @@ private void Start()
ActionList.gameObject.SetActive(false);
}

/// <summary>
/// Clear debug console. Called from Hololens keyword manager.
/// </summary>
public void ClearDebug()
{
DebugConsole.transform.parent.SendMessage("ClearDebug", SendMessageOptions.DontRequireReceiver);
}

/// <summary>
/// Show debug console. Called from Hololens keyword manager.
/// </summary>
public void ShowDebug()
{
DebugConsole.SetActive(true);
}

/// <summary>
/// Hide debug console. Called from Hololens keyword manager.
/// </summary>
public void HideDebug()
{
DebugConsole.SetActive(false);
}

/// <summary>
/// Show selection panel.
/// </summary>
@@ -398,8 +372,11 @@ private void UploadActivityVoice()
/// </summary>
public void HideMenu()
{
ActionList.gameObject.SetActive(false);
IsMenuVisible = false;
if (ActionList != null)
{
ActionList.gameObject.SetActive(false);
IsMenuVisible = false;
}
}

/// <summary>
1 change: 1 addition & 0 deletions Assets/MirageXR/Player/Scripts/RootObject.cs
Original file line number Diff line number Diff line change
@@ -153,6 +153,7 @@ private void OnDestroy()
_pointCloudManager.Unsubscribe();
_activityManager.OnDestroy();
_planeManager.Dispose();
Instance = null;
}
}
}