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.

Sign up for GitHub

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

Jump to bottom

Virtual Environments #127

Open
wants to merge 34 commits into
base: develop
Choose a base branch
from
Open

Virtual Environments #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
93321b5
Added Menu for Virtual Environment Feature and Linked it to Main Menu
EmilieHK Aug 12, 2020
2c6da10
Added exemplary skyboxes
JulianStaab Aug 12, 2020
ba5d344
Added Scripts to store and display environments
EmilieHK Aug 12, 2020
7dc3fd6
Added VE Preview Item
JulianStaab Aug 12, 2020
c0a66e0
Merge
JulianStaab Aug 12, 2020
9c9efce
Fixed merge errors and linked the preview item to the menu
JulianStaab Aug 12, 2020
f271774
Worked on the Virtual Environments menu
JulianStaab Aug 21, 2020
0b2c875
Implemented Item Display in the VE Menu
JulianStaab Aug 21, 2020
9807d30
Folder CleanUp
EmilieHK Aug 22, 2020
9c899fd
Finished virtual environments selection window
JulianStaab Aug 25, 2020
57f9055
Created and added better preview images
JulianStaab Aug 25, 2020
c6ad38e
Added 3D Model of Office Room
EmilieHK Aug 25, 2020
d77c2cd
Added several new environments and 3d objects
JulianStaab Aug 25, 2020
907e03c
Implemented AR or VR check
JulianStaab Sep 2, 2020
9c96630
Worked on the virtual environments
JulianStaab Sep 2, 2020
49cc91c
Added more 3d environment prefabs
EmilieHK Sep 8, 2020
924d083
Added several more 3d environments and preview images
Sep 9, 2020
6e8606a
Added Credits windows to the Virtual Environments
JulianStaab Oct 6, 2020
a299a7a
Updated this branch to MRTK v2.4.0 and fixed several issues caused by…
JulianStaab Dec 14, 2020
f80bc4f
Testing features
Dec 15, 2020
c5905e6
Removed Button Scaling when being focused
Dec 15, 2020
1de2a70
Preparation for build
Feb 24, 2021
bd80aad
Removed files from different branch
Feb 24, 2021
465f222
Fixed building issues with Photon
JulianStaab Mar 18, 2021
e412119
Minor Clean-Up
EmilieHK Aug 5, 2021
a5acb34
minor photon fix
JulianStaab Aug 8, 2021
cea0cc8
added virtual environments asset bundles and added the assets
JulianStaab Aug 8, 2021
a60e0ae
create exportable asset bundle manifests
JulianStaab Aug 8, 2021
091938d
Implemented Loading from AssetBundles
JulianStaab Aug 8, 2021
eb79bf9
Removed VE Assets; Now only uses AssetBundles
JulianStaab Aug 8, 2021
e8c0761
Added VR/AR check on the environment load
JulianStaab Aug 8, 2021
e2fc697
Rework of the VEMenu script
JulianStaab Aug 11, 2021
3eb4409
Implemented Quiz Downloader
JulianStaab Mar 22, 2022
9b986b2
Revert "Implemented Quiz Downloader"
JulianStaab Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...owsMixedReality/Shared/DotNetAdapter.meta → Frontend/VIAProMa/Assets/AssetBundles.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Frontend/VIAProMa/Assets/AssetBundles/AssetBundles
View file
Open in desktop
Binary file not shown.
25 changes: 25 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/AssetBundles.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
ManifestFileVersion: 0
CRC: 2014439043
AssetBundleManifest:
AssetBundleInfos:
Info_0:
Name: artgallery
Dependencies: {}
Info_1:
Name: conferenceroom
Dependencies: {}
Info_2:
Name: hotelroom
Dependencies: {}
Info_3:
Name: silentlibrary
Dependencies: {}
Info_4:
Name: modernoffice
Dependencies: {}
Info_5:
Name: winterloft
Dependencies: {}
Info_6:
Name: roundgallery
Dependencies: {}
7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/AssetBundles.manifest.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/AssetBundles.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Frontend/VIAProMa/Assets/AssetBundles/artgallery
View file
Open in desktop
Binary file not shown.
38 changes: 38 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/artgallery.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
ManifestFileVersion: 0
CRC: 153468764
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: a510fef27a1d17ee03766e4a873de291
TypeTreeHash:
serializedVersion: 2
Hash: 069797ccdc458d01886e092d5a79e275
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 4
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 23
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 33
Script: {instanceID: 0}
- Class: 43
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 49
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
Assets:
- Assets/3D Models/VirtualEnvironments/Art Gallery/Art Gallery.prefab
- Assets/Virtual Environments/PreviewImages/PI_countryhouse.PNG
- Assets/Virtual Environments/Sample_Skyboxes/Outdoor Environments/Nature Sunrise/Nature
Sunrise.mat
- Assets/Virtual Environments/CreditStrings/CountryHouseCredits.txt
Dependencies: []
7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/artgallery.manifest.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/artgallery.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Frontend/VIAProMa/Assets/AssetBundles/conferenceroom
View file
Open in desktop
Binary file not shown.
44 changes: 44 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/conferenceroom.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
ManifestFileVersion: 0
CRC: 1157137925
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: fe1f5b21b70ee262bfcd9efc727b20da
TypeTreeHash:
serializedVersion: 2
Hash: cf74657c334ef892cf2488e785dfac7c
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 4
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 23
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 33
Script: {instanceID: 0}
- Class: 43
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 49
Script: {instanceID: 0}
- Class: 65
Script: {instanceID: 0}
- Class: 90
Script: {instanceID: 0}
- Class: 95
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
Assets:
- Assets/Virtual Environments/CreditStrings/ConferenceRoomCredits.txt
- Assets/Virtual Environments/PreviewImages/PI_conferenceroom.PNG
- Assets/Virtual Environments/Sample_Skyboxes/Outdoor Environments/Venice Sunset/Venice
Sunset.mat
- Assets/3D Models/VirtualEnvironments/Modern Lounge/Modern Lounge.prefab
Dependencies: []
7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/conferenceroom.manifest.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/conferenceroom.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Frontend/VIAProMa/Assets/AssetBundles/hotelroom
View file
Open in desktop
Binary file not shown.
26 changes: 26 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/hotelroom.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
ManifestFileVersion: 0
CRC: 4177383486
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: c70521b4246c7ce289e0a101b8730002
TypeTreeHash:
serializedVersion: 2
Hash: 5a4f7949edd0ea13039d74a0f9fc997e
HashAppended: 0
ClassTypes:
- Class: 21
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 49
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
Assets:
- Assets/Virtual Environments/CreditStrings/HotelRoomCredits.txt
- Assets/Virtual Environments/Sample_Skyboxes/Indoors Environments/HotelRoomBeige/Skybox_HRB.mat
- Assets/Virtual Environments/PreviewImages/PI_hotelroom.PNG
Dependencies: []
7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/hotelroom.manifest.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/hotelroom.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Frontend/VIAProMa/Assets/AssetBundles/modernoffice
View file
Open in desktop
Binary file not shown.
37 changes: 37 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/modernoffice.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
ManifestFileVersion: 0
CRC: 1517764436
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 264b8011a089f7fa54023ac21f9f5e73
TypeTreeHash:
serializedVersion: 2
Hash: 069797ccdc458d01886e092d5a79e275
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 4
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 23
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 33
Script: {instanceID: 0}
- Class: 43
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 49
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
Assets:
- Assets/Virtual Environments/CreditStrings/ModernOfficeCredits.txt
- Assets/Virtual Environments/PreviewImages/PI_modernoffice.PNG
- Assets/3D Models/VirtualEnvironments/Modern Office/Office_VR.prefab
- Assets/Virtual Environments/Sample_Skyboxes/Outdoor Environments/Epic_BlueSunset/Epic_BlueSunset.mat
Dependencies: []
7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/modernoffice.manifest.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/modernoffice.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Frontend/VIAProMa/Assets/AssetBundles/roundgallery
View file
Open in desktop
Binary file not shown.
37 changes: 37 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/roundgallery.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
ManifestFileVersion: 0
CRC: 1417199156
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 2517bfbaec68e44ca33eb8c99ef9d2b1
TypeTreeHash:
serializedVersion: 2
Hash: 069797ccdc458d01886e092d5a79e275
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 4
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 23
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 33
Script: {instanceID: 0}
- Class: 43
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 49
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
Assets:
- Assets/Virtual Environments/Sample_Skyboxes/Outdoor Environments/Epic_GloriousPink/Epic_GloriousPink.mat
- Assets/Virtual Environments/CreditStrings/RoundGalleryCredits.txt
- Assets/Virtual Environments/PreviewImages/PI_roundgallery.PNG
- Assets/3D Models/VirtualEnvironments/Round Gallery/Round Gallery.prefab
Dependencies: []
7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/roundgallery.manifest.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/roundgallery.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Frontend/VIAProMa/Assets/AssetBundles/silentlibrary
View file
Open in desktop
Binary file not shown.
38 changes: 38 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/silentlibrary.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
ManifestFileVersion: 0
CRC: 644650935
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: d242817638b1ffc74893663dfe9dc8cc
TypeTreeHash:
serializedVersion: 2
Hash: 069797ccdc458d01886e092d5a79e275
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 4
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 23
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 33
Script: {instanceID: 0}
- Class: 43
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 49
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
Assets:
- Assets/Virtual Environments/Sample_Skyboxes/Outdoor Environments/Cold Night/Cold
Night.mat
- Assets/Virtual Environments/PreviewImages/PI_silentlibrary.PNG
- Assets/Virtual Environments/CreditStrings/SilentLibraryCredits.txt
- Assets/3D Models/VirtualEnvironments/Silent Library/Silent Library.prefab
Dependencies: []
7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/silentlibrary.manifest.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Frontend/VIAProMa/Assets/AssetBundles/silentlibrary.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Frontend/VIAProMa/Assets/AssetBundles/winterloft
View file
Open in desktop
Binary file not shown.
Loading