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
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,11 @@ void UGetTelemetryFromServer_AsyncExecution::Activate()
FString Mistake;

switch (pRequest->GetStatus()) {
case EHttpRequestStatus::Failed_ConnectionError:
Mistake = TEXT("Connection failed.");
case EHttpRequestStatus::Failed:
if (pRequest->GetFailureReason() == EHttpFailureReason::ConnectionError)
{
Mistake = TEXT("Connection failed.");
}
default:
Mistake = TEXT("Request failed.");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// GitHub: https://github.com/Gamergenic1/MaxQ/

#include "Sample04Actor.h"
#include "Engine/Engine.h"
#include "Spice.h"

using MaxQSamples::Log;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// GitHub: https://github.com/Gamergenic1/MaxQ/

#include "Sample05Actor.h"
#include "Engine/Engine.h"
#include "SpiceTypes.h"
#include "Spice.h"
#include "SampleUtilities.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "Misc/Paths.h"
#include "HAL/FileManager.h"
#include "GenericPlatform/GenericPlatformMisc.h"
#include "Engine/Engine.h"
#include "Spice.h"

using MaxQSamples::Log;
Expand Down
15 changes: 13 additions & 2 deletions Plugins/MaxQ/Source/MaxQCppSamples/Private/SampleUtilities.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
#include "Interfaces/IHttpRequest.h"
#include "Interfaces/IHttpResponse.h"
#include "Spice.h"
#include "Misc/Paths.h"
#include "HAL/PlatformFileManager.h"
#include "GenericPlatform/GenericPlatformFile.h"
#include "GameFramework/Actor.h"
#include "Engine/Engine.h"
#include "HAL/FileManager.h"
#include "Components/StaticMeshComponent.h"
#include "Engine/StaticMesh.h"

#if WITH_EDITOR
#include "Interfaces/IPluginManager.h"
Expand Down Expand Up @@ -646,8 +654,11 @@ void USampleUtilities::GetTelemetryFromServer(FTelemetryCallback Callback, FStri
FString Mistake;

switch (pRequest->GetStatus()) {
case EHttpRequestStatus::Failed_ConnectionError:
Mistake = TEXT("Connection failed.");
case EHttpRequestStatus::Failed:
if (pRequest->GetFailureReason() == EHttpFailureReason::ConnectionError)
{
Mistake = TEXT("Connection failed.");
}
default:
Mistake = TEXT("Request failed.");
}
Expand Down
2 changes: 1 addition & 1 deletion Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample04Actor.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
#pragma once

#include "CoreMinimal.h"
#include "GameFramework/Actor.h"
#include "SpiceConstants.h"
#include "SpiceTypes.h"
#include "SampleUtilities.h"
#include "UObject/WeakObjectPtrTemplates.h"
#include "Sample04Actor.generated.h"

class AActor;

//-----------------------------------------------------------------------------
// Sample04
Expand Down
1 change: 1 addition & 0 deletions Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample05Actor.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include "CoreMinimal.h"
#include "SampleUtilities.h"
#include "GameFramework/Actor.h"
#include "Sample05Actor.generated.h"


Expand Down
1 change: 1 addition & 0 deletions Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample06Actor.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#pragma once

#include "CoreMinimal.h"
#include "GameFramework/Actor.h"
#include "SpiceConstants.h"
#include "SpiceTypes.h"
#include "SampleUtilities.h"
Expand Down
4 changes: 3 additions & 1 deletion Plugins/MaxQ/Source/Spice/Private/SpiceData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

#include "SpiceData.h"
#include "SpiceUtilities.h"
#include "Misc/Paths.h"
#include "HAL/FileManager.h"

PRAGMA_PUSH_PLATFORM_DEFAULT_PACKING
extern "C"
Expand Down Expand Up @@ -378,7 +380,7 @@ namespace MaxQ::Data
if (!ErrorCheck(ResultCode, ErrorMessage) && n_actual != N)
{
if (ResultCode) *ResultCode = ES_ResultCode::Error;
if (ErrorMessage) *ErrorMessage = FString::Printf(TEXT("Blueprint request for BODY%s_%s Expected double[%d] but proc returned double[%d]"), bodyid, *item, N, n_actual);
if (ErrorMessage) *ErrorMessage = FString::Printf(TEXT("Blueprint request for BODY%d_%s Expected double[%d] but proc returned double[%d]"), bodyid, *item, N, n_actual);
}
}

Expand Down
1 change: 1 addition & 0 deletions Plugins/MaxQ/Source/Spice/Private/SpiceDiagnostics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "Containers/StringFwd.h"
#include "Spice.h"
#include "SpiceUtilities.h"
#include "Misc/Paths.h"

#include <iomanip>
#include <sstream>
Expand Down
4 changes: 4 additions & 0 deletions Plugins/MaxQ/Source/Spice/Public/SpiceConstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@

#pragma once

#include "HAL/Platform.h"
#include "Containers/UnrealString.h"
#include "UObject/NameTypes.h"

#pragma region NaifFNames
namespace MaxQ::Constants
{
Expand Down
1 change: 1 addition & 0 deletions Plugins/MaxQ/Source/Spice/Public/SpiceEnums.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

#include "CoreMinimal.h"
#include "SpicePlatformDefs.h"
#include "SpiceEnums.generated.h"

UENUM(BlueprintType)
enum class ES_ResultCode : uint8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include "K2Node_MathGenericInterface.h"
#include "EdGraphSchema_K2.h"
#include "K2Node.h"


void IK2Node_MathGenericInterface::NotifyConnectionChanged(UEdGraphPin* Pin, UEdGraphPin* Connection)
Expand Down
5 changes: 3 additions & 2 deletions Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_hat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,12 @@ FText UK2Node_hat::GetNodeTitle(ENodeTitleType::Type TitleType) const
case ENodeTitleType::FullTitle:
/** The full title, may be multiple lines. */
return LOCTEXT("ListViewTitle", "vhat");
if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
// commented out to avoid compilation error C4702: unreachable code
/*if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
{
return FText::FromString(FString::Printf(TEXT("vhat %s"), *OperandType.TypeName.ToString()));
}
break;
break;*/
case ENodeTitleType::MenuTitle:
/** Menu Title for context menus to be displayed in context menus referencing the node. */
return LOCTEXT("MenuTitle", "vhat - Unit vector");
Expand Down
5 changes: 3 additions & 2 deletions Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_minus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,12 @@ FText UK2Node_minus::GetNodeTitle(ENodeTitleType::Type TitleType) const
case ENodeTitleType::FullTitle:
/** The full title, may be multiple lines. */
return LOCTEXT("ListViewTitle", "vminus");
if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
// commented out to avoid compilation error C4702: unreachable code
/*if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
{
return FText::FromString(FString::Printf(TEXT("vminus %s"), *OperandType.TypeName.ToString()));
}
break;
break;*/
case ENodeTitleType::MenuTitle:
/** Menu Title for context menus to be displayed in context menus referencing the node. */
return LOCTEXT("MenuTitle", "vminus - Negate vector");
Expand Down
5 changes: 3 additions & 2 deletions Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_pack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -419,11 +419,12 @@ FText UK2Node_pack::GetNodeTitle(ENodeTitleType::Type TitleType) const
case ENodeTitleType::FullTitle:
/** The full title, may be multiple lines. */
return LOCTEXT("ListViewTitle", "vpack");
if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
// commented out to avoid compilation error C4702: unreachable code
/*if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
{
return FText::FromString(FString::Printf(TEXT("vpack %s"), *OperandType.TypeName.ToString()));
}
break;
break;*/
case ENodeTitleType::MenuTitle:
/** Menu Title for context menus to be displayed in context menus referencing the node. */
return LOCTEXT("MenuTitle", "vpack - Pack/Init MaxQ vector");
Expand Down
5 changes: 3 additions & 2 deletions Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_upack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,12 @@ FText UK2Node_upack::GetNodeTitle(ENodeTitleType::Type TitleType) const
case ENodeTitleType::FullTitle:
/** The full title, may be multiple lines. */
return LOCTEXT("ListViewTitle", "vupack");
if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
// commented out to avoid compilation error C4702: unreachable code
/*if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
{
return FText::FromString(FString::Printf(TEXT("vupack %s"), *OperandType.TypeName.ToString()));
}
break;
break;*/
case ENodeTitleType::MenuTitle:
/** Menu Title for context menus to be displayed in context menus referencing the node. */
return LOCTEXT("MenuTitle", "vupack - Unpack MaxQ vector");
Expand Down
5 changes: 3 additions & 2 deletions Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vadd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ FText UK2Node_vadd::GetNodeTitle(ENodeTitleType::Type TitleType) const
case ENodeTitleType::FullTitle:
/** The full title, may be multiple lines. */
return LOCTEXT("ListViewTitle", "vadd");
if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
// commented out to avoid compilation error C4702: unreachable code
/*if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
{
return FText::FromString(FString::Printf(TEXT("vadd %s"), *OperandType.TypeName.ToString()));
}
break;
break;*/
case ENodeTitleType::MenuTitle:
/** Menu Title for context menus to be displayed in context menus referencing the node. */
return LOCTEXT("MenuTitle", "vadd - Add MaxQ vectors");
Expand Down
13 changes: 7 additions & 6 deletions Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vsub.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ FText UK2Node_vsub::GetNodeTitle(ENodeTitleType::Type TitleType) const
{
case ENodeTitleType::FullTitle:
return LOCTEXT("ListViewTitle", "vsub");
if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
{
/** The full title, may be multiple lines. */
return FText::FromString(FString::Printf(TEXT("vsub %s"), *OperandType.TypeName.ToString()));
}
break;
// commented out to avoid compilation error C4702: unreachable code
//if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
//{
// /** The full title, may be multiple lines. */
// return FText::FromString(FString::Printf(TEXT("vsub %s"), *OperandType.TypeName.ToString()));
//}
//break;
case ENodeTitleType::MenuTitle:
/** Menu Title for context menus to be displayed in context menus referencing the node. */
return LOCTEXT("MenuTitle", "vsub - Subtract two MaxQ vectors");
Expand Down
4 changes: 2 additions & 2 deletions Source/Spice.Target.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ public class SpiceTarget : TargetRules
public SpiceTarget(TargetInfo Target) : base(Target)
{
Type = TargetType.Game;
DefaultBuildSettings = BuildSettingsVersion.V2;
DefaultBuildSettings = BuildSettingsVersion.V5;
IncludeOrderVersion = EngineIncludeOrderVersion.Latest;

// Assumes CSpice_Library has already been built.

ExtraModuleNames.Add("Spice");
ExtraModuleNames.Add("MaxQMain");
CppStandard = CppStandardVersion.Cpp17;
CppStandard = CppStandardVersion.Cpp20;
}
}
4 changes: 2 additions & 2 deletions Source/SpiceEditor.Target.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class SpiceEditorTarget : TargetRules
public SpiceEditorTarget(TargetInfo Target) : base(Target)
{
Type = TargetType.Editor;
DefaultBuildSettings = BuildSettingsVersion.V2;
DefaultBuildSettings = BuildSettingsVersion.V5;
IncludeOrderVersion = EngineIncludeOrderVersion.Latest;

bUseFastPDBLinking = false;
Expand All @@ -34,7 +34,7 @@ public SpiceEditorTarget(TargetInfo Target) : base(Target)

UpdateDocs(Target);
BuildCSpiceLib(this);
CppStandard = CppStandardVersion.Cpp17;
CppStandard = CppStandardVersion.Cpp20;
}

public void UpdateDocs(TargetInfo Target)
Expand Down