更新Space Camera适配

Assets/GHZScritps/AgoraRTCManager.cs

@@ -107,32 +107,32 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
     {
         Debug.Log("  JoinChannel  " + _channelName);
         RtcEngine.EnableAudio();
-        RtcEngine.EnableVideo();
+    //    RtcEngine.EnableVideo();
 
         // RtcEngine.DisableAudio();
         //  RtcEngine.DisableVideo();
-        VideoEncoderConfiguration config = new VideoEncoderConfiguration();
-        config.dimensions = new VideoDimensions(1280, 720);
-        config.frameRate = 15;
-        config.bitrate = 0;
+       // VideoEncoderConfiguration config = new VideoEncoderConfiguration();
+      //  config.dimensions = new VideoDimensions(1280, 720);
+      //  config.frameRate = 15;
+      //  config.bitrate = 0;
         //    config.orientationMode = ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE;
-        RtcEngine.SetVideoEncoderConfiguration(config);
+       // RtcEngine.SetVideoEncoderConfiguration(config);
         RtcEngine.SetChannelProfile(CHANNEL_PROFILE_TYPE.CHANNEL_PROFILE_COMMUNICATION);
         RtcEngine.SetClientRole(CLIENT_ROLE_TYPE.CLIENT_ROLE_BROADCASTER);
         // _channelName = roomid;
-        RtcEngine.SetExternalVideoSource(true, true, EXTERNAL_VIDEO_SOURCE_TYPE.VIDEO_FRAME, new SenderOptions());
+   //     RtcEngine.SetExternalVideoSource(true, true, EXTERNAL_VIDEO_SOURCE_TYPE.VIDEO_FRAME, new SenderOptions());
 
         RtcEngine.JoinChannel(_token, _channelName, "", uid);
         if (!isSwitchCamera&&(DeviceType.type != "Rhinox"|| DeviceType.type!= "Phone"))
         {
-            RtcEngine.SwitchCamera();
+         //   RtcEngine.SwitchCamera();
             isSwitchCamera = !isSwitchCamera;
         }
         StartCoroutine(InitVideoAndAduio(1f));
         if(!RTCINIT)
         {
             RTCINIT = true;
-            StartCoroutine(RenderTexturesScreenCapture());
+          //  StartCoroutine(RenderTexturesScreenCapture());
         }
     }
     static bool RTCINIT;
@@ -362,7 +362,7 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
     {
         if(isVideo)
         {
-            XRRGBCamera.Instance.playCamera();
+            XRRGBCamera.Instance.playCamera(CustomInfo.mWidth, CustomInfo.mHight);
 
         }
         else

Assets/Plugins/Android/AndroidManifest.xml

@@ -12,6 +12,9 @@
     <meta-data android:name="nreal_sdk" android:value="true" />
     <meta-data android:name="com.nreal.supportDevices" android:value="NrealLight|NrealAir" />
   </application>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.CAMERA"/>
+  <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
   <uses-permission android:name="android.permission.BLUETOOTH" />
   <uses-permission android:name="android.permission.RECORD_AUDIO" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -20,4 +23,7 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
   <uses-permission android:name="android.permission.INTERNET" />
+  <queries>
+    <package android:name="com.ffalcon.rayneo.systemwindows" />
+  </queries>
 </manifest>

Assets/Plugins/Android/AndroidManifest.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c6c0439466d930643824744322200e90
+guid: 4370e831f3c77fc418ff2677fde976f1
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Plugins/Android/baseProjectTemplate.gradle.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b96307930a543e040b98e210e995b8ef
+guid: fc0393c36edf42b4f9d866c5009062d3
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Plugins/Android/gradleTemplate.properties

@@ -1,6 +1,7 @@
-android.useAndroidX=true
 org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M
 org.gradle.parallel=true
+android.useAndroidX=true
+android.enableJetifier=true
 android.enableR8=**MINIFY_WITH_R_EIGHT**
 unityStreamingAssets=**STREAMING_ASSETS**
 **ADDITIONAL_PROPERTIES**

Assets/Plugins/Android/gradleTemplate.properties.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 027c763540e84d24aa2c293f14989cb9
+guid: 818d25f89d1bef74da95de2fb77f0834
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from YUNYUNGEGE at 2023/9/20 16:46:58
+Build from YUNYUNGEGE at 2023/9/25 10:50:05

Assets/Studio/Scenes/Logo/Logo.unity

@@ -465,10 +465,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d4c33e92d8dc2934e919ffa2ff71afd6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  isARCamrea: 1
+  isAuto: 0
   CaptureImage: {fileID: 0}
   RGBCamTexture: {fileID: 0}
-  cameraManager: {fileID: 0}
 --- !u!1 &653649476
 GameObject:
   m_ObjectHideFlags: 0
@@ -1921,6 +1920,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 5394885976978340327}
     m_Modifications:
+    - target: {fileID: 1383684212367668920, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_CullingMask.m_Bits
+      value: 15359
+      objectReference: {fileID: 0}
     - target: {fileID: 2411008272923392955, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_CullingMask.m_Bits
@@ -1956,6 +1960,11 @@ PrefabInstance:
       propertyPath: isHand
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5757916128606210463, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6007065485426161915, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_Name
@@ -2021,6 +2030,16 @@ PrefabInstance:
       propertyPath: m_RootOrder
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 7842368592036399144, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_TrackingStateInput.m_Action.m_Name
+      value: Tracking State Input
+      objectReference: {fileID: 0}
+    - target: {fileID: 7842368593265403976, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 9056915208821754902, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_CullingMask.m_Bits
@@ -2035,7 +2054,7 @@ PrefabInstance:
   m_SourcePrefab: {fileID: 100100000, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
 --- !u!4 &1836526757 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 7361397498185573409, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+  m_CorrespondingSourceObject: {fileID: 7842368593265403979, guid: 7cd0ceba7525bdc42a36be841a8aad16,
     type: 3}
   m_PrefabInstance: {fileID: 1836526756}
   m_PrefabAsset: {fileID: 0}

Assets/Studio/Scripts/Room/StudioRtc.cs

@@ -91,7 +91,7 @@ public class StudioRtc : SCRtcManager
             {
                 rt = new RenderTexture(CustomInfo.mWidth, CustomInfo.mHight, 1);
         }
-        XRRGBCamera.Instance.playCamera();
+        XRRGBCamera.Instance.playCamera(CustomInfo.mWidth, CustomInfo.mHight);
         //cam.targetTexture = rt;
         //me.setMyCamera(rt);
         //if (tex == null)

Assets/Studio/_4ShowScene/ConsoleFunctionModule/DlgScripts/ConsoleDlg.cs

@@ -127,7 +127,7 @@ namespace ShadowStudio.UI
                 Vuforia.VuforiaBehaviour.Instance.enabled = false;
 
             }
-            XRRGBCamera.Instance.playCamera();
+            XRRGBCamera.Instance.playCamera(CustomInfo.mWidth, CustomInfo.mHight);
         }
 
         public void ClickOnScan()
@@ -146,7 +146,7 @@ namespace ShadowStudio.UI
                 //{
                 //  //  StudioRtc.Instance.startCamera();
                 //}
-                XRRGBCamera.Instance.playCamera();
+                XRRGBCamera.Instance.playCamera(CustomInfo.mWidth, CustomInfo.mHight);
                 Debug.Log("startCamera===>");
 
 
@@ -204,7 +204,7 @@ namespace ShadowStudio.UI
                 //{
                 //    StudioRtc.Instance.startCamera();
                 //}
-                XRRGBCamera.Instance.playCamera();
+                XRRGBCamera.Instance.playCamera(CustomInfo.mWidth, CustomInfo.mHight);
             }
         }
 

Assets/Studio/_4ShowScene/ScanpicFunctionModule/Scripts/VuforiaFindAction.cs

@@ -70,7 +70,7 @@ public class VuforiaFindAction : DefaultObserverEventHandler// DefaultTrackableE
                 //{
                 //    StudioRtc.Instance.startCamera();
                 //}
-                XRRGBCamera.Instance.playCamera();
+                XRRGBCamera.Instance.playCamera(CustomInfo.mWidth, CustomInfo.mHight);
                 AgoraRTCManager.Instance.JoinChannel();
             }
         }
@@ -115,7 +115,7 @@ public class VuforiaFindAction : DefaultObserverEventHandler// DefaultTrackableE
             //{
             //    StudioRtc.Instance.startCamera();
             //}
-            XRRGBCamera.Instance.playCamera();
+            XRRGBCamera.Instance.playCamera(CustomInfo.mWidth, CustomInfo.mHight);
             CommonMethod.ShowScanEffect(false);
             if (ScanPictureBtn.Instance.Bg)
             {

Assets/XR/Settings/OpenXR Package Settings.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9ef793c31862a37448e907829482ef80, type: 3}
   m_Name: OculusQuestFeature Android
   m_EditorClassIdentifier: 
-  m_enabled: 0
+  m_enabled: 1
   nameUi: Oculus Quest Support
   version: 1.0.0
   featureIdInternal: com.unity.openxr.feature.oculusquest
@@ -121,7 +121,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: feeef8d85de8db242bdda70cc7ff5acd, type: 3}
   m_Name: OculusTouchControllerProfile Android
   m_EditorClassIdentifier: 
-  m_enabled: 0
+  m_enabled: 1
   nameUi: Oculus Touch Controller Profile
   version: 0.0.1
   featureIdInternal: com.unity.openxr.feature.input.oculustouch

Assets/XR/XRGeneralSettings.asset

@@ -43,7 +43,8 @@ MonoBehaviour:
   m_RequiresSettingsUpdate: 0
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
-  m_Loaders: []
+  m_Loaders:
+  - {fileID: 11400000, guid: 53584fd2c6a42324e9d7690d0e4e1d12, type: 2}
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0

GHZMRSpaceXR.sln

@@ -3,8 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{615ACB60-7481-2B11-05CA-D1D7ECE4D507}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XREditor", "XREditor.csproj", "{F163D277-F4A7-9D87-5731-5ABD03715D7C}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarsPB", "MarsPB.csproj", "{39D8A39D-551A-7EE4-DF2B-683F2184A386}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RayNeo", "RayNeo.csproj", "{1749054C-9747-78F8-74F7-245C109435E1}"
+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}"
@@ -21,10 +25,18 @@ Global
 		{615ACB60-7481-2B11-05CA-D1D7ECE4D507}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{615ACB60-7481-2B11-05CA-D1D7ECE4D507}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{615ACB60-7481-2B11-05CA-D1D7ECE4D507}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F163D277-F4A7-9D87-5731-5ABD03715D7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F163D277-F4A7-9D87-5731-5ABD03715D7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F163D277-F4A7-9D87-5731-5ABD03715D7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F163D277-F4A7-9D87-5731-5ABD03715D7C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39D8A39D-551A-7EE4-DF2B-683F2184A386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{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
+		{1749054C-9747-78F8-74F7-245C109435E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1749054C-9747-78F8-74F7-245C109435E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1749054C-9747-78F8-74F7-245C109435E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1749054C-9747-78F8-74F7-245C109435E1}.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

ProjectSettings/EditorBuildSettings.asset

@@ -5,6 +5,9 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
+  - enabled: 0
+    path: Assets/Main.unity
+    guid: 1978d9bf8593e5d48960f22cbb69eea1
   - enabled: 1
     path: Assets/Studio/Scenes/Logo/Logo.unity
     guid: c37c1babc7b6f744cb6546625fe87f80
@@ -18,8 +21,8 @@ EditorBuildSettings:
     path: Assets/Studio/Scenes/Show/Show.unity
     guid: ae34a02a0fc4f6e41a4bdf3e80ea1c56
   - enabled: 0
-    path: Assets/TestVideo.unity
-    guid: 0d6fbfc550a5d5443bc6b6631ef09172
+    path: 
+    guid: 00000000000000000000000000000000
   m_configObjects:
     UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: d024b25d37137f94890858d4b6a88af6,
       type: 2}

ProjectSettings/ProjectSettings.asset

@@ -148,10 +148,7 @@ PlayerSettings:
     Others: 1
   bundleVersion: 1.0.0
   preloadedAssets:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
+  - {fileID: -7757256057747849950, guid: bf1be7b556e14e44aadbe8ccbd6b4a1d, type: 2}
   - {fileID: 3407827143893180361, guid: 93ed3b462c7c82d4594fa4d925b91911, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -182,8 +179,8 @@ PlayerSettings:
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 10133
-  AndroidMinSdkVersion: 27
-  AndroidTargetSdkVersion: 0
+  AndroidMinSdkVersion: 30
+  AndroidTargetSdkVersion: 32
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   stripEngineCode: 1
@@ -845,7 +842,7 @@ PlayerSettings:
   webGLDecompressionFallback: 0
   webGLPowerPreference: 2
   scriptingDefineSymbols:
-    Android: VUFORIA_ANDROID_SETTINGS;UNITY_CCU;CURVEDUI_TMP;TRILIB_USE_ZIP;BUILDTYPE_RELEASE;ASSETSTYPE_RESOURCE;BUILDTYPE_ANDROID;PLAYTYPE_ARGLASS
+    Android: VUFORIA_ANDROID_SETTINGS;UNITY_CCU;CURVEDUI_TMP;TRILIB_USE_ZIP;BUILDTYPE_RELEASE;ASSETSTYPE_RESOURCE;BUILDTYPE_ANDROID;PLAYTYPE_ARGLASS;STARTER_ASSETS_PACKAGES_CHECKED
     Standalone: UNITY_CCU;CURVEDUI_TMP
     Windows Store Apps: VUFORIA_WSA_SETTINGS
     iPhone: VUFORIA_IOS_SETTINGS
@@ -929,6 +926,7 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 1
   platformCapabilities:
     WindowsStoreApps:
+      EnterpriseAuthentication: False
       OfflineMapsManagement: False
       HumanInterfaceDevice: False
       Location: False
@@ -940,7 +938,6 @@ PlayerSettings:
       PrivateNetworkClientServer: False
       InternetClientServer: False
       VideosLibrary: False
-      BackgroundMediaPlayback: False
       Objects3D: False
       RemoteSystem: False
       BlockedChatMessages: False
@@ -963,9 +960,9 @@ PlayerSettings:
       RecordedCallsFolder: False
       Contacts: False
       InternetClient: True
-      Proximity: False
       CodeGeneration: False
-      EnterpriseAuthentication: False
+      BackgroundMediaPlayback: False
+      Proximity: False
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: False