Skip to content

Commit 5d12675

Browse files
authored
Merge pull request #35 from micbelgique/sprint5.1
#25
2 parents b77d4f2 + fa4472f commit 5d12675

File tree

99 files changed

+56327
-30951
lines changed

Some content is hidden

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

99 files changed

+56327
-30951
lines changed

src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/App.cs

-265
Original file line numberDiff line numberDiff line change
@@ -108,271 +108,6 @@ public async Task StartAsync(CancellationToken token)
108108
await StartSimulation("Innover");
109109
};
110110

111-
// Creation of new conference
112-
var keys = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys");
113-
var btnA = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/A");
114-
var sensorA = btnA.FindFirstChild<InteractableNode>();
115-
var btnB = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/B");
116-
var sensorB = btnB.FindFirstChild<InteractableNode>();
117-
var btnC = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/C");
118-
var sensorC = btnC.FindFirstChild<InteractableNode>();
119-
var btnD = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/D");
120-
var sensorD = btnD.FindFirstChild<InteractableNode>();
121-
var btnE = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/E");
122-
var sensorE = btnE.FindFirstChild<InteractableNode>();
123-
var btnF = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/F");
124-
var sensorF = btnF.FindFirstChild<InteractableNode>();
125-
var btnG = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/G");
126-
var sensorG = btnG.FindFirstChild<InteractableNode>();
127-
var btnH = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/H");
128-
var sensorH = btnH.FindFirstChild<InteractableNode>();
129-
var btnI = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/I");
130-
var sensorI = btnI.FindFirstChild<InteractableNode>();
131-
var btnJ = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/J");
132-
var sensorJ = btnJ.FindFirstChild<InteractableNode>();
133-
var btnK = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/K");
134-
var sensorK = btnK.FindFirstChild<InteractableNode>();
135-
var btnL = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/L");
136-
var sensorL = btnL.FindFirstChild<InteractableNode>();
137-
var btnM = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/M");
138-
var sensorM = btnM.FindFirstChild<InteractableNode>();
139-
var btnN = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/N");
140-
var sensorN = btnN.FindFirstChild<InteractableNode>();
141-
var btnO = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/O");
142-
var sensorO = btnO.FindFirstChild<InteractableNode>();
143-
var btnP = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/P");
144-
var sensorP = btnP.FindFirstChild<InteractableNode>();
145-
var btnQ = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/Q");
146-
var sensorQ = btnQ.FindFirstChild<InteractableNode>();
147-
var btnR = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/R");
148-
var sensorR = btnR.FindFirstChild<InteractableNode>();
149-
var btnS = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/S");
150-
var sensorS = btnS.FindFirstChild<InteractableNode>();
151-
var btnT = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/T");
152-
var sensorT = btnT.FindFirstChild<InteractableNode>();
153-
var btnU = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/U");
154-
var sensorU = btnU.FindFirstChild<InteractableNode>();
155-
var btnV = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/V");
156-
var sensorV = btnV.FindFirstChild<InteractableNode>();
157-
var btnW = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/W");
158-
var sensorW = btnW.FindFirstChild<InteractableNode>();
159-
var btnX = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/X");
160-
var sensorX = btnX.FindFirstChild<InteractableNode>();
161-
var btnY = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/Y");
162-
var sensorY = btnY.FindFirstChild<InteractableNode>();
163-
var btnZ = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/Z");
164-
var sensorZ = btnZ.FindFirstChild<InteractableNode>();
165-
var btn0 = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/0");
166-
var sensor0 = btn0.FindFirstChild<InteractableNode>();
167-
var btn1 = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/1");
168-
var sensor1 = btn1.FindFirstChild<InteractableNode>();
169-
var btn2 = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/2");
170-
var sensor2 = btn2.FindFirstChild<InteractableNode>();
171-
var btn3 = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/3");
172-
var sensor3 = btn3.FindFirstChild<InteractableNode>();
173-
var btn4 = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/4");
174-
var sensor4 = btn4.FindFirstChild<InteractableNode>();
175-
var btn5 = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/5");
176-
var sensor5 = btn5.FindFirstChild<InteractableNode>();
177-
var btn6 = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/6");
178-
var sensor6 = btn6.FindFirstChild<InteractableNode>();
179-
var btn7 = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/7");
180-
var sensor7 = btn7.FindFirstChild<InteractableNode>();
181-
var btn8 = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/8");
182-
var sensor8 = btn8.FindFirstChild<InteractableNode>();
183-
var btn9 = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/9");
184-
var sensor9 = btn9.FindFirstChild<InteractableNode>();
185-
var btnDelete = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/Delete");
186-
var sensorDelete = btnDelete.FindFirstChild<InteractableNode>();
187-
var btnEnter = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/Enter");
188-
var sensorEnter = btnEnter.FindFirstChild<InteractableNode>();
189-
var btnEspace = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Keys/Espace");
190-
var sensorEspace = btnEspace.FindFirstChild<InteractableNode>();
191-
var text = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/ConferenceValue");
192-
var valueText = text.FindFirstChild<TextNode>();
193-
var site = (TransformNode)_app.Scene.FindChildByPath("ConferenceRoom/Site");
194-
195-
sensorA.Selected += async (sender, args) =>
196-
{
197-
valueText.Text += 'a';
198-
};
199-
sensorB.Selected += async (sender, args) =>
200-
{
201-
valueText.Text += 'b';
202-
};
203-
sensorC.Selected += async (sender, args) =>
204-
{
205-
valueText.Text += 'c';
206-
};
207-
sensorD.Selected += async (sender, args) =>
208-
{
209-
valueText.Text += 'd';
210-
};
211-
sensorE.Selected += async (sender, args) =>
212-
{
213-
valueText.Text += 'e';
214-
};
215-
sensorF.Selected += async (sender, args) =>
216-
{
217-
valueText.Text += 'f';
218-
};
219-
sensorG.Selected += async (sender, args) =>
220-
{
221-
valueText.Text += 'g';
222-
};
223-
sensorH.Selected += async (sender, args) =>
224-
{
225-
valueText.Text += 'h';
226-
};
227-
sensorI.Selected += async (sender, args) =>
228-
{
229-
valueText.Text += 'i';
230-
};
231-
sensorJ.Selected += async (sender, args) =>
232-
{
233-
valueText.Text += 'j';
234-
};
235-
sensorK.Selected += async (sender, args) =>
236-
{
237-
valueText.Text += 'k';
238-
};
239-
sensorL.Selected += async (sender, args) =>
240-
{
241-
valueText.Text += 'l';
242-
};
243-
sensorM.Selected += async (sender, args) =>
244-
{
245-
valueText.Text += 'm';
246-
};
247-
sensorN.Selected += async (sender, args) =>
248-
{
249-
valueText.Text += 'n';
250-
};
251-
sensorO.Selected += async (sender, args) =>
252-
{
253-
valueText.Text += 'o';
254-
};
255-
sensorP.Selected += async (sender, args) =>
256-
{
257-
valueText.Text += 'p';
258-
};
259-
sensorQ.Selected += async (sender, args) =>
260-
{
261-
valueText.Text += 'q';
262-
};
263-
sensorR.Selected += async (sender, args) =>
264-
{
265-
valueText.Text += 'r';
266-
};
267-
sensorS.Selected += async (sender, args) =>
268-
{
269-
valueText.Text += 's';
270-
};
271-
sensorT.Selected += async (sender, args) =>
272-
{
273-
valueText.Text += 't';
274-
};
275-
sensorU.Selected += async (sender, args) =>
276-
{
277-
valueText.Text += 'u';
278-
};
279-
sensorV.Selected += async (sender, args) =>
280-
{
281-
valueText.Text += 'v';
282-
};
283-
sensorW.Selected += async (sender, args) =>
284-
{
285-
valueText.Text += 'w';
286-
};
287-
sensorX.Selected += async (sender, args) =>
288-
{
289-
valueText.Text += 'x';
290-
};
291-
sensorY.Selected += async (sender, args) =>
292-
{
293-
valueText.Text += 'y';
294-
};
295-
sensorZ.Selected += async (sender, args) =>
296-
{
297-
valueText.Text += 'z';
298-
};
299-
sensor0.Selected += async (sender, args) =>
300-
{
301-
valueText.Text += '0';
302-
};
303-
sensor1.Selected += async (sender, args) =>
304-
{
305-
valueText.Text += '1';
306-
};
307-
sensor2.Selected += async (sender, args) =>
308-
{
309-
valueText.Text += '2';
310-
};
311-
sensor3.Selected += async (sender, args) =>
312-
{
313-
valueText.Text += '3';
314-
};
315-
sensor4.Selected += async (sender, args) =>
316-
{
317-
valueText.Text += '4';
318-
};
319-
sensor5.Selected += async (sender, args) =>
320-
{
321-
valueText.Text += '5';
322-
};
323-
sensor6.Selected += async (sender, args) =>
324-
{
325-
valueText.Text += '6';
326-
};
327-
sensor7.Selected += async (sender, args) =>
328-
{
329-
valueText.Text += '7';
330-
};
331-
sensor8.Selected += async (sender, args) =>
332-
{
333-
valueText.Text += '8';
334-
};
335-
sensor9.Selected += async (sender, args) =>
336-
{
337-
valueText.Text += '9';
338-
};
339-
sensorEspace.Selected += async (sender, args) =>
340-
{
341-
valueText.Text += ' ';
342-
};
343-
sensorDelete.Selected += async (sender, args) =>
344-
{
345-
if (!string.IsNullOrEmpty(valueText.Text))
346-
{
347-
valueText.Text = valueText.Text.Substring(0, valueText.Text.Length - 1);
348-
}
349-
};
350-
sensorEnter.Selected += async (sender, args) =>
351-
{
352-
keys.IsActive = false;
353-
try
354-
{
355-
await AskNewConference(valueText.Text);
356-
valueText.Text = "Votre conférence a été généré et va démarrer";
357-
Task.Delay(3000);
358-
site.IsActive = true;
359-
// à adapter quand on pourra choisir la durée de la réunion
360-
Task.Delay(300000);
361-
site.IsActive = false;
362-
keys.IsActive = true;
363-
valueText.Text = "";
364-
}
365-
catch(Exception e)
366-
{
367-
valueText.Text = "Votre conférence n'a pas été généré";
368-
keys.IsActive = true;
369-
Task.Delay(3000);
370-
valueText.Text = "";
371-
}
372-
373-
};
374-
375-
376111
}
377112

378113

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:689f95a36cf42309a399f5ba52ec196cde59872969af858b53964ee38aa63b7d
3-
size 282624
2+
oid sha256:775c1de57ec8efab581619243e669e856a14e8dc2aece76d69489de4a6915227
3+
size 236544
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c1cb2edd4e5cfd9e3ba031e1063a35e1d4231a261e537bd3472507dc5caa85dd
2+
oid sha256:0ab9fd1f2c46e4bf419df63d8894982cf7cb1acb2338ce1295d00087c5fcc59a
33
size 149504

src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/Debug/net6.0/mesh.cloudscripting.manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"wasLastProvisionAppSuccessful": "True",
2121
"wasLastDeployAppSuccessful": null,
2222
"wasLastUploadBlobSuccessful": "True",
23-
"meshAppBuildId": "afad3546-2fda-436b-8b02-4b1b7364394a",
23+
"meshAppBuildId": "4c932f7b-0bce-47ca-ab2d-d3c2cea3deb3",
2424
"debugTimeoutSecs": 120,
2525
"provisionState": "Inactive"
2626
}
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:5f86f48d048af40f51dfb147376f37ee016a281a4fed00cbd312311d37bea46a
3-
size 272384
2+
oid sha256:fc4cf7105712ed02b05b91e7d895e6f9507f10c337fb5a54fbba6df0845c9315
3+
size 202240
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c1cb2edd4e5cfd9e3ba031e1063a35e1d4231a261e537bd3472507dc5caa85dd
2+
oid sha256:0ab9fd1f2c46e4bf419df63d8894982cf7cb1acb2338ce1295d00087c5fcc59a
33
size 149504

src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/Release/net6.0/mesh.cloudscripting.manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"wasLastProvisionAppSuccessful": "True",
2121
"wasLastDeployAppSuccessful": null,
2222
"wasLastUploadBlobSuccessful": "False",
23-
"meshAppBuildId": "afad3546-2fda-436b-8b02-4b1b7364394a",
23+
"meshAppBuildId": "5563a566-c9c1-4dd4-a96b-f4eb355d4bde",
2424
"debugTimeoutSecs": 120,
2525
"provisionState": "Inactive"
2626
}
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:36cfbd85e43be31b31a1050712d78f73680acb2bbdbfbf9f84fcaa3c8a872581
3-
size 87475940
2+
oid sha256:159c20f95336ab1f71f06f997178ff72c02f066dfbb790b76fa6c688b0b7df17
3+
size 87461242
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:689f95a36cf42309a399f5ba52ec196cde59872969af858b53964ee38aa63b7d
3-
size 282624
2+
oid sha256:fc4cf7105712ed02b05b91e7d895e6f9507f10c337fb5a54fbba6df0845c9315
3+
size 202240
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c1cb2edd4e5cfd9e3ba031e1063a35e1d4231a261e537bd3472507dc5caa85dd
2+
oid sha256:0ab9fd1f2c46e4bf419df63d8894982cf7cb1acb2338ce1295d00087c5fcc59a
33
size 149504

src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/publish/mesh.cloudscripting.manifest.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"subscriptionId": "1310286d-4161-404b-b6eb-6a936fac3555",
2020
"wasLastProvisionAppSuccessful": "True",
2121
"wasLastDeployAppSuccessful": null,
22-
"wasLastUploadBlobSuccessful": "True",
23-
"meshAppBuildId": "afad3546-2fda-436b-8b02-4b1b7364394a",
22+
"wasLastUploadBlobSuccessful": "False",
23+
"meshAppBuildId": "5563a566-c9c1-4dd4-a96b-f4eb355d4bde",
2424
"debugTimeoutSecs": 120,
2525
"provisionState": "Inactive"
2626
}
Binary file not shown.

src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/mesh.cloudscripting.manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"wasLastProvisionAppSuccessful": "True",
2121
"wasLastDeployAppSuccessful": null,
2222
"wasLastUploadBlobSuccessful": "True",
23-
"meshAppBuildId": "afad3546-2fda-436b-8b02-4b1b7364394a",
23+
"meshAppBuildId": "5563a566-c9c1-4dd4-a96b-f4eb355d4bde",
2424
"debugTimeoutSecs": 120,
2525
"provisionState": "Inactive"
2626
}

src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Debug/net6.0/MIC-Maquette.AssemblyInfo.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
3-
// Ce code a été généré par un outil.
4-
// Version du runtime :4.0.30319.42000
3+
// This code was generated by a tool.
54
//
6-
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
7-
// le code est régénéré.
5+
// Changes to this file may cause incorrect behavior and will be lost if
6+
// the code is regenerated.
87
// </auto-generated>
98
//------------------------------------------------------------------------------
109

@@ -14,7 +13,7 @@
1413
[assembly: System.Reflection.AssemblyCompanyAttribute("MIC-Maquette")]
1514
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
1615
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
17-
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7d686b9bd9b8e8360f60ef3ef3cf7a2b1256fd6a")]
16+
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b77d4f21d19232ad0f39912b5dbad768e39f5d4b")]
1817
[assembly: System.Reflection.AssemblyProductAttribute("MIC-Maquette")]
1918
[assembly: System.Reflection.AssemblyTitleAttribute("MIC-Maquette")]
2019
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
87eee7c05714c3697f0601d901cd2f3e67a967eeb2670da9048bcefc7e4099dd
1+
bde8322c766282c3206b61c429bc33319846ddc9d4b05043c60661574a6f8337

src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Debug/net6.0/MIC-Maquette.GeneratedMSBuildEditorConfig.editorconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ build_property.EnforceExtendedAnalyzerRules =
99
build_property._SupportedPlatformList = Linux,macOS,Windows
1010
build_property.RootNamespace = MIC-Maquette
1111
build_property.RootNamespace = MIC-Maquette
12-
build_property.ProjectDir = C:\Users\MissonOscar\Desktop\Mesh-Innovate-Connect\src\MIC\Assets\.MeshCloudScripting\MIC-Maquette\
12+
build_property.ProjectDir = C:\Users\Thoma\Desktop\Mesh-Innovate-Connect\src\MIC\Assets\.MeshCloudScripting\MIC-Maquette\
1313
build_property.EnableComHosting =
1414
build_property.EnableGeneratedComInterfaceComImportInterop =
1515
build_property.RazorLangVersion = 6.0
1616
build_property.SupportLocalizedComponentNames =
1717
build_property.GenerateRazorMetadataSourceChecksumAttributes =
18-
build_property.MSBuildProjectDirectory = C:\Users\MissonOscar\Desktop\Mesh-Innovate-Connect\src\MIC\Assets\.MeshCloudScripting\MIC-Maquette
18+
build_property.MSBuildProjectDirectory = C:\Users\Thoma\Desktop\Mesh-Innovate-Connect\src\MIC\Assets\.MeshCloudScripting\MIC-Maquette
1919
build_property._RazorSourceGeneratorDebug =
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a4d67e05918d77b936d91849ad387aa688e1406b1aa5e8373fb9814fdfde978c
1+
8f3cfcfd82db58fb8aa5e0ebf63b94ee268ffc7f0f807af79c5df1b437426fb7

0 commit comments

Comments
 (0)