Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setup player size converting to bullet #10

Merged
merged 3 commits into from
Sep 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public void Enter()

private void SetUpPlayer(PlayerData player, PlayerCarpetDataProvider carpet)
{
player.SizeConverter = new PlayerSizeConverter(player);
player.SizeCalculator = new PLayerSizeCalculator(player, carpet);
player.SizeSetter = new PlayerSizeSetter(player);
player.CarpetSizeSetter = new PlayerCarpetSizeSetter(carpet.transform);
Expand Down
1 change: 1 addition & 0 deletions Assets/Scripts/Data/Dynamic/Player/PlayerData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class PlayerData
public float Size { get; set; }
public float Radius { get; set; }

public PlayerSizeConverter SizeConverter { get; set; }
public PLayerSizeCalculator SizeCalculator { get; set; }
public PlayerSizeSetter SizeSetter { get; set; }
public PlayerCarpetSizeSetter CarpetSizeSetter { get; set; }
Expand Down
24 changes: 24 additions & 0 deletions Assets/Scripts/Features/Player/Bullet/PlayerBulletSizeSetter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
using BlockBreaker.Data.Dynamic.Player;
using UnityEngine;

namespace BlockBreaker.Features.Player.Bullet
{
public class PlayerBulletSizeSetter
{
public void Set(PlayerBulletData bullet, float size)
{
bullet.Size = size;
bullet.Radius = size / 2f;
bullet.Transform.localScale = Vector3.one * bullet.Size;

CorrectPosition(bullet);
}

private void CorrectPosition(PlayerBulletData bullet)
{
Vector3 initialPosition = bullet.InitialPosition;
bullet.Transform.localPosition =
new Vector3(initialPosition.x, initialPosition.y + bullet.Radius, initialPosition.z);
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Assets/Scripts/Features/Player/PLayerSizeCalculator.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using BlockBreaker.Data.Dynamic.Player;
using BlockBreaker.Data.Static.Configuration.Player;
using BlockBreaker.Features.Obstacle;
using BlockBreaker.Features.Player.Carpet;
using UnityEngine;
Expand Down
19 changes: 12 additions & 7 deletions Assets/Scripts/Features/Player/PlayerInputHandler.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using BlockBreaker.Features.Player.Bullet;
using BlockBreaker.Data.Dynamic.Player;
using BlockBreaker.Features.Player.Bullet;
using BlockBreaker.Infrastructure.Services;
using BlockBreaker.Infrastructure.Services.Input;
using UnityEngine;
Expand All @@ -9,35 +10,39 @@ namespace BlockBreaker.Features.Player
public class PlayerInputHandler : IActiveService
{
private readonly IObjectPool<PlayerBulletDataProvider> _bullets;
private readonly PlayerData _player;
private readonly IPlayerTouchInputService _touchInputService;

private PlayerBulletDataProvider _currentBullet;

public PlayerInputHandler(IObjectPool<PlayerBulletDataProvider> bullets,
public PlayerInputHandler(IObjectPool<PlayerBulletDataProvider> bullets, PlayerData player,
IPlayerTouchInputService touchInputService)
{
_bullets = bullets;
_player = player;
_touchInputService = touchInputService;
}

~PlayerInputHandler() => Disable();

public void Enable()
{
_touchInputService.OnTouchBegan += InstantiateBullet;
_touchInputService.OnTouchEnded += OnTouchEnded;
_touchInputService.OnTouchHold += OnTouchHold;
_touchInputService.OnTouchHold += ConvertPlayerSizeToBullet;
}

public void Disable()
{
_touchInputService.OnTouchBegan -= InstantiateBullet;
_touchInputService.OnTouchEnded -= OnTouchEnded;
_touchInputService.OnTouchHold -= OnTouchHold;
_touchInputService.OnTouchHold -= ConvertPlayerSizeToBullet;
}

~PlayerInputHandler() => Disable();

private void InstantiateBullet() => _currentBullet = _bullets.Get();
private void OnTouchEnded() { } // TODO: Shoot the bullet
private void OnTouchHold() { } // TODO: Convert player size to bullet

private void ConvertPlayerSizeToBullet() => _player.SizeConverter.Convert(_currentBullet.Data,
_currentBullet.Data.Config.CreationSpeed * Time.deltaTime);
}
}
21 changes: 21 additions & 0 deletions Assets/Scripts/Features/Player/PlayerSizeConverter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using BlockBreaker.Data.Dynamic.Player;
using BlockBreaker.Features.Player.Bullet;

namespace BlockBreaker.Features.Player
{
public class PlayerSizeConverter
{
private readonly PlayerData _player;
private readonly PlayerBulletSizeSetter _bulletSizeSetter = new();

public PlayerSizeConverter(PlayerData player) => _player = player;

public void Convert(PlayerBulletData bullet, float sizeAmount)
{
_player.SizeSetter.Set(_player.Size - sizeAmount);
_player.CarpetSizeSetter.Set(_player.Size);

_bulletSizeSetter.Set(bullet, bullet.Size + sizeAmount);
}
}
}
3 changes: 3 additions & 0 deletions Assets/Scripts/Features/Player/PlayerSizeConverter.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private void BindData()
.BindInterfacesAndSelfTo<PlayerData>()
.AsSingle()
.WhenInjectedInto(typeof(PlayerDataProvider), typeof(PlayerConfigurator),
typeof(PlayerBulletConfigurator));
typeof(PlayerBulletConfigurator), typeof(PlayerInputHandler));
}
}
}