Skip to content

Commit 4e0ec81

Browse files
committed
Update UnrealCSharp
1 parent b8f85fb commit 4e0ec81

File tree

10 files changed

+79
-393
lines changed

10 files changed

+79
-393
lines changed

Diff for: Plugins/UnrealCSharp

Submodule UnrealCSharp updated 83 files

Diff for: Script/Game/UnrealCSharpTest/UnitTest/Dynamic/BlueprintBlueprintDynamicFunction/CSharp_TestBlueprintBlueprintDynamicFunctionActor_C.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void SetBoolValueFunction(bool InBoolValue)
109109
BoolValue = InBoolValue;
110110
}
111111

112-
[UFunction, BlueprintCallable, BlueprintNativeEvent]
112+
[UFunction, BlueprintCallable, BlueprintImplementableEvent]
113113
public bool GetBoolValueFunction()
114114
{
115115
return BoolValue;

Diff for: Script/Game/UnrealCSharpTest/UnitTest/Dynamic/BlueprintRawDynamicFunction/TestBlueprintRawDynamicFunctionActor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void SetBoolValueFunction(bool InBoolValue)
109109
BoolValue = InBoolValue;
110110
}
111111

112-
[UFunction, BlueprintCallable, BlueprintNativeEvent]
112+
[UFunction, BlueprintCallable, BlueprintImplementableEvent]
113113
public bool GetBoolValueFunction()
114114
{
115115
return BoolValue;

Diff for: Source/UnrealCSharpTest/Private/TestBase/TestBaseSubsystem.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,3 @@
22

33

44
#include "TestBase/TestBaseSubsystem.h"
5-
6-
void UTestBaseSubsystem::Test_Implementation()
7-
{
8-
}

Diff for: Source/UnrealCSharpTest/Private/TestCore/TestCoreSubsystem.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "Kismet/KismetStringLibrary.h"
77
#include "TestBase/TestBaseSubsystem.h"
88
#include "TestCore/TestCoreBlueprintFunctionLibrary.h"
9+
#include "TestCore/CrossVersion.h"
910

1011
void UTestCoreSubsystem::Test() const
1112
{
@@ -22,7 +23,11 @@ void UTestCoreSubsystem::StartTest() const
2223

2324
void UTestCoreSubsystem::ProcessTest() const
2425
{
26+
#if UE_U_WORLD_GET_SUBSYSTEM_ARRAY_COPY
27+
auto TestSubsystemArray = GetWorld()->GetSubsystemArrayCopy<UTestBaseSubsystem>();
28+
#else
2529
auto TestSubsystemArray = GetWorld()->GetSubsystemArray<UTestBaseSubsystem>();
30+
#endif
2631

2732
for (const auto& TestSubsystem : TestSubsystemArray)
2833
{

Diff for: Source/UnrealCSharpTest/Private/UnitTest/Reflection/TestCSharpFunctionActor.cpp

-321
Original file line numberDiff line numberDiff line change
@@ -48,324 +48,3 @@ void ATestCSharpFunctionActor::Tick(float DeltaTime)
4848
{
4949
Super::Tick(DeltaTime);
5050
}
51-
52-
void ATestCSharpFunctionActor::SetBoolValueFunction_Implementation(const bool InBoolValue)
53-
{
54-
BoolValue = InBoolValue;
55-
}
56-
57-
bool ATestCSharpFunctionActor::GetBoolValueFunction_Implementation() const
58-
{
59-
return BoolValue;
60-
}
61-
62-
void ATestCSharpFunctionActor::OutBoolValueFunction_Implementation(bool& OutBoolValue) const
63-
{
64-
OutBoolValue = BoolValue;
65-
}
66-
67-
void ATestCSharpFunctionActor::SetInt32ValueFunction_Implementation(const int32 InInt32Value)
68-
{
69-
Int32Value = InInt32Value;
70-
}
71-
72-
int32 ATestCSharpFunctionActor::GetInt32ValueFunction_Implementation() const
73-
{
74-
return Int32Value;
75-
}
76-
77-
void ATestCSharpFunctionActor::OutInt32ValueFunction_Implementation(int32& OutInt32Value) const
78-
{
79-
OutInt32Value = Int32Value;
80-
}
81-
82-
void ATestCSharpFunctionActor::SetInt64ValueFunction_Implementation(const int64 InInt64Value)
83-
{
84-
Int64Value = InInt64Value;
85-
}
86-
87-
int64 ATestCSharpFunctionActor::GetInt64ValueFunction_Implementation() const
88-
{
89-
return Int64Value;
90-
}
91-
92-
void ATestCSharpFunctionActor::OutInt64ValueFunction_Implementation(int64& OutInt64Value) const
93-
{
94-
OutInt64Value = Int64Value;
95-
}
96-
97-
void ATestCSharpFunctionActor::SetUInt8ValueFunction_Implementation(const uint8 InUInt8Value)
98-
{
99-
UInt8Value = InUInt8Value;
100-
}
101-
102-
uint8 ATestCSharpFunctionActor::GetUInt8ValueFunction_Implementation() const
103-
{
104-
return UInt8Value;
105-
}
106-
107-
void ATestCSharpFunctionActor::OutUInt8ValueFunction_Implementation(uint8& OutUInt8Value) const
108-
{
109-
OutUInt8Value = UInt8Value;
110-
}
111-
112-
void ATestCSharpFunctionActor::SetFloatValueFunction_Implementation(const float InFloatValue)
113-
{
114-
FloatValue = InFloatValue;
115-
}
116-
117-
float ATestCSharpFunctionActor::GetFloatValueFunction_Implementation() const
118-
{
119-
return FloatValue;
120-
}
121-
122-
void ATestCSharpFunctionActor::OutFloatValueFunction_Implementation(float& OutFloatValue) const
123-
{
124-
OutFloatValue = FloatValue;
125-
}
126-
127-
void ATestCSharpFunctionActor::SetDoubleValueFunction_Implementation(const double InDoubleValue)
128-
{
129-
DoubleValue = InDoubleValue;
130-
}
131-
132-
double ATestCSharpFunctionActor::GetDoubleValueFunction_Implementation() const
133-
{
134-
return DoubleValue;
135-
}
136-
137-
void ATestCSharpFunctionActor::OutDoubleValueFunction_Implementation(double& OutDoubleValue) const
138-
{
139-
OutDoubleValue = DoubleValue;
140-
}
141-
142-
void ATestCSharpFunctionActor::SetNameValueFunction_Implementation(const FName& InNameValue)
143-
{
144-
NameValue = InNameValue;
145-
}
146-
147-
FName ATestCSharpFunctionActor::GetNameValueFunction_Implementation() const
148-
{
149-
return NameValue;
150-
}
151-
152-
void ATestCSharpFunctionActor::OutNameValueFunction_Implementation(FName& OutNameValue) const
153-
{
154-
OutNameValue = NameValue;
155-
}
156-
157-
void ATestCSharpFunctionActor::SetTextValueFunction_Implementation(const FText& InTextValue)
158-
{
159-
TextValue = InTextValue;
160-
}
161-
162-
FText ATestCSharpFunctionActor::GetTextValueFunction_Implementation() const
163-
{
164-
return TextValue;
165-
}
166-
167-
void ATestCSharpFunctionActor::OutTextValueFunction_Implementation(FText& OutTextValue) const
168-
{
169-
OutTextValue = TextValue;
170-
}
171-
172-
void ATestCSharpFunctionActor::SetStringValueFunction_Implementation(const FString& InStringValue)
173-
{
174-
StringValue = InStringValue;
175-
}
176-
177-
FString ATestCSharpFunctionActor::GetStringValueFunction_Implementation() const
178-
{
179-
return StringValue;
180-
}
181-
182-
void ATestCSharpFunctionActor::OutStringValueFunction_Implementation(FString& OutStringValue) const
183-
{
184-
OutStringValue = StringValue;
185-
}
186-
187-
void ATestCSharpFunctionActor::SetEnumValueFunction_Implementation(const ETestEnum InEnumValue)
188-
{
189-
EnumValue = InEnumValue;
190-
}
191-
192-
ETestEnum ATestCSharpFunctionActor::GetEnumValueFunction_Implementation() const
193-
{
194-
return EnumValue;
195-
}
196-
197-
void ATestCSharpFunctionActor::OutEnumValueFunction_Implementation(TEnumAsByte<ETestEnum>& OutEnumValue) const
198-
{
199-
OutEnumValue = EnumValue;
200-
}
201-
202-
void ATestCSharpFunctionActor::SetEnumClassValueFunction_Implementation(const ETestEnumClass InEnumClassValue)
203-
{
204-
EnumClassValue = InEnumClassValue;
205-
}
206-
207-
ETestEnumClass ATestCSharpFunctionActor::GetEnumClassValueFunction_Implementation() const
208-
{
209-
return EnumClassValue;
210-
}
211-
212-
void ATestCSharpFunctionActor::OutEnumClassValueFunction_Implementation(ETestEnumClass& OutEnumClassValue) const
213-
{
214-
OutEnumClassValue = EnumClassValue;
215-
}
216-
217-
void ATestCSharpFunctionActor::SetStructValueFunction_Implementation(const FTestStruct& InStructValue)
218-
{
219-
StructValue = InStructValue;
220-
}
221-
222-
FTestStruct ATestCSharpFunctionActor::GetStructValueFunction_Implementation() const
223-
{
224-
return StructValue;
225-
}
226-
227-
void ATestCSharpFunctionActor::OutStructValueFunction_Implementation(FTestStruct& OutStructValue) const
228-
{
229-
OutStructValue = StructValue;
230-
}
231-
232-
void ATestCSharpFunctionActor::SetObjectValueFunction_Implementation(UObject* InObjectValue)
233-
{
234-
ObjectValue = InObjectValue;
235-
}
236-
237-
UObject* ATestCSharpFunctionActor::GetObjectValueFunction_Implementation() const
238-
{
239-
return ObjectValue;
240-
}
241-
242-
void ATestCSharpFunctionActor::OutObjectValueFunction_Implementation(UObject*& OutObjectValue) const
243-
{
244-
OutObjectValue = ObjectValue;
245-
}
246-
247-
void ATestCSharpFunctionActor::SetClassValueFunction_Implementation(UClass* InClassValue)
248-
{
249-
ClassValue = InClassValue;
250-
}
251-
252-
UClass* ATestCSharpFunctionActor::GetClassValueFunction_Implementation() const
253-
{
254-
return ClassValue;
255-
}
256-
257-
void ATestCSharpFunctionActor::OutClassValueFunction_Implementation(UClass*& OutClassValue) const
258-
{
259-
OutClassValue = ClassValue;
260-
}
261-
262-
void ATestCSharpFunctionActor::SetInterfaceValueFunction_Implementation(
263-
const TScriptInterface<ITestInterface>& InInterfaceValue)
264-
{
265-
InterfaceValue = InInterfaceValue;
266-
}
267-
268-
TScriptInterface<ITestInterface> ATestCSharpFunctionActor::GetInterfaceValueFunction_Implementation() const
269-
{
270-
return InterfaceValue;
271-
}
272-
273-
void ATestCSharpFunctionActor::OutInterfaceValueFunction_Implementation(
274-
TScriptInterface<ITestInterface>& OutInterfaceValue) const
275-
{
276-
OutInterfaceValue = InterfaceValue;
277-
}
278-
279-
void ATestCSharpFunctionActor::SetSubclassOfValueFunction_Implementation(const TSubclassOf<UObject> InSubclassOfValue)
280-
{
281-
SubclassOfValue = InSubclassOfValue;
282-
}
283-
284-
TSubclassOf<UObject> ATestCSharpFunctionActor::GetSubclassOfValueFunction_Implementation() const
285-
{
286-
return SubclassOfValue;
287-
}
288-
289-
void ATestCSharpFunctionActor::OutSubclassOfValueFunction_Implementation(TSubclassOf<UObject>& OutSubclassOfValue) const
290-
{
291-
OutSubclassOfValue = SubclassOfValue;
292-
}
293-
294-
void ATestCSharpFunctionActor::SetSoftObjectPtrValueFunction_Implementation(
295-
const TSoftObjectPtr<UObject>& InSoftObjectPtrValue)
296-
{
297-
SoftObjectPtrValue = InSoftObjectPtrValue;
298-
}
299-
300-
TSoftObjectPtr<UObject> ATestCSharpFunctionActor::GetSoftObjectPtrValueFunction_Implementation() const
301-
{
302-
return SoftObjectPtrValue;
303-
}
304-
305-
void ATestCSharpFunctionActor::OutSoftObjectPtrValueFunction_Implementation(
306-
TSoftObjectPtr<UObject>& OutSoftObjectPtrValue) const
307-
{
308-
OutSoftObjectPtrValue = SoftObjectPtrValue;
309-
}
310-
311-
void ATestCSharpFunctionActor::SetSoftClassPtrValueFunction_Implementation(
312-
const TSoftClassPtr<UObject>& InSoftClassPtrValue)
313-
{
314-
SoftClassPtrValue = InSoftClassPtrValue;
315-
}
316-
317-
TSoftClassPtr<UObject> ATestCSharpFunctionActor::GetSoftClassPtrValueFunction_Implementation() const
318-
{
319-
return SoftClassPtrValue;
320-
}
321-
322-
void ATestCSharpFunctionActor::OutSoftClassPtrValueFunction_Implementation(
323-
TSoftClassPtr<UObject>& OutSoftClassPtrValue) const
324-
{
325-
OutSoftClassPtrValue = SoftClassPtrValue;
326-
}
327-
328-
void ATestCSharpFunctionActor::SetArrayValueFunction_Implementation(const TArray<int32>& InArrayValue)
329-
{
330-
ArrayValue = InArrayValue;
331-
}
332-
333-
TArray<int32> ATestCSharpFunctionActor::GetArrayValueFunction_Implementation() const
334-
{
335-
return ArrayValue;
336-
}
337-
338-
void ATestCSharpFunctionActor::OutArrayValueFunction_Implementation(TArray<int32>& OutArrayValue) const
339-
{
340-
OutArrayValue = ArrayValue;
341-
}
342-
343-
void ATestCSharpFunctionActor::SetSetValueFunction_Implementation(const TSet<int32>& InSetValue)
344-
{
345-
SetValue = InSetValue;
346-
}
347-
348-
TSet<int32> ATestCSharpFunctionActor::GetSetValueFunction_Implementation() const
349-
{
350-
return SetValue;
351-
}
352-
353-
void ATestCSharpFunctionActor::OutSetValueFunction_Implementation(TSet<int32>& OutSetValue) const
354-
{
355-
OutSetValue = SetValue;
356-
}
357-
358-
void ATestCSharpFunctionActor::SetMapValueFunction_Implementation(const TMap<int32, int32>& InMapValue)
359-
{
360-
MapValue = InMapValue;
361-
}
362-
363-
TMap<int32, int32> ATestCSharpFunctionActor::GetMapValueFunction_Implementation() const
364-
{
365-
return MapValue;
366-
}
367-
368-
void ATestCSharpFunctionActor::OutMapValueFunction_Implementation(TMap<int32, int32>& OutMapValue) const
369-
{
370-
OutMapValue = MapValue;
371-
}

Diff for: Source/UnrealCSharpTest/Private/UnitTest/Reflection/TestReflectionPropertyActor.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ ATestReflectionPropertyActor::ATestReflectionPropertyActor():
2727
InterfaceValue(this),
2828
SubclassOfValue(GetClass()),
2929
WeakObjectPtrValue(this),
30-
LazyObjectPtrValue(this),
3130
SoftObjectPtrValue(this),
3231
SoftClassPtrValue(GetClass()),
3332
ArrayValue({1, 2}),
@@ -41,6 +40,8 @@ ATestReflectionPropertyActor::ATestReflectionPropertyActor():
4140
// Called when the game starts or when spawned
4241
void ATestReflectionPropertyActor::BeginPlay()
4342
{
43+
LazyObjectPtrValue = this;
44+
4445
Super::BeginPlay();
4546
}
4647

Diff for: Source/UnrealCSharpTest/Public/TestBase/TestBaseSubsystem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ class UNREALCSHARPTEST_API UTestBaseSubsystem : public UWorldSubsystem
1515
GENERATED_BODY()
1616

1717
public:
18-
UFUNCTION(BlueprintCallable, BlueprintNativeEvent)
18+
UFUNCTION(BlueprintCallable, BlueprintImplementableEvent)
1919
void Test();
2020
};

0 commit comments

Comments
 (0)