Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis

Config/DefaultEngine.ini

@@ -166,3 +166,24 @@ DefaultSizeInMegabyte=512
 +Pools=(SizeInMegabyte=64,MinTileSize=0,MaxTileSize=9999,Formats=(PF_DXTI,PF_DXT5))
 +Pools=(SizeInMegabyte=512,MinTileSize=0,MaxTileSize=9999,Formats=(PF_A32B32G32R32F))
 
+[/Script/OculusHMD.OculusHMDRuntimeSettings]
+bAutoEnabled=True
+bEnableSpecificColorGamut=False
+ColorSpace=Quest
+bSupportsDash=True
+bCompositesDepth=True
+bHQDistortion=False
+PixelDensityMin=0.250000
+PixelDensityMax=1.000000
+CPULevel=2
+GPULevel=3
+FFRLevel=FFR_Off
+FFRDynamic=False
+bChromaCorrection=False
+bRecenterHMDWithController=True
+bFocusAware=True
+bLateLatching=False
+bRequiresSystemKeyboard=False
+HandTrackingSupport=ControllersOnly
+bPhaseSync=False
+

Config/DefaultInput.ini

@@ -107,7 +107,7 @@ bUseMouseForTouch=True
 bEnableMouseSmoothing=True
 bEnableFOVScaling=True
 bCaptureMouseOnLaunch=True
-bAlwaysShowTouchInterface=False
+bAlwaysShowTouchInterface=True
 bShowConsoleOnFourFingerTap=True
 bEnableGestureRecognizer=False
 bUseAutocorrect=False

Config/DefaultPixelStreaming.ini

@@ -0,0 +1,5 @@
+
+
+[/Script/PixelStreaming.PixelStreamingSettings]
+bPixelStreamerMouseAlwaysAttached=False
+

FORTIS_Taktika.uproject

@@ -134,6 +134,10 @@
 				"Win64",
 				"Linux"
 			]
+		},
+		{
+			"Name": "PixelStreaming",
+			"Enabled": true
 		}
 	]
 }

Source/FORTIS_Taktika/Private/ResComGameInstance.cpp

@@ -11,6 +11,7 @@ void UResComGameInstance::Init()
 {
 	Super::Init();
 	apartmentManager = NewObject<UResComApartmentManager>(this);
+	statisticsManager = NewObject<UResComStatistics>(this);
 }
 
 //void UResComGameInstance::SetApartmentManager(UResComApartmentManager* manager)
@@ -23,9 +24,10 @@ UResComApartmentManager* UResComGameInstance::GetApartmentManager() const
 	return apartmentManager;
 }
 
-
-
-
+UResComStatistics* UResComGameInstance::GetStatisticsManager() const
+{
+	return statisticsManager;
+}
 
 
 

Source/FORTIS_Taktika/Private/ResComStatistics.cpp

@@ -0,0 +1,36 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "ResComStatistics.h"
+
+void UResComStatistics::NewState(FString state)
+{
+	if (prevState.duration != 0.0f)
+	{
+		prevState.duration = GetWorld()->GetTimeSeconds() - prevState.duration;
+		stateHistory.Add(prevState);
+	}
+	
+	prevState.state = state;
+	prevState.duration = GetWorld()->GetTimeSeconds();
+}
+
+FString UResComStatistics::GetStateHistoryString()
+{
+	FString strTmp("");
+	for (auto& state : stateHistory)
+	{
+		strTmp += "->" + state.state;
+	}
+	return strTmp;
+}
+
+void UResComStatistics::StartVR()
+{
+	timeLastStartVR = GetWorld()->GetTimeSeconds();
+}
+
+void UResComStatistics::EndVR()
+{
+	timeVR += GetWorld()->GetTimeSeconds() - timeLastStartVR;
+}

Source/FORTIS_Taktika/Public/ResComGameInstance.h

@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "ResComStatistics.h"
 #include "ResComApartmentManager.h"
 #include "Engine/LatentActionManager.h"
 #include "Interfaces/IHttpRequest.h"
@@ -27,6 +28,7 @@ class FORTIS_TAKTIKA_API UResComGameInstance : public UGameInstance
 	GENERATED_BODY()
 private:
 	UResComApartmentManager* apartmentManager;
+	UResComStatistics* statisticsManager;
 	//FString HttpData;
 	//FHttpDelegate& Callback;
 protected:
@@ -38,6 +40,9 @@ public:
 	UFUNCTION(BlueprintCallable, Category = "ApartmentManager")
 	UResComApartmentManager* GetApartmentManager() const;
 
+	UFUNCTION(BlueprintCallable, Category = "StatisticsManager")
+	UResComStatistics* GetStatisticsManager() const;
+
 
 
 	//UFUNCTION(BlueprintCallable)

Source/FORTIS_Taktika/Public/ResComStatistics.h

@@ -0,0 +1,67 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/NoExportTypes.h"
+#include "ResComStatistics.generated.h"
+
+/**
+ * 
+ */
+
+USTRUCT(BlueprintType)
+struct FStateAndTime
+{
+	GENERATED_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	FString state;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	float duration = 0.0f;
+
+	FStateAndTime() {};
+	FStateAndTime(FString s, float t) : state(s), duration(t) {};
+};
+
+USTRUCT(BlueprintType)
+struct FUserStatistics
+{
+	GENERATED_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	float timeSession = 0.0f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	float timeVR = 0.0f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	TArray<FStateAndTime> stateHistory;
+};
+
+UCLASS(BlueprintType)
+class FORTIS_TAKTIKA_API UResComStatistics : public UObject
+{
+	GENERATED_BODY()
+protected:
+	float timeSession = 0.0f;
+	float timeVR = 0.0f;
+	TArray<FStateAndTime> stateHistory;
+
+	// start variables
+	float timeLastStartVR = 0.0f;
+	FStateAndTime prevState;
+public:
+	UFUNCTION(BlueprintCallable, Category = "states")
+	void NewState(FString state);
+
+	UFUNCTION(BlueprintCallable, Category = "states")
+	FString GetStateHistoryString();
+
+	UFUNCTION(BlueprintCallable, Category = "VR")
+	void StartVR();
+
+	UFUNCTION(BlueprintCallable, Category = "VR")
+	void EndVR();
+};