jonaszbigda/FireKrackers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.1.2

Browse Source
This commit is contained in:
Jonasz Bigda
2023-09-05 19:59:40 +02:00
parent 362d216dfd
commit 72f64957a6
75 changed files with 1808 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/FireworkDuels/EditPermissions_UPL.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<root xmlns:android="http://schemas.android.com/apk/res/android">
<androidManifestUpdates>
<removePermission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<removePermission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<removePermission android:name="android.permission.ACCESS_MEDIA_LOCATION"/>
</androidManifestUpdates>
</root>

7
Source/FireworkDuels/FireworkDuels.Build.cs
View File

@@ -1,5 +1,6 @@
// Copyright Epic Games, Inc. All Rights Reserved.
using System.IO;
using UnrealBuildTool;
public class FireworkDuels : ModuleRules
@@ -12,6 +13,12 @@ public class FireworkDuels : ModuleRules
PrivateDependencyModuleNames.AddRange(new string[] { });
if(Target.Platform == UnrealTargetPlatform.Android)
{
var manifestFile = Path.Combine(ModuleDirectory, "EditPermissions_UPL.xml");
AdditionalPropertiesForReceipt.Add("AndroidPlugin", manifestFile);
}
// Uncomment if you are using Slate UI
// PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });

7
Source/FireworkDuels/FireworksPawn.cpp
View File

@@ -109,13 +109,14 @@ void AFireworksPawn::SetupPlayerInputComponent(UInputComponent* PlayerInputCompo
void AFireworksPawn::SetupGrabAttachment(EControllerHand Hand) {
FName Socket = Hand == EControllerHand::Left ? TEXT("SocketL") : TEXT("SocketR");
APickableObject* HeldObject = Hand == EControllerHand::Left ? HeldObject_L : HeldObject_R;
USkeletalMeshComponent* HandMesh = Hand == EControllerHand::Left ? LeftHandMesh : RightHandMesh;
FTransform HeldObjectTransformLocal = HeldObject->StaticMesh->GetSocketTransform(Socket, ERelativeTransformSpace::RTS_Actor);
// Set new values
FTransform NewTransform;
NewTransform.SetScale3D(FVector(1.f, 1.f, 1.f));
NewTransform.SetLocation(FVector(0.f, 0.f, 0.f));
NewTransform.SetLocation(IsSteamVR ? FVector(-10.f, 0.f, 0.f) : FVector(0.f, 0.f, 0.f));
NewTransform.SetRotation(HeldObjectTransformLocal.GetRotation().Inverse());
// Set new transform
@@ -137,7 +138,7 @@ bool AFireworksPawn::TryGrab(EControllerHand Hand)
HoveredActorL->StaticMesh->SetSimulatePhysics(false);
HoveredActorL->StaticMesh->SetRenderCustomDepth(false);
HeldObject_L = HoveredActorL;
HeldObject_L->AttachToComponent(MotionControllerL, FAttachmentTransformRules::KeepRelativeTransform);
HeldObject_L->AttachToComponent(MotionControllerL, FAttachmentTransformRules::KeepWorldTransform);
SetupGrabAttachment(EControllerHand::Left);
HeldObject_L->SetInstigator(this);
IsGrabbingL = true;
@@ -155,7 +156,7 @@ bool AFireworksPawn::TryGrab(EControllerHand Hand)
HoveredActorR->StaticMesh->SetSimulatePhysics(false);
HoveredActorR->StaticMesh->SetRenderCustomDepth(false);
HeldObject_R = HoveredActorR;
HeldObject_R->StaticMesh->AttachToComponent(MotionControllerR, FAttachmentTransformRules::KeepRelativeTransform);
HeldObject_R->AttachToComponent(MotionControllerR, FAttachmentTransformRules::KeepWorldTransform);
SetupGrabAttachment(EControllerHand::Right);
HeldObject_R->SetInstigator(this);
IsGrabbingR = true;

3
Source/FireworkDuels/FireworksPawn.h
View File

@@ -133,6 +133,9 @@ public:
UPROPERTY(EditAnywhere, BlueprintReadWrite)
EControllerHand DominatingHand = EControllerHand::Right;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
bool IsSteamVR = false;
// Functions
// Try to grab object

19
Source/FireworkDuels/Private/LevelTemplate.cpp
View File

@@ -39,8 +39,19 @@ float ALevelTemplate::StopGame() {
}
int32 ALevelTemplate::GetAwardStars() {
if (GameTime < ThreeStarTarget) return 3;
if (GameTime < TwoStarTarget) return 2;
if (GameTime < OneStarTarget) return 1;
return 0;
if (GameTime <= ThreeStarTarget)
{
return 3;
}
else if (GameTime <= TwoStarTarget)
{
return 2;
}
else if (GameTime <= OneStarTarget)
{
return 1;
}
else {
return 0;
}
}

6
Source/FireworkDuels/Public/LevelTemplate.h
View File

@@ -21,13 +21,13 @@ public:
UPaperTileMapComponent* Template;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
int32 OneStarTarget = 180;
float OneStarTarget = 180.f;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
int32 TwoStarTarget = 120;
float TwoStarTarget = 120.f;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
int32 ThreeStarTarget = 60;
float ThreeStarTarget = 60.f;
UPROPERTY(VisibleAnywhere, BlueprintReadOnly)
float GameTime = 0.f;