Skip to content

Commit 2d07c5c

Browse files
MissonOMissonO
authored
Merge pull request #52 from micbelgique/develop
merge develop on main
2 parents 4729a50 + a59f9b8 commit 2d07c5c

File tree

87 files changed

+17345
-21168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+17345
-21168
lines changed

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

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Azure Static Web Apps CI/CD
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
pull_request:
8+
types: [opened, synchronize, reopened, closed]
9+
branches:
10+
- develop
11+
12+
jobs:
13+
build_and_deploy_job:
14+
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
15+
runs-on: ubuntu-latest
16+
name: Build and Deploy Job
17+
steps:
18+
- uses: actions/checkout@v3
19+
with:
20+
submodules: true
21+
lfs: false
22+
- name: Build And Deploy
23+
id: builddeploy
24+
uses: Azure/static-web-apps-deploy@v1
25+
with:
26+
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_SKY_072F79703 }}
27+
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
28+
action: "upload"
29+
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
30+
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
31+
app_location: "/src/conference-ia/" # App source code path
32+
api_location: "" # Api source code path - optional
33+
output_location: "src/conference-ia/dist" # Built app content directory - optional
34+
###### End of Repository/Build Configurations ######
35+
36+
close_pull_request_job:
37+
if: github.event_name == 'pull_request' && github.event.action == 'closed'
38+
runs-on: ubuntu-latest
39+
name: Close Pull Request Job
40+
steps:
41+
- name: Close Pull Request
42+
id: closepullrequest
43+
uses: Azure/static-web-apps-deploy@v1
44+
with:
45+
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_SKY_072F79703 }}
46+
action: "close"

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

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ name: Azure Static Web Apps CI/CD
33
on:
44
push:
55
branches:
6-
- main
7-
pull_request:
8-
types: [opened, synchronize, reopened, closed]
9-
branches:
10-
- main
6+
-cleanTest
117

128
jobs:
139
build_and_deploy_job:

‎.github/workflows/azure-staticwebapp.yml

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# This workflow will build and push a web application to an Azure Static Web App when you change your code.
2+
#
3+
# This workflow assumes you have already created the target Azure Static Web App.
4+
# For instructions see https://docs.microsoft.com/azure/static-web-apps/get-started-portal?tabs=vanilla-javascript
5+
#
6+
# To configure this workflow:
7+
#
8+
# 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.
9+
# For instructions on obtaining the deployment token see: https://docs.microsoft.com/azure/static-web-apps/deployment-token-management
10+
#
11+
# 3. Change the values for the APP_LOCATION, API_LOCATION and APP_ARTIFACT_LOCATION, AZURE_STATIC_WEB_APPS_API_TOKEN environment variables (below).
12+
# For instructions on setting up the appropriate configuration values go to https://docs.microsoft.com/azure/static-web-apps/front-end-frameworks
13+
name: Deploy web app to Azure Static Web Apps
14+
15+
on:
16+
push:
17+
branches: [ "cleanTest" ]
18+
19+
# Environment variables available to all jobs and steps in this workflow
20+
env:
21+
APP_LOCATION: "src/conference-ia" # location of your client code
22+
API_LOCATION: "api" # location of your api source code - optional
23+
APP_ARTIFACT_LOCATION: "src/conference-ia/dist" # location of client code build output
24+
AZURE_STATIC_WEB_APPS_API_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing deployment token for your static web app
25+
26+
permissions:
27+
contents: read
28+
29+
jobs:
30+
build_and_deploy_job:
31+
permissions:
32+
contents: read # for actions/checkout to fetch code
33+
pull-requests: write # for Azure/static-web-apps-deploy to comment on PRs
34+
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
35+
runs-on: ubuntu-latest
36+
name: Build and Deploy Job
37+
steps:
38+
- uses: actions/checkout@v4
39+
with:
40+
submodules: true
41+
- name: Build And Deploy
42+
id: builddeploy
43+
uses: Azure/static-web-apps-deploy@v1
44+
with:
45+
azure_static_web_apps_api_token: ${{ env.AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing api token for app
46+
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
47+
action: "upload"
48+
###### Repository/Build Configurations - These values can be configured to match you app requirements. ######
49+
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
50+
app_location: ${{ env.APP_LOCATION }}
51+
api_location: ${{ env.API_LOCATION }}
52+
app_artifact_location: ${{ env.APP_ARTIFACT_LOCATION }}
53+
###### End of Repository/Build Configurations ######
54+
55+
close_pull_request_job:
56+
permissions:
57+
contents: none
58+
if: github.event_name == 'pull_request' && github.event.action == 'closed'
59+
runs-on: ubuntu-latest
60+
name: Close Pull Request Job
61+
steps:
62+
- name: Close Pull Request
63+
id: closepullrequest
64+
uses: Azure/static-web-apps-deploy@v1
65+
with:
66+
azure_static_web_apps_api_token: ${{ env.AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing api token for app
67+
action: "close"

‎src/MIC/.gitignore

+7-6
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
/[Aa]ssets/Plugins/Editor/JetBrains*
2525

2626
# Ignore tokens
27-
/[Aa]ssets/.MeshCloudScripting/Presentation1/mesh.cloudscripting.manifest.json
28-
/[Aa]ssets/.MeshCloudScripting/Presentation1/appsettings.json
29-
/[Aa]ssets/.MeshCloudScripting/Presentation1/appsettings.Development.json
30-
/[Aa]ssets/.MeshCloudScripting/Presentation1/appsettings.Production.json
31-
/[Aa]ssets/.MeshCloudScripting/Presentation1/appsettings.UnityLocalDev.json
27+
/[Aa]ssets/.MeshCloudScripting/MIC-Maquette/mesh.cloudscripting.manifest.json
28+
/[Aa]ssets/.MeshCloudScripting/MIC-Maquette/appsettings.json
29+
/[Aa]ssets/.MeshCloudScripting/MIC-Maquette/appsettings.Development.json
30+
/[Aa]ssets/.MeshCloudScripting/MIC-Maquette/appsettings.Production.json
31+
/[Aa]ssets/.MeshCloudScripting/MIC-Maquette/appsettings.UnityLocalDev.json
32+
/[Aa]ssets/.MeshCloudScripting/MIC-Maquette/bin/
3233

3334

3435
# Visual Studio cache directory
@@ -81,4 +82,4 @@ crashlytics-build.properties
8182
/[Aa]ssets/[Ss]treamingAssets/aa/*
8283

8384
# Lightning file
84-
/[Aa]ssets/Scenes/MIC-Maquette/LightingData.asset
85+
/[Aa]ssets/Scenes/MIC-Maquette/LightingData.asset

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/AnimationScripts/SimuSandBoxAnimatorAnimator.cs

-59
This file was deleted.

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ namespace MeshApp.Animations
1111
using Microsoft.Mesh.CloudScripting.Declarations;
1212

1313
[UserCreatable(false)]
14-
public class SimuWorkAnimatorAnimator : AnimationNode
14+
public class TalkingAnimator : AnimationNode
1515
{
1616
private readonly float[] _baseLayerSpeeds = { 1F, };
1717

18-
protected SimuWorkAnimatorAnimator(in Guid ahandle, bool transfer)
18+
protected TalkingAnimator(in Guid ahandle, bool transfer)
1919
: base(ahandle, transfer)
2020
{ }
2121

2222
public enum BaseLayerState
2323
{
24-
ActiveSimuWork,
24+
Talking,
2525
}
2626

2727
[Replication(ReplicationKind.Full)]
@@ -46,14 +46,14 @@ internal long SystemTimeOfBaseLayerUpdated
4646
set => GetPropertyAccessor(nameof(SystemTimeOfBaseLayerUpdated)).SetValue(value);
4747
}
4848

49-
internal static SimuWorkAnimatorAnimator GetOrCreateInstance(in Guid cookie, bool transfer)
49+
internal static TalkingAnimator GetOrCreateInstance(in Guid cookie, bool transfer)
5050
{
5151
var result = GetOrCreateCloudObject(
5252
cookie,
5353
transfer,
54-
(handle, t) => new SimuWorkAnimatorAnimator(handle, transfer: t));
54+
(handle, t) => new TalkingAnimator(handle, transfer: t));
5555

56-
return result as SimuWorkAnimatorAnimator;
56+
return result as TalkingAnimator;
5757
}
5858
}
5959
}

0 commit comments

Comments
 (0)