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

Added tool to load and unload gltf files from the MainScene.unity #22

Merged
merged 29 commits into from
May 28, 2024
Merged

Added tool to load and unload gltf files from the MainScene.unity #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
50f3d0d
Added tool to load and unload gltf files from the MainScene.unity
Etiennefaivredarcier Mar 7, 2024
ddf8868
Added AR packages dependencies and commented scene viewer media free
Etiennefaivredarcier Mar 27, 2024
349f73c
Fixed dependencies package versions and fixed warnings
Etiennefaivredarcier Apr 4, 2024
b0a2fc0
Added text mesh pro assets - re-added simple UI to load content files…
Etiennefaivredarcier Apr 5, 2024
eb84792
Added simple UI to select scenes, text mesh pro package, and fix depe…
Etiennefaivredarcier Apr 5, 2024
61dc7e6
doc update
nlsdvl Mar 18, 2024
352696f
fix 5G-MAG/rt-xr-unity-player#26
nlsdvl Mar 22, 2024
6f8bd21
fix broken issue template
nlsdvl Mar 15, 2024
1420cfb
adds build check on pull request - 5G-MAG/rt-xr-unity-player#21
nlsdvl Mar 15, 2024
f96845d
update rt-xr- dependencies documentation
nlsdvl Mar 22, 2024
a497a47
fix build section anchor change
nlsdvl Mar 22, 2024
abf34d8
fix 5G-MAG/rt-xr-unity-player#28
nlsdvl Mar 22, 2024
d52096d
update README
nlsdvl Mar 26, 2024
7f4119f
add guidelines to work on embeded dependencies
nlsdvl Mar 27, 2024
5633431
Merge pull request #25 from 5G-MAG/development
nlsdvl Mar 15, 2024
3819b46
Merge pull request #29 from 5G-MAG/v0.9.x
nlsdvl Apr 2, 2024
805a4d7
Updated glTFast submodule commit hash
Etiennefaivredarcier Apr 12, 2024
bcd055c
Updated glTFast repository commit, fixed android path in glTF menu
Etiennefaivredarcier Apr 15, 2024
5335174
Added google arcore extensions submodule
Etiennefaivredarcier Apr 15, 2024
7ff0f58
updated google ar core extension package version
Etiennefaivredarcier Apr 15, 2024
58cd422
Fixed project settings and readme conflicts
Etiennefaivredarcier Apr 15, 2024
5ec8290
Updated project settings
Etiennefaivredarcier Apr 17, 2024
9ef4bf2
updated glTFast commit
Etiennefaivredarcier Apr 17, 2024
0eb6813
use .meta files to configure target on media pipelines
nlsdvl Apr 18, 2024
e416582
fix disposal of MediaPlayer when unloading a gltf scene
nlsdvl Apr 25, 2024
11f7e2a
Added XR base assets and added a Paths.txt to load glTF files
Etiennefaivredarcier Apr 26, 2024
8fa6f48
Added http support on the gltfListItem.cs
Etiennefaivredarcier Apr 26, 2024
7a9bf6c
Move Paths.txt to Ressources folder
nlsdvl May 28, 2024
a9c20fa
updates rt-xr-glTFast with support for MPEG_anchoring
nlsdvl May 28, 2024
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: 7 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,10 @@
path = Packages/com.atteneder.gltfast
url = https://github.com/5G-MAG/rt-xr-gITFast.git
branch = dev/iso-23090-14
[submodule "Packages/com.google.ar.core.arfoundation.extensions"]
path = Packages/com.google.ar.core.arfoundation.extensions
url = https://github.com/google-ar/arcore-unity-extensions.git
branch = v1.41.0
[submodule "Packages/arcore-unity-extensions"]
path = Packages/arcore-unity-extensions
url = https://github.com/google-ar/arcore-unity-extensions.git
5 changes: 5 additions & 0 deletions .vscode/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"visualstudiotoolsforunity.vstuc"
]
}
10 changes: 10 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Attach to Unity",
"type": "vstuc",
"request": "attach"
}
]
}
55 changes: 55 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"files.exclude": {
"**/.DS_Store": true,
"**/.git": true,
"**/.gitmodules": true,
"**/*.booproj": true,
"**/*.pidb": true,
"**/*.suo": true,
"**/*.user": true,
"**/*.userprefs": true,
"**/*.unityproj": true,
"**/*.dll": true,
"**/*.exe": true,
"**/*.pdf": true,
"**/*.mid": true,
"**/*.midi": true,
"**/*.wav": true,
"**/*.gif": true,
"**/*.ico": true,
"**/*.jpg": true,
"**/*.jpeg": true,
"**/*.png": true,
"**/*.psd": true,
"**/*.tga": true,
"**/*.tif": true,
"**/*.tiff": true,
"**/*.3ds": true,
"**/*.3DS": true,
"**/*.fbx": true,
"**/*.FBX": true,
"**/*.lxo": true,
"**/*.LXO": true,
"**/*.ma": true,
"**/*.MA": true,
"**/*.obj": true,
"**/*.OBJ": true,
"**/*.asset": true,
"**/*.cubemap": true,
"**/*.flare": true,
"**/*.mat": true,
"**/*.meta": true,
"**/*.prefab": true,
"**/*.unity": true,
"build/": true,
"Build/": true,
"Library/": true,
"library/": true,
"obj/": true,
"Obj/": true,
"ProjectSettings/": true,
"temp/": true,
"Temp/": true
},
"dotnet.defaultSolution": "gltfsceneviewer.sln"
}
29 changes: 29 additions & 0 deletions Assets/Resources/ExampleReferenceImageLibrary.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 848409ee8ba454f42a5ddff137688a27, type: 3}
m_Name: ExampleReferenceImageLibrary
m_EditorClassIdentifier:
m_GuidLow: 5742386992110946922
m_GuidHigh: 162396364293496233
m_DataStore:
m_Storage: []
m_Images:
- m_SerializedGuid:
m_GuidLow: 5417433671449033477
m_GuidHigh: 14958399675139131034
m_SerializedTextureGuid:
m_GuidLow: 5738842387350746723
m_GuidHigh: 281997926308445056
m_Size: {x: 0, y: 0}
m_SpecifySize: 0
m_Name: DefaultTexture
m_Texture: {fileID: 0}
8 changes: 8 additions & 0 deletions Assets/Resources/ExampleReferenceImageLibrary.asset.meta
View file
Open in desktop

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

26 changes: 26 additions & 0 deletions Assets/Resources/Paths.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_app_n.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_app_s.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_ctrl_n.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_ctrl_s.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_floor_n.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_floor_n_a.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_floor_s.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_geom_n.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_geom_s.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_geoSpatial_n_cs.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_geoSpatial_s_cs.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_m2D_n.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_m2D_s.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_m3D_n.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_m3D_s.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_viewer_n.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/anchoring/anchorTest_viewer_s.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/gravity/gravity.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/interactivity/UseCase_01-variant3-Interactivity.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/interactivity/UseCase_02-variant3-Interactivity.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/interactivity/UseCase_03-variant1-Interactivity.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/interactivity/UseCase_03-variant3-Interactivity.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/TV/scene.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/video/scene-av-combined.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/video/scene-av-independant.gltf
https://raw.githubusercontent.com/5G-MAG/rt-xr-content/rt-xr/dev/mpeg_anchoring/video/scene.gltf
7 changes: 7 additions & 0 deletions Assets/Resources/Paths.txt.meta
View file
Open in desktop

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

Loading
Loading