Merge pull request #132 from AgoraIO-Extensions/publish/4.4.0

Publish/4.4.0

Agora-Unreal-SDK-Blueprint-Example/Config/DefaultEngine.ini

@@ -1,24 +1,34 @@
 
 
-[/Script/EngineSettings.GameMapsSettings]
-GameDefaultMap=/Game/API-Example/MainLevel.MainLevel
-EditorStartupMap=/Game/API-Example/MainLevel.MainLevel
-
 [/Script/HardwareTargeting.HardwareTargetingSettings]
 TargetedHardwareClass=Desktop
 AppliedTargetedHardwareClass=Desktop
 DefaultGraphicsPerformance=Maximum
 AppliedDefaultGraphicsPerformance=Maximum
 
 [/Script/Engine.Engine]
-+ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/AgoraExample")
-+ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/AgoraExample")
-+ActiveClassRedirects=(OldClassName="TP_BlankGameModeBase",NewClassName="AgoraExampleGameModeBase")
++ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/AgoraBPExample")
++ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/AgoraBPExample")
++ActiveClassRedirects=(OldClassName="TP_BlankGameModeBase",NewClassName="AgoraBPExampleGameModeBase")
+
+[/Script/EngineSettings.GameMapsSettings]
+EditorStartupMap=/Game/API-Example/MainLevel.MainLevel
+GameDefaultMap=/Game/API-Example/MainLevel.MainLevel
+
+[/Script/AndroidRuntimeSettings.AndroidRuntimeSettings]
+MinSDKVersion=24
+bBuildForArmV7=True
+bBuildForArm64=True
+bPackageDataInsideApk=True
+
+[/Script/IOSRuntimeSettings.IOSRuntimeSettings]
+AdditionalPlistData=<key>NSCameraUsageDescription</key><string>AgoraVideoCall</string><key>NSMicrophoneUsageDescription</key><string>AgoraVideoCall</string>
+bEnableBackgroundFetch=True
 
 [/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings]
 bEnablePlugin=True
 bAllowNetworkConnection=True
-SecurityToken=990A8E7B43F2575DE5F30FB114408D3D
+SecurityToken=4E62204D4FB335FC140092A4A916430C
 bIncludeInShipping=False
 bAllowExternalStartInShipping=False
 bCompileAFSProject=False
@@ -29,127 +39,3 @@ ConnectionType=USBOnly
 bUseManualIPAddress=False
 ManualIPAddress=
 
-[/Script/AndroidRuntimeSettings.AndroidRuntimeSettings]
-PackageName=com.agora.example
-StoreVersion=1
-StoreVersionOffsetArmV7=0
-StoreVersionOffsetArm64=0
-StoreVersionOffsetX8664=0
-ApplicationDisplayName=
-VersionDisplayName=1.0
-MinSDKVersion=21
-TargetSDKVersion=30
-InstallLocation=InternalOnly
-bEnableGradle=True
-bEnableLint=False
-bPackageDataInsideApk=True
-bCreateAllPlatformsInstall=False
-bDisableVerifyOBBOnStartUp=False
-bForceSmallOBBFiles=False
-bAllowLargeOBBFiles=False
-bAllowPatchOBBFile=False
-bAllowOverflowOBBFiles=False
-bUseExternalFilesDir=False
-bPublicLogFiles=True
-Orientation=SensorLandscape
-MaxAspectRatio=2.100000
-bUseDisplayCutout=False
-bRestoreNotificationsOnReboot=False
-bFullScreen=True
-bEnableNewKeyboard=True
-DepthBufferPreference=Default
-bValidateTextureFormats=True
-bEnableBundle=False
-bEnableUniversalAPK=True
-bBundleABISplit=True
-bBundleLanguageSplit=True
-bBundleDensitySplit=True
-ExtraApplicationSettings=
-ExtraActivitySettings=
-+ExtraPermissions=android.permission.WRITE_EXTERNAL_STORAGE
-+ExtraPermissions=android.permission.READ_EXTERNAL_STORAGE
-+ExtraPermissions=android.permission.QUERY_ALL_PACKAGES
-bAndroidVoiceEnabled=False
-bRemoveOSIG=False
-+GoogleVRCaps=Daydream33
-bGoogleVRSustainedPerformance=False
-KeyStore=
-KeyAlias=
-KeyStorePassword=
-KeyPassword=
-bBuildForArmV7=False
-bBuildForArm64=True
-bBuildForX8664=False
-bBuildForES31=True
-bSupportsVulkan=False
-bSupportsVulkanSM5=False
-ClangSanitizer=None
-bAndroidOpenGLSupportsBackbufferSampling=False
-bDetectVulkanByDefault=True
-bBuildWithHiddenSymbolVisibility=False
-bSaveSymbols=True
-bForceLDLinker=False
-bEnableGooglePlaySupport=False
-bUseGetAccounts=False
-GamesAppID=
-bEnableSnapshots=False
-bSupportAdMob=True
-AdMobAdUnitID=
-GooglePlayLicenseKey=
-GCMClientSenderID=
-bShowLaunchImage=True
-bAllowIMU=False
-bAllowControllers=True
-bBlockAndroidKeysOnControllers=False
-bControllersBlockDeviceFeedback=False
-AndroidAudio=Default
-AudioSampleRate=44100
-AudioCallbackBufferFrameSize=1024
-AudioNumBuffersToEnqueue=4
-AudioMaxChannels=0
-AudioNumSourceWorkers=0
-SpatializationPlugin=
-ReverbPlugin=
-OcclusionPlugin=
-CompressionOverrides=(bOverrideCompressionTimes=False,DurationThreshold=5.000000,MaxNumRandomBranches=0,SoundCueQualityIndex=0)
-bUseAudioStreamCaching=False
-CacheSizeKB=0
-MaxChunkSizeOverrideKB=0
-bResampleForDevice=False
-SoundCueCookQualityIndex=-1
-MaxSampleRate=0.000000
-HighSampleRate=0.000000
-MedSampleRate=0.000000
-LowSampleRate=0.000000
-MinSampleRate=0.000000
-CompressionQualityModifier=0.000000
-AutoStreamingThreshold=0.000000
-AndroidGraphicsDebugger=None
-MaliGraphicsDebuggerPath=(Path="")
-bEnableMaliPerfCounters=False
-bMultiTargetFormat_ETC2=True
-bMultiTargetFormat_DXT=True
-bMultiTargetFormat_ASTC=True
-TextureFormatPriority_ETC2=0.200000
-TextureFormatPriority_DXT=0.600000
-TextureFormatPriority_ASTC=0.900000
-SDKAPILevelOverride=
-NDKAPILevelOverride=
-bStreamLandscapeMeshLODs=False
-bEnableDomStorage=False
-
-[/Script/LuminRuntimeSettings.LuminRuntimeSettings]
-IconModelPath=(Path="")
-IconPortalPath=(Path="")
-
-[/Script/UnrealEd.CookerSettings]
-bCookOnTheFlyForLaunchOn=False
-
-[/Script/Engine.UserInterfaceSettings]
-UIScaleRule=ScaleToFit
-bAllowHighDPIInGameMode=True
-
-[/Script/IOSRuntimeSettings.IOSRuntimeSettings]
-AdditionalPlistData=<key>NSCameraUsageDescription</key><string>AgoraVideoCall</string><key>NSMicrophoneUsageDescription</key><string>AgoraVideoCall</string>
-bEnableBackgroundFetch=True
-

Agora-Unreal-SDK-Blueprint-Example/Config/DefaultGame.ini

@@ -1,115 +1,3 @@
 
-
 [/Script/EngineSettings.GeneralProjectSettings]
-CompanyName=Agora.IO
-CompanyDistinguishedName=
-CopyrightNotice=Fill out your copyright notice in the Description page of Project Settings.
-Description=
-Homepage=
-LicensingTerms=
-PrivacyPolicy=
-ProjectID=F28DD96CA944005A448A628C8CED523A
-ProjectName=
-ProjectVersion=1.0.0.0
-SupportContact=
-ProjectDisplayedTitle=
-ProjectDebugTitleInfo=
-bShouldWindowPreserveAspectRatio=True
-bUseBorderlessWindow=False
-bStartInVR=False
-bAllowWindowResize=False
-bAllowClose=True
-bAllowMaximize=True
-bAllowMinimize=True
-
-[/Script/MoviePlayer.MoviePlayerSettings]
-bWaitForMoviesToComplete=False
-bMoviesAreSkippable=False
-
-[/Script/UnrealEd.ProjectPackagingSettings]
-Build=IfProjectHasCode
-BuildConfiguration=PPBC_Development
-BuildTarget=
-StagingDirectory=(Path="D:/Build/UEbuild/9.8.22")
-FullRebuild=False
-ForDistribution=False
-IncludeDebugFiles=False
-BlueprintNativizationMethod=Disabled
-bIncludeNativizedAssetsInProjectGeneration=False
-bExcludeMonolithicEngineHeadersInNativizedCode=False
-UsePakFile=True
-bUseIoStore=False
-bMakeBinaryConfig=False
-bGenerateChunks=False
-bGenerateNoChunks=False
-bChunkHardReferencesOnly=False
-bForceOneChunkPerFile=False
-MaxChunkSize=0
-bBuildHttpChunkInstallData=False
-HttpChunkInstallDataDirectory=(Path="")
-bCompressed=True
-PakFileCompressionFormats=Oodle
-bForceUseProjectCompressionFormatIgnoreHardwareOverride=False
-PakFileAdditionalCompressionOptions=-compressionblocksize=256KB
-PakFileCompressionMethod=Kraken
-PakFileCompressionLevel_DebugDevelopment=3
-PakFileCompressionLevel_TestShipping=5
-PakFileCompressionLevel_Distribution=7
-HttpChunkInstallDataVersion=
-IncludePrerequisites=True
-IncludeAppLocalPrerequisites=False
-bShareMaterialShaderCode=True
-bDeterministicShaderCodeOrder=False
-bSharedMaterialNativeLibraries=True
-ApplocalPrerequisitesDirectory=(Path="")
-IncludeCrashReporter=False
-InternationalizationPreset=English
--CulturesToStage=en
-+CulturesToStage=en
-LocalizationTargetCatchAllChunkId=0
-bCookAll=False
-bCookMapsOnly=False
-bSkipEditorContent=False
-bSkipMovies=False
--IniKeyBlacklist=KeyStorePassword
--IniKeyBlacklist=KeyPassword
--IniKeyBlacklist=rsa.privateexp
--IniKeyBlacklist=rsa.modulus
--IniKeyBlacklist=rsa.publicexp
--IniKeyBlacklist=aes.key
--IniKeyBlacklist=SigningPublicExponent
--IniKeyBlacklist=SigningModulus
--IniKeyBlacklist=SigningPrivateExponent
--IniKeyBlacklist=EncryptionKey
--IniKeyBlacklist=IniKeyBlacklist
--IniKeyBlacklist=IniSectionBlacklist
-+IniKeyBlacklist=KeyStorePassword
-+IniKeyBlacklist=KeyPassword
-+IniKeyBlacklist=rsa.privateexp
-+IniKeyBlacklist=rsa.modulus
-+IniKeyBlacklist=rsa.publicexp
-+IniKeyBlacklist=aes.key
-+IniKeyBlacklist=SigningPublicExponent
-+IniKeyBlacklist=SigningModulus
-+IniKeyBlacklist=SigningPrivateExponent
-+IniKeyBlacklist=EncryptionKey
-+IniKeyBlacklist=IniKeyBlacklist
-+IniKeyBlacklist=IniSectionBlacklist
-+DirectoriesToAlwaysStageAsUFS=(Path="Movies")
-+DirectoriesToAlwaysStageAsUFS=(Path="Audio")
-+DirectoriesToAlwaysStageAsUFS=(Path="Image")
-+DirectoriesToAlwaysStageAsNonUFS=(Path="Movies")
-+DirectoriesToAlwaysStageAsNonUFS=(Path="Audio")
-+DirectoriesToAlwaysStageAsNonUFS=(Path="Image")
-
-[/Script/Engine.AssetManagerSettings]
--PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass=/Script/Engine.World,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
--PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass=/Script/Engine.PrimaryAssetLabel,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
-+PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass=/Script/Engine.World,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
-+PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass=/Script/Engine.PrimaryAssetLabel,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
-bOnlyCookProductionAssets=False
-bShouldManagerDetermineTypeAndName=False
-bShouldGuessTypeAndNameInEditor=True
-bShouldAcquireMissingChunksOnLoad=False
-MetaDataTagsForAssetRegistry=()
-
+ProjectID=7F03214342F10C46757B378800C62811

Agora-Unreal-SDK-Blueprint-Example/Config/IOS/IOSEngine.ini

@@ -0,0 +1,6 @@
+[Audio]
+AudioMixerModuleName=
+
+
+[/Script/IOSRuntimeSettings.IOSRuntimeSettings]
+bEnableIdleTimer=False

Agora-Unreal-SDK-Blueprint-Example/Source/AgoraBPExample.Target.cs

@@ -1,4 +1,4 @@
-// Copyright Epic Games, Inc. All Rights Reserved.
+// Copyright(c) 2024 Agora.io. All rights reserved.
 
 using UnrealBuildTool;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ public class AgoraBPExampleTarget : TargetRules
 	public AgoraBPExampleTarget( TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Game;
-		DefaultBuildSettings = BuildSettingsVersion.V2;
+		DefaultBuildSettings = BuildSettingsVersion.Latest;
 		if (Target.Platform == UnrealTargetPlatform.IOS)
 		{
 			bOverrideBuildEnvironment = true;
@@ -19,10 +19,26 @@ public AgoraBPExampleTarget( TargetInfo Target) : base(Target)
 		if (Target.Platform == UnrealTargetPlatform.IOS || Target.Platform == UnrealTargetPlatform.Mac)
         {
             bOverrideBuildEnvironment = true;
-            // -Wno-unused-but-set-variable�� fix error "variable 'layerNames' set but not used"
-            //  -Wno-gcc-compat: gcc does not allow an atrribute in this position on a function declaration
-            // -Wno-reorder-ctor: fix error "field 'eventHandler' will be initialized after field 'mccUid'"
+
+            // [-Wno-unused-but-set-variable]: fix error "variable 'layerNames' set but not used"
+            // [-Wno-gcc-compat]: gcc does not allow an attribute in this position on a function declaration
+            // [-Wno-reorder-ctor]: fix error "field 'eventHandler' will be initialized after field 'mccUid'"
+
+            // For UE427:
+            // [-Wno-deprecated-builtins]: UE_4.27/Engine/Source/Runtime/Core/Public/Templates/IsTriviallyCopyConstructible.h:13:17: error: builtin __has_trivial_copy is deprecated; use __is_trivially_copyable instead
+            //  enum { Value = __has_trivial_copy(T) };
+
+            // [-Wno-bitwise-instead-of-logical]: UE_4.27/Engine/Source/Runtime/CoreUObject/Public/AssetRegistry/AssetDataTagMap.h:36:32: note: cast one or both operands to int to silence this warning
+            // bool IsEmpty() const { return Class.IsNone() & Package.IsNone() & Object.IsNone(); } //-V792\n
+
+            // [-Wno-single-bit-bitfield-constant-conversion]: UE_4.27/Engine/Source/Runtime/Engine/Public/MaterialShared.h:2304:30: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 
+            //  MarkedForGarbageCollection = 1;
+            // AdditionalCompilerArguments = "-Wno-unused-but-set-variable -Wno-gcc-compat -Wno-reorder-ctor -Wno-deprecated-builtins -Wno-bitwise-instead-of-logical -Wno-single-bit-bitfield-constant-conversion";
+
+            // error: unknown warning option '-Wno-deprecated-builtins'; did you mean '-Wno-deprecated-volatile'? [-Werror,-Wunknown-warning-option]
+            // error: unknown warning option '-Wno-single-bit-bitfield-constant-conversion'; did you mean '-Wno-bitfield-constant-conversion'? [-Werror,-Wunknown-warning-option]
             AdditionalCompilerArguments = "-Wno-unused-but-set-variable -Wno-gcc-compat -Wno-reorder-ctor";
-        }
+
+		}
 	}
 }

Agora-Unreal-SDK-Blueprint-Example/Source/AgoraBPExample/AgoraBPExample.Build.cs

@@ -1,4 +1,4 @@
-// Copyright Epic Games, Inc. All Rights Reserved.
+// Copyright(c) 2024 Agora.io. All rights reserved.
 
 using System.IO;
 using System;
@@ -10,7 +10,7 @@ public AgoraBPExample(ReadOnlyTargetRules Target) : base(Target)
 	{
 		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 
-		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" });
+		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore","UMG"});
 
 		PrivateDependencyModuleNames.AddRange(new string[] {  });
 
@@ -22,14 +22,21 @@ public AgoraBPExample(ReadOnlyTargetRules Target) : base(Target)
 
         // To include OnlineSubsystemSteam, add it to the plugins section in your uproject file with the Enabled attribute set to true
 
-
         if (Target.Platform == UnrealTargetPlatform.Android)
         {
             PrivateDependencyModuleNames.AddRange(new string[] { "AndroidPermission" });
-            string UPLFilePath = Path.Combine(ModuleDirectory, "UPL", "AgoraExample_UPL.xml");
+            string UPLFilePath = Path.Combine(ModuleDirectory, "UPL","AgoraExample_UPL_Android.xml");
             Console.WriteLine("AgoraExample UPL Path: " + UPLFilePath);
             // Modify AndroidMenifest.xml
             AdditionalPropertiesForReceipt.Add("AndroidPlugin", UPLFilePath);
         }
+
+        if (Target.Platform == UnrealTargetPlatform.IOS)
+        {
+            string UPLFilePath = Path.Combine(ModuleDirectory, "UPL","AgoraExample_UPL_IOS.xml");
+            Console.WriteLine("AgoraExample IOS UPL Path: " + UPLFilePath);
+            // Modify info.plist
+            AdditionalPropertiesForReceipt.Add("IOSPlugin", UPLFilePath);
+        }
     }
 }

Agora-Unreal-SDK-Blueprint-Example/Source/AgoraBPExample/AgoraBPExample.cpp

@@ -1,4 +1,4 @@
-// Copyright Epic Games, Inc. All Rights Reserved.
+// Copyright(c) 2024 Agora.io. All rights reserved.
 
 #include "AgoraBPExample.h"
 #include "Modules/ModuleManager.h"

Agora-Unreal-SDK-Blueprint-Example/Source/AgoraBPExample/AgoraBPExample.h

@@ -1,4 +1,4 @@
-// Copyright Epic Games, Inc. All Rights Reserved.
+// Copyright(c) 2024 Agora.io. All rights reserved.
 
 #pragma once
 

Agora-Unreal-SDK-Blueprint-Example/Source/AgoraBPExample/AgoraBPExampleGameModeBase.cpp

@@ -1,4 +1,4 @@
-// Copyright Epic Games, Inc. All Rights Reserved.
+// Copyright(c) 2024 Agora.io. All rights reserved.
 
 
 #include "AgoraBPExampleGameModeBase.h"