diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml new file mode 100644 index 00000000..de290b56 --- /dev/null +++ b/.github/workflows/tag.yml @@ -0,0 +1,46 @@ +name: Create or overwrite tag + +on: + workflow_dispatch: + inputs: + tag_name: + description: Tag name to create or overwrite + required: true + type: string + +permissions: + contents: write + +jobs: + tag: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Create or overwrite tag + env: + TAG_NAME: ${{ inputs.tag_name }} + run: | + if [ -z "$TAG_NAME" ]; then + echo "tag_name is required" + exit 1 + fi + + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + + git fetch --tags --force + + if git rev-parse "$TAG_NAME" >/dev/null 2>&1; then + git tag -d "$TAG_NAME" + fi + + git push origin ":refs/tags/$TAG_NAME" || true + + git tag -a "$TAG_NAME" -m "Release $TAG_NAME" + git push origin "refs/tags/$TAG_NAME" + + echo "Tag '$TAG_NAME' has been created/overwritten at commit $GITHUB_SHA" diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/AudioSourceBGM.mp3 b/API-Example-Unity/Assets/API-Example/Examples/Advanced/AudioSourceBGM.mp3 new file mode 100644 index 00000000..b7e13c81 Binary files /dev/null and b/API-Example-Unity/Assets/API-Example/Examples/Advanced/AudioSourceBGM.mp3 differ diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/AudioSourceBGM.mp3.meta b/API-Example-Unity/Assets/API-Example/Examples/Advanced/AudioSourceBGM.mp3.meta new file mode 100644 index 00000000..0d1f4a2f --- /dev/null +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/AudioSourceBGM.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4b9687114e72249d49ad3fa333933afc +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/AudioSpectrum/AudioSpectrum.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/AudioSpectrum/AudioSpectrum.cs index 5ec6ac7b..4479e5e5 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/AudioSpectrum/AudioSpectrum.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/AudioSpectrum/AudioSpectrum.cs @@ -324,7 +324,7 @@ private VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(1.0f, 1.333f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -360,7 +360,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(4.5f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/ChannelMediaRelay/ChannelMediaRelay.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/ChannelMediaRelay/ChannelMediaRelay.cs index 550adba7..6d132638 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/ChannelMediaRelay/ChannelMediaRelay.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/ChannelMediaRelay/ChannelMediaRelay.cs @@ -245,7 +245,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -281,7 +281,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(2f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/ContentInspect/ContentInspect.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/ContentInspect/ContentInspect.cs index c1d66815..7950c53f 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/ContentInspect/ContentInspect.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/ContentInspect/ContentInspect.cs @@ -210,7 +210,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -246,7 +246,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(2f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureAudio/CustomCaptureAudio.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureAudio/CustomCaptureAudio.cs index bab2d079..e60044c4 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureAudio/CustomCaptureAudio.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureAudio/CustomCaptureAudio.cs @@ -124,7 +124,11 @@ private IEnumerator PreparationFilePath(Action callback) yield return www.SendWebRequest(); +#if UNITY_2020_1_OR_NEWER if (www.result != UnityWebRequest.Result.Success) +#else + if (www.isNetworkError || www.isHttpError) +#endif { Debug.LogError("Failed to load file: " + www.error); } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/CustomCaptureVideo.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/CustomCaptureVideo.cs index c61fea33..51db6415 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/CustomCaptureVideo.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/CustomCaptureVideo.cs @@ -295,7 +295,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, .5f); // configure videoSurface - VideoSurface videoSurface = go.AddComponent(); + VideoSurface videoSurface = go.AddComponent(); return videoSurface; } @@ -331,7 +331,7 @@ private static VideoSurface makeImageSurface(string goName) go.transform.localScale = new Vector3(3f, 4f, 1f); // configure videoSurface - VideoSurface videoSurface = go.AddComponent(); + VideoSurface videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/MultChannelsPush/MultChannelPush.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/MultChannelsPush/MultChannelPush.cs index a2bd2c6e..54648d40 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/MultChannelsPush/MultChannelPush.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/MultChannelsPush/MultChannelPush.cs @@ -292,7 +292,7 @@ private static VideoSurface makeImageSurface(string goName) go.transform.localScale = new Vector3(3f, 4f, 1f); // configure videoSurface - VideoSurface videoSurface = go.AddComponent(); + VideoSurface videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/StaticImagePush/TexturePush.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/StaticImagePush/TexturePush.cs index 63b8e6c2..346658ee 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/StaticImagePush/TexturePush.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/StaticImagePush/TexturePush.cs @@ -260,7 +260,7 @@ private static VideoSurface makeImageSurface(string goName) go.transform.localScale = new Vector3(3f, 4f, 1f); // configure videoSurface - VideoSurface videoSurface = go.AddComponent(); + VideoSurface videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/WebCamWithVirtualCamPush/WebCamWithVirtualCamPush.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/WebCamWithVirtualCamPush/WebCamWithVirtualCamPush.cs index 62ed8367..f50482fc 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/WebCamWithVirtualCamPush/WebCamWithVirtualCamPush.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomCaptureVideo/WebCamWithVirtualCamPush/WebCamWithVirtualCamPush.cs @@ -330,7 +330,7 @@ private static VideoSurface makeImageSurface(string goName) go.transform.localScale = new Vector3(3f, 4f, 1f); // configure videoSurface - VideoSurface videoSurface = go.AddComponent(); + VideoSurface videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomRenderAudio/CustomRenderAudio.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomRenderAudio/CustomRenderAudio.cs index c01a1a93..3260d04c 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomRenderAudio/CustomRenderAudio.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomRenderAudio/CustomRenderAudio.cs @@ -37,12 +37,14 @@ public class CustomRenderAudio : MonoBehaviour private const int CHANNEL = 2; - private const int SAMPLE_RATE = 44100; + private const int SAMPLE_RATE = 48000; private const int PULL_FREQ_PER_SEC = 100; private RingBuffer _audioBuffer; + private AudioSource _audioSource; private AudioClip _audioClip; + Pcm16AudioWriter _audioWriter; private Thread _pullAudioFrameThread; @@ -50,16 +52,19 @@ public class CustomRenderAudio : MonoBehaviour private int _writeCount; private int _readCount; + + private void Start() { LoadAssetData(); if (CheckAppId()) { + _audioWriter = new Pcm16AudioWriter("CustomRenderAudio_" + DateTime.Now.ToString("yyyyMMddHHmmss"), SAMPLE_RATE, CHANNEL); InitRtcEngine(); JoinChannel(); - var aud = InitAudioSource(); - StartPullAudioFrame(aud, "externalClip"); + _audioSource = InitAudioSource(); + StartPullAudioFrame(_audioSource, "externalClip"); } } @@ -99,6 +104,9 @@ private void InitRtcEngine() context.areaCode = AREA_CODE.AREA_CODE_GLOB; RtcEngine.Initialize(context); RtcEngine.InitEventHandler(handler); + + // RtcEngine.SetParameters("{\"che.audio.use.call.mode\":false}"); + RtcEngine.SetParameters("{\"che.audio.keep.audiosession\":true}"); } } @@ -107,6 +115,8 @@ private void JoinChannel() lock (_rtcLock) { RtcEngine.EnableAudio(); + RtcEngine.EnableVideo(); + RtcEngine.SetClientRole(CLIENT_ROLE_TYPE.CLIENT_ROLE_BROADCASTER); //no enableAudioDevice to set false？ how this methond work? var nRet = RtcEngine.SetExternalAudioSink(true, SAMPLE_RATE, CHANNEL); this.Log.UpdateLog("SetExternalAudioSink ret:" + nRet); @@ -135,7 +145,8 @@ private void StartPullAudioFrame(AudioSource aud, string clipName) _pullAudioFrameThread.Start(); _audioClip = AudioClip.Create(clipName, - SAMPLE_RATE / PULL_FREQ_PER_SEC, CHANNEL, SAMPLE_RATE, true, + SAMPLE_RATE / PULL_FREQ_PER_SEC * CHANNEL, + CHANNEL, SAMPLE_RATE, true, OnAudioRead); aud.clip = _audioClip; aud.loop = true; @@ -155,9 +166,20 @@ private void OnDestroy() RtcEngine.LeaveChannel(); RtcEngine.Dispose(); RtcEngine = null; + _audioWriter.Flush(); } //need wait pullAudioFrameThread stop _pullAudioFrameThread.Join(); + + if (_audioSource != null) + { + _audioSource.Stop(); + } + + if (_audioClip != null) + { + Destroy(_audioClip); + } } private void PullAudioFrameThread() @@ -197,18 +219,19 @@ private void PullAudioFrameThread() } nRet = -1; nRet = RtcEngine.PullAudioFrame(audioFrame); - Debug.Log("PullAudioFrame returns: " + nRet); + // Debug.Log("PullAudioFrame returns: " + nRet); if (nRet == 0) { Marshal.Copy((IntPtr)audioFrame.buffer, byteBuffer, 0, byteBuffer.Length); var floatArray = ConvertByteToFloat16(byteBuffer); + _audioWriter.PutData(byteBuffer); lock (_audioBuffer) { _audioBuffer.Put(floatArray); } _writeCount += floatArray.Length; - + } } @@ -246,19 +269,14 @@ private void OnAudioRead(float[] data) //if (!_startSignal) return; lock (_audioBuffer) { - for (var i = 0; i < data.Length; i++) + if(_audioBuffer.Count >= data.Length) { - - if (_audioBuffer.Count > 0) - { - data[i] = _audioBuffer.Get(); - } - else - { - data[i] = 0; - } + _audioBuffer.MoveTo(data); + } + else + { + Array.Clear(data,0, data.Length); } - //readCount += 1; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomRenderAudio/CustomRenderAudioScene.unity b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomRenderAudio/CustomRenderAudioScene.unity index 7dd4a3ba..d83ec3a1 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomRenderAudio/CustomRenderAudioScene.unity +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/CustomRenderAudio/CustomRenderAudioScene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -49,16 +50,14 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -116,9 +115,10 @@ NavMeshSettings: --- !u!1 &223737645 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 223737648} - component: {fileID: 223737647} @@ -133,20 +133,27 @@ GameObject: --- !u!81 &223737646 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 223737645} m_Enabled: 1 --- !u!20 &223737647 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 223737645} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -176,8 +183,9 @@ Camera: --- !u!4 &223737648 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 223737645} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} @@ -189,9 +197,10 @@ Transform: --- !u!1 &577133587 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 577133591} - component: {fileID: 577133590} @@ -209,8 +218,9 @@ GameObject: --- !u!114 &577133588 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 577133587} m_Enabled: 1 m_EditorHideFlags: 0 @@ -225,8 +235,9 @@ MonoBehaviour: --- !u!114 &577133589 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 577133587} m_Enabled: 1 m_EditorHideFlags: 0 @@ -246,8 +257,9 @@ MonoBehaviour: --- !u!223 &577133590 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 577133587} m_Enabled: 1 serializedVersion: 3 @@ -266,8 +278,9 @@ Canvas: --- !u!224 &577133591 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 577133587} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -286,8 +299,9 @@ RectTransform: --- !u!114 &577133592 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 577133587} m_Enabled: 1 m_EditorHideFlags: 0 @@ -302,8 +316,9 @@ MonoBehaviour: --- !u!82 &577133593 AudioSource: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 577133587} m_Enabled: 1 serializedVersion: 4 @@ -328,63 +343,79 @@ AudioSource: rolloffCustomCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 --- !u!1 &601254152 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 601254153} - component: {fileID: 601254155} @@ -399,8 +430,9 @@ GameObject: --- !u!224 &601254153 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 601254152} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -417,8 +449,9 @@ RectTransform: --- !u!114 &601254154 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 601254152} m_Enabled: 1 m_EditorHideFlags: 0 @@ -450,15 +483,145 @@ MonoBehaviour: --- !u!222 &601254155 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 601254152} + m_CullTransparentMesh: 0 +--- !u!1 &1470827876 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1470827878} + - component: {fileID: 1470827877} + m_Layer: 0 + m_Name: AudioSourceBGM + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1470827877 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470827876} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 4b9687114e72249d49ad3fa333933afc, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.5 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &1470827878 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470827876} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1553249328 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1553249331} - component: {fileID: 1553249330} @@ -473,8 +636,9 @@ GameObject: --- !u!114 &1553249329 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1553249328} m_Enabled: 1 m_EditorHideFlags: 0 @@ -491,8 +655,9 @@ MonoBehaviour: --- !u!114 &1553249330 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1553249328} m_Enabled: 1 m_EditorHideFlags: 0 @@ -505,8 +670,9 @@ MonoBehaviour: --- !u!4 &1553249331 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1553249328} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -518,9 +684,10 @@ Transform: --- !u!1 &1806852892 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1806852893} - component: {fileID: 1806852895} @@ -535,8 +702,9 @@ GameObject: --- !u!224 &1806852893 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1806852892} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -553,8 +721,9 @@ RectTransform: --- !u!114 &1806852894 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1806852892} m_Enabled: 1 m_EditorHideFlags: 0 @@ -586,6 +755,8 @@ MonoBehaviour: --- !u!222 &1806852895 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1806852892} + m_CullTransparentMesh: 0 diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/DualCamera/DualCamera.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/DualCamera/DualCamera.cs index b4f2f481..0f4ee337 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/DualCamera/DualCamera.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/DualCamera/DualCamera.cs @@ -359,7 +359,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -395,7 +395,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(2f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/JoinChannelVideoToken/JoinChannelVideoToken.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/JoinChannelVideoToken/JoinChannelVideoToken.cs index 9d8e8733..4e6f0303 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/JoinChannelVideoToken/JoinChannelVideoToken.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/JoinChannelVideoToken/JoinChannelVideoToken.cs @@ -202,7 +202,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, .5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -238,7 +238,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(3f, 4f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/JoinChannelWithUserAccount/JoinChannelWithUserAccount.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/JoinChannelWithUserAccount/JoinChannelWithUserAccount.cs index 0d2cfbc6..ecb9912f 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/JoinChannelWithUserAccount/JoinChannelWithUserAccount.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/JoinChannelWithUserAccount/JoinChannelWithUserAccount.cs @@ -176,7 +176,7 @@ private VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -212,7 +212,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(2f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/MediaPlayer/MediaPlayerExample.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/MediaPlayer/MediaPlayerExample.cs index a6db2e57..79640041 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/MediaPlayer/MediaPlayerExample.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/MediaPlayer/MediaPlayerExample.cs @@ -384,7 +384,7 @@ private VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(1.0f, 1.333f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -420,7 +420,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(4.5f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/MediaPlayerOpenWithMediaSource/MediaPlayerOpenWithMediaSourceExample.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/MediaPlayerOpenWithMediaSource/MediaPlayerOpenWithMediaSourceExample.cs index b0c00f8c..63a1a6a7 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/MediaPlayerOpenWithMediaSource/MediaPlayerOpenWithMediaSourceExample.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/MediaPlayerOpenWithMediaSource/MediaPlayerOpenWithMediaSourceExample.cs @@ -363,7 +363,7 @@ private VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(1.0f, 1.333f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -399,7 +399,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(4.5f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/MediaRecorder/MediaRecorder.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/MediaRecorder/MediaRecorder.cs index a380aeaa..2b757a57 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/MediaRecorder/MediaRecorder.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/MediaRecorder/MediaRecorder.cs @@ -214,7 +214,7 @@ private VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(1.0f, 1.333f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -250,7 +250,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(4.5f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/Metadata/MetadataSample.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/Metadata/MetadataSample.cs index 93af9f45..2a82cc1e 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/Metadata/MetadataSample.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/Metadata/MetadataSample.cs @@ -228,7 +228,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -264,7 +264,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(2f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/MusicPlayer/MusicPlayerExample.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/MusicPlayer/MusicPlayerExample.cs index 53536391..0d17b590 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/MusicPlayer/MusicPlayerExample.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/MusicPlayer/MusicPlayerExample.cs @@ -399,7 +399,7 @@ private VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(1.0f, 1.333f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -435,7 +435,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(4.5f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/Plugin/PluginSceneSample.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/Plugin/PluginSceneSample.cs index 1a8ad55c..80de9d10 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/Plugin/PluginSceneSample.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/Plugin/PluginSceneSample.cs @@ -210,7 +210,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -246,7 +246,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(2f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -368,10 +368,6 @@ public override void OnUplinkNetworkInfoUpdated(UplinkNetworkInfo info) _sample.Log.UpdateLog("OnUplinkNetworkInfoUpdated"); } - public override void OnDownlinkNetworkInfoUpdated(DownlinkNetworkInfo info) - { - _sample.Log.UpdateLog("OnDownlinkNetworkInfoUpdated"); - } } } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/ProcessAudioRawData/ProcessAudioRawData.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/ProcessAudioRawData/ProcessAudioRawData.cs index 3899d160..ceaf85bc 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/ProcessAudioRawData/ProcessAudioRawData.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/ProcessAudioRawData/ProcessAudioRawData.cs @@ -33,7 +33,7 @@ public class ProcessAudioRawData : MonoBehaviour internal IRtcEngine RtcEngine; public int CHANNEL = 2; - public int PULL_FREQ_PER_SEC = 100; + public int PULL_FREQ_PER_SEC = 10; public int SAMPLE_RATE = 48000; @@ -43,22 +43,26 @@ public class ProcessAudioRawData : MonoBehaviour internal int _readCount; internal RingBuffer _audioBuffer; + internal AudioSource _audioSource; internal AudioClip _audioClip; + internal Pcm16AudioWriter _audioWriter; void Start() { LoadAssetData(); if (CheckAppId()) { + _audioWriter = new Pcm16AudioWriter("ProcessAudioRawData_" + DateTime.Now.ToString("yyyyMMddHHmmss"), + SAMPLE_RATE, CHANNEL); InitEngine(); JoinChannel(); - var aud = GetComponent(); - if (aud == null) + _audioSource= GetComponent(); + if (_audioSource == null) { - gameObject.AddComponent(); + _audioSource = gameObject.AddComponent(); } - SetupAudio(aud, "externalClip"); + SetupAudio(_audioSource, "externalClip"); } } @@ -105,13 +109,14 @@ void InitEngine() RtcEngine.Initialize(context); RtcEngine.InitEventHandler(handler); + var samplesPerCall = SAMPLE_RATE / PULL_FREQ_PER_SEC * CHANNEL * 2; RtcEngine.SetPlaybackAudioFrameParameters(SAMPLE_RATE, CHANNEL, - RAW_AUDIO_FRAME_OP_MODE_TYPE.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, 1024); + RAW_AUDIO_FRAME_OP_MODE_TYPE.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, samplesPerCall); RtcEngine.SetRecordingAudioFrameParameters(SAMPLE_RATE, CHANNEL, - RAW_AUDIO_FRAME_OP_MODE_TYPE.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, 1024); - RtcEngine.SetMixedAudioFrameParameters(SAMPLE_RATE, CHANNEL, 1024); + RAW_AUDIO_FRAME_OP_MODE_TYPE.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, samplesPerCall); + RtcEngine.SetMixedAudioFrameParameters(SAMPLE_RATE, CHANNEL, samplesPerCall); RtcEngine.SetEarMonitoringAudioFrameParameters(SAMPLE_RATE, CHANNEL, - RAW_AUDIO_FRAME_OP_MODE_TYPE.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, 1024); + RAW_AUDIO_FRAME_OP_MODE_TYPE.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, samplesPerCall); RtcEngine.RegisterAudioFrameObserver(new AudioFrameObserver(this), AUDIO_FRAME_POSITION.AUDIO_FRAME_POSITION_PLAYBACK | @@ -120,25 +125,39 @@ void InitEngine() AUDIO_FRAME_POSITION.AUDIO_FRAME_POSITION_BEFORE_MIXING | AUDIO_FRAME_POSITION.AUDIO_FRAME_POSITION_EAR_MONITORING, OBSERVER_MODE.RAW_DATA); + + RtcEngine.SetParameters("{\"che.audio.keep.audiosession\":true}"); } void JoinChannel() { - RtcEngine.SetClientRole(CLIENT_ROLE_TYPE.CLIENT_ROLE_BROADCASTER); RtcEngine.EnableAudio(); RtcEngine.EnableVideo(); + RtcEngine.SetClientRole(CLIENT_ROLE_TYPE.CLIENT_ROLE_BROADCASTER); RtcEngine.JoinChannel(_token, _channelName, "", 0); } private void OnDestroy() { Debug.Log("OnDestroy"); + + if (_audioSource != null) + { + _audioSource.Stop(); + } + + if (_audioClip != null) + { + Destroy(_audioClip); + } + if (RtcEngine != null) { RtcEngine.InitEventHandler(null); RtcEngine.UnRegisterAudioFrameObserver(); RtcEngine.LeaveChannel(); RtcEngine.Dispose(); + _audioWriter.Flush(); } } @@ -157,18 +176,17 @@ private void OnAudioRead(float[] data) { lock (_audioBuffer) { - for (var i = 0; i < data.Length; i++) + if(_audioBuffer.Count >= data.Length) { - if (_audioBuffer.Count > 0) - { - data[i] = _audioBuffer.Get(); - _readCount += 1; - } + _audioBuffer.MoveTo(data); + } + else + { + Array.Clear(data,0, data.Length); } - //Debug.Log(string.Format("{0},{1},{2},{3},{4},{5},{6},{7},{8}", data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7], data[8])); } - Debug.LogFormat("buffer length remains: {0}", _writeCount - _readCount); + // Debug.LogFormat("buffer length remains: {0}", _writeCount - _readCount); } internal static float[] ConvertByteToFloat16(byte[] byteArray) @@ -251,16 +269,16 @@ internal AudioFrameObserver(ProcessAudioRawData agoraAudioRawData) public override bool OnRecordAudioFrame(string channelId, AudioFrame audioFrame) { - Debug.Log("OnRecordAudioFrame-----------"); + // Debug.Log("OnRecordAudioFrame-----------"); return true; } public override bool OnPlaybackAudioFrame(string channelId, AudioFrame audioFrame) { - Debug.Log("OnPlaybackAudioFrame-----------"); + // Debug.Log("OnPlaybackAudioFrame-----------"); var floatArray = ProcessAudioRawData.ConvertByteToFloat16(audioFrame.RawBuffer); - + _agoraAudioRawData._audioWriter.PutData(audioFrame.RawBuffer); lock (_agoraAudioRawData._audioBuffer) { _agoraAudioRawData._audioBuffer.Put(floatArray); @@ -278,7 +296,7 @@ public override bool OnPlaybackAudioFrameBeforeMixing(string channel_id, uint uid, AudioFrame audio_frame) { - Debug.Log("OnPlaybackAudioFrameBeforeMixing-----------"); + // Debug.Log("OnPlaybackAudioFrameBeforeMixing-----------"); return false; } @@ -286,7 +304,7 @@ public override bool OnPlaybackAudioFrameBeforeMixing(string channel_id, string uid, AudioFrame audio_frame) { - Debug.Log("OnPlaybackAudioFrameBeforeMixing2-----------"); + // Debug.Log("OnPlaybackAudioFrameBeforeMixing2-----------"); return false; } } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/ProcessAudioRawData/ProcessAudioRawDataScene.unity b/API-Example-Unity/Assets/API-Example/Examples/Advanced/ProcessAudioRawData/ProcessAudioRawDataScene.unity index 23a7c746..b94d6a1b 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/ProcessAudioRawData/ProcessAudioRawDataScene.unity +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/ProcessAudioRawData/ProcessAudioRawDataScene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,7 +38,8 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465782, g: 0.49641186, b: 0.5748162, a: 1} + m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641258, b: 0.57481694, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -49,16 +50,14 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -116,9 +115,10 @@ NavMeshSettings: --- !u!1 &945370386 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 945370389} - component: {fileID: 945370388} @@ -133,8 +133,9 @@ GameObject: --- !u!114 &945370387 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 945370386} m_Enabled: 1 m_EditorHideFlags: 0 @@ -151,8 +152,9 @@ MonoBehaviour: --- !u!114 &945370388 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 945370386} m_Enabled: 1 m_EditorHideFlags: 0 @@ -165,8 +167,9 @@ MonoBehaviour: --- !u!4 &945370389 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 945370386} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -178,9 +181,10 @@ Transform: --- !u!1 &978782038 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 978782039} - component: {fileID: 978782041} @@ -195,8 +199,9 @@ GameObject: --- !u!224 &978782039 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 978782038} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -213,8 +218,9 @@ RectTransform: --- !u!114 &978782040 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 978782038} m_Enabled: 1 m_EditorHideFlags: 0 @@ -246,15 +252,145 @@ MonoBehaviour: --- !u!222 &978782041 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 978782038} + m_CullTransparentMesh: 0 +--- !u!1 &1287803769 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1287803771} + - component: {fileID: 1287803770} + m_Layer: 0 + m_Name: AudioSourceBGM + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1287803770 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1287803769} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 4b9687114e72249d49ad3fa333933afc, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.5 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &1287803771 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1287803769} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1547202983 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1547202985} - component: {fileID: 1547202984} @@ -268,8 +404,9 @@ GameObject: --- !u!108 &1547202984 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1547202983} m_Enabled: 1 serializedVersion: 8 @@ -295,6 +432,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_Lightmapping: 4 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 @@ -304,8 +442,9 @@ Light: --- !u!4 &1547202985 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1547202983} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} @@ -317,9 +456,10 @@ Transform: --- !u!1 &1669929520 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1669929521} - component: {fileID: 1669929523} @@ -334,8 +474,9 @@ GameObject: --- !u!224 &1669929521 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669929520} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -352,8 +493,9 @@ RectTransform: --- !u!114 &1669929522 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669929520} m_Enabled: 1 m_EditorHideFlags: 0 @@ -385,15 +527,18 @@ MonoBehaviour: --- !u!222 &1669929523 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669929520} + m_CullTransparentMesh: 0 --- !u!1 &1895106155 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1895106159} - component: {fileID: 1895106158} @@ -411,8 +556,9 @@ GameObject: --- !u!114 &1895106156 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895106155} m_Enabled: 1 m_EditorHideFlags: 0 @@ -427,8 +573,9 @@ MonoBehaviour: --- !u!114 &1895106157 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895106155} m_Enabled: 1 m_EditorHideFlags: 0 @@ -448,8 +595,9 @@ MonoBehaviour: --- !u!223 &1895106158 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895106155} m_Enabled: 1 serializedVersion: 3 @@ -468,8 +616,9 @@ Canvas: --- !u!224 &1895106159 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895106155} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -488,8 +637,9 @@ RectTransform: --- !u!114 &1895106160 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895106155} m_Enabled: 1 m_EditorHideFlags: 0 @@ -501,11 +651,15 @@ MonoBehaviour: _token: _channelName: LogText: {fileID: 1669929522} + CHANNEL: 2 + PULL_FREQ_PER_SEC: 10 + SAMPLE_RATE: 48000 --- !u!82 &1895106161 AudioSource: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895106155} m_Enabled: 1 serializedVersion: 4 @@ -530,63 +684,79 @@ AudioSource: rolloffCustomCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 --- !u!1 &2059654527 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2059654531} - component: {fileID: 2059654530} @@ -602,27 +772,35 @@ GameObject: --- !u!81 &2059654528 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2059654527} m_Enabled: 1 --- !u!124 &2059654529 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2059654527} m_Enabled: 1 --- !u!20 &2059654530 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2059654527} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -652,8 +830,9 @@ Camera: --- !u!4 &2059654531 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2059654527} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithYUV.meta b/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithRGBA.meta similarity index 100% rename from API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithYUV.meta rename to API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithRGBA.meta diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithYUV/RenderWithYUV.unity b/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithRGBA/RenderWithRGBA.unity similarity index 81% rename from API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithYUV/RenderWithYUV.unity rename to API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithRGBA/RenderWithRGBA.unity index 0ffb41f9..daf29c96 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithYUV/RenderWithYUV.unity +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithRGBA/RenderWithRGBA.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,7 +38,8 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465782, g: 0.49641186, b: 0.5748162, a: 1} + m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641258, b: 0.57481694, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -49,16 +50,14 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -116,9 +115,10 @@ NavMeshSettings: --- !u!1 &23143796 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 23143797} m_Layer: 0 @@ -131,8 +131,9 @@ GameObject: --- !u!224 &23143797 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 23143796} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -150,9 +151,10 @@ RectTransform: --- !u!1 &57215603 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 57215604} - component: {fileID: 57215606} @@ -167,8 +169,9 @@ GameObject: --- !u!224 &57215604 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 57215603} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -185,8 +188,9 @@ RectTransform: --- !u!114 &57215605 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 57215603} m_Enabled: 1 m_EditorHideFlags: 0 @@ -218,15 +222,18 @@ MonoBehaviour: --- !u!222 &57215606 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 57215603} + m_CullTransparentMesh: 0 --- !u!1 &81226225 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 81226226} - component: {fileID: 81226228} @@ -241,8 +248,9 @@ GameObject: --- !u!224 &81226226 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81226225} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -259,8 +267,9 @@ RectTransform: --- !u!114 &81226227 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81226225} m_Enabled: 1 m_EditorHideFlags: 0 @@ -283,18 +292,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &81226228 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81226225} + m_CullTransparentMesh: 0 --- !u!1 &123142942 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 123142943} - component: {fileID: 123142945} @@ -309,8 +322,9 @@ GameObject: --- !u!224 &123142943 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 123142942} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -327,8 +341,9 @@ RectTransform: --- !u!114 &123142944 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 123142942} m_Enabled: 1 m_EditorHideFlags: 0 @@ -360,15 +375,18 @@ MonoBehaviour: --- !u!222 &123142945 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 123142942} + m_CullTransparentMesh: 0 --- !u!1 &157195964 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 157195965} - component: {fileID: 157195967} @@ -383,8 +401,9 @@ GameObject: --- !u!224 &157195965 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 157195964} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -402,8 +421,9 @@ RectTransform: --- !u!114 &157195966 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 157195964} m_Enabled: 1 m_EditorHideFlags: 0 @@ -426,18 +446,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &157195967 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 157195964} + m_CullTransparentMesh: 0 --- !u!1 &187059947 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 187059948} - component: {fileID: 187059951} @@ -453,8 +477,9 @@ GameObject: --- !u!224 &187059948 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 187059947} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -472,8 +497,9 @@ RectTransform: --- !u!114 &187059949 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 187059947} m_Enabled: 1 m_EditorHideFlags: 0 @@ -524,8 +550,9 @@ MonoBehaviour: --- !u!114 &187059950 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 187059947} m_Enabled: 1 m_EditorHideFlags: 0 @@ -548,18 +575,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &187059951 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 187059947} + m_CullTransparentMesh: 0 --- !u!1 &192351111 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 192351112} - component: {fileID: 192351115} @@ -575,8 +606,9 @@ GameObject: --- !u!224 &192351112 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192351111} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -594,8 +626,9 @@ RectTransform: --- !u!114 &192351113 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192351111} m_Enabled: 1 m_EditorHideFlags: 0 @@ -646,8 +679,9 @@ MonoBehaviour: --- !u!114 &192351114 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192351111} m_Enabled: 1 m_EditorHideFlags: 0 @@ -670,18 +704,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &192351115 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192351111} + m_CullTransparentMesh: 0 --- !u!1 &309734061 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 309734062} - component: {fileID: 309734065} @@ -697,8 +735,9 @@ GameObject: --- !u!224 &309734062 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 309734061} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -717,8 +756,9 @@ RectTransform: --- !u!114 &309734063 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 309734061} m_Enabled: 1 m_EditorHideFlags: 0 @@ -741,17 +781,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &309734064 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 309734061} + m_CullTransparentMesh: 0 --- !u!114 &309734065 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 309734061} m_Enabled: 1 m_EditorHideFlags: 0 @@ -781,9 +825,10 @@ MonoBehaviour: --- !u!1 &564334337 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 564334338} - component: {fileID: 564334340} @@ -798,8 +843,9 @@ GameObject: --- !u!224 &564334338 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 564334337} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -816,8 +862,9 @@ RectTransform: --- !u!114 &564334339 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 564334337} m_Enabled: 1 m_EditorHideFlags: 0 @@ -849,20 +896,23 @@ MonoBehaviour: --- !u!222 &564334340 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 564334337} + m_CullTransparentMesh: 0 --- !u!1 &682948754 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 682948755} - component: {fileID: 682948756} m_Layer: 0 - m_Name: YUVToggle + m_Name: RGBAToggle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -871,8 +921,9 @@ GameObject: --- !u!224 &682948755 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 682948754} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -891,8 +942,9 @@ RectTransform: --- !u!114 &682948756 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 682948754} m_Enabled: 1 m_EditorHideFlags: 0 @@ -936,9 +988,10 @@ MonoBehaviour: --- !u!1 &768688627 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 768688628} - component: {fileID: 768688631} @@ -954,8 +1007,9 @@ GameObject: --- !u!224 &768688628 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 768688627} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -973,8 +1027,9 @@ RectTransform: --- !u!114 &768688629 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 768688627} m_Enabled: 1 m_EditorHideFlags: 0 @@ -997,17 +1052,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &768688630 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 768688627} + m_CullTransparentMesh: 0 --- !u!114 &768688631 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 768688627} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1018,9 +1077,10 @@ MonoBehaviour: --- !u!1 &795735160 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 795735161} m_Layer: 0 @@ -1033,8 +1093,9 @@ GameObject: --- !u!224 &795735161 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 795735160} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1059,9 +1120,10 @@ RectTransform: --- !u!1 &914353648 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 914353649} - component: {fileID: 914353652} @@ -1077,8 +1139,9 @@ GameObject: --- !u!224 &914353649 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 914353648} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1096,8 +1159,9 @@ RectTransform: --- !u!114 &914353650 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 914353648} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1148,8 +1212,9 @@ MonoBehaviour: --- !u!114 &914353651 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 914353648} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1172,18 +1237,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &914353652 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 914353648} + m_CullTransparentMesh: 0 --- !u!1 &953875965 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 953875969} - component: {fileID: 953875968} @@ -1199,27 +1268,35 @@ GameObject: --- !u!81 &953875966 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 953875965} m_Enabled: 1 --- !u!124 &953875967 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 953875965} m_Enabled: 1 --- !u!20 &953875968 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 953875965} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1249,8 +1326,9 @@ Camera: --- !u!4 &953875969 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 953875965} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -398.8} @@ -1262,9 +1340,10 @@ Transform: --- !u!1 &992359640 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 992359641} - component: {fileID: 992359644} @@ -1280,8 +1359,9 @@ GameObject: --- !u!224 &992359641 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 992359640} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1298,8 +1378,9 @@ RectTransform: --- !u!114 &992359642 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 992359640} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1312,8 +1393,9 @@ MonoBehaviour: --- !u!114 &992359643 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 992359640} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1345,15 +1427,18 @@ MonoBehaviour: --- !u!222 &992359644 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 992359640} + m_CullTransparentMesh: 0 --- !u!1 &1082565128 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1082565129} - component: {fileID: 1082565132} @@ -1369,8 +1454,9 @@ GameObject: --- !u!224 &1082565129 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1082565128} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1387,8 +1473,9 @@ RectTransform: --- !u!114 &1082565130 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1082565128} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1401,8 +1488,9 @@ MonoBehaviour: --- !u!114 &1082565131 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1082565128} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1434,15 +1522,18 @@ MonoBehaviour: --- !u!222 &1082565132 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1082565128} + m_CullTransparentMesh: 0 --- !u!1 &1187593725 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1187593726} - component: {fileID: 1187593727} @@ -1456,8 +1547,9 @@ GameObject: --- !u!224 &1187593726 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1187593725} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1476,8 +1568,9 @@ RectTransform: --- !u!114 &1187593727 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1187593725} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1521,9 +1614,10 @@ MonoBehaviour: --- !u!1 &1236015339 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1236015341} - component: {fileID: 1236015340} @@ -1537,8 +1631,9 @@ GameObject: --- !u!108 &1236015340 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1236015339} m_Enabled: 1 serializedVersion: 8 @@ -1564,6 +1659,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_Lightmapping: 4 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 @@ -1573,8 +1669,9 @@ Light: --- !u!4 &1236015341 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1236015339} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} @@ -1586,9 +1683,10 @@ Transform: --- !u!1 &1259659092 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1259659095} - component: {fileID: 1259659094} @@ -1603,8 +1701,9 @@ GameObject: --- !u!114 &1259659093 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1259659092} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1621,8 +1720,9 @@ MonoBehaviour: --- !u!114 &1259659094 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1259659092} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1635,8 +1735,9 @@ MonoBehaviour: --- !u!4 &1259659095 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1259659092} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1648,9 +1749,10 @@ Transform: --- !u!1 &1311975317 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1311975318} - component: {fileID: 1311975320} @@ -1665,8 +1767,9 @@ GameObject: --- !u!224 &1311975318 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311975317} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1683,8 +1786,9 @@ RectTransform: --- !u!114 &1311975319 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311975317} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1712,19 +1816,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: RenderWithYUV + m_Text: RenderWithRGBA --- !u!222 &1311975320 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311975317} + m_CullTransparentMesh: 0 --- !u!1 &1340607773 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1340607774} - component: {fileID: 1340607777} @@ -1740,8 +1847,9 @@ GameObject: --- !u!224 &1340607774 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1340607773} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1759,8 +1867,9 @@ RectTransform: --- !u!114 &1340607775 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1340607773} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1811,8 +1920,9 @@ MonoBehaviour: --- !u!114 &1340607776 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1340607773} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1835,18 +1945,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1340607777 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1340607773} + m_CullTransparentMesh: 0 --- !u!1 &1472031678 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1472031679} m_Layer: 0 @@ -1859,8 +1973,9 @@ GameObject: --- !u!4 &1472031679 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1472031678} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1872,9 +1987,10 @@ Transform: --- !u!1 &1487080361 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1487080362} - component: {fileID: 1487080364} @@ -1889,8 +2005,9 @@ GameObject: --- !u!224 &1487080362 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1487080361} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1908,8 +2025,9 @@ RectTransform: --- !u!114 &1487080363 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1487080361} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1932,18 +2050,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1487080364 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1487080361} + m_CullTransparentMesh: 0 --- !u!1 &1489708439 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1489708442} - component: {fileID: 1489708441} @@ -1958,8 +2080,9 @@ GameObject: --- !u!114 &1489708440 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1489708439} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1991,14 +2114,17 @@ MonoBehaviour: --- !u!222 &1489708441 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1489708439} + m_CullTransparentMesh: 0 --- !u!224 &1489708442 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1489708439} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2015,9 +2141,10 @@ RectTransform: --- !u!1 &1624608805 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1624608806} - component: {fileID: 1624608808} @@ -2032,8 +2159,9 @@ GameObject: --- !u!224 &1624608806 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1624608805} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2050,8 +2178,9 @@ RectTransform: --- !u!114 &1624608807 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1624608805} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2074,18 +2203,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1624608808 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1624608805} + m_CullTransparentMesh: 0 --- !u!1 &1682671367 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1682671368} - component: {fileID: 1682671370} @@ -2100,8 +2233,9 @@ GameObject: --- !u!224 &1682671368 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1682671367} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2118,8 +2252,9 @@ RectTransform: --- !u!114 &1682671369 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1682671367} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2151,15 +2286,18 @@ MonoBehaviour: --- !u!222 &1682671370 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1682671367} + m_CullTransparentMesh: 0 --- !u!1 &1713483988 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1713483993} - component: {fileID: 1713483992} @@ -2176,8 +2314,9 @@ GameObject: --- !u!114 &1713483989 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1713483988} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2189,13 +2328,14 @@ MonoBehaviour: _token: _channelName: LogText: {fileID: 1489708440} - YUVToggle: {fileID: 682948756} + RGBAToggle: {fileID: 682948756} PlaneToggle: {fileID: 1187593727} --- !u!114 &1713483990 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1713483988} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2210,8 +2350,9 @@ MonoBehaviour: --- !u!114 &1713483991 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1713483988} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2231,8 +2372,9 @@ MonoBehaviour: --- !u!223 &1713483992 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1713483988} m_Enabled: 1 serializedVersion: 3 @@ -2251,8 +2393,9 @@ Canvas: --- !u!224 &1713483993 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1713483988} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2272,9 +2415,10 @@ RectTransform: --- !u!1 &1750656517 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1750656518} - component: {fileID: 1750656520} @@ -2289,8 +2433,9 @@ GameObject: --- !u!224 &1750656518 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1750656517} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2307,8 +2452,9 @@ RectTransform: --- !u!114 &1750656519 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1750656517} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2336,19 +2482,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: Use YUV + m_Text: Use RGBA --- !u!222 &1750656520 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1750656517} + m_CullTransparentMesh: 0 --- !u!1 &1791333082 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1791333083} - component: {fileID: 1791333086} @@ -2364,8 +2513,9 @@ GameObject: --- !u!224 &1791333083 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1791333082} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2383,8 +2533,9 @@ RectTransform: --- !u!114 &1791333084 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1791333082} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2429,8 +2580,9 @@ MonoBehaviour: --- !u!114 &1791333085 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1791333082} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2453,18 +2605,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1791333086 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1791333082} + m_CullTransparentMesh: 0 --- !u!1 &2099399175 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2099399176} - component: {fileID: 2099399178} @@ -2479,8 +2635,9 @@ GameObject: --- !u!224 &2099399176 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099399175} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2497,8 +2654,9 @@ RectTransform: --- !u!114 &2099399177 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099399175} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2530,15 +2688,18 @@ MonoBehaviour: --- !u!222 &2099399178 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099399175} + m_CullTransparentMesh: 0 --- !u!1 &2119469631 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2119469632} - component: {fileID: 2119469634} @@ -2553,8 +2714,9 @@ GameObject: --- !u!224 &2119469632 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2119469631} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2571,8 +2733,9 @@ RectTransform: --- !u!114 &2119469633 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2119469631} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2595,9 +2758,12 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &2119469634 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2119469631} + m_CullTransparentMesh: 0 diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithYUV/RenderWithYUV.unity.meta b/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithRGBA/RenderWithRGBA.unity.meta similarity index 100% rename from API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithYUV/RenderWithYUV.unity.meta rename to API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithRGBA/RenderWithRGBA.unity.meta diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithYUV/RenderWithYUVSample.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithRGBA/RenderWithRGBASample.cs similarity index 94% rename from API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithYUV/RenderWithYUVSample.cs rename to API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithRGBA/RenderWithRGBASample.cs index c9beeecc..0858de54 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithYUV/RenderWithYUVSample.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithRGBA/RenderWithRGBASample.cs @@ -10,9 +10,9 @@ using io.agora.rtc.demo; -namespace Agora_RTC_Plugin.API_Example.Examples.Basic.RenderWithYUVSample +namespace Agora_RTC_Plugin.API_Example.Examples.Basic.RenderWithRGBASample { - public class RenderWithYUVSample : MonoBehaviour + public class RenderWithRGBASample : MonoBehaviour { [FormerlySerializedAs("appIdInput")] [SerializeField] @@ -35,7 +35,7 @@ public class RenderWithYUVSample : MonoBehaviour internal Logger Log; internal IRtcEngine RtcEngine = null; - public Toggle YUVToggle; + public Toggle RGBAToggle; public Toggle PlaneToggle; @@ -154,7 +154,7 @@ internal string GetChannelName() #region -- Video Render UI Logic --- - internal void MakeVideoView(uint uid, string channelId = "", bool useYUV = false, bool usePlane = false) + internal void MakeVideoView(uint uid, string channelId = "", bool useRGBA = false, bool usePlane = false) { var go = GameObject.Find(uid.ToString()); if (!ReferenceEquals(go, null)) @@ -165,9 +165,9 @@ internal void MakeVideoView(uint uid, string channelId = "", bool useYUV = false VideoSurface videoSurface = null; if (usePlane) - videoSurface = MakePlaneSurface(uid.ToString(), useYUV); + videoSurface = MakePlaneSurface(uid.ToString(), useRGBA); else - videoSurface = MakeImageSurface(uid.ToString(), useYUV); + videoSurface = MakeImageSurface(uid.ToString(), useRGBA); if (ReferenceEquals(videoSurface, null)) return; // configure videoSurface @@ -203,7 +203,7 @@ internal void MakeVideoView(uint uid, string channelId = "", bool useYUV = false } // VIDEO TYPE 1: 3D Object - private VideoSurface MakePlaneSurface(string goName, bool useYUV = false) + private VideoSurface MakePlaneSurface(string goName, bool useRGBA = false) { var go = GameObject.CreatePrimitive(PrimitiveType.Plane); @@ -239,16 +239,16 @@ private VideoSurface MakePlaneSurface(string goName, bool useYUV = false) // configure videoSurface VideoSurface videoSurface = null; - if (useYUV) - videoSurface = go.AddComponent(); - else + if (useRGBA) videoSurface = go.AddComponent(); + else + videoSurface = go.AddComponent(); return videoSurface; } // Video TYPE 2: RawImage - private VideoSurface MakeImageSurface(string goName, bool useYUV = false) + private VideoSurface MakeImageSurface(string goName, bool useRGBA = false) { GameObject go = new GameObject(); @@ -280,10 +280,10 @@ private VideoSurface MakeImageSurface(string goName, bool useYUV = false) // configure videoSurface VideoSurface videoSurface = null; - if (useYUV) - videoSurface = go.AddComponent(); - else + if (useRGBA) videoSurface = go.AddComponent(); + else + videoSurface = go.AddComponent(); return videoSurface; } @@ -304,11 +304,11 @@ internal static void DestroyVideoView(uint uid) internal class UserEventHandler : IRtcEngineEventHandler { - private readonly RenderWithYUVSample _sample; + private readonly RenderWithRGBASample _sample; private HashSet usersInChannel = new HashSet(); - internal UserEventHandler(RenderWithYUVSample videoSample) + internal UserEventHandler(RenderWithRGBASample videoSample) { _sample = videoSample; } @@ -330,7 +330,7 @@ public override void OnJoinChannelSuccess(RtcConnection connection, int elapsed) string.Format("OnJoinChannelSuccess channelName: {0}, uid: {1}, elapsed: {2}", connection.channelId, connection.localUid, elapsed)); - _sample.MakeVideoView(0, "", _sample.YUVToggle.isOn, _sample.PlaneToggle.isOn); + _sample.MakeVideoView(0, "", _sample.RGBAToggle.isOn, _sample.PlaneToggle.isOn); } public override void OnRejoinChannelSuccess(RtcConnection connection, int elapsed) @@ -341,10 +341,10 @@ public override void OnRejoinChannelSuccess(RtcConnection connection, int elapse public override void OnLeaveChannel(RtcConnection connection, RtcStats stats) { _sample.Log.UpdateLog("OnLeaveChannel"); - RenderWithYUVSample.DestroyVideoView(0); + RenderWithRGBASample.DestroyVideoView(0); foreach (var uid in this.usersInChannel) { - RenderWithYUVSample.DestroyVideoView(uid); + RenderWithRGBASample.DestroyVideoView(uid); } this.usersInChannel.Clear(); @@ -358,7 +358,7 @@ public override void OnClientRoleChanged(RtcConnection connection, CLIENT_ROLE_T public override void OnUserJoined(RtcConnection connection, uint uid, int elapsed) { _sample.Log.UpdateLog(string.Format("OnUserJoined uid: ${0} elapsed: ${1}", uid, elapsed)); - _sample.MakeVideoView(uid, _sample.GetChannelName(), _sample.YUVToggle.isOn, _sample.PlaneToggle.isOn); + _sample.MakeVideoView(uid, _sample.GetChannelName(), _sample.RGBAToggle.isOn, _sample.PlaneToggle.isOn); this.usersInChannel.Add(uid); } @@ -366,7 +366,7 @@ public override void OnUserOffline(RtcConnection connection, uint uid, USER_OFFL { _sample.Log.UpdateLog(string.Format("OnUserOffLine uid: ${0}, reason: ${1}", uid, (int)reason)); - RenderWithYUVSample.DestroyVideoView(uid); + RenderWithRGBASample.DestroyVideoView(uid); this.usersInChannel.Remove(uid); } } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithYUV/RenderWithYUVSample.cs.meta b/API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithRGBA/RenderWithRGBASample.cs.meta similarity index 100% rename from API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithYUV/RenderWithYUVSample.cs.meta rename to API-Example-Unity/Assets/API-Example/Examples/Advanced/RenderWithRGBA/RenderWithRGBASample.cs.meta diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/ScreenShare/ScreenShare.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/ScreenShare/ScreenShare.cs index 3f18e251..d4f07a41 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/ScreenShare/ScreenShare.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/ScreenShare/ScreenShare.cs @@ -205,15 +205,15 @@ public void OnStartShareBtnClick() { var windowId = option.Split("|".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)[1]; Log.UpdateLog(string.Format(">>>>> Start sharing {0}", windowId)); - var nRet = RtcEngine.StartScreenCaptureByWindowId(long.Parse(windowId), default(Rectangle), - default(ScreenCaptureParameters)); + var nRet = RtcEngine.StartScreenCaptureByWindowId(long.Parse(windowId), new Rectangle(), + new ScreenCaptureParameters()); this.Log.UpdateLog("StartScreenCaptureByWindowId:" + nRet); } else { var dispId = uint.Parse(option.Split("|".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)[1]); Log.UpdateLog(string.Format(">>>>> Start sharing display {0}", dispId)); - var nRet = RtcEngine.StartScreenCaptureByDisplayId(dispId, default(Rectangle), + var nRet = RtcEngine.StartScreenCaptureByDisplayId(dispId, new Rectangle(), new ScreenCaptureParameters { captureMouseCursor = true, frameRate = 30 }); this.Log.UpdateLog("StartScreenCaptureByDisplayId:" + nRet); } @@ -375,7 +375,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, .5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -411,7 +411,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(3f, 4f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/ScreenShareWhileVideoCall/ScreenShareWhileVideoCall.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/ScreenShareWhileVideoCall/ScreenShareWhileVideoCall.cs index addb3594..f2f7662c 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/ScreenShareWhileVideoCall/ScreenShareWhileVideoCall.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/ScreenShareWhileVideoCall/ScreenShareWhileVideoCall.cs @@ -210,15 +210,15 @@ private void OnStartShareBtnClick() { var windowId = option.Split("|".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)[1]; Log.UpdateLog(string.Format(">>>>> Start sharing {0}", windowId)); - var nRet = RtcEngine.StartScreenCaptureByWindowId(long.Parse(windowId), default(Rectangle), - default(ScreenCaptureParameters)); + var nRet = RtcEngine.StartScreenCaptureByWindowId(long.Parse(windowId), new Rectangle(), + new ScreenCaptureParameters()); this.Log.UpdateLog("StartScreenCaptureByWindowId:" + nRet); } else { var dispId = uint.Parse(option.Split("|".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)[1]); Log.UpdateLog(string.Format(">>>>> Start sharing display {0}", dispId)); - var nRet = RtcEngine.StartScreenCaptureByDisplayId(dispId, default(Rectangle), + var nRet = RtcEngine.StartScreenCaptureByDisplayId(dispId, new Rectangle(), new ScreenCaptureParameters { captureMouseCursor = true, frameRate = 30 }); this.Log.UpdateLog("StartScreenCaptureByDisplayId:" + nRet); } @@ -321,7 +321,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, .5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -357,7 +357,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(3f, 4f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/SetBeautyEffectOptions/SetBeautyEffectOptions.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/SetBeautyEffectOptions/SetBeautyEffectOptions.cs index 3d74d7d8..b141c3fd 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/SetBeautyEffectOptions/SetBeautyEffectOptions.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/SetBeautyEffectOptions/SetBeautyEffectOptions.cs @@ -245,7 +245,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -281,7 +281,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(2f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/SetEncryption/EncryptionSample.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/SetEncryption/EncryptionSample.cs index 7c6e9cc2..f62deb89 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/SetEncryption/EncryptionSample.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/SetEncryption/EncryptionSample.cs @@ -188,7 +188,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -224,7 +224,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(2f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/SetVideoEncodeConfiguration/SetVideoEncodeConfiguration.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/SetVideoEncodeConfiguration/SetVideoEncodeConfiguration.cs index 562ca22e..5694aa41 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/SetVideoEncodeConfiguration/SetVideoEncodeConfiguration.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/SetVideoEncodeConfiguration/SetVideoEncodeConfiguration.cs @@ -196,7 +196,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -232,7 +232,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(2f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/SpatialAudioWithMediaPlayer/SpatialAudioWithMediaPlayer.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/SpatialAudioWithMediaPlayer/SpatialAudioWithMediaPlayer.cs index eb01e393..31053d85 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/SpatialAudioWithMediaPlayer/SpatialAudioWithMediaPlayer.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/SpatialAudioWithMediaPlayer/SpatialAudioWithMediaPlayer.cs @@ -294,7 +294,7 @@ private static VideoSurface MakePlaneSurface(string goName) go.transform.localScale = new Vector3(0.25f, 0.5f, 0.5f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } @@ -330,7 +330,7 @@ private static VideoSurface MakeImageSurface(string goName) go.transform.localScale = new Vector3(2f, 3f, 1f); // configure videoSurface - var videoSurface = go.AddComponent(); + var videoSurface = go.AddComponent(); return videoSurface; } diff --git a/API-Example-Unity/Assets/API-Example/Examples/Advanced/SpatialAudioWithUsers/SpatialAudioWithUsers.cs b/API-Example-Unity/Assets/API-Example/Examples/Advanced/SpatialAudioWithUsers/SpatialAudioWithUsers.cs index a1401b81..d3850c76 100644 --- a/API-Example-Unity/Assets/API-Example/Examples/Advanced/SpatialAudioWithUsers/SpatialAudioWithUsers.cs +++ b/API-Example-Unity/Assets/API-Example/Examples/Advanced/SpatialAudioWithUsers/SpatialAudioWithUsers.cs @@ -229,10 +229,10 @@ public void ResetRemoteAudioPosition() private void SetupUI() { GameObject go = GameObject.Find("LocalView"); - LocalView = go.AddComponent(); + LocalView = go.AddComponent(); go.transform.Rotate(0.0f, 0.0f, 180.0f); go = GameObject.Find("RemoteView"); - RemoteView = go.AddComponent(); + RemoteView = go.AddComponent(); go.transform.Rotate(0.0f, 0.0f, 180.0f); go = GameObject.Find("Leave"); go.GetComponent