diff --git a/Content/IntegrationGameModeBaseBP.uasset b/Content/IntegrationGameModeBaseBP.uasset index b0c21b8f..18945ea8 100644 --- a/Content/IntegrationGameModeBaseBP.uasset +++ b/Content/IntegrationGameModeBaseBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9280c4f366a393dafed32d4fe3920bc888d6e7d2ebc45e474b204f05d0f3a1e0 -size 53962 +oid sha256:d0e627f55fd73f0e5876ed299b2f29e9fe9dfaa94dafbe90c484ac32874ac808 +size 54056 diff --git a/Content/LpxTangible.uasset b/Content/LpxTangible.uasset deleted file mode 100644 index 0ee9bf2c..00000000 --- a/Content/LpxTangible.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67764aee750ef0c005a3ee69b9a5d412822f996eab8caa70f1cbea6ee094c6da -size 13358 diff --git a/Content/TangibleActor.uasset b/Content/TangibleActor.uasset new file mode 100644 index 00000000..3aeee539 --- /dev/null +++ b/Content/TangibleActor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cea9c1c5c294585eb7645105a4e1d438397861240126b64fc847748ec8702afa +size 22486 diff --git a/Content/TangibleComponent.uasset b/Content/TangibleComponent.uasset new file mode 100644 index 00000000..b19f2151 --- /dev/null +++ b/Content/TangibleComponent.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00eccd12e5d7bc2db10e8c6635337b34be9f3f552603dc041315d6ebf6116e77 +size 13383 diff --git a/Source/Integration/IntegrationGameModeBase.h b/Source/Integration/IntegrationGameModeBase.h index 618d2eb2..b3921039 100644 --- a/Source/Integration/IntegrationGameModeBase.h +++ b/Source/Integration/IntegrationGameModeBase.h @@ -39,6 +39,10 @@ public: UFUNCTION(BlueprintCallable) void ConsoleSendInput(const FString& text); + // The blueprint class TangibleActor + UPROPERTY(EditDefaultsOnly, Category = TangibleClasses) + TSubclassOf ClassTangibleActor; + // Transfer console output from the Luprex engine to unreal. void HandleLuprexConsoleOutput(); diff --git a/Source/Integration/LpxTangibleBase.cpp b/Source/Integration/TangibleComponentBase.cpp similarity index 68% rename from Source/Integration/LpxTangibleBase.cpp rename to Source/Integration/TangibleComponentBase.cpp index a7c3f22e..6185bef3 100644 --- a/Source/Integration/LpxTangibleBase.cpp +++ b/Source/Integration/TangibleComponentBase.cpp @@ -1,10 +1,10 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "LpxTangibleBase.h" +#include "TangibleComponentBase.h" // Sets default values for this component's properties -ULpxTangibleBase::ULpxTangibleBase() +UTangibleComponentBase::UTangibleComponentBase() { // Set this component to be initialized when the game starts, and to be ticked every frame. You can turn these features // off to improve performance if you don't need them. @@ -15,7 +15,7 @@ ULpxTangibleBase::ULpxTangibleBase() // Called when the game starts -void ULpxTangibleBase::BeginPlay() +void UTangibleComponentBase::BeginPlay() { Super::BeginPlay(); @@ -25,7 +25,7 @@ void ULpxTangibleBase::BeginPlay() // Called every frame -void ULpxTangibleBase::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) +void UTangibleComponentBase::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) { Super::TickComponent(DeltaTime, TickType, ThisTickFunction); diff --git a/Source/Integration/LpxTangibleBase.h b/Source/Integration/TangibleComponentBase.h similarity index 81% rename from Source/Integration/LpxTangibleBase.h rename to Source/Integration/TangibleComponentBase.h index 2113bc2a..d3a84e04 100644 --- a/Source/Integration/LpxTangibleBase.h +++ b/Source/Integration/TangibleComponentBase.h @@ -4,17 +4,17 @@ #include "CoreMinimal.h" #include "Components/ActorComponent.h" -#include "LpxTangibleBase.generated.h" +#include "TangibleComponentBase.generated.h" UCLASS(Blueprintable, BlueprintType, ClassGroup = (Custom), meta = (BlueprintSpawnableComponent), ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) -class INTEGRATION_API ULpxTangibleBase : public UActorComponent +class INTEGRATION_API UTangibleComponentBase : public UActorComponent { GENERATED_BODY() public: // Sets default values for this component's properties - ULpxTangibleBase(); + UTangibleComponentBase(); protected: // Called when the game starts