maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-07 22:35:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

3D Bullet pattern fix

Browse source
This commit is contained in:
Marco 2025-06-21 10:42:11 +02:00
commit a6c8544de8
5 changed files with 525 additions and 438 deletions
Download patch file Download diff file Expand all files Collapse all files

63
Scripts/Actors/BulletSpawner3D.cs
View file

@ -7,47 +7,62 @@ namespace Cirno.Scripts.Actors;
public partial class BulletSpawner3D : Node3D
{
[Export] public PackedScene BulletScene;
public void SpawnBullet(BulletInfo bulletInfo, Vector3 position)
{
var bulletScene = bulletInfo.BulletScene ?? BulletScene;
Bullet3D bullet;
int count = bulletInfo.BulletCount;
float spreadRadians = Mathf.DegToRad(bulletInfo.Spread);
float step = count > 1 ? spreadRadians / (count - 1) : 0;
// Choose base direction (defaults to +X)
Vector2 baseDirection = bulletInfo.Direction == Vector2.Zero
? Vector2.Right
: bulletInfo.Direction.Normalized();
float baseAngle = Mathf.Atan2(baseDirection.Y, baseDirection.X); // angle in radians
float offsetRadians = Mathf.DegToRad(bulletInfo.RotationOffset);
// Calculate per-bullet spread angle step
float spreadRadians = Mathf.DegToRad(bulletInfo.Spread);
// 👇 Configure this depending on desired pattern
bool isFullCircle = Mathf.Abs(bulletInfo.Spread - 360f) < 0.01f;
float angleStep = isFullCircle
? spreadRadians / count // Full circle: divide evenly across bullets
: count > 1
? spreadRadians / (count - 1) // Fan spread: divide across gaps
: 0f;
// Determine starting angle for bullet pattern
float startAngle = isFullCircle
? baseAngle + offsetRadians // Full circle starts at baseAngle + offset
: baseAngle + offsetRadians - (spreadRadians / 2.0f); // Fan starts centered
// Spawn bullets
for (int i = 0; i < count; i++)
{
bullet = PoolingManager.Instance.SpawnBullet<Bullet3D>(bulletInfo.OriginalBulletResource);
Bullet3D bullet = PoolingManager.Instance.SpawnBullet<Bullet3D>(bulletInfo.OriginalBulletResource);
bullet.GlobalPosition = position;
// Optionally apply modifiers (null-safe)
if (bulletInfo.Modifier is not null)
{
bulletInfo = bulletInfo.Modifier.ModifyBullet(bulletInfo, i, count);
}
bullet.Initialize(bulletInfo);
Vector2 baseDirection = bulletInfo.Direction == Vector2.Zero ? Vector2.Right : bulletInfo.Direction.Normalized();
float baseAngle = Mathf.Atan2(baseDirection.Y, baseDirection.X);
// Compute final angle for this bullet
float angle = startAngle + angleStep * i;
// Spread centered: offset from center
float offsetFromCenter = (i - (count - 1) / 2.0f) * step;
float angle = baseAngle + Mathf.DegToRad(bulletInfo.RotationOffset) + offsetFromCenter;
// Optional: Tiny jitter to avoid precision collapse
// angle += i * 0.0001f;
Vector2 bulletDirection = new Vector2(Mathf.Cos(angle), Mathf.Sin(angle));
Vector2 bulletDirection = new Vector2(Mathf.Cos(angle), Mathf.Sin(angle)).Normalized();
bullet.SetDirection(bulletDirection);
// float offsetRadians = Mathf.DegToRad(bulletInfo.RotationOffset);
// float spreadStep = Mathf.DegToRad(bulletInfo.Spread) / Mathf.Max(1, bulletInfo.BulletCount - 1); // Ensure proper spread spacing, also add 1 if 0
// float angle = baseAngle + offsetRadians + (spreadStep * i);
//
//
// Vector2 bulletDirection = new Vector2(Mathf.Cos(angle), Mathf.Sin(angle));
//
// bullet.SetDirection(bulletDirection);
// Optional: Debug offset to visualize all bullets
// bullet.GlobalPosition += new Vector3(i * 0.1f, 0, 0);
GD.Print($"Bullet {i}: Angle={Mathf.RadToDeg(angle)}, Direction={bulletDirection}");
}
}