Merge pull request #26 from ProteusVRpublic/Version_6_2

Version 6.2
ProteusVRpublic · Jul 30, 2019 · 964190b · 964190b
2 parents 4d1aba9 + ce078b1
commit 964190b
Show file tree

Hide file tree

Showing 30 changed files with 19 additions and 19 deletions.
diff --git a/Content/Pawn/Assets/MenuPointer/Avatar_Exp_M1.uasset b/Content/Pawn/Assets/MenuPointer/Avatar_Exp_M1.uasset
diff --git a/Content/Pawn/Assets/MenuPointer/Avatar_Exp_M1_Inst.uasset b/Content/Pawn/Assets/MenuPointer/Avatar_Exp_M1_Inst.uasset
diff --git a/Content/Proteus_Multi/GameInfoInstance.uasset b/Content/Proteus_Multi/GameInfoInstance.uasset
diff --git a/Content/Proteus_Multi/InteractiveObjects/Baton_Int_.uasset b/Content/Proteus_Multi/InteractiveObjects/Baton_Int_.uasset
diff --git a/Content/Proteus_Multi/InteractiveObjects/Book_Int_.uasset b/Content/Proteus_Multi/InteractiveObjects/Book_Int_.uasset
diff --git a/Content/Proteus_Multi/InteractiveObjects/Cube_Int_.uasset b/Content/Proteus_Multi/InteractiveObjects/Cube_Int_.uasset
diff --git a/Content/Proteus_Multi/InteractiveObjects/Gun_Int_.uasset b/Content/Proteus_Multi/InteractiveObjects/Gun_Int_.uasset
diff --git a/Content/Proteus_Multi/InteractiveObjects/Hat_Int_.uasset b/Content/Proteus_Multi/InteractiveObjects/Hat_Int_.uasset
diff --git a/Content/Proteus_Multi/InteractiveObjects/Sword_Int_.uasset b/Content/Proteus_Multi/InteractiveObjects/Sword_Int_.uasset
diff --git a/Content/Proteus_Multi/MainMenuPC.uasset b/Content/Proteus_Multi/MainMenuPC.uasset
diff --git a/Content/Proteus_Multi/MultiMap01.umap b/Content/Proteus_Multi/MultiMap01.umap
diff --git a/Content/Proteus_Multi/Outline/BP_APOP_Outline.uasset b/Content/Proteus_Multi/Outline/BP_APOP_Outline.uasset
diff --git a/Content/Proteus_Multi/Outline/MI_APOP_SS_Opaque_Normal_Black.uasset b/Content/Proteus_Multi/Outline/MI_APOP_SS_Opaque_Normal_Black.uasset
diff --git a/Content/Proteus_Multi/Outline/MI_APOP_SS_Opaque_Thick_Green.uasset b/Content/Proteus_Multi/Outline/MI_APOP_SS_Opaque_Thick_Green.uasset
diff --git a/Content/Proteus_Multi/Outline/M_APOP_SS_Opaque.uasset b/Content/Proteus_Multi/Outline/M_APOP_SS_Opaque.uasset
diff --git a/Content/Proteus_Multi/Outline/Outliner.uasset b/Content/Proteus_Multi/Outline/Outliner.uasset
diff --git a/Content/Proteus_Multi/Outline/SK_APOP.uasset b/Content/Proteus_Multi/Outline/SK_APOP.uasset
diff --git a/Content/Proteus_Multi/Outline/SM_APOP.uasset b/Content/Proteus_Multi/Outline/SM_APOP.uasset
diff --git a/Content/Proteus_Multi/ProteusInteractions.uasset b/Content/Proteus_Multi/ProteusInteractions.uasset
diff --git a/Content/Proteus_Multi/ProteusPawn.uasset b/Content/Proteus_Multi/ProteusPawn.uasset
diff --git a/Content/Proteus_Multi/UI/MenuPointer/Avatar_Exp_M1.uasset b/Content/Proteus_Multi/UI/MenuPointer/Avatar_Exp_M1.uasset
diff --git a/Content/Proteus_Multi/UI/MenuPointer/Avatar_Exp_M1_Inst.uasset b/Content/Proteus_Multi/UI/MenuPointer/Avatar_Exp_M1_Inst.uasset
diff --git a/Content/Proteus_Multi/UI/Widgets/ConnectMenu.uasset b/Content/Proteus_Multi/UI/Widgets/ConnectMenu.uasset
diff --git a/Content/Proteus_Multi/entryMap.umap b/Content/Proteus_Multi/entryMap.umap
diff --git a/OculusAvatar.zip b/OculusAvatar.zip
diff --git a/Plugins/ProteusAvatars/Source/ProteusAvatars/Private/ProteusLocalAvatar.cpp b/Plugins/ProteusAvatars/Source/ProteusAvatars/Private/ProteusLocalAvatar.cpp
@@ -358,11 +358,11 @@ void AProteusLocalAvatar::LipSyncVismesReady()
 {
 	/*if (UseCannedLipSyncPlayback)
 	{
-		AvatarComponent->UpdateVisemeValues(PlayBackLipSyncComponent->GetVisemes());
+		AvatarComponent->UpdateVisemeValues(PlayBackLipSyncComponent->GetVisemes(), PlayBackLipSyncComponent->GetLaughterScore());
 	}
 	else
 	{*/
-		AvatarComponent->UpdateVisemeValues(LipSyncComponent->GetVisemes());
+		AvatarComponent->UpdateVisemeValues(LipSyncComponent->GetVisemes(), LipSyncComponent->GetLaughterScore());
 	//}
 }
 
@@ -381,7 +381,7 @@ UOvrAvatar::MaterialType AProteusLocalAvatar::GetOvrAvatarMaterialFromType(Avata
 	return UOvrAvatar::MaterialType::Opaque;
 }
 
-/*void AProteusLocalAvatar::AvatarVisibility(bool AvatarVisible)
+void AProteusLocalAvatar::AvatarVisibility()
 {
-	AvatarComponent->SetAvatarVisibility(AvatarVisible);
-}*/
+	AvatarComponent->SetVisibilityType(AvatarVisibilityType == AvatarVisibility::FirstPerson ? ovrAvatarVisibilityFlag_FirstPerson : ovrAvatarVisibilityFlag_ThirdPerson);
+}
diff --git a/Plugins/ProteusAvatars/Source/ProteusAvatars/Public/ProteusLocalAvatar.h b/Plugins/ProteusAvatars/Source/ProteusAvatars/Public/ProteusLocalAvatar.h
@@ -148,8 +148,8 @@ class PROTEUSAVATARS_API AProteusLocalAvatar : public APawn
 		void SetRightHandVisibility(bool RightHandVisible);
 	UFUNCTION(BlueprintCallable, Category = "OculusAvatar")
 		void SetControllersVisibility(bool ControllersVisible);
-	//UFUNCTION(BlueprintCallable, Category = "OculusAvatar")
-	//	void AvatarVisibility(bool AvatarVisible);
+	UFUNCTION(BlueprintCallable, Category = "OculusAvatar")
+		void AvatarVisibility();
 
 	virtual void BeginPlay() override;
 	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;

diff --git a/Proteus Template 6.1.pdf → Proteus Template 6.2.pdf b/Proteus Template 6.1.pdf → Proteus Template 6.2.pdf
diff --git a/Proteus.png b/Proteus.png
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
-# **Proteus Template 6.1**
+# **Proteus Template 6.2**
 
 Discussion on Unreal forum at https://forums.unrealengine.com/development-discussion/vr-ar-development/106631-single-multiplayer-touch-vive-proteus-blueprint-only-template
 
 # First release: March 2016 (under the name "SteamVR Template"
-# Latest Version 6.1 (under the name "Proteus VR Template")
-# Latest release July 17, 2019
+# Latest Version 6.2 (under the name "Proteus VR Template")
+# Latest release July 30, 2019
 
 # What can I do with that, that I cannot do with the "VR Template" in Unreal?
 Well, rapidly: It's single or multiplayer (LAN or Oculus Home); It uses Oculus Avatars (or not); It uses voice over IP (VOIP  -- Oculus Home only); full of nice features fully using Oculus functions; compatible Go/Quest/Rift; minimum use of C++ (but still some, since some methods not possible only in blueprints); hey, we were the first to propose a template back in 2016!
@@ -16,22 +16,22 @@ This template consists of virtual reality compatible pawn and settings, ready to
 * Download it at https://github.com/ProteusVRpublic/ProteusTemplate 
 
 ## Compatible with the following Unreal Engine versions:
-* Unreal Engine 4.22*, latest commit e28248e (June 7, 2019), found at https://github.com/Oculus-VR/UnrealEngine 
+* Unreal Engine 4.22*, latest commit 5f77421 (July 25, 2019),, found at https://github.com/Oculus-VR/UnrealEngine 
 * minor changes to the engine possibly / mandatory required
 
 
-### What's new in version 6.1
-# Unreal 4.22.2
-# HTC Vive compatible
-# HTC Vive camera access
-# Thoroughly tested with Oculus Quest
-# Highlight selected object compatible with Oculus Quest
-# Small dot selector on widgets
+### What's new in version 6.2
+* Unreal 4.22.3
+* “Ghost” function for clients to appear / disappear
+* Works with Oculus Quest, but in reduced 72Hz mode due to 1.39 plugin problem
+* 1.39 enables FFR+MultiView+Vulkan
+* 1.39 enables Avatars 64-bits on the Quest
+
 
 
 
 ## Compatibility
-# Oculus Plugin 1.38
+# Oculus Plugin 1.39
 # Oculus Platform SDK 1.32
 # Oculus Audio SDK 1.34
 # Oculus Avatar SDK 1.36