diff --git a/Content/Blueprints/OptiXLaserActor_Pickup.uasset b/Content/Blueprints/OptiXLaserActor_Pickup.uasset deleted file mode 100644 index 25833a9267f95d04544901c2ff65e1d98680842d..0000000000000000000000000000000000000000 Binary files a/Content/Blueprints/OptiXLaserActor_Pickup.uasset and /dev/null differ diff --git a/Content/Blueprints/OptiXLaserDetectorActor_Pickup.uasset b/Content/Blueprints/OptiXLaserDetectorActor_Pickup.uasset deleted file mode 100644 index f6cc2e1f8e169b6b7334fa3df35f8ab755cfbdc2..0000000000000000000000000000000000000000 Binary files a/Content/Blueprints/OptiXLaserDetectorActor_Pickup.uasset and /dev/null differ diff --git a/Content/Blueprints/OptiXVRPawnBP.uasset b/Content/Blueprints/OptiXVRPawnBP.uasset deleted file mode 100644 index 3f7dd9e9c0fc9de812581a2e05520eae54a80b7b..0000000000000000000000000000000000000000 Binary files a/Content/Blueprints/OptiXVRPawnBP.uasset and /dev/null differ diff --git a/Content/Blueprints/OptiXVRPawnStandaloneBPOld.uasset b/Content/Blueprints/OptiXVRPawnStandaloneBPOld.uasset deleted file mode 100644 index 09f1f7567527514329262d870757731daaaabf6c..0000000000000000000000000000000000000000 Binary files a/Content/Blueprints/OptiXVRPawnStandaloneBPOld.uasset and /dev/null differ diff --git a/Content/Blueprints/TeleportControllerBP.uasset b/Content/Blueprints/TeleportControllerBP.uasset index c12247644733670eb844a149d0b9380a911bda4a..bc71155c16d56df0b15c2423eadfe49869e41c91 100644 Binary files a/Content/Blueprints/TeleportControllerBP.uasset and b/Content/Blueprints/TeleportControllerBP.uasset differ diff --git a/Content/VirtualReality/Mannequin/Animations/MannequinHand_Right_CanGrab.uasset b/Content/VirtualReality/Mannequin/Animations/MannequinHand_Right_CanGrab.uasset deleted file mode 100644 index 6f020f65ed017ee0a4d22013cb886869f4e7132f..0000000000000000000000000000000000000000 Binary files a/Content/VirtualReality/Mannequin/Animations/MannequinHand_Right_CanGrab.uasset and /dev/null differ diff --git a/Content/VirtualReality/Mannequin/Animations/MannequinHand_Right_Grab.uasset b/Content/VirtualReality/Mannequin/Animations/MannequinHand_Right_Grab.uasset deleted file mode 100644 index 7fa4c188fde195e0f9802f146d02c668bae88828..0000000000000000000000000000000000000000 Binary files a/Content/VirtualReality/Mannequin/Animations/MannequinHand_Right_Grab.uasset and /dev/null differ diff --git a/Content/VirtualReality/Mannequin/Animations/MannequinHand_Right_Open.uasset b/Content/VirtualReality/Mannequin/Animations/MannequinHand_Right_Open.uasset deleted file mode 100644 index 2e5fe75dd652eded71a58b5646117637f533dfa1..0000000000000000000000000000000000000000 Binary files a/Content/VirtualReality/Mannequin/Animations/MannequinHand_Right_Open.uasset and /dev/null differ diff --git a/Content/VirtualReality/Mannequin/Animations/RightGrip_BS.uasset b/Content/VirtualReality/Mannequin/Animations/RightGrip_BS.uasset deleted file mode 100644 index 87736f3110838d4bd3b634c6208df89f1d49f095..0000000000000000000000000000000000000000 Binary files a/Content/VirtualReality/Mannequin/Animations/RightGrip_BS.uasset and /dev/null differ diff --git a/Content/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset b/Content/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset deleted file mode 100644 index 1b57809d073d3e3e804b13c72a4948c6bf99f0ba..0000000000000000000000000000000000000000 Binary files a/Content/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset and /dev/null differ diff --git a/Content/VirtualReality/Mannequin/Character/Materials/M_HandMat.uasset b/Content/VirtualReality/Mannequin/Character/Materials/M_HandMat.uasset deleted file mode 100644 index a924e60d73a42b27ea55e0024b6658aad6e186f8..0000000000000000000000000000000000000000 Binary files a/Content/VirtualReality/Mannequin/Character/Materials/M_HandMat.uasset and /dev/null differ diff --git a/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right.uasset b/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right.uasset deleted file mode 100644 index 02ce552cac619d51e5dcf7ee1bbc75edca1da40f..0000000000000000000000000000000000000000 Binary files a/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right.uasset and /dev/null differ diff --git a/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_PhysicsAsset.uasset b/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_PhysicsAsset.uasset deleted file mode 100644 index 1bcd09836631e952eaf0c7ba3a7b947e71a80a2c..0000000000000000000000000000000000000000 Binary files a/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_PhysicsAsset.uasset and /dev/null differ diff --git a/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_Skeleton.uasset b/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_Skeleton.uasset deleted file mode 100644 index fbbc631dd7bb61a35b6882cceadeaa19ccb93fe9..0000000000000000000000000000000000000000 Binary files a/Content/VirtualReality/Mannequin/Character/Mesh/MannequinHand_Right_Skeleton.uasset and /dev/null differ diff --git a/Content/VirtualReality/Mannequin/Character/Textures/UE4_Mannequin_MAT_MASKA.uasset b/Content/VirtualReality/Mannequin/Character/Textures/UE4_Mannequin_MAT_MASKA.uasset deleted file mode 100644 index 4ad7aa6c5fa591147e145acd0f08f4119cf34ca7..0000000000000000000000000000000000000000 Binary files a/Content/VirtualReality/Mannequin/Character/Textures/UE4_Mannequin_MAT_MASKA.uasset and /dev/null differ diff --git a/Content/VirtualReality/Mannequin/Character/Textures/UE4_Mannequin__normals.uasset b/Content/VirtualReality/Mannequin/Character/Textures/UE4_Mannequin__normals.uasset deleted file mode 100644 index d7f5c3bd6dcb198dc502be4b244231fba03ea525..0000000000000000000000000000000000000000 Binary files a/Content/VirtualReality/Mannequin/Character/Textures/UE4_Mannequin__normals.uasset and /dev/null differ diff --git a/Content/VirtualReality/Meshes/GenericHMD.uasset b/Content/VirtualReality/Meshes/GenericHMD.uasset deleted file mode 100644 index e414d72f05eb0a400cd65569c963674d2365e6c4..0000000000000000000000000000000000000000 Binary files a/Content/VirtualReality/Meshes/GenericHMD.uasset and /dev/null differ diff --git a/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset b/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset deleted file mode 100644 index 53342173c80b6ab92b7cc8e5cfb87f8b5e5a4c70..0000000000000000000000000000000000000000 Binary files a/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset and /dev/null differ diff --git a/Content/VirtualRealityBP/Blueprints/GripEnum.uasset b/Content/VirtualRealityBP/Blueprints/GripEnum.uasset deleted file mode 100644 index f6967c4b0f467f21ceb685d48f3dbacdf7757421..0000000000000000000000000000000000000000 Binary files a/Content/VirtualRealityBP/Blueprints/GripEnum.uasset and /dev/null differ diff --git a/Content/VirtualRealityBP/Blueprints/MotionControllerHaptics.uasset b/Content/VirtualRealityBP/Blueprints/MotionControllerHaptics.uasset deleted file mode 100644 index f45d7592a4d4d6096aa9c23f3004b9a0f0edabe2..0000000000000000000000000000000000000000 Binary files a/Content/VirtualRealityBP/Blueprints/MotionControllerHaptics.uasset and /dev/null differ diff --git a/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset b/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset deleted file mode 100644 index 9dc7fb76184aa339c6e7e4ae32fb279d5febae4d..0000000000000000000000000000000000000000 Binary files a/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset and /dev/null differ diff --git a/Content/VirtualRealityBP/Blueprints/PickupActorInterface.uasset b/Content/VirtualRealityBP/Blueprints/PickupActorInterface.uasset deleted file mode 100644 index f6a7668011e7fe9e12013837d13d2ee57300d659..0000000000000000000000000000000000000000 Binary files a/Content/VirtualRealityBP/Blueprints/PickupActorInterface.uasset and /dev/null differ diff --git a/Source/OptiX/Private/LineInstancedStaticMeshComponent.cpp b/Source/OptiX/Private/LineInstancedStaticMeshComponent.cpp index 7d67578b8bf6682c8aedf0fb77e3b2f66fa967ab..612ff057db825b6b3ec1acdd05cb393c4b711e08 100644 --- a/Source/OptiX/Private/LineInstancedStaticMeshComponent.cpp +++ b/Source/OptiX/Private/LineInstancedStaticMeshComponent.cpp @@ -67,7 +67,7 @@ FPrimitiveSceneProxy* ULineInstancedStaticMeshComponent::CreateSceneProxy() FPrimitiveSceneProxy* Proxy = Super::CreateSceneProxy(); - if (!PerInstanceRenderData.IsValid()) + if (!PerInstanceRenderData.IsValid() || PerInstanceSMData.Num() < 1 ) { return Proxy; } @@ -89,8 +89,8 @@ FPrimitiveSceneProxy* ULineInstancedStaticMeshComponent::CreateSceneProxy() } FMatrix Transform; - PerInstanceRenderData->InstanceBuffer_GameThread->GetInstanceTransform(Index, Transform); - PerInstanceRenderData->InstanceBuffer_GameThread->SetInstance(Index, Transform, static_cast<float>(Index)); + PerInstanceRenderData->InstanceBuffer_GameThread->GetInstanceTransform(RenderIndex, Transform); + PerInstanceRenderData->InstanceBuffer_GameThread->SetInstance(RenderIndex, Transform, static_cast<float>(RenderIndex)); } return Proxy; diff --git a/Source/OptiX/Private/OptiXTargetComponent.cpp b/Source/OptiX/Private/OptiXTargetComponent.cpp index 39a9bce575a27741d59da1b79716ec7968db3765..bb5d4d307d754436fd928751dc9e1cf847823365 100644 --- a/Source/OptiX/Private/OptiXTargetComponent.cpp +++ b/Source/OptiX/Private/OptiXTargetComponent.cpp @@ -1,16 +1,28 @@ // Fill out your copyright notice in the Description page of Project Settings. #include "OptiXTargetComponent.h" + +#include "UObject/ConstructorHelpers.h" + #include "OptiXModule.h" + + UOptiXTargetComponent::UOptiXTargetComponent(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) { CurrentTexturePattern = ETexturePattern::TP_CHECKER; - FString N = "Texture2D'/OptiX/Targets/Checker.Checker'"; - Texture = LoadObject<UTexture2D>(this, *N); - TextureSize = FIntPoint(Texture->GetSizeX(), Texture->GetSizeY()); - TargetSize = FVector(2.0f, 20.0f, 20.0f * static_cast<float>(TextureSize.Y) / static_cast<float>(TextureSize.X)); + //FString N = "Texture2D'/OptiX/Targets/Checker.Checker'"; + //Texture = LoadObject<UTexture2D>(this, *N); + + static ConstructorHelpers::FObjectFinder<UTexture2D> TextureLoader(TEXT("Texture2D'/OptiX/Targets/Checker.Checker'")); + Texture = TextureLoader.Object; + + if (Texture != NULL) + { + TextureSize = FIntPoint(Texture->GetSizeX(), Texture->GetSizeY()); + TargetSize = FVector(2.0f, 20.0f, 20.0f * static_cast<float>(TextureSize.Y) / static_cast<float>(TextureSize.X)); + } } // God sometimes unreal is annoying diff --git a/Source/OptiX/Private/SelectableActorBase.cpp b/Source/OptiX/Private/SelectableActorBase.cpp index 3dba01797ecdd3678054129881c8158d7fd8a3db..f45146f68d39b9c8313b87b0e176073b1da592b4 100644 --- a/Source/OptiX/Private/SelectableActorBase.cpp +++ b/Source/OptiX/Private/SelectableActorBase.cpp @@ -11,6 +11,9 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti : Super(ObjectInitializer) { + UE_LOG(LogTemp, Display, TEXT("OptiX ASelectableActorBase Constructor")); + + SetMobility(EComponentMobility::Movable); GetStaticMeshComponent()->SetGenerateOverlapEvents(true); @@ -248,6 +251,10 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ConnectorH->SetMaterial(1, MetalMaterial.Object); ConnectorH->SetGenerateOverlapEvents(false); ConnectorH->SetCollisionEnabled(ECollisionEnabled::NoCollision); + + UE_LOG(LogTemp, Display, TEXT("OptiX ASelectableActorBase Constructor End")); + + } void ASelectableActorBase::BeginPlay()