diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index db306810..8b23a261 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -83,3 +83,17 @@ CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet +CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") +[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings] +bEnablePlugin=True +bAllowNetworkConnection=True +SecurityToken=394DEB4A4EBD34B2CA62539458067772 +bIncludeInShipping=False +bAllowExternalStartInShipping=False +bCompileAFSProject=False +bUseCompression=False +bLogFiles=False +bReportStats=False +ConnectionType=USBOnly +bUseManualIPAddress=False +ManualIPAddress= + diff --git a/Config/HoloLens/HoloLensEngine.ini b/Config/HoloLens/HoloLensEngine.ini new file mode 100644 index 00000000..7b8b53f9 --- /dev/null +++ b/Config/HoloLens/HoloLensEngine.ini @@ -0,0 +1,31 @@ + + +[/Script/HoloLensPlatformEditor.HoloLensTargetSettings] +bBuildForEmulation=False +bBuildForDevice=True +bUseNameForLogo=True +bBuildForRetailWindowsStore=False +bAutoIncrementVersion=False +bShouldCreateAppInstaller=False +AppInstallerInstallationURL= +HoursBetweenUpdateChecks=0 +bEnablePIXProfiling=False +TileBackgroundColor=(B=64,G=0,R=0,A=255) +SplashScreenBackgroundColor=(B=64,G=0,R=0,A=255) ++PerCultureResources=(CultureId="",Strings=(PackageDisplayName="",PublisherDisplayName="",PackageDescription="",ApplicationDisplayName="",ApplicationDescription=""),Images=()) +TargetDeviceFamily=Windows.Holographic +MinimumPlatformVersion= +MaximumPlatformVersionTested=10.0.18362.0 +MaxTrianglesPerCubicMeter=500.000000 +SpatialMeshingVolumeSize=20.000000 +CompilerVersion=Default +Windows10SDKVersion=10.0.18362.0 ++CapabilityList=internetClientServer ++CapabilityList=privateNetworkClientServer ++Uap2CapabilityList=spatialPerception +bSetDefaultCapabilities=False +SpatializationPlugin= +ReverbPlugin= +OcclusionPlugin= +SoundCueCookQualityIndex=-1 + diff --git a/Content/DeveloperTools/PartEditor/EUWBP_PartEditor.uasset b/Content/DeveloperTools/PartEditor/EUWBP_PartEditor.uasset new file mode 100644 index 00000000..21029dbc Binary files /dev/null and b/Content/DeveloperTools/PartEditor/EUWBP_PartEditor.uasset differ diff --git a/Content/DeveloperTools/PartEditor/WBP_HSplitter.uasset b/Content/DeveloperTools/PartEditor/WBP_HSplitter.uasset new file mode 100644 index 00000000..02d651b5 Binary files /dev/null and b/Content/DeveloperTools/PartEditor/WBP_HSplitter.uasset differ diff --git a/Content/DeveloperTools/PartEditor/WBP_PartShapeEditor.uasset b/Content/DeveloperTools/PartEditor/WBP_PartShapeEditor.uasset new file mode 100644 index 00000000..bb5dba80 Binary files /dev/null and b/Content/DeveloperTools/PartEditor/WBP_PartShapeEditor.uasset differ diff --git a/Content/UI/BuildUI/WBP_Grid.uasset b/Content/UI/BuildUI/WBP_Grid.uasset index ce5762d6..842fd44a 100644 Binary files a/Content/UI/BuildUI/WBP_Grid.uasset and b/Content/UI/BuildUI/WBP_Grid.uasset differ diff --git a/Content/UI/EUWBP_ReparentBlueprint.uasset b/Content/UI/EUWBP_ReparentBlueprint.uasset index fd32106e..8e972ee0 100644 Binary files a/Content/UI/EUWBP_ReparentBlueprint.uasset and b/Content/UI/EUWBP_ReparentBlueprint.uasset differ diff --git a/Content/UI/Parts/BP_PartEditor_PixelData.uasset b/Content/UI/Parts/BP_PartEditor_PixelData.uasset deleted file mode 100644 index 6dfb39c4..00000000 Binary files a/Content/UI/Parts/BP_PartEditor_PixelData.uasset and /dev/null differ diff --git a/Content/UI/Parts/EUWBP_PartEditor.uasset b/Content/UI/Parts/EUWBP_PartEditor.uasset deleted file mode 100644 index f98b7a2f..00000000 Binary files a/Content/UI/Parts/EUWBP_PartEditor.uasset and /dev/null differ diff --git a/Content/UI/Parts/WBP_PartEditor_PixelSelector.uasset b/Content/UI/Parts/WBP_PartEditor_PixelSelector.uasset deleted file mode 100644 index 8d34572e..00000000 Binary files a/Content/UI/Parts/WBP_PartEditor_PixelSelector.uasset and /dev/null differ diff --git a/Content/UI/WorldGeneration/GalaxyMap/HUD/WBP_GalaxyMap_HUD.uasset b/Content/UI/WorldGeneration/GalaxyMap/HUD/WBP_GalaxyMap_HUD.uasset index 7d76ab19..732618cc 100644 Binary files a/Content/UI/WorldGeneration/GalaxyMap/HUD/WBP_GalaxyMap_HUD.uasset and b/Content/UI/WorldGeneration/GalaxyMap/HUD/WBP_GalaxyMap_HUD.uasset differ diff --git a/Content/UI/WorldGeneration/StarSystem/HUD/WBP_StarSystem_HUD.uasset b/Content/UI/WorldGeneration/StarSystem/HUD/WBP_StarSystem_HUD.uasset index 96f5dd93..153f5d3e 100644 Binary files a/Content/UI/WorldGeneration/StarSystem/HUD/WBP_StarSystem_HUD.uasset and b/Content/UI/WorldGeneration/StarSystem/HUD/WBP_StarSystem_HUD.uasset differ diff --git a/Source/Voidsinger/UI/PixelMoldEditorBase.cpp b/Source/Voidsinger/UI/PixelMoldEditorBase.cpp index d116e173..d81f8bd6 100644 --- a/Source/Voidsinger/UI/PixelMoldEditorBase.cpp +++ b/Source/Voidsinger/UI/PixelMoldEditorBase.cpp @@ -53,9 +53,12 @@ void UPixelMoldEditorBase::SetMold(MinimalPixelMoldDataType NewMold) */ void UPixelMoldEditorBase::LoadMoldFromTarget() { - SetMold(Target->GetPixelMold()); + if (IsValid(Target)) + { + SetMold(Target->GetPixelMold()); - OnMoldUpdated(Mold.Array(), Mold.Array(), false); + OnMoldUpdated(Mold.Array(), Mold.Array(), false); + } } /** @@ -236,4 +239,14 @@ bool UPixelMoldEditorBase::GetPart(FIntPoint Location, FMinimalPartInstanceData& PartData = PartLocations.FindRef(Location); return true; -} \ No newline at end of file +} + +/** + * Gets the current mold of this editor + * + * @return The current mold + */ +const TSet& UPixelMoldEditorBase::GetMold() const +{ + return Mold; +} diff --git a/Source/Voidsinger/UI/PixelMoldEditorBase.h b/Source/Voidsinger/UI/PixelMoldEditorBase.h index 1c1a1d5f..728d7808 100644 --- a/Source/Voidsinger/UI/PixelMoldEditorBase.h +++ b/Source/Voidsinger/UI/PixelMoldEditorBase.h @@ -123,6 +123,14 @@ class VOIDSINGER_API UPixelMoldEditorBase : public UUserWidget UFUNCTION(BlueprintCallable) bool GetPart(FIntPoint Location, FMinimalPartInstanceData& PartData); + /** + * Gets the current mold of this editor + * + * @return The current mold + */ + UFUNCTION(BlueprintPure) + const TSet& GetMold() const; + /** * Called when the mold of this is changed in any way. * @@ -133,7 +141,7 @@ class VOIDSINGER_API UPixelMoldEditorBase : public UUserWidget private: //Stores the mold of this. - MinimalPixelMoldDataType Mold; + TSet Mold; //Stores the locations of all parts in the mold of this. TGridMap PartLocations; diff --git a/Source/VoidsingerEditorTools/PartEditorBase.cpp b/Source/VoidsingerEditorTools/PartEditorBase.cpp index 4797f158..ba580560 100644 --- a/Source/VoidsingerEditorTools/PartEditorBase.cpp +++ b/Source/VoidsingerEditorTools/PartEditorBase.cpp @@ -12,6 +12,7 @@ TArray UPartEditorBase::GetPartShape() { if (IsValid(PartBeingEdited)) { + UE_LOG(LogTemp, Warning, TEXT("part being edited shape num %i"), PartBeingEdited->Shape.Num()); return PartBeingEdited->Shape.Array(); } return TArray(); @@ -24,7 +25,7 @@ TArray UPartEditorBase::GetPartShape() */ void UPartEditorBase::SetPartShape(TArray NewShape) { - if (IsValid(PartBeingEdited)) + if (IsValid(PartBeingEdited) && IsValid(this)) { PartBeingEdited->Shape = TSet(NewShape); } diff --git a/Voidsinger.uproject b/Voidsinger.uproject index a361ae9e..4a66e326 100644 --- a/Voidsinger.uproject +++ b/Voidsinger.uproject @@ -11,7 +11,7 @@ "AdditionalDependencies": [ "Engine", "CoreUObject", - "UMG", + "UMG" ] }, {