Skip to content

Commit 26a1aa6

Browse files
icywindicywind
authored
Merge pull request #143 from AgoraIO-Community/dev/refactor5
Dev/refactor5
2 parents bd68753 + a742650 commit 26a1aa6

File tree

75 files changed

+18717
-838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+18717
-838
lines changed

‎.vscode/settings.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"files.exclude":
3+
{
4+
"**/.DS_Store":true,
5+
"**/.git":true,
6+
"**/.gitignore":true,
7+
"**/.gitmodules":true,
8+
"**/*.booproj":true,
9+
"**/*.pidb":true,
10+
"**/*.suo":true,
11+
"**/*.user":true,
12+
"**/*.userprefs":true,
13+
"**/*.unityproj":true,
14+
"**/*.dll":true,
15+
"**/*.exe":true,
16+
"**/*.pdf":true,
17+
"**/*.mid":true,
18+
"**/*.midi":true,
19+
"**/*.wav":true,
20+
"**/*.gif":true,
21+
"**/*.ico":true,
22+
"**/*.jpg":true,
23+
"**/*.jpeg":true,
24+
"**/*.png":true,
25+
"**/*.psd":true,
26+
"**/*.tga":true,
27+
"**/*.tif":true,
28+
"**/*.tiff":true,
29+
"**/*.3ds":true,
30+
"**/*.3DS":true,
31+
"**/*.fbx":true,
32+
"**/*.FBX":true,
33+
"**/*.lxo":true,
34+
"**/*.LXO":true,
35+
"**/*.ma":true,
36+
"**/*.MA":true,
37+
"**/*.obj":true,
38+
"**/*.OBJ":true,
39+
"**/*.asset":true,
40+
"**/*.cubemap":true,
41+
"**/*.flare":true,
42+
"**/*.mat":true,
43+
"**/*.meta":true,
44+
"**/*.prefab":true,
45+
"**/*.unity":true,
46+
"build/":true,
47+
"Build/":true,
48+
"Library/":true,
49+
"library/":true,
50+
"obj/":true,
51+
"Obj/":true,
52+
"ProjectSettings/":true,
53+
"temp/":true,
54+
"Temp/":true
55+
}
56+
}

‎Agora_Unity_WebGL.sln‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agora_Unity_WebGL", "Agora_Unity_WebGL.csproj", "{5EE451A5-78B9-8C5B-AF56-C363A15704D4}"
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agora_Unity_WebGL", "Assembly-CSharp.csproj", "{885A3DAA-1E51-87A4-E4C6-DD4176626251}"
55
EndProject
66
Global
77
GlobalSection(SolutionConfigurationPlatforms) = preSolution
88
Debug|Any CPU = Debug|Any CPU
99
Release|Any CPU = Release|Any CPU
1010
EndGlobalSection
1111
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12-
{5EE451A5-78B9-8C5B-AF56-C363A15704D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13-
{5EE451A5-78B9-8C5B-AF56-C363A15704D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
14-
{5EE451A5-78B9-8C5B-AF56-C363A15704D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
15-
{5EE451A5-78B9-8C5B-AF56-C363A15704D4}.Release|Any CPU.Build.0 = Release|Any CPU
12+
{885A3DAA-1E51-87A4-E4C6-DD4176626251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13+
{885A3DAA-1E51-87A4-E4C6-DD4176626251}.Debug|Any CPU.Build.0 = Debug|Any CPU
14+
{885A3DAA-1E51-87A4-E4C6-DD4176626251}.Release|Any CPU.ActiveCfg = Release|Any CPU
15+
{885A3DAA-1E51-87A4-E4C6-DD4176626251}.Release|Any CPU.Build.0 = Release|Any CPU
1616
EndGlobalSection
1717
GlobalSection(SolutionProperties) = preSolution
1818
HideSolutionNode = FALSE
1919
EndGlobalSection
20+
GlobalSection(MonoDevelopProperties) = preSolution
21+
StartupItem = Assembly-CSharp.csproj
22+
EndGlobalSection
2023
EndGlobal

‎Assembly-CSharp.csproj‎

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<LangVersion>4</LangVersion>
5+
</PropertyGroup>
6+
<PropertyGroup>
7+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9+
<ProductVersion>10.0.20506</ProductVersion>
10+
<SchemaVersion>2.0</SchemaVersion>
11+
<RootNamespace></RootNamespace>
12+
<ProjectGuid>{885A3DAA-1E51-87A4-E4C6-DD4176626251}</ProjectGuid>
13+
<OutputType>Library</OutputType>
14+
<AppDesignerFolder>Properties</AppDesignerFolder>
15+
<AssemblyName>Assembly-CSharp</AssemblyName>
16+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
17+
<FileAlignment>512</FileAlignment>
18+
<BaseDirectory>Assets</BaseDirectory>
19+
</PropertyGroup>
20+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21+
<DebugSymbols>true</DebugSymbols>
22+
<DebugType>full</DebugType>
23+
<Optimize>false</Optimize>
24+
<OutputPath>Temp\bin\Debug\</OutputPath>
25+
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2017_4_0;UNITY_2017_4;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_WEBGL;UNITY_WEBGL;UNITY_WEBGL_API;UNITY_DISABLE_WEB_VERIFICATION;UNITY_GFX_USE_PLATFORM_VSYNC;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_VR;ENABLE_SPATIALTRACKING;ENABLE_IL2CPP;NET_2_0_SUBSET;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE</DefineConstants>
26+
<ErrorReport>prompt</ErrorReport>
27+
<WarningLevel>4</WarningLevel>
28+
<NoWarn>0169</NoWarn>
29+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
30+
</PropertyGroup>
31+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
32+
<DebugType>pdbonly</DebugType>
33+
<Optimize>true</Optimize>
34+
<OutputPath>Temp\bin\Release\</OutputPath>
35+
<ErrorReport>prompt</ErrorReport>
36+
<WarningLevel>4</WarningLevel>
37+
<NoWarn>0169</NoWarn>
38+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
39+
</PropertyGroup>
40+
<ItemGroup>
41+
<Reference Include="System" />
42+
<Reference Include="System.XML" />
43+
<Reference Include="System.Core" />
44+
<Reference Include="System.Runtime.Serialization" />
45+
<Reference Include="System.Xml.Linq" />
46+
<Reference Include="UnityEngine">
47+
<HintPath>C:/Program Files/Unity/Editor/Data/Managed\UnityEngine.dll</HintPath>
48+
</Reference>
49+
<Reference Include="UnityEditor">
50+
<HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
51+
</Reference>
52+
</ItemGroup>
53+
<ItemGroup>
54+
<Compile Include="Assets\AgoraEngine\Demo\AudioVideoStateControl.cs" />
55+
<Compile Include="Assets\AgoraEngine\Demo\ButtonHandler.cs" />
56+
<Compile Include="Assets\AgoraEngine\Demo\TestHelloUnityVideo.cs" />
57+
<Compile Include="Assets\AgoraEngine\Demo\TestHome.cs" />
58+
<Compile Include="Assets\AgoraEngine\Demo\UIElementDragger.cs" />
59+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\AgoraBase.cs" />
60+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\AgoraCallback.cs" />
61+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\AgoraChannel.cs" />
62+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\AgoraChannelCallback.cs" />
63+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\AgoraGamingRtcEngine.cs" />
64+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\AudioEffectManager.cs" />
65+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\deviceManager\AudioPlaybackDeviceManager.cs" />
66+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\deviceManager\AudioRecordingDeviceManager.cs" />
67+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\deviceManager\MediaRecorder.cs" />
68+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\deviceManager\ScreenCaptureManager.cs" />
69+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\deviceManager\VideoDeviceManager.cs" />
70+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\native\IAgoraGamingRtcEngineNative.cs" />
71+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\observer\MetaDataObserver.cs" />
72+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\observer\PacketObserver.cs" />
73+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\rawData\AudioRawDataManager.cs" />
74+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\rawData\VideoRawDataManager.cs" />
75+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\tools\AgoraCallbackObject.cs" />
76+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\tools\AgoraCallbackQueue.cs" />
77+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\tools\AgoraLog.cs" />
78+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\videoRender\VideoRender.cs" />
79+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraGamingSDK\videoRender\VideoSurface.cs" />
80+
<Compile Include="Assets\AgoraEngine\Scripts\AgoraWebGLEventHandler.cs" />
81+
<Compile Include="Assets\AgoraEngine\Scripts\InSurfaceRenderer.cs" />
82+
<Compile Include="Assets\AgoraEngine\Utils\AgoraUIUtils.cs" />
83+
<Compile Include="Assets\AgoraEngine\Utils\TokenClient.cs" />
84+
<Compile Include="Assets\AgoraEngine\Utils\TokenRequestHelper.cs" />
85+
<Compile Include="Assets\API-Example\app-screenshare-sample\AgoraScreenShare.cs" />
86+
<Compile Include="Assets\API-Example\datastream-sample\TestDataStream.cs" />
87+
<Compile Include="Assets\API-Example\desktop-screenshare-sample\WebScreenShare.cs" />
88+
<Compile Include="Assets\API-Example\geo-area-sample\HelloVideoAgora2.cs" />
89+
<Compile Include="Assets\API-Example\multi-channel-sample\Scripts\AgoraChannelPanel.cs" />
90+
<Compile Include="Assets\API-Example\multi-channel-sample\Scripts\AgoraChannelPanelNew.cs" />
91+
<Compile Include="Assets\API-Example\multi-channel-sample\Scripts\MultiChannelSceneCtrl.cs" />
92+
<Compile Include="Assets\API-Example\rtmp-streaming-sample\RtmpStreaming.cs" />
93+
<Compile Include="Assets\API-Example\SpatialAudioForClientManager\SpatialAudioForClientManager.cs" />
94+
<Compile Include="Assets\API-Example\SpatialAudioForMultichannel\SpatialAudioforMultichannel.cs" />
95+
<Compile Include="Assets\API-Example\tools\Logger.cs" />
96+
<Compile Include="Assets\API-Example\tools\PermissionHelper.cs" />
97+
<Compile Include="Assets\API-Example\tools\ToggleStateButton.cs" />
98+
<Compile Include="Assets\API-Example\tools\UIElementDragger.cs" />
99+
<Compile Include="Assets\API-Example\video-encoder-configuration\video_encoder_configuration.cs" />
100+
<Compile Include="Assets\FunctionalTest\DevDemo\Api_TestHelper.cs" />
101+
<Compile Include="Assets\FunctionalTest\DevDemo\ButtonHandler.cs" />
102+
<Compile Include="Assets\FunctionalTest\DevDemo\GlobalDebug.cs" />
103+
<Compile Include="Assets\FunctionalTest\DevDemo\MultiChannel\MC_Main.cs" />
104+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\AMT_Item.cs" />
105+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\DVC_ShareAudio.cs" />
106+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\DVC_ShareScreen.cs" />
107+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\FetchErrorDescription.cs" />
108+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\FrameHandlers.cs" />
109+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\Test_ADM.cs" />
110+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\Test_AudioEffects.cs" />
111+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\Test_AudioMixing.cs" />
112+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\Test_Misc.cs" />
113+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\Test_MuteStreams.cs" />
114+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\Test_OldScreenShare.cs" />
115+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\Test_PlaybackDeviceManager.cs" />
116+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\Test_RecordingDeviceManager.cs" />
117+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\Test_VideoDeviceManager.cs" />
118+
<Compile Include="Assets\FunctionalTest\DevDemo\Test\Test_Watermark.cs" />
119+
<Compile Include="Assets\FunctionalTest\DevDemo\TestFinder.cs" />
120+
<Compile Include="Assets\FunctionalTest\DevDemo\TestHelloUnityVideo.cs" />
121+
<Compile Include="Assets\FunctionalTest\DevDemo\TestHome.cs" />
122+
<Compile Include="Assets\FunctionalTest\DevDemo\TestInits.cs" />
123+
<Compile Include="Assets\FunctionalTest\DevDemo\TestUI.cs" />
124+
<Compile Include="Assets\FunctionalTest\DevDemo\Web\ImplTester.cs" />
125+
<Compile Include="Assets\FunctionalTest\DevDemo\Web\ImplTesterBeforeJoin.cs" />
126+
<Compile Include="Assets\FunctionalTest\DevDemo\Web\TestApiImplementor.cs" />
127+
<Compile Include="Assets\FunctionalTest\JoinMultipleChannel\AgoraMultiChannel.cs" />
128+
<Compile Include="Assets\FunctionalTest\NewScreenShareClientManager\AgoraClientManager.cs" />
129+
<Compile Include="Assets\FunctionalTest\NewScreenShareMChannel\AgoraMultiChannel2.cs" />
130+
<Compile Include="Assets\FunctionalTest\Respawn\TestVideoRespawn.cs" />
131+
<Reference Include="UnityEngine.UI">
132+
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
133+
</Reference>
134+
<Reference Include="UnityEngine.Networking">
135+
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
136+
</Reference>
137+
<Reference Include="UnityEngine.TestRunner">
138+
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
139+
</Reference>
140+
<Reference Include="nunit.framework">
141+
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
142+
</Reference>
143+
<Reference Include="UnityEngine.Timeline">
144+
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
145+
</Reference>
146+
<Reference Include="UnityEngine.UIAutomation">
147+
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UIAutomation/UnityEngine.UIAutomation.dll</HintPath>
148+
</Reference>
149+
<Reference Include="UnityEngine.GoogleAudioSpatializer">
150+
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityGoogleAudioSpatializer/RuntimeEditor/UnityEngine.GoogleAudioSpatializer.dll</HintPath>
151+
</Reference>
152+
<Reference Include="UnityEngine.HoloLens">
153+
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
154+
</Reference>
155+
<Reference Include="UnityEngine.SpatialTracking">
156+
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll</HintPath>
157+
</Reference>
158+
<Reference Include="UnityEngine.Advertisements">
159+
<HintPath>C:/ProgramData/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Advertisements.dll</HintPath>
160+
</Reference>
161+
<Reference Include="UnityEngine.Analytics">
162+
<HintPath>C:/ProgramData/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Analytics.dll</HintPath>
163+
</Reference>
164+
<Reference Include="UnityEngine.Purchasing">
165+
<HintPath>C:/ProgramData/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Purchasing.dll</HintPath>
166+
</Reference>
167+
<Reference Include="UnityEngine.StandardEvents">
168+
<HintPath>C:/ProgramData/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.StandardEvents.dll</HintPath>
169+
</Reference>
170+
</ItemGroup>
171+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
172+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
173+
Other similar extension points exist, see Microsoft.Common.targets.
174+
<Target Name="BeforeBuild">
175+
</Target>
176+
<Target Name="AfterBuild">
177+
</Target>
178+
-->
179+
180+
</Project>

‎Assets/API-Example/SpatialAudioForClientManager.meta‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)