merge develop on main

.github/workflows/azure-static-web-apps-agreeable-sky-072f79703.yml

@@ -0,0 +1,46 @@
+name: Azure Static Web Apps CI/CD
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - develop
+
+jobs:
+  build_and_deploy_job:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+          lfs: false
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_SKY_072F79703 }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: "/src/conference-ia/" # App source code path
+          api_location: "" # Api source code path - optional
+          output_location: "src/conference-ia/dist" # Built app content directory - optional
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_SKY_072F79703 }}
+          action: "close"

.github/workflows/azure-static-web-apps-black-rock-04b9de903.yml

@@ -3,11 +3,7 @@ name: Azure Static Web Apps CI/CD
 on:
   push:
     branches:
-      - main
-  pull_request:
-    types: [opened, synchronize, reopened, closed]
-    branches:
-      - main
+      -cleanTest
 
 jobs:
   build_and_deploy_job:

.github/workflows/azure-staticwebapp.yml

@@ -0,0 +1,67 @@
+# This workflow will build and push a web application to an Azure Static Web App when you change your code.
+#
+# This workflow assumes you have already created the target Azure Static Web App.
+# For instructions see https://docs.microsoft.com/azure/static-web-apps/get-started-portal?tabs=vanilla-javascript
+#
+# To configure this workflow:
+#
+# 1. Set up a secret in your repository named AZURE_STATIC_WEB_APPS_API_TOKEN with the value of your Static Web Apps deployment token.
+#    For instructions on obtaining the deployment token see: https://docs.microsoft.com/azure/static-web-apps/deployment-token-management
+#
+# 3. Change the values for the APP_LOCATION, API_LOCATION and APP_ARTIFACT_LOCATION, AZURE_STATIC_WEB_APPS_API_TOKEN environment variables (below).
+#    For instructions on setting up the appropriate configuration values go to https://docs.microsoft.com/azure/static-web-apps/front-end-frameworks
+name: Deploy web app to Azure Static Web Apps
+
+on:
+  push:
+    branches: [ "cleanTest" ]
+
+# Environment variables available to all jobs and steps in this workflow
+env:
+  APP_LOCATION: "src/conference-ia" # location of your client code
+  API_LOCATION: "api" # location of your api source code - optional
+  APP_ARTIFACT_LOCATION: "src/conference-ia/dist" # location of client code build output
+  AZURE_STATIC_WEB_APPS_API_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing deployment token for your static web app
+
+permissions:
+  contents: read
+
+jobs:
+  build_and_deploy_job:
+    permissions:
+      contents: read # for actions/checkout to fetch code
+      pull-requests: write # for Azure/static-web-apps-deploy to comment on PRs
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ env.AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing api token for app
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match you app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: ${{ env.APP_LOCATION }}
+          api_location: ${{ env.API_LOCATION }}
+          app_artifact_location: ${{ env.APP_ARTIFACT_LOCATION }}
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    permissions:
+      contents: none
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ env.AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing api token for app
+          action: "close"

src/MIC/.gitignore

@@ -24,11 +24,12 @@
 /[Aa]ssets/Plugins/Editor/JetBrains*
 
 # Ignore tokens
-/[Aa]ssets/.MeshCloudScripting/Presentation1/mesh.cloudscripting.manifest.json
-/[Aa]ssets/.MeshCloudScripting/Presentation1/appsettings.json
-/[Aa]ssets/.MeshCloudScripting/Presentation1/appsettings.Development.json
-/[Aa]ssets/.MeshCloudScripting/Presentation1/appsettings.Production.json
-/[Aa]ssets/.MeshCloudScripting/Presentation1/appsettings.UnityLocalDev.json
+/[Aa]ssets/.MeshCloudScripting/MIC-Maquette/mesh.cloudscripting.manifest.json
+/[Aa]ssets/.MeshCloudScripting/MIC-Maquette/appsettings.json
+/[Aa]ssets/.MeshCloudScripting/MIC-Maquette/appsettings.Development.json
+/[Aa]ssets/.MeshCloudScripting/MIC-Maquette/appsettings.Production.json
+/[Aa]ssets/.MeshCloudScripting/MIC-Maquette/appsettings.UnityLocalDev.json
+/[Aa]ssets/.MeshCloudScripting/MIC-Maquette/bin/
 
 
 # Visual Studio cache directory
@@ -81,4 +82,4 @@ crashlytics-build.properties
 /[Aa]ssets/[Ss]treamingAssets/aa/*
 
 # Lightning file
-/[Aa]ssets/Scenes/MIC-Maquette/LightingData.asset
+/[Aa]ssets/Scenes/MIC-Maquette/LightingData.asset

src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/AnimationScripts/SimuWorkAnimatorAnimator.cs → src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/AnimationScripts/TalkingAnimator.cs

@@ -11,17 +11,17 @@ namespace MeshApp.Animations
     using Microsoft.Mesh.CloudScripting.Declarations;
 
     [UserCreatable(false)]
-    public class SimuWorkAnimatorAnimator : AnimationNode
+    public class TalkingAnimator : AnimationNode
     {
         private readonly float[] _baseLayerSpeeds = { 1F, };
 
-        protected SimuWorkAnimatorAnimator(in Guid ahandle, bool transfer)
+        protected TalkingAnimator(in Guid ahandle, bool transfer)
         : base(ahandle, transfer)
         { }
 
         public enum BaseLayerState
         {
-            ActiveSimuWork,
+            Talking,
         }
 
         [Replication(ReplicationKind.Full)]
@@ -46,14 +46,14 @@ internal long SystemTimeOfBaseLayerUpdated
             set => GetPropertyAccessor(nameof(SystemTimeOfBaseLayerUpdated)).SetValue(value);
         }
 
-        internal static SimuWorkAnimatorAnimator GetOrCreateInstance(in Guid cookie, bool transfer)
+        internal static TalkingAnimator GetOrCreateInstance(in Guid cookie, bool transfer)
         {
             var result = GetOrCreateCloudObject(
                 cookie,
                 transfer,
-                (handle, t) => new SimuWorkAnimatorAnimator(handle, transfer: t));
+                (handle, t) => new TalkingAnimator(handle, transfer: t));
 
-            return result as SimuWorkAnimatorAnimator;
+            return result as TalkingAnimator;
         }
     }
 }