p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CarlaWheeledVehicle: Add timelines for doors

This commit is contained in:
Daniel Santos-Olivan 2021-09-09 12:36:51 +02:00 committed by bernat
parent 25412daf93
commit 4fb8476211
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.cpp
View File

@ -9,6 +9,7 @@
#include "Engine/CollisionProfile.h"
#include "MovementComponents/DefaultMovementComponent.h"
#include "Rendering/SkeletalMeshRenderData.h"
#include "UObject/UObjectGlobals.h"
#include "PhysXPublic.h"
#include "PhysXVehicleManager.h"
@ -42,6 +43,8 @@ ACarlaWheeledVehicle::ACarlaWheeledVehicle(const FObjectInitializer& ObjectIniti
GetVehicleMovementComponent()->bReverseAsBrake = false;
BaseMovementComponent = CreateDefaultSubobject<UBaseCarlaMovementComponent>(TEXT("BaseMovementComponent"));
DoorTimelineDefault = CreateDefaultSubobject<UTimelineComponent>(TEXT("Timeline"));
}
ACarlaWheeledVehicle::~ACarlaWheeledVehicle() {}
@ -584,6 +587,29 @@ void ACarlaWheeledVehicle::EndPlay(const EEndPlayReason::Type EndPlayReason)
ShowDebugTelemetry(false);
}
void ACarlaWheeledVehicle::ConfigureAnimationData()
{
UE_LOG(LogTemp, Warning, TEXT("ACarlaWheeledVehicle::ConfigureAnimationData: NumDoors: %d"), DoorAnimMaxAngle.Num());
DoorAnimAlpha.Init(1.0, DoorAnimMaxAngle.Num());
DoorTimeline.Reset();
UE_LOG(LogTemp, Warning, TEXT("ACarlaWheeledVehicle::ConfigureAnimationData: DoorAnimAlpha: %d"), DoorAnimAlpha.Num());
for (int i = 0; i < DoorAnimMaxAngle.Num(); i++) {
//DoorAnimAlpha.Emplace(DoorAnimMaxAngle[i] * 2.0f);
//UE_LOG(LogTemp, Warning, TEXT(" DoorAnimAlpha: %d %d"), DoorAnimAlpha[i], DoorAnimAlpha.Num());
//UTimelineComponent* Timeline = CreateDefaultSubobject<UTimelineComponent>(TEXT("Timeline_%d"), i);
FName NameTimeline = FName(TEXT("Timeline_%d"), i);
UTimelineComponent* Timeline = DuplicateObject<UTimelineComponent>(DoorTimelineDefault, nullptr);
DoorTimeline.Add(Timeline);
}
UE_LOG(LogTemp, Warning, TEXT("ACarlaWheeledVehicle::ConfigureAnimationData: DoorTimeline: %d"), DoorTimeline.Num());
}
void ACarlaWheeledVehicle::OpenDoor(EVehicleDoor DoorIdx) {
// We check if the car has any door configured
if (DoorAnimMaxAngle.Num() == 0) {

12
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h
View File

@ -17,6 +17,7 @@
#include "WheeledVehicleMovementComponent4W.h"
#include "VehicleAnimInstance.h"
#include "MovementComponents/BaseCarlaMovementComponent.h"
#include "Components/TimelineComponent.h"
#include "CoreMinimal.h"
@ -262,11 +263,20 @@ protected:
UFUNCTION(BlueprintCallable, CallInEditor)
void AdjustVehicleBounds();
UFUNCTION(BlueprintCallable, CallInEditor)
void ConfigureAnimationData();
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Door Animation")
TArray<float> DoorAnimMaxAngle;
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Door Animation")
TArray<float> DoorAnimAlpha;
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Door Animation")
TArray<float> DoorAnimMaxAngle;
UTimelineComponent* DoorTimelineDefault;
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Door Animation")
TArray<UTimelineComponent*> DoorTimeline;
private: