diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 3db5434b..3d1ea9ec 100644 --- a/Config/DefaultEngine.ini +++ b/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 + diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 047284a1..ec3dcf74 100644 --- a/Config/DefaultInput.ini +++ b/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 diff --git a/Config/DefaultPixelStreaming.ini b/Config/DefaultPixelStreaming.ini new file mode 100644 index 00000000..807820fd --- /dev/null +++ b/Config/DefaultPixelStreaming.ini @@ -0,0 +1,5 @@ + + +[/Script/PixelStreaming.PixelStreamingSettings] +bPixelStreamerMouseAlwaysAttached=False + diff --git a/Content/Blueprints/Library/BP_FunctionLibrary.uasset b/Content/Blueprints/Library/BP_FunctionLibrary.uasset index b37d2d86..f741574f 100644 Binary files a/Content/Blueprints/Library/BP_FunctionLibrary.uasset and b/Content/Blueprints/Library/BP_FunctionLibrary.uasset differ diff --git a/Content/Blueprints/Managers/BP_Controller.uasset b/Content/Blueprints/Managers/BP_Controller.uasset index fe87d2d6..f7ee2f5a 100644 Binary files a/Content/Blueprints/Managers/BP_Controller.uasset and b/Content/Blueprints/Managers/BP_Controller.uasset differ diff --git a/Content/Blueprints/Managers/BP_GameInstance.uasset b/Content/Blueprints/Managers/BP_GameInstance.uasset index a8e138c2..16c24ae0 100644 Binary files a/Content/Blueprints/Managers/BP_GameInstance.uasset and b/Content/Blueprints/Managers/BP_GameInstance.uasset differ diff --git a/Content/Blueprints/Player/BP_PlayerStateManager.uasset b/Content/Blueprints/Player/BP_PlayerStateManager.uasset index 3373cc37..84427ad9 100644 Binary files a/Content/Blueprints/Player/BP_PlayerStateManager.uasset and b/Content/Blueprints/Player/BP_PlayerStateManager.uasset differ diff --git a/Content/Blueprints/Startup/BP_ControllerStartupLevel.uasset b/Content/Blueprints/Startup/BP_ControllerStartupLevel.uasset index 66b4bc24..5386e424 100644 Binary files a/Content/Blueprints/Startup/BP_ControllerStartupLevel.uasset and b/Content/Blueprints/Startup/BP_ControllerStartupLevel.uasset differ diff --git a/Content/Blueprints/Statisctics/BP_Statistics.uasset b/Content/Blueprints/Statisctics/BP_Statistics.uasset new file mode 100644 index 00000000..9921a672 Binary files /dev/null and b/Content/Blueprints/Statisctics/BP_Statistics.uasset differ diff --git a/Content/Blueprints/Structures/Struct_ButtonsBackRC.uasset b/Content/Blueprints/Structures/Struct_ButtonsBackRC.uasset new file mode 100644 index 00000000..da2f8e5f Binary files /dev/null and b/Content/Blueprints/Structures/Struct_ButtonsBackRC.uasset differ diff --git a/Content/HUD/Blueprints/BP_UIStateManager.uasset b/Content/HUD/Blueprints/BP_UIStateManager.uasset index fedb8e2e..da18f9a4 100644 Binary files a/Content/HUD/Blueprints/BP_UIStateManager.uasset and b/Content/HUD/Blueprints/BP_UIStateManager.uasset differ diff --git a/Content/HUD/Templates/UW_InputBox.uasset b/Content/HUD/Templates/UW_InputBox.uasset index 378ca0fe..071e1a60 100644 Binary files a/Content/HUD/Templates/UW_InputBox.uasset and b/Content/HUD/Templates/UW_InputBox.uasset differ diff --git a/Content/HUD/Templates/UW_TemplateButton.uasset b/Content/HUD/Templates/UW_TemplateButton.uasset index cc68aea4..2ec6d7eb 100644 Binary files a/Content/HUD/Templates/UW_TemplateButton.uasset and b/Content/HUD/Templates/UW_TemplateButton.uasset differ diff --git a/Content/HUD/Textures/Blocks/All/BackKey_fortis.uasset b/Content/HUD/Textures/Blocks/All/BackKey_fortis.uasset new file mode 100644 index 00000000..f3d8211d Binary files /dev/null and b/Content/HUD/Textures/Blocks/All/BackKey_fortis.uasset differ diff --git a/Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackDefault_fortis.uasset b/Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackDefault_fortis.uasset new file mode 100644 index 00000000..569a6df2 Binary files /dev/null and b/Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackDefault_fortis.uasset differ diff --git a/Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackDisabled_fortis.uasset b/Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackDisabled_fortis.uasset new file mode 100644 index 00000000..a14bfcdc Binary files /dev/null and b/Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackDisabled_fortis.uasset differ diff --git a/Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackHovered_fortis.uasset b/Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackHovered_fortis.uasset new file mode 100644 index 00000000..14411ca8 Binary files /dev/null and b/Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackHovered_fortis.uasset differ diff --git a/Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackPressed_fortis.uasset b/Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackPressed_fortis.uasset new file mode 100644 index 00000000..3782780c Binary files /dev/null and b/Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackPressed_fortis.uasset differ diff --git a/Content/HUD/Textures/Blocks/All/IconEnter_fortis.uasset b/Content/HUD/Textures/Blocks/All/IconEnter_fortis.uasset new file mode 100644 index 00000000..66bb18bd Binary files /dev/null and b/Content/HUD/Textures/Blocks/All/IconEnter_fortis.uasset differ diff --git a/Content/HUD/Textures/Blocks/All/IconNetwork_fortis.uasset b/Content/HUD/Textures/Blocks/All/IconNetwork_fortis.uasset new file mode 100644 index 00000000..39687734 Binary files /dev/null and b/Content/HUD/Textures/Blocks/All/IconNetwork_fortis.uasset differ diff --git a/Content/HUD/Textures/Blocks/All/KeyboardBackground_fortis.uasset b/Content/HUD/Textures/Blocks/All/KeyboardBackground_fortis.uasset new file mode 100644 index 00000000..3d286fe6 Binary files /dev/null and b/Content/HUD/Textures/Blocks/All/KeyboardBackground_fortis.uasset differ diff --git a/Content/HUD/Textures/Blocks/All/UpArrow_fortis.uasset b/Content/HUD/Textures/Blocks/All/UpArrow_fortis.uasset new file mode 100644 index 00000000..99b23e65 Binary files /dev/null and b/Content/HUD/Textures/Blocks/All/UpArrow_fortis.uasset differ diff --git a/Content/HUD/Textures/Examples/All/Example_Keyboard.uasset b/Content/HUD/Textures/Examples/All/Example_Keyboard.uasset new file mode 100644 index 00000000..98753b28 Binary files /dev/null and b/Content/HUD/Textures/Examples/All/Example_Keyboard.uasset differ diff --git a/Content/HUD/Textures/Examples/All/Example_Keyboard_En.uasset b/Content/HUD/Textures/Examples/All/Example_Keyboard_En.uasset new file mode 100644 index 00000000..5d5fa047 Binary files /dev/null and b/Content/HUD/Textures/Examples/All/Example_Keyboard_En.uasset differ diff --git a/Content/HUD/Widgets/UW_About.uasset b/Content/HUD/Widgets/UW_About.uasset index c0932d16..db68ed3f 100644 Binary files a/Content/HUD/Widgets/UW_About.uasset and b/Content/HUD/Widgets/UW_About.uasset differ diff --git a/Content/HUD/Widgets/UW_Elevator.uasset b/Content/HUD/Widgets/UW_Elevator.uasset index 9df70f5e..4d9a93f3 100644 Binary files a/Content/HUD/Widgets/UW_Elevator.uasset and b/Content/HUD/Widgets/UW_Elevator.uasset differ diff --git a/Content/HUD/Widgets/UW_FilterFlatCard.uasset b/Content/HUD/Widgets/UW_FilterFlatCard.uasset index 88f4ec9d..5514d2fb 100644 Binary files a/Content/HUD/Widgets/UW_FilterFlatCard.uasset and b/Content/HUD/Widgets/UW_FilterFlatCard.uasset differ diff --git a/Content/HUD/Widgets/UW_FilterFlatPanel.uasset b/Content/HUD/Widgets/UW_FilterFlatPanel.uasset index 8c86f394..13bb96a4 100644 Binary files a/Content/HUD/Widgets/UW_FilterFlatPanel.uasset and b/Content/HUD/Widgets/UW_FilterFlatPanel.uasset differ diff --git a/Content/HUD/Widgets/UW_FlatCardAdvanced.uasset b/Content/HUD/Widgets/UW_FlatCardAdvanced.uasset index 2801372c..ca29b4f9 100644 Binary files a/Content/HUD/Widgets/UW_FlatCardAdvanced.uasset and b/Content/HUD/Widgets/UW_FlatCardAdvanced.uasset differ diff --git a/Content/HUD/Widgets/UW_FlatCardVR.uasset b/Content/HUD/Widgets/UW_FlatCardVR.uasset index 4c090696..2f6c4ad9 100644 Binary files a/Content/HUD/Widgets/UW_FlatCardVR.uasset and b/Content/HUD/Widgets/UW_FlatCardVR.uasset differ diff --git a/Content/HUD/Widgets/UW_Information.uasset b/Content/HUD/Widgets/UW_Information.uasset index d5da915a..6b04152c 100644 Binary files a/Content/HUD/Widgets/UW_Information.uasset and b/Content/HUD/Widgets/UW_Information.uasset differ diff --git a/Content/HUD/Widgets/UW_Infrastructure.uasset b/Content/HUD/Widgets/UW_Infrastructure.uasset index c14f1bc5..d7ee9d26 100644 Binary files a/Content/HUD/Widgets/UW_Infrastructure.uasset and b/Content/HUD/Widgets/UW_Infrastructure.uasset differ diff --git a/Content/HUD/Widgets/UW_Keyboard.uasset b/Content/HUD/Widgets/UW_Keyboard.uasset new file mode 100644 index 00000000..d59b2ab0 Binary files /dev/null and b/Content/HUD/Widgets/UW_Keyboard.uasset differ diff --git a/Content/HUD/Widgets/UW_LoginGeneral.uasset b/Content/HUD/Widgets/UW_LoginGeneral.uasset index 16c29107..088903e0 100644 Binary files a/Content/HUD/Widgets/UW_LoginGeneral.uasset and b/Content/HUD/Widgets/UW_LoginGeneral.uasset differ diff --git a/Content/HUD/Widgets/UW_LoginPage.uasset b/Content/HUD/Widgets/UW_LoginPage.uasset index 49676e11..7551686b 100644 Binary files a/Content/HUD/Widgets/UW_LoginPage.uasset and b/Content/HUD/Widgets/UW_LoginPage.uasset differ diff --git a/Content/HUD/Widgets/UW_Main.uasset b/Content/HUD/Widgets/UW_Main.uasset index 1a9f8133..44cdbdd3 100644 Binary files a/Content/HUD/Widgets/UW_Main.uasset and b/Content/HUD/Widgets/UW_Main.uasset differ diff --git a/Content/HUD/Widgets/UW_MainWindowVR.uasset b/Content/HUD/Widgets/UW_MainWindowVR.uasset index 4678f299..a34f98a5 100644 Binary files a/Content/HUD/Widgets/UW_MainWindowVR.uasset and b/Content/HUD/Widgets/UW_MainWindowVR.uasset differ diff --git a/Content/HUD/Widgets/UW_MenuFlat.uasset b/Content/HUD/Widgets/UW_MenuFlat.uasset index 537083e3..081369c2 100644 Binary files a/Content/HUD/Widgets/UW_MenuFlat.uasset and b/Content/HUD/Widgets/UW_MenuFlat.uasset differ diff --git a/Content/HUD/Widgets/UW_NavigationButtons.uasset b/Content/HUD/Widgets/UW_NavigationButtons.uasset index 978b8599..c716dbbd 100644 Binary files a/Content/HUD/Widgets/UW_NavigationButtons.uasset and b/Content/HUD/Widgets/UW_NavigationButtons.uasset differ diff --git a/Content/HUD/Widgets/UW_NavigationVR.uasset b/Content/HUD/Widgets/UW_NavigationVR.uasset index 33189e85..66de943e 100644 Binary files a/Content/HUD/Widgets/UW_NavigationVR.uasset and b/Content/HUD/Widgets/UW_NavigationVR.uasset differ diff --git a/Content/HUD/Widgets/UW_Overview.uasset b/Content/HUD/Widgets/UW_Overview.uasset index 4815420b..c7a67113 100644 Binary files a/Content/HUD/Widgets/UW_Overview.uasset and b/Content/HUD/Widgets/UW_Overview.uasset differ diff --git a/Content/HUD/Widgets/UW_Presentation.uasset b/Content/HUD/Widgets/UW_Presentation.uasset index bba70b4c..f10dbf77 100644 Binary files a/Content/HUD/Widgets/UW_Presentation.uasset and b/Content/HUD/Widgets/UW_Presentation.uasset differ diff --git a/Content/HUD/Widgets/UW_RCSelection.uasset b/Content/HUD/Widgets/UW_RCSelection.uasset index 546838b4..f8509a05 100644 Binary files a/Content/HUD/Widgets/UW_RCSelection.uasset and b/Content/HUD/Widgets/UW_RCSelection.uasset differ diff --git a/Content/HUD/Widgets/UW_SelectHouseVR.uasset b/Content/HUD/Widgets/UW_SelectHouseVR.uasset index b20858bd..ec300827 100644 Binary files a/Content/HUD/Widgets/UW_SelectHouseVR.uasset and b/Content/HUD/Widgets/UW_SelectHouseVR.uasset differ diff --git a/Content/HUD/Widgets/UW_SendOrPrint.uasset b/Content/HUD/Widgets/UW_SendOrPrint.uasset index 4894a3c4..426946f6 100644 Binary files a/Content/HUD/Widgets/UW_SendOrPrint.uasset and b/Content/HUD/Widgets/UW_SendOrPrint.uasset differ diff --git a/Content/HUD/Widgets/UW_WelcomeUser.uasset b/Content/HUD/Widgets/UW_WelcomeUser.uasset index 4d6cbd98..4efb46f4 100644 Binary files a/Content/HUD/Widgets/UW_WelcomeUser.uasset and b/Content/HUD/Widgets/UW_WelcomeUser.uasset differ diff --git a/Content/Maps/L_Test.umap b/Content/Maps/L_Test.umap index ada790d9..69ba808f 100644 Binary files a/Content/Maps/L_Test.umap and b/Content/Maps/L_Test.umap differ diff --git a/Content/Test/models/M_H.uasset b/Content/Test/models/M_H.uasset new file mode 100644 index 00000000..b2409307 Binary files /dev/null and b/Content/Test/models/M_H.uasset differ diff --git a/Content/Test/models/M_W.uasset b/Content/Test/models/M_W.uasset new file mode 100644 index 00000000..76ebc209 Binary files /dev/null and b/Content/Test/models/M_W.uasset differ diff --git a/Content/Test/models/Water_MaterialC.uasset b/Content/Test/models/Water_MaterialC.uasset new file mode 100644 index 00000000..7c1e4bd7 Binary files /dev/null and b/Content/Test/models/Water_MaterialC.uasset differ diff --git a/Content/Test/models/Water_Material_CustomMesh.uasset b/Content/Test/models/Water_Material_CustomMesh.uasset new file mode 100644 index 00000000..51cb7eb5 Binary files /dev/null and b/Content/Test/models/Water_Material_CustomMesh.uasset differ diff --git a/Content/Test/models/fixedBoat_inside.uasset b/Content/Test/models/fixedBoat_inside.uasset new file mode 100644 index 00000000..234f6046 Binary files /dev/null and b/Content/Test/models/fixedBoat_inside.uasset differ diff --git a/Content/Test/models/fixedBoat_outside.uasset b/Content/Test/models/fixedBoat_outside.uasset new file mode 100644 index 00000000..35746482 Binary files /dev/null and b/Content/Test/models/fixedBoat_outside.uasset differ diff --git a/FORTIS_Taktika.uproject b/FORTIS_Taktika.uproject index 89293697..67ed70d1 100644 --- a/FORTIS_Taktika.uproject +++ b/FORTIS_Taktika.uproject @@ -134,6 +134,10 @@ "Win64", "Linux" ] + }, + { + "Name": "PixelStreaming", + "Enabled": true } ] } \ No newline at end of file diff --git a/Source/FORTIS_Taktika/Private/ResComGameInstance.cpp b/Source/FORTIS_Taktika/Private/ResComGameInstance.cpp index a199360f..52d63548 100644 --- a/Source/FORTIS_Taktika/Private/ResComGameInstance.cpp +++ b/Source/FORTIS_Taktika/Private/ResComGameInstance.cpp @@ -11,6 +11,7 @@ void UResComGameInstance::Init() { Super::Init(); apartmentManager = NewObject(this); + statisticsManager = NewObject(this); } //void UResComGameInstance::SetApartmentManager(UResComApartmentManager* manager) @@ -23,9 +24,10 @@ UResComApartmentManager* UResComGameInstance::GetApartmentManager() const return apartmentManager; } - - - +UResComStatistics* UResComGameInstance::GetStatisticsManager() const +{ + return statisticsManager; +} diff --git a/Source/FORTIS_Taktika/Private/ResComStatistics.cpp b/Source/FORTIS_Taktika/Private/ResComStatistics.cpp new file mode 100644 index 00000000..e71c9ab0 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/Source/FORTIS_Taktika/Public/ResComGameInstance.h b/Source/FORTIS_Taktika/Public/ResComGameInstance.h index 8ee2bdb7..1c7c455a 100644 --- a/Source/FORTIS_Taktika/Public/ResComGameInstance.h +++ b/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) diff --git a/Source/FORTIS_Taktika/Public/ResComStatistics.h b/Source/FORTIS_Taktika/Public/ResComStatistics.h new file mode 100644 index 00000000..301f3734 --- /dev/null +++ b/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 stateHistory; +}; + +UCLASS(BlueprintType) +class FORTIS_TAKTIKA_API UResComStatistics : public UObject +{ + GENERATED_BODY() +protected: + float timeSession = 0.0f; + float timeVR = 0.0f; + TArray 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(); +};