Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Config/DefaultEngine.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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=

31 changes: 31 additions & 0 deletions Config/HoloLens/HoloLensEngine.ini
Original file line number Diff line number Diff line change
@@ -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

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Content/UI/BuildUI/WBP_Grid.uasset
Binary file not shown.
Binary file modified Content/UI/EUWBP_ReparentBlueprint.uasset
Binary file not shown.
Binary file removed Content/UI/Parts/BP_PartEditor_PixelData.uasset
Binary file not shown.
Binary file removed Content/UI/Parts/EUWBP_PartEditor.uasset
Binary file not shown.
Binary file removed Content/UI/Parts/WBP_PartEditor_PixelSelector.uasset
Binary file not shown.
Binary file not shown.
Binary file not shown.
19 changes: 16 additions & 3 deletions Source/Voidsinger/UI/PixelMoldEditorBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

/**
Expand Down Expand Up @@ -236,4 +239,14 @@ bool UPixelMoldEditorBase::GetPart(FIntPoint Location, FMinimalPartInstanceData&

PartData = PartLocations.FindRef(Location);
return true;
}
}

/**
* Gets the current mold of this editor
*
* @return The current mold
*/
const TSet<FMinimalPartInstanceData>& UPixelMoldEditorBase::GetMold() const
{
return Mold;
}
10 changes: 9 additions & 1 deletion Source/Voidsinger/UI/PixelMoldEditorBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<FMinimalPartInstanceData>& GetMold() const;

/**
* Called when the mold of this is changed in any way.
*
Expand All @@ -133,7 +141,7 @@ class VOIDSINGER_API UPixelMoldEditorBase : public UUserWidget

private:
//Stores the mold of this.
MinimalPixelMoldDataType Mold;
TSet<FMinimalPartInstanceData> Mold;

//Stores the locations of all parts in the mold of this.
TGridMap<FMinimalPartInstanceData> PartLocations;
Expand Down
3 changes: 2 additions & 1 deletion Source/VoidsingerEditorTools/PartEditorBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ TArray<FIntPoint> 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<FIntPoint>();
Expand All @@ -24,7 +25,7 @@ TArray<FIntPoint> UPartEditorBase::GetPartShape()
*/
void UPartEditorBase::SetPartShape(TArray<FIntPoint> NewShape)
{
if (IsValid(PartBeingEdited))
if (IsValid(PartBeingEdited) && IsValid(this))
{
PartBeingEdited->Shape = TSet<FIntPoint>(NewShape);
}
Expand Down
2 changes: 1 addition & 1 deletion Voidsinger.uproject
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"AdditionalDependencies": [
"Engine",
"CoreUObject",
"UMG",
"UMG"
]
},
{
Expand Down