upgrade arena-unity and add citation

arenaxr · May 13, 2024 · c461031 · c461031
1 parent 12309f0
commit c461031
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 67 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 RenderFusion with [ARENA](https://arenaxr.org/) and Unity!
 
-<img alt="" src="Documentation~/images/demo.png">
+<img alt="demo image" src="Documentation~/images/demo.png">
 
 See a demo video [here](https://www.youtube.com/watch?v=6mA4k9myuOM)!
 
@@ -29,3 +29,13 @@ Open `Samples~/HDRP`.
 
 ## License
 See the [LICENSE](LICENSE) file.
+
+If you find this project helpful for any research-related purposes, please consider citing our paper:
+```
+@inproceedings{renderfusion,
+  author = {Lu, Edward and Bharadwaj, Sagar and Dasari, Mallesham and Smith, Connor and Seshan, Srinivasan and Rowe, Anthony},
+  booktitle = {2023 International Symposium on Mixed and Augmented Reality (ISMAR)},
+  title = {RenderFusion: Balancing Local and Remote Rendering for Interactive 3D Scenes},
+  year = {2023}
+}
+```
diff --git a/Samples~/HDRP/Packages/manifest.json b/Samples~/HDRP/Packages/manifest.json
@@ -3,7 +3,6 @@
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
     "com.unity.ai.navigation": "1.1.5",
-    "com.unity.cloud.draco.webgl-2022": "1.0.0",
     "com.unity.feature.development": "1.0.1",
     "com.unity.ide.rider": "3.0.27",
     "com.unity.ide.visualstudio": "2.0.22",

diff --git a/Samples~/HDRP/Packages/packages-lock.json b/Samples~/HDRP/Packages/packages-lock.json
@@ -35,7 +35,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.cloud.draco": {
-      "version": "5.0.2",
+      "version": "5.1.3",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -44,15 +44,8 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.cloud.draco.webgl-2022": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.cloud.gltfast": {
-      "version": "6.2.0",
+      "version": "6.4.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -63,6 +56,15 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.cloud.ktx": {
+      "version": "3.4.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.collab-proxy": {
       "version": "2.2.0",
       "depth": 1,
@@ -130,6 +132,16 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.meshopt.decompress": {
+      "version": "0.1.0-preview.6",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.burst": "1.4.11"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.nuget.newtonsoft-json": {
       "version": "3.2.1",
       "depth": 1,
@@ -241,8 +253,8 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
-      "version": "3.0.6",
-      "depth": 0,
+      "version": "3.0.8",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.ugui": "1.0.0"
@@ -315,37 +327,39 @@
       "depth": 0,
       "source": "git",
       "dependencies": {
-        "com.unity.webrtc": "3.0.0-pre.6",
+        "com.unity.webrtc": "3.0.0-pre.7",
         "io.conix.arena.unity": "https://github.com/arenaxr/arena-unity.git"
       },
-      "hash": "140b529d220b188d8db4e2e1b97730cc26e611d5"
+      "hash": "12309f0879828af0b2668a1e29488a57be1361c7"
     },
     "io.conix.arena.renderfusion-hdrp": {
       "version": "https://github.com/arenaxr/arena-renderfusion.git?path=/Addons~/io.conix.arena.renderfusion-hdrp",
       "depth": 0,
       "source": "git",
       "dependencies": {
-        "com.unity.webrtc": "3.0.0-pre.6",
+        "com.unity.webrtc": "3.0.0-pre.7",
         "io.conix.arena.unity": "https://github.com/arenaxr/arena-unity.git",
         "io.conix.arena.renderfusion": "https://github.com/arenaxr/arena-renderfusion.git"
       },
-      "hash": "140b529d220b188d8db4e2e1b97730cc26e611d5"
+      "hash": "12309f0879828af0b2668a1e29488a57be1361c7"
     },
     "io.conix.arena.unity": {
       "version": "https://github.com/arenaxr/arena-unity.git",
       "depth": 0,
       "source": "git",
       "dependencies": {
-        "com.unity.cloud.draco": "5.0.2",
-        "com.unity.cloud.gltfast": "6.2.0",
+        "com.unity.cloud.gltfast": "6.4.0",
+        "com.unity.cloud.draco": "5.1.3",
+        "com.unity.cloud.ktx": "3.4.0",
+        "com.unity.meshopt.decompress": "0.1.0-preview.6",
         "com.unity.nuget.newtonsoft-json": "3.0.2",
         "com.unity.collab-proxy": "1.2.16",
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.ide.rider": "1.2.1",
         "com.unity.ide.visualstudio": "2.0.8",
         "com.unity.ide.vscode": "1.2.3",
         "com.unity.test-framework": "1.1.24",
-        "com.unity.textmeshpro": "2.1.4",
+        "com.unity.textmeshpro": "3.0.8",
         "com.unity.timeline": "1.2.18",
         "com.unity.ugui": "1.0.0",
         "com.unity.modules.ai": "1.0.0",
@@ -380,7 +394,7 @@
         "com.unity.modules.wind": "1.0.0",
         "com.unity.modules.xr": "1.0.0"
       },
-      "hash": "6e3ea0b60cf7b53bb26cd24168215b3fffeffaf2"
+      "hash": "c44610b36ad3edbb35b78cd85ba6ed45ee75267e"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",

diff --git a/Samples~/SRP/Packages/manifest.json b/Samples~/SRP/Packages/manifest.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "com.unity.cloud.draco.webgl-2022": "1.0.0",
     "com.unity.toolchain.linux-x86_64": "2.0.6",
     "com.unity.webrtc": "3.0.0-pre.7",
     "io.conix.arena.renderfusion": "https://github.com/arenaxr/arena-renderfusion.git",

diff --git a/Samples~/SRP/Packages/packages-lock.json b/Samples~/SRP/Packages/packages-lock.json
@@ -11,7 +11,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.cloud.draco": {
-      "version": "5.0.2",
+      "version": "5.1.3",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -20,15 +20,8 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.cloud.draco.webgl-2022": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.cloud.gltfast": {
-      "version": "6.2.0",
+      "version": "6.4.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -39,6 +32,15 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.cloud.ktx": {
+      "version": "3.4.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.collab-proxy": {
       "version": "2.2.0",
       "depth": 1,
@@ -92,6 +94,16 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.meshopt.decompress": {
+      "version": "0.1.0-preview.6",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.burst": "1.4.11"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.nuget.newtonsoft-json": {
       "version": "3.2.1",
       "depth": 1,
@@ -127,7 +139,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
-      "version": "3.0.6",
+      "version": "3.0.8",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -192,16 +204,18 @@
       "depth": 0,
       "source": "git",
       "dependencies": {
-        "com.unity.cloud.draco": "5.0.2",
-        "com.unity.cloud.gltfast": "6.2.0",
+        "com.unity.cloud.gltfast": "6.4.0",
+        "com.unity.cloud.draco": "5.1.3",
+        "com.unity.cloud.ktx": "3.4.0",
+        "com.unity.meshopt.decompress": "0.1.0-preview.6",
         "com.unity.nuget.newtonsoft-json": "3.0.2",
         "com.unity.collab-proxy": "1.2.16",
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.ide.rider": "1.2.1",
         "com.unity.ide.visualstudio": "2.0.8",
         "com.unity.ide.vscode": "1.2.3",
         "com.unity.test-framework": "1.1.24",
-        "com.unity.textmeshpro": "2.1.4",
+        "com.unity.textmeshpro": "3.0.8",
         "com.unity.timeline": "1.2.18",
         "com.unity.ugui": "1.0.0",
         "com.unity.modules.ai": "1.0.0",
@@ -236,7 +250,7 @@
         "com.unity.modules.wind": "1.0.0",
         "com.unity.modules.xr": "1.0.0"
       },
-      "hash": "6e3ea0b60cf7b53bb26cd24168215b3fffeffaf2"
+      "hash": "c44610b36ad3edbb35b78cd85ba6ed45ee75267e"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",

diff --git a/Samples~/URP/Assets/Scenes/MyScene.unity b/Samples~/URP/Assets/Scenes/MyScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.18028326, g: 0.22571333, b: 0.30692202, a: 1}
+  m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -205,7 +205,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -454,6 +454,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 743554626676363792, guid: 600d2e340ad8949ea87932bc0ffe7159,
+        type: 3}
+      propertyPath: hostAddress
+      value: arenaxr.org
+      objectReference: {fileID: 0}
+    - target: {fileID: 743554626676363792, guid: 600d2e340ad8949ea87932bc0ffe7159,
+        type: 3}
+      propertyPath: namespaceName
+      value: Edward
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

diff --git a/Samples~/URP/Packages/manifest.json b/Samples~/URP/Packages/manifest.json
@@ -1,17 +1,16 @@
 {
   "dependencies": {
     "com.unity.ai.navigation": "1.1.5",
-    "com.unity.cloud.draco.webgl-2022": "1.0.0",
     "com.unity.collab-proxy": "2.2.0",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.render-pipelines.universal": "14.0.10",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.7.6",
-    "com.unity.toolchain.linux-x86_64": "2.0.6",
+    "com.unity.toolchain.linux-x86_64": "2.0.9",
     "com.unity.ugui": "1.0.0",
-    "com.unity.visualscripting": "1.9.1",
+    "com.unity.visualscripting": "1.9.4",
     "com.unity.webrtc": "3.0.0-pre.7",
     "io.conix.arena.renderfusion": "https://github.com/arenaxr/arena-renderfusion.git",
     "io.conix.arena.renderfusion-urp": "https://github.com/arenaxr/arena-renderfusion.git?path=/Addons~/io.conix.arena.renderfusion-urp",