Compare commits

...

3 Commits

Author SHA1 Message Date
Steven Long
e2bb5ec656 Add collision detection 2023-07-19 09:40:16 -07:00
f15e1031bd Merge cont 2023-07-17 13:10:38 -07:00
86b8ddc3f0 Merge 2023-07-17 13:10:26 -07:00
14 changed files with 196 additions and 106 deletions

View File

@@ -0,0 +1,48 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://c4fnm4wmn7n83"
path="res://.godot/imported/Cookie.blend-390d13d3a707da248d8fffd5b357a4cb.scn"
[deps]
source_file="res://Models/Cookie.blend"
dest_files=["res://.godot/imported/Cookie.blend-390d13d3a707da248d8fffd5b357a4cb.scn"]
[params]
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/embedded_image_handling=1
blender/nodes/visible=0
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true

View File

@@ -6,4 +6,9 @@
<ItemGroup> <ItemGroup>
<Folder Include="Scenes\" /> <Folder Include="Scenes\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="Chickensoft.AutoInject" Version="1.3.0" />
<PackageReference Include="Chickensoft.SuperNodes" Version="1.2.1" />
<PackageReference Include="Chickensoft.SuperNodes.Types" Version="1.2.1" />
</ItemGroup>
</Project> </Project>

View File

@@ -1,9 +0,0 @@
<Project Sdk="Godot.NET.Sdk/4.1.0">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>
</PropertyGroup>
<ItemGroup>
<Folder Include="Scenes\" />
</ItemGroup>
</Project>

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=17 format=3 uid="uid://bcsgd8vxy43g2"] [gd_scene load_steps=19 format=3 uid="uid://bcsgd8vxy43g2"]
[ext_resource type="Script" path="res://Scripts/Player.cs" id="1_8dc05"] [ext_resource type="Script" path="res://Scripts/Player.cs" id="1_8dc05"]
[ext_resource type="PackedScene" uid="uid://d20uxkpid4ynd" path="res://Models/vivi1.gltf" id="1_mqt2m"] [ext_resource type="PackedScene" uid="uid://d20uxkpid4ynd" path="res://Models/vivi1.gltf" id="1_mqt2m"]
@@ -7,7 +7,9 @@
[ext_resource type="Script" path="res://Scripts/CameraSystem.cs" id="3_5ecw2"] [ext_resource type="Script" path="res://Scripts/CameraSystem.cs" id="3_5ecw2"]
[ext_resource type="PackedScene" uid="uid://c13g5orvyhy1p" path="res://Models/moogle.gltf" id="4_dckjs"] [ext_resource type="PackedScene" uid="uid://c13g5orvyhy1p" path="res://Models/moogle.gltf" id="4_dckjs"]
[ext_resource type="Script" path="res://Scripts/NPCFollow.cs" id="4_o5mpp"] [ext_resource type="Script" path="res://Scripts/NPCFollow.cs" id="4_o5mpp"]
[ext_resource type="ArrayMesh" uid="uid://35saq7eyk446" path="res://Models/Cookie.obj" id="8_8xb3w"] [ext_resource type="Script" path="res://Scripts/DebugText.cs" id="8_ksx3s"]
[ext_resource type="ArrayMesh" uid="uid://35saq7eyk446" path="res://Models/Cookie.obj" id="8_p45nj"]
[ext_resource type="Script" path="res://Scripts/Enemy.cs" id="9_0gfg2"]
[sub_resource type="BoxShape3D" id="BoxShape3D_8verc"] [sub_resource type="BoxShape3D" id="BoxShape3D_8verc"]
size = Vector3(100, 2, 100) size = Vector3(100, 2, 100)
@@ -115,15 +117,27 @@ material_override = SubResource("StandardMaterial3D_ultw4")
use_collision = true use_collision = true
size = Vector3(15.0266, 4.74018, 1) size = Vector3(15.0266, 4.74018, 1)
[node name="CharacterBody3D" type="CharacterBody3D" parent="."] [node name="DebugUI" type="Node2D" parent="."]
collision_layer = 0
collision_mask = 16
[node name="Cookie" type="MeshInstance3D" parent="CharacterBody3D"] [node name="TextEdit" type="TextEdit" parent="DebugUI"]
offset_right = 3468.0
offset_bottom = 777.0
script = ExtResource("8_ksx3s")
[node name="RigidBody3D" type="RigidBody3D" parent="."]
collision_layer = 0
collision_mask = 17
max_contacts_reported = 10
contact_monitor = true
script = ExtResource("9_0gfg2")
[node name="Cookie" type="MeshInstance3D" parent="RigidBody3D"]
transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -8.04457, -0.130408, -1.66095) transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -8.04457, -0.130408, -1.66095)
mesh = ExtResource("8_8xb3w") mesh = ExtResource("8_p45nj")
skeleton = NodePath("../..") skeleton = NodePath("../..")
[node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D"] [node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -8.04457, 0.690081, -1.66095) transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -8.04457, 0.690081, -1.66095)
shape = SubResource("CapsuleShape3D_y33ih") shape = SubResource("CapsuleShape3D_y33ih")
[connection signal="body_entered" from="RigidBody3D" to="RigidBody3D" method="OnHit"]

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=4 format=3 uid="uid://dg7731nx22ewp"] [gd_scene load_steps=5 format=3 uid="uid://dg7731nx22ewp"]
[ext_resource type="Script" path="res://Scripts/Fireball.cs" id="1_4ipg4"] [ext_resource type="Script" path="res://Scripts/Fireball.cs" id="1_4ipg4"]
@@ -7,12 +7,26 @@ albedo_color = Color(0.666667, 0, 0.239216, 1)
[sub_resource type="SphereMesh" id="SphereMesh_6bhr7"] [sub_resource type="SphereMesh" id="SphereMesh_6bhr7"]
[node name="Fireball" type="Node3D"] [sub_resource type="SphereShape3D" id="SphereShape3D_64t08"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.916843, 0) radius = 0.51754
script = ExtResource("1_4ipg4")
_projectileSpeed = 20.0
[node name="MeshInstance3D" type="MeshInstance3D" parent="."] [node name="RigidBody3D" type="RigidBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.00392, 0) collision_layer = 16
gravity_scale = 0.0
max_contacts_reported = 5
contact_monitor = true
script = ExtResource("1_4ipg4")
_projectileSpeed = 10.0
[node name="Fireball" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.916843, 0)
[node name="MeshInstance3D" type="MeshInstance3D" parent="Fireball"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0870771, 0)
material_override = SubResource("StandardMaterial3D_jxwqo") material_override = SubResource("StandardMaterial3D_jxwqo")
mesh = SubResource("SphereMesh_6bhr7") mesh = SubResource("SphereMesh_6bhr7")
skeleton = NodePath("../../..")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.00448, 0.081282)
shape = SubResource("SphereShape3D_64t08")

View File

@@ -1,7 +1,9 @@
using Godot;
public partial class Blizzard : Projectile public partial class Blizzard : Projectile
{ {
public override void _PhysicsProcess(double delta) public override void _PhysicsProcess(double delta)
{ {
Translate(new Godot.Vector3(0, 0, Speed * (float)delta)); Translate(new Vector3(0, 0, Speed * (float)delta));
} }
} }

View File

@@ -1,21 +0,0 @@
[remap]
importer="wavefront_obj"
importer_version=1
type="Mesh"
uid="uid://cj246dmena0if"
path="res://.godot/imported/Cookie.obj-9c7fa2a3d48746d9f2fd322d3854502d.mesh"
[deps]
files=["res://.godot/imported/Cookie.obj-9c7fa2a3d48746d9f2fd322d3854502d.mesh"]
source_file="res://Scripts/Cookie.obj"
dest_files=["res://.godot/imported/Cookie.obj-9c7fa2a3d48746d9f2fd322d3854502d.mesh", "res://.godot/imported/Cookie.obj-9c7fa2a3d48746d9f2fd322d3854502d.mesh"]
[params]
generate_tangents=true
scale_mesh=Vector3(1, 1, 1)
offset_mesh=Vector3(0, 0, 0)
optimize_mesh=true

15
Scripts/DebugText.cs Normal file
View File

@@ -0,0 +1,15 @@
using Godot;
public partial class DebugText : TextEdit
{
private Player _playerNode;
public override void _Ready()
{
_playerNode = GetNode<Player>("/root/Main/Player");
}
public override void _Process(double delta)
{
Text = $"Can Shoot: {_playerNode.CanShoot}";
}
}

13
Scripts/Enemy.cs Normal file
View File

@@ -0,0 +1,13 @@
using Godot;
public partial class Enemy : Node
{
public void OnHit(Variant body)
{
if (body.Obj is Projectile)
{
GD.Print("Hit");
QueueFree();
}
}
}

View File

@@ -17,6 +17,8 @@ public partial class Player : CharacterBody3D
[Export] [Export]
private Array<PackedScene> _projectiles; private Array<PackedScene> _projectiles;
public bool CanShoot { get; private set; }
private Node3D _cameraMount; private Node3D _cameraMount;
private Node3D _pivot; private Node3D _pivot;
private Node3D _camera; private Node3D _camera;
@@ -32,13 +34,14 @@ public partial class Player : CharacterBody3D
_camera = GetNode<Node3D>("/root/Main/Player/CameraMount/Camera"); _camera = GetNode<Node3D>("/root/Main/Player/CameraMount/Camera");
_pivot = GetNode<Node3D>("/root/Main/Player/Pivot"); _pivot = GetNode<Node3D>("/root/Main/Player/Pivot");
_weaponType = _projectiles.First(); _weaponType = _projectiles.First();
CanShoot = true;
} }
public override void _Process(double delta) public override void _Process(double delta)
{ {
if (Input.IsActionJustPressed("quit")) if (Input.IsActionJustPressed("quit"))
GetTree().Quit(); GetTree().Quit();
if (Input.IsActionJustPressed("shoot")) if (Input.IsActionJustPressed("shoot") && CanShoot)
Shoot(); Shoot();
if (Input.IsActionJustPressed("switch")) if (Input.IsActionJustPressed("switch"))
SwitchWeaponType(); SwitchWeaponType();
@@ -53,19 +56,25 @@ public partial class Player : CharacterBody3D
MoveAndSlide(); MoveAndSlide();
} }
private void Shoot() private async void Shoot()
{ {
GD.Print("Shoot"); GD.Print("Shoot");
var projectile = _weaponType.Instantiate<Node3D>(); var projectile = _weaponType.Instantiate<Projectile>();
projectile.Position = Position; projectile.Position = Position;
projectile.Rotation = Rotation; projectile.Rotation = Rotation;
GetParent().AddChild(projectile); GetParent().AddChild(projectile);
CanShoot = false;
await ToSignal(GetTree().CreateTimer(projectile.Cooldown), "timeout");
CanShoot = true;
} }
private void SwitchWeaponType() private async void SwitchWeaponType()
{ {
var index = _projectiles.IndexOf(_weaponType); var index = _projectiles.IndexOf(_weaponType);
_weaponType = _projectiles[(index + 1) % _projectiles.Count]; _weaponType = _projectiles[(index + 1) % _projectiles.Count];
CanShoot = false;
await ToSignal(GetTree().CreateTimer(.5), "timeout");
CanShoot = true;
} }

View File

@@ -3,7 +3,10 @@
public partial class Projectile : Node3D public partial class Projectile : Node3D
{ {
[Export] [Export]
private float _projectileSpeed = 0.1f; public double Cooldown { get; protected set; }
[Export]
private float _projectileSpeed = 100f;
public override void _Ready() public override void _Ready()
{ {
@@ -11,4 +14,9 @@ public partial class Projectile : Node3D
} }
public float Speed { get; private set; } public float Speed { get; private set; }
public void OnTimeToLiveTimeout()
{
QueueFree();
}
} }

View File

@@ -1,8 +0,0 @@
namespace Sandbox.Scripts
{
internal enum WeaponType
{
Fire = 0,
Blizzard = 1
}
}

View File

@@ -12,7 +12,7 @@ config_version=5
config/name="Sandbox" config/name="Sandbox"
run/main_scene="res://Scenes/Main.tscn" run/main_scene="res://Scenes/Main.tscn"
config/features=PackedStringArray("4.0", "C#", "Forward Plus") config/features=PackedStringArray("4.1", "C#", "Forward Plus")
[dotnet] [dotnet]