Merge branch 'main' into ios-microphone-fix

inworld-ai · Jun 18, 2024 · 55329ea · 55329ea
2 parents d7a808a + faaab67
commit 55329ea
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/InworldAI/Content/Components/ChatBubbles/BP_ChatBubblesComponent.uasset b/InworldAI/Content/Components/ChatBubbles/BP_ChatBubblesComponent.uasset
diff --git a/InworldAI/Content/Components/ChatBubbles/WBP_ChatBubble.uasset b/InworldAI/Content/Components/ChatBubbles/WBP_ChatBubble.uasset
diff --git a/InworldAI/Content/Components/ChatBubbles/WBP_ChatBubbles.uasset b/InworldAI/Content/Components/ChatBubbles/WBP_ChatBubbles.uasset
diff --git a/InworldAI/Source/InworldAIEditor/Private/InworldAIEditorSettings.cpp b/InworldAI/Source/InworldAIEditor/Private/InworldAIEditorSettings.cpp
@@ -29,5 +29,12 @@ UInworldAIEditorSettings::UInworldAIEditorSettings(const FObjectInitializer& Obj
 	CharacterPlaybacks = { UInworldCharacterPlaybackTrigger::StaticClass() };
 	OtherCharacterComponents = { UInworldCharacterAudioComponent::StaticClass() };
 
-	InworldStudioWidget = "/InworldAI/StudioWidget/EUW_InworldStudio.EUW_InworldStudio";
+	static ConstructorHelpers::FClassFinder<UActorComponent> ChatComponent3DClassFinder(TEXT("/InworldAI/Components/ChatBubbles/BP_ChatBubblesComponent"));
+	if (ChatComponent3DClassFinder.Class)
+	{
+		OtherCharacterComponents.Add(ChatComponent3DClassFinder.Class);
+	}
+
+
+	InworldStudioWidget = FSoftObjectPath{ TEXT("EditorUtilityWidgetBlueprint'/InworldAI/StudioWidget/EUW_InworldStudio.EUW_InworldStudio'") };
 }
diff --git a/InworldAI/Source/InworldAIPlatform/Public/Apple/AppleAudioPermission.h b/InworldAI/Source/InworldAIPlatform/Public/Apple/AppleAudioPermission.h
@@ -30,6 +30,8 @@ typedef void (*Callback)(bool);
 
 -(int) getPermission
 {
+    if(nil == [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSMicrophoneUsageDescription"]) return -1;
+
     switch([AVCaptureDevice authorizationStatusForMediaType : AVMediaTypeAudio])
     {
         case AVAuthorizationStatusAuthorized: