Gremlinsoft
/
Godot-SpaceShooter
2
1
Fork 0
Code Issues 7 Pull Requests Packages Projects 1 Releases Wiki Activity

Code cleanup

pull/23/head
Sascha 2023-10-26 13:07:45 +07:00
parent 9aff213b2d
commit b41cc14695
15 changed files with 253 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godot-space Shooter.csproj.old.5
Unescape Escape View File

@ -1,4 +1,4 @@
<Project Sdk="Godot.NET.Sdk/4.2.0-beta.2">
<Project Sdk="Godot.NET.Sdk/4.2.0-beta.3">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>

BIN
Meshes/asteroid_01.mesh
View File

Binary file not shown.

BIN
Meshes/asteroid_02.mesh
View File

Binary file not shown.

BIN
Meshes/asteroid_03.mesh
View File

Binary file not shown.

12
Scenes/SpaceShooter.tscn
Unescape Escape View File

@ -48,10 +48,10 @@ freeze_mode = 1
transform = Transform3D(9, 0, 0, 0, 9, 0, 0, 0, 9, 0, 0, 12.4454)
shape = SubResource("BoxShape3D_bw288")
[node name="SoundManager" type="Node" parent="." node_paths=PackedStringArray("explosionSound", "backgroundMusic", "laserSound")]
[node name="SoundManager" type="Node" parent="." node_paths=PackedStringArray("backgroundMusic", "explosionSound", "laserSound")]
script = ExtResource("8_4ksf0")
explosionSound = NodePath("ExplosionSound")
backgroundMusic = NodePath("BackgroundMusic")
explosionSound = NodePath("ExplosionSound")
laserSound = NodePath("LaserSound")
[node name="ExplosionSound" type="AudioStreamPlayer3D" parent="SoundManager"]
@ -65,15 +65,15 @@ autoplay = true
[node name="LaserSound" type="AudioStreamPlayer3D" parent="SoundManager"]
stream = ExtResource("11_bbedd")
[node name="GameManager" type="Node" parent="." node_paths=PackedStringArray("labelAsteroids", "labelLifes", "labelPoints", "labelLevel", "labelNextLevel", "asteroidsContainer")]
[node name="GameManager" type="Node" parent="." node_paths=PackedStringArray("asteroidsContainer", "labelAsteroids", "labelLevel", "labelLifes", "labelNextLevel", "labelPoints")]
script = ExtResource("9_rsrr5")
asteroids = Array[PackedScene]([ExtResource("5_do6ba"), ExtResource("6_tqoe7"), ExtResource("7_v6ul2")])
asteroidsContainer = NodePath("../Asteroids")
labelAsteroids = NodePath("../Control/LabelAsteroids")
labelLifes = NodePath("../Control/LabelLives")
labelPoints = NodePath("../Control/LabelPoints")
labelLevel = NodePath("../Control/LabelLevel")
labelLifes = NodePath("../Control/LabelLives")
labelNextLevel = NodePath("../Control/LabelNextLevel")
asteroidsContainer = NodePath("../Asteroids")
labelPoints = NodePath("../Control/LabelPoints")
[node name="Asteroids" type="Node3D" parent="."]

19
Scripts/Asteroid.cs
Unescape Escape View File

@ -1,18 +1,19 @@
using Godot;
namespace Scripts;
[GlobalClass]
public partial class Asteroid : Node3D {
[Export] public RigidBody3D AsteroidRb;
[Export] private MeshInstance3D asteroidMesh;
[Export] private CollisionShape3D asteroidCollisionShape;
[Export] private GpuParticlesCollisionSphere3D particleCollision;
[Export] private MeshInstance3D asteroidMesh;
[Export] public RigidBody3D AsteroidRb;
[Export] private PackedScene explosion;
private float speed;
[Export] private GpuParticlesCollisionSphere3D particleCollision;
private Vector3 rotation;
private float rotSpeed = 100f;
private float size;
private Vector3 rotation;
private float speed;
public override void _EnterTree() {
Position = new((float)GD.RandRange(-3.7, 3.7), 0, -6.4f);
@ -27,8 +28,7 @@ public partial class Asteroid : Node3D {
rotation = new((float)GD.RandRange(-rotSpeed, rotSpeed), (float)GD.RandRange(-rotSpeed, rotSpeed), (float)GD.RandRange(-rotSpeed, rotSpeed));
}
public override void _Ready() {
}
public override void _Ready() { }
public override void _PhysicsProcess(double delta) {
AsteroidRb.Rotate(rotation.Normalized(), (float)delta);
@ -57,7 +57,7 @@ public partial class Asteroid : Node3D {
Explode(collisionPosition);
break;
default:
GD.Print($"Asteroid collided with unknown.");
GD.Print("Asteroid collided with unknown.");
break;
}
}
@ -72,6 +72,7 @@ public partial class Asteroid : Node3D {
ex.Emitting = true;
}
}
GameManager.Instance.AsteroidNumber--;
QueueFree();
}

2
Scripts/Background.cs
Unescape Escape View File

@ -1,8 +1,10 @@
using Godot;
namespace Scripts;
public partial class Background : Sprite3D {
[Export] private float moveVelocity = -250f;
public override void _Process(double delta) {
Rect2 region = RegionRect;
region.Position += new Vector2(0, moveVelocity * (float)delta);

3
Scripts/Explosion.cs
Unescape Escape View File

@ -1,7 +1,6 @@
using Godot;
public partial class Explosion : GpuParticles3D
{
public partial class Explosion : GpuParticles3D {
public override void _Process(double delta) {
if (!Emitting) QueueFree();
}

6
Scripts/GameArea.cs
Unescape Escape View File

@ -1,7 +1,3 @@
using Godot;
using System;
public partial class GameArea : Node3D
{
}
public partial class GameArea : Node3D { }

33
Scripts/GameManager.cs
Unescape Escape View File

@ -4,16 +4,23 @@ using Godot.Collections;
namespace Scripts;
public partial class GameManager : Node {
private int asteroidMaxNumber = 3;
private int asteroidNumber;
[Export] private Array<PackedScene> asteroids;
private float spawnTimer;
[Export] private Node3D asteroidsContainer;
[Export] private RichTextLabel labelAsteroids;
[Export] private RichTextLabel labelLifes;
[Export] private RichTextLabel labelPoints;
[Export] private RichTextLabel labelLevel;
[Export] private RichTextLabel labelLifes;
[Export] private RichTextLabel labelNextLevel;
[Export] private Node3D asteroidsContainer;
[Export] private RichTextLabel labelPoints;
private int level = 1;
private int lives = 10;
private int nextLevelPoints = 11;
private int points;
private float spawnRate = 1f;
private float spawnTimer;
public int AsteroidNumber {
get => asteroidNumber;
@ -65,14 +72,6 @@ public partial class GameManager : Node {
}
}
private int asteroidMaxNumber = 3;
private int lives = 10;
private int points;
private int nextLevelPoints = 11;
private int level = 1;
private int asteroidNumber;
private float spawnRate = 1f;
public static GameManager Instance { get; private set; }
@ -106,7 +105,9 @@ public partial class GameManager : Node {
labelLevel.Text = $"Actual Level: {Level}";
}
private static void GameOver() => GD.Print("GAME OVER!");
private static void GameOver() {
GD.Print("GAME OVER!");
}
private void NextLevel() {
GD.Print("Next Level!");
@ -116,5 +117,7 @@ public partial class GameManager : Node {
spawnRate = 1f - Level * 0.1f;
}
public void OnGameAreaBodyExited(Node body) => GD.Print($"{body.Name} leaved GameArea!");
public void OnGameAreaBodyExited(Node body) {
GD.Print($"{body.Name} leaved GameArea!");
}
}

1
Scripts/LaserBeam.cs
Unescape Escape View File

@ -3,6 +3,7 @@ using Godot;
public partial class LaserBeam : Node3D {
[Export] private RigidBody3D rigidBody;
private float speed = 10f;
public override void _Ready() {
Vector3 movement = new(0f, 0f, -speed);
rigidBody.AddConstantForce(movement);

40
Scripts/PlayerShip.cs
Unescape Escape View File

@ -1,35 +1,34 @@
using System.Diagnostics;
using Godot;
namespace Scripts;
public partial class PlayerShip : Node3D {
[Export] private float moveVelocity = 10f;
[Export] private float rotVelocity = 15f;
[Export] private Node3D jet;
[Export] public RigidBody3D PlayerRb;
[Export] private PackedScene explosion;
[Export] private GpuParticles3D gpulaser;
[Export] private CpuParticles3D cpulaser;
[Export] private PackedScene laser;
[Export] private Node3D shots;
public static PlayerShip Instance { get; private set;}
public partial class PlayerShip : Node3D {
private const float jetTimerMax = 0.5f;
private float jetTimer = jetTimerMax;
private const float laserTimerMax = 1f;
private float laserTimer = laserTimerMax;
private Vector3 moveDir;
private Vector3 rotDir;
private const string PLAYER_MOVE_FORWARD = "Player_Move_Forward";
private const string PLAYER_MOVE_BACKWARDS = "Player_Move_Backwards";
private const string PLAYER_MOVE_LEFT = "Player_Move_Left";
private const string PLAYER_MOVE_RIGHT = "Player_Move_Right";
private const string PLAYER_FIRE = "Player_Fire";
[Export] private CpuParticles3D cpulaser;
[Export] private PackedScene explosion;
[Export] private GpuParticles3D gpulaser;
[Export] private Node3D jet;
private float jetTimer = jetTimerMax;
[Export] private PackedScene laser;
private float laserTimer = laserTimerMax;
private Vector3 moveDir;
[Export] private float moveVelocity = 10f;
[Export] public RigidBody3D PlayerRb;
private Vector3 rotDir;
[Export] private float rotVelocity = 15f;
private bool shooting;
[Export] private Node3D shots;
public static PlayerShip Instance { get; private set; }
public override void _Ready() {
Position = new(0, 0, 5);
@ -52,14 +51,13 @@ public partial class PlayerShip : Node3D {
if (Input.IsActionJustReleased(PLAYER_MOVE_LEFT) || Input.IsActionJustReleased(PLAYER_MOVE_RIGHT)) rotDir = Vector3.Zero;
//Fire
if (Input.IsActionJustPressed(PLAYER_FIRE)) {
if (Input.IsActionJustPressed(PLAYER_FIRE))
if (laser.Instantiate() is Node3D shot) {
shot.Position = PlayerRb.Position + new Vector3(0f, 0f, 0.74f);
shots.AddChild(shot);
SoundManager.Instance.PlayLaserSound(PlayerRb.Position);
}
}
}
public override void _PhysicsProcess(double delta) {
if (moveDir != Vector3.Zero) {
@ -70,6 +68,7 @@ public partial class PlayerShip : Node3D {
else {
jet.Visible = false;
}
PlayerRb.RotationDegrees = rotDir;
CheckBoundaries();
}
@ -95,6 +94,7 @@ public partial class PlayerShip : Node3D {
ex.Position = collisionPosition;
ex.Emitting = true;
}
SoundManager.Instance.PlayExplosion(collisionPosition);
GameManager.Instance.Lives--;
}

7
Scripts/SoundManager.cs
Unescape Escape View File

@ -1,15 +1,16 @@
using Godot;
using Godot.Collections;
namespace Scripts;
public partial class SoundManager : Node {
[Export] private AudioStreamPlayer3D explosionSound;
[Export] private AudioStreamPlayer backgroundMusic;
[Export] private AudioStreamPlayer3D explosionSound;
[Export] private AudioStreamPlayer3D laserSound;
public static SoundManager Instance { get; private set; }
public override void _Ready() => Instance = this;
public override void _Ready() {
Instance = this;
}
public void PlayExplosion(Vector3 position) {
explosionSound.Position = position;

42
export_presets.cfg
Unescape Escape View File

@ -0,0 +1,42 @@
[preset.0]
name="Linux/X11"
platform="Linux/X11"
runnable=true
dedicated_server=false
custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path=""
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
encrypt_directory=false
[preset.0.options]
custom_template/debug=""
custom_template/release=""
debug/export_console_wrapper=1
binary_format/embed_pck=false
texture_format/bptc=true
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
binary_format/architecture="x86_64"
ssh_remote_deploy/enabled=false
ssh_remote_deploy/host="user@host_ip"
ssh_remote_deploy/port="22"
ssh_remote_deploy/extra_args_ssh=""
ssh_remote_deploy/extra_args_scp=""
ssh_remote_deploy/run_script="#!/usr/bin/env bash
export DISPLAY=:0
unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
\"{temp_dir}/{exe_name}\" {cmd_args}"
ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
rm -rf \"{temp_dir}\""
dotnet/include_scripts_content=false
dotnet/include_debug_symbols=true
dotnet/embed_build_outputs=false