123

GHZMRSpaceXR.sln

@@ -5,14 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarsPB", "MarsPB.csproj", "{39D8A39D-551A-7EE4-DF2B-683F2184A386}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Demos", "AVProVideo.Demos.csproj", "{B4FA4F2C-5A03-B7CA-FE63-252418910BB9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.Timeline", "AVProVideo.Extensions.Timeline.csproj", "{645EC6B1-0F78-6394-2887-4A5829512E27}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.UnityUI", "AVProVideo.Extensions.UnityUI.csproj", "{EF6AD545-1FEC-FF18-19E4-AC36EACDB8A3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.VisualEffectGraph", "AVProVideo.Extensions.VisualEffectGraph.csproj", "{DAE146D9-4257-171E-34CA-698928D18F2D}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{0B921971-FAAE-A324-DFD6-5664460350D6}"
@@ -33,22 +25,6 @@ Global
 		{39D8A39D-551A-7EE4-DF2B-683F2184A386}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39D8A39D-551A-7EE4-DF2B-683F2184A386}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39D8A39D-551A-7EE4-DF2B-683F2184A386}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B4FA4F2C-5A03-B7CA-FE63-252418910BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4FA4F2C-5A03-B7CA-FE63-252418910BB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4FA4F2C-5A03-B7CA-FE63-252418910BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B4FA4F2C-5A03-B7CA-FE63-252418910BB9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{645EC6B1-0F78-6394-2887-4A5829512E27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{645EC6B1-0F78-6394-2887-4A5829512E27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{645EC6B1-0F78-6394-2887-4A5829512E27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{645EC6B1-0F78-6394-2887-4A5829512E27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF6AD545-1FEC-FF18-19E4-AC36EACDB8A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF6AD545-1FEC-FF18-19E4-AC36EACDB8A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF6AD545-1FEC-FF18-19E4-AC36EACDB8A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF6AD545-1FEC-FF18-19E4-AC36EACDB8A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DAE146D9-4257-171E-34CA-698928D18F2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DAE146D9-4257-171E-34CA-698928D18F2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DAE146D9-4257-171E-34CA-698928D18F2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DAE146D9-4257-171E-34CA-698928D18F2D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}.Release|Any CPU.ActiveCfg = Release|Any CPU

Packages/manifest.json

@@ -1,9 +1,6 @@
 {
   "dependencies": {
-    "com.ghz.avideoplayer": "https://gogs.ghz-tech.com:8843/GHzGlass/VideoPlayerXR.git",
-    "jh.baseeditor.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZBasePackage.git",
-    "jh.trilib.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/TriLibXR.git",
-    "jh.xr.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_A01",
+    "com.ghz.avideoplayer": "https://gogs.ghz-tech.com:8843/GHzGlass/VideoPlayerXR.git#EasyMovieTexture",
     "com.ptc.vuforia.engine": "file:com.ptc.vuforia.engine-10.13.3.tgz",
     "com.unity.ide.rider": "3.0.16",
     "com.unity.ide.visualstudio": "2.0.16",
@@ -17,6 +14,9 @@
     "com.unity.xr.arcore": "4.2.8",
     "com.unity.xr.arfoundation": "4.2.8",
     "com.unity.xr.openxr": "1.5.3",
+    "jh.baseeditor.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZBasePackage.git",
+    "jh.trilib.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/TriLibXR.git",
+    "jh.xr.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Phone",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

Packages/packages-lock.json

@@ -1,11 +1,11 @@
 {
   "dependencies": {
     "com.ghz.avideoplayer": {
-      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/VideoPlayerXR.git",
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/VideoPlayerXR.git#EasyMovieTexture",
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "0c10eb2d941902e3b5ff389c956ee49fd8d19f54"
+      "hash": "226456e7e10d7ad11486d11c42e302ffcfdacce1"
     },
     "com.ptc.vuforia.engine": {
       "version": "file:com.ptc.vuforia.engine-10.13.3.tgz",
@@ -200,15 +200,18 @@
       "hash": "474231f32c66e7b039e2f96aaf39165650f30cb0"
     },
     "jh.xr.engine": {
-      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_A01",
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Phone",
       "depth": 0,
       "source": "git",
       "dependencies": {
         "com.unity.xr.management": "4.0.1",
         "com.unity.xr.legacyinputhelpers": "2.1.2",
-        "com.unity.inputsystem": "1.4.2"
+        "com.unity.inputsystem": "1.4.2",
+        "com.unity.xr.arcore": "4.2.8",
+        "com.unity.xr.arfoundation": "4.2.8",
+        "com.unity.xr.openxr": "1.5.3"
       },
-      "hash": "c54eaf05e8a8a5ae4de15d9b7b85e25a7b5fcbec"
+      "hash": "1b2401a54e6eae3ffb8d1181c87b9c26c523d3c9"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",

ProjectSettings/ProjectSettings.asset

@@ -146,7 +146,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 10.13.3
+  bundleVersion: 2.1.0
   preloadedAssets:
   - {fileID: 0}
   - {fileID: 0}
@@ -171,7 +171,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.vuforia.engine.VuforiaEngine
+    Android: com.ghz.MRSpace
     Lumin: com.PTCInc.VuforiaEngine
     Standalone: com.PTCInc.VuforiaEngine
     iPhone: com.vuforia.engine.VuforiaEngine
@@ -181,7 +181,7 @@ PlayerSettings:
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 10133
-  AndroidMinSdkVersion: 26
+  AndroidMinSdkVersion: 28
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -189,7 +189,7 @@ PlayerSettings:
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
   ForceInternetPermission: 1
-  ForceSDCardPermission: 0
+  ForceSDCardPermission: 1
   CreateWallpaper: 0
   APKExpansionFiles: 0
   keepLoadedShadersAlive: 0
@@ -257,12 +257,12 @@ PlayerSettings:
   clonedFromGUID: 2384ff924a3af4e60b5229a9cc8b5126
   templatePackageId: 
   templateDefaultScene: 
-  useCustomMainManifest: 0
+  useCustomMainManifest: 1
   useCustomLauncherManifest: 0
   useCustomMainGradleTemplate: 0
   useCustomLauncherGradleManifest: 0
-  useCustomBaseGradleTemplate: 0
-  useCustomGradlePropertiesTemplate: 0
+  useCustomBaseGradleTemplate: 1
+  useCustomGradlePropertiesTemplate: 1
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 2
   AndroidTargetDevices: 0
@@ -529,7 +529,10 @@ PlayerSettings:
       m_Height: 76
       m_Kind: 0
       m_SubKind: iPad
-  m_BuildTargetBatching: []
+  m_BuildTargetBatching:
+  - m_BuildTarget: Android
+    m_StaticBatching: 1
+    m_DynamicBatching: 1
   m_BuildTargetShaderSettings: []
   m_BuildTargetGraphicsJobs:
   - m_BuildTarget: MacStandaloneSupport
@@ -578,7 +581,7 @@ PlayerSettings:
   openGLRequireES32: 0
   m_TemplateCustomTags: {}
   mobileMTRendering:
-    Android: 0
+    Android: 1
     iPhone: 1
     tvOS: 1
   m_BuildTargetGroupLightmapEncodingQuality:
@@ -861,7 +864,7 @@ PlayerSettings:
   incrementalIl2cppBuild:
     iPhone: 1
   suppressCommonWarnings: 1
-  allowUnsafeCode: 0
+  allowUnsafeCode: 1
   useDeterministicCompilation: 1
   enableRoslynAnalyzers: 1
   selectedPlatform: 2

ProjectSettings/QualitySettings.asset

@@ -129,12 +129,12 @@ QualitySettings:
     skinWeights: 2
     textureQuality: 0
     anisotropicTextures: 1
-    antiAliasing: 0
+    antiAliasing: 4
     softParticles: 0
     softVegetation: 1
     realtimeReflectionProbes: 1
     billboardsFaceCameraPosition: 1
-    vSyncCount: 1
+    vSyncCount: 0
     lodBias: 1
     maximumLODLevel: 0
     streamingMipmapsActive: 0
@@ -151,13 +151,13 @@ QualitySettings:
     customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   - serializedVersion: 2
-    name: Very High
-    pixelLightCount: 3
+    name: Ultra
+    pixelLightCount: 4
     shadows: 2
     shadowResolution: 2
     shadowProjection: 1
-    shadowCascades: 2
-    shadowDistance: 70
+    shadowCascades: 4
+    shadowDistance: 150
     shadowNearPlaneOffset: 3
     shadowCascade2Split: 0.33333334
     shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
@@ -165,13 +165,13 @@ QualitySettings:
     skinWeights: 4
     textureQuality: 0
     anisotropicTextures: 2
-    antiAliasing: 2
+    antiAliasing: 4
     softParticles: 1
     softVegetation: 1
     realtimeReflectionProbes: 1
     billboardsFaceCameraPosition: 1
     vSyncCount: 1
-    lodBias: 1.5
+    lodBias: 2
     maximumLODLevel: 0
     streamingMipmapsActive: 0
     streamingMipmapsAddAllCameras: 1
@@ -179,7 +179,7 @@ QualitySettings:
     streamingMipmapsRenderersPerFrame: 512
     streamingMipmapsMaxLevelReduction: 2
     streamingMipmapsMaxFileIORequests: 1024
-    particleRaycastBudget: 1024
+    particleRaycastBudget: 4096
     asyncUploadTimeSlice: 2
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
@@ -187,13 +187,13 @@ QualitySettings:
     customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   - serializedVersion: 2
-    name: Ultra
-    pixelLightCount: 4
+    name: Very High
+    pixelLightCount: 3
     shadows: 2
     shadowResolution: 2
     shadowProjection: 1
-    shadowCascades: 4
-    shadowDistance: 150
+    shadowCascades: 2
+    shadowDistance: 70
     shadowNearPlaneOffset: 3
     shadowCascade2Split: 0.33333334
     shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
@@ -201,13 +201,13 @@ QualitySettings:
     skinWeights: 4
     textureQuality: 0
     anisotropicTextures: 2
-    antiAliasing: 2
+    antiAliasing: 4
     softParticles: 1
     softVegetation: 1
     realtimeReflectionProbes: 1
     billboardsFaceCameraPosition: 1
     vSyncCount: 1
-    lodBias: 2
+    lodBias: 1.5
     maximumLODLevel: 0
     streamingMipmapsActive: 0
     streamingMipmapsAddAllCameras: 1
@@ -215,7 +215,7 @@ QualitySettings:
     streamingMipmapsRenderersPerFrame: 512
     streamingMipmapsMaxLevelReduction: 2
     streamingMipmapsMaxFileIORequests: 1024
-    particleRaycastBudget: 4096
+    particleRaycastBudget: 1024
     asyncUploadTimeSlice: 2
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1

ProjectSettings/TagManager.asset

@@ -8,17 +8,17 @@ TagManager:
   - Default
   - TransparentFX
   - Ignore Raycast
-  - 
+  - 3
   - Water
   - UI
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
+  - 6
+  - 7
+  - 8
+  - 9
+  - 10
+  - 11
+  - 12
+  - 13
   - 
   - 
   -