generated from Persson-dev/Godot-Xmake
Compare commits
6 Commits
caca
...
9449b125eb
| Author | SHA1 | Date | |
|---|---|---|---|
| 9449b125eb | |||
| 3769fd3ace | |||
| 65e2a0b3ce | |||
| 960ce2a546 | |||
| eb8e3b0888 | |||
| d0028dd0f8 |
File diff suppressed because one or more lines are too long
@@ -3750,15 +3750,6 @@ skin = SubResource("Skin_l3wpu")
|
|||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.908729, 0)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.908729, 0)
|
||||||
shape = SubResource("CapsuleShape3D_mm42w")
|
shape = SubResource("CapsuleShape3D_mm42w")
|
||||||
|
|
||||||
[node name="SpringArmPivot" type="SpringArmPivot" parent="."]
|
|
||||||
|
|
||||||
[node name="SpringArm3D" type="SpringArm3D" parent="SpringArmPivot"]
|
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.31667, 0)
|
|
||||||
spring_length = 2.0
|
|
||||||
margin = 0.2
|
|
||||||
|
|
||||||
[node name="Camera3D" type="Camera3D" parent="SpringArmPivot/SpringArm3D"]
|
|
||||||
|
|
||||||
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
|
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
|
||||||
root_node = NodePath("../Mesh")
|
root_node = NodePath("../Mesh")
|
||||||
libraries = {
|
libraries = {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
[ext_resource type="Texture2D" path="res://Assets/Textures/Black.png" id="2_fkwcn"]
|
[ext_resource type="Texture2D" path="res://Assets/Textures/Black.png" id="2_fkwcn"]
|
||||||
[ext_resource type="Texture2D" path="res://Assets/Textures/Orange.png" id="3_ux02w"]
|
[ext_resource type="Texture2D" path="res://Assets/Textures/Orange.png" id="3_ux02w"]
|
||||||
[ext_resource type="Texture2D" path="res://Assets/Textures/Green.png" id="4_wp15n"]
|
[ext_resource type="Texture2D" path="res://Assets/Textures/Green.png" id="4_wp15n"]
|
||||||
[ext_resource type="PackedScene" uid="uid://d38w4ae3qj0k4" path="res://Scenes/Characters/first_person_player.tscn" id="5_8ctht"]
|
[ext_resource type="PackedScene" path="res://Scenes/Characters/first_person_player.tscn" id="5_8ctht"]
|
||||||
|
|
||||||
[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_6c4vd"]
|
[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_6c4vd"]
|
||||||
panorama = ExtResource("1_mnexj")
|
panorama = ExtResource("1_mnexj")
|
||||||
@@ -51,7 +51,7 @@ uv1_triplanar = true
|
|||||||
[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_rit6o"]
|
[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_rit6o"]
|
||||||
data = PackedVector3Array(-12.5, 2.5, 2.5, 2.5, -2.5, 2.5, -2.5, -2.5, 2.5, -12.5, 2.5, -2.5, -2.5, -2.5, -2.5, 2.5, -2.5, -2.5, -12.5, 2.5, 2.5, -12.5, 2.5, -2.5, 2.5, -2.5, 2.5, -12.5, 2.5, -2.5, 2.5, -2.5, -2.5, 2.5, -2.5, 2.5, -12.5, 2.5, -2.5, -12.5, 2.5, 2.5, -2.5, -2.5, -2.5, -12.5, 2.5, 2.5, -2.5, -2.5, 2.5, -2.5, -2.5, -2.5, -2.5, -2.5, 2.5, 2.5, -2.5, 2.5, -2.5, -2.5, -2.5, 2.5, -2.5, 2.5, 2.5, -2.5, -2.5, -2.5, -2.5, -2.5)
|
data = PackedVector3Array(-12.5, 2.5, 2.5, 2.5, -2.5, 2.5, -2.5, -2.5, 2.5, -12.5, 2.5, -2.5, -2.5, -2.5, -2.5, 2.5, -2.5, -2.5, -12.5, 2.5, 2.5, -12.5, 2.5, -2.5, 2.5, -2.5, 2.5, -12.5, 2.5, -2.5, 2.5, -2.5, -2.5, 2.5, -2.5, 2.5, -12.5, 2.5, -2.5, -12.5, 2.5, 2.5, -2.5, -2.5, -2.5, -12.5, 2.5, 2.5, -2.5, -2.5, 2.5, -2.5, -2.5, -2.5, -2.5, -2.5, 2.5, 2.5, -2.5, 2.5, -2.5, -2.5, -2.5, 2.5, -2.5, 2.5, 2.5, -2.5, -2.5, -2.5, -2.5, -2.5)
|
||||||
|
|
||||||
[node name="World" type="Node3D"]
|
[node name="World" type="World"]
|
||||||
|
|
||||||
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
|
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
|
||||||
environment = SubResource("Environment_ctwiv")
|
environment = SubResource("Environment_ctwiv")
|
||||||
|
|||||||
45
godot/Scenes/Menus/mainmenu.tscn
Normal file
45
godot/Scenes/Menus/mainmenu.tscn
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
[gd_scene load_steps=2 format=3 uid="uid://bqfqg7xwwlxd8"]
|
||||||
|
|
||||||
|
[ext_resource type="PackedScene" path="res://Scenes/Network/networking.tscn" id="1_vrong"]
|
||||||
|
|
||||||
|
[node name="MainMenu" type="MainMenu"]
|
||||||
|
anchors_preset = 8
|
||||||
|
anchor_left = 0.5
|
||||||
|
anchor_top = 0.5
|
||||||
|
anchor_right = 0.5
|
||||||
|
anchor_bottom = 0.5
|
||||||
|
grow_horizontal = 2
|
||||||
|
grow_vertical = 2
|
||||||
|
size_flags_horizontal = 4
|
||||||
|
size_flags_vertical = 4
|
||||||
|
|
||||||
|
[node name="Container" type="VBoxContainer" parent="."]
|
||||||
|
layout_mode = 1
|
||||||
|
anchors_preset = 8
|
||||||
|
anchor_left = 0.5
|
||||||
|
anchor_top = 0.5
|
||||||
|
anchor_right = 0.5
|
||||||
|
anchor_bottom = 0.5
|
||||||
|
offset_left = -228.512
|
||||||
|
offset_top = -89.5
|
||||||
|
offset_right = 228.512
|
||||||
|
offset_bottom = 89.5
|
||||||
|
grow_horizontal = 2
|
||||||
|
grow_vertical = 2
|
||||||
|
|
||||||
|
[node name="JoinButton" type="Button" parent="Container"]
|
||||||
|
layout_mode = 2
|
||||||
|
theme_override_font_sizes/font_size = 35
|
||||||
|
text = "Join Game"
|
||||||
|
|
||||||
|
[node name="CreateButton" type="Button" parent="Container"]
|
||||||
|
layout_mode = 2
|
||||||
|
theme_override_font_sizes/font_size = 35
|
||||||
|
text = "Create Game"
|
||||||
|
|
||||||
|
[node name="QuitButton" type="Button" parent="Container"]
|
||||||
|
layout_mode = 2
|
||||||
|
theme_override_font_sizes/font_size = 35
|
||||||
|
text = "Quit"
|
||||||
|
|
||||||
|
[node name="Lobby" parent="." instance=ExtResource("1_vrong")]
|
||||||
3
godot/Scenes/Network/networking.tscn
Normal file
3
godot/Scenes/Network/networking.tscn
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
[gd_scene format=3 uid="uid://clafls1xhludi"]
|
||||||
|
|
||||||
|
[node name="Lobby" type="Lobby"]
|
||||||
15
godot/Scenes/main.tscn
Normal file
15
godot/Scenes/main.tscn
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
[gd_scene load_steps=3 format=3 uid="uid://4jt0v2b2l4rt"]
|
||||||
|
|
||||||
|
[ext_resource type="PackedScene" path="res://Scenes/Network/networking.tscn" id="1_06ibn"]
|
||||||
|
[ext_resource type="PackedScene" path="res://Scenes/Menus/mainmenu.tscn" id="2_lavg1"]
|
||||||
|
|
||||||
|
[node name="Main" type="Main"]
|
||||||
|
|
||||||
|
[node name="Lobby" parent="." instance=ExtResource("1_06ibn")]
|
||||||
|
|
||||||
|
[node name="MainMenu" parent="." instance=ExtResource("2_lavg1")]
|
||||||
|
|
||||||
|
[connection signal="local_player_connected" from="Lobby" to="MainMenu" method="on_connected"]
|
||||||
|
[connection signal="change_scene" from="MainMenu" to="." method="change_scene"]
|
||||||
|
[connection signal="create_game" from="MainMenu" to="Lobby" method="create_game"]
|
||||||
|
[connection signal="join_game" from="MainMenu" to="Lobby" method="join_game"]
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
[icons]
|
[icons]
|
||||||
Blitz3 = "res://icon.svg"
|
Blitz3 = "res://icon.png"
|
||||||
|
|
||||||
[configuration]
|
[configuration]
|
||||||
|
|
||||||
|
|||||||
BIN
godot/icon.png
Normal file
BIN
godot/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
@@ -1 +0,0 @@
|
|||||||
<svg height="128" width="128" xmlns="http://www.w3.org/2000/svg"><rect x="2" y="2" width="124" height="124" rx="14" fill="#363d52" stroke="#212532" stroke-width="4"/><g transform="scale(.101) translate(122 122)"><g fill="#fff"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 813 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H447l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c3 34 55 34 58 0v-86c-3-34-55-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 950 B |
@@ -11,9 +11,14 @@ config_version=5
|
|||||||
[application]
|
[application]
|
||||||
|
|
||||||
config/name="Blitz3"
|
config/name="Blitz3"
|
||||||
run/main_scene="res://Scenes/Levels/world.tscn"
|
run/main_scene="res://Scenes/main.tscn"
|
||||||
config/features=PackedStringArray("4.2", "Forward Plus")
|
config/features=PackedStringArray("4.2", "Forward Plus")
|
||||||
config/icon="res://icon.svg"
|
config/icon="res://icon.png"
|
||||||
|
|
||||||
|
[display]
|
||||||
|
|
||||||
|
window/size/viewport_width=1920
|
||||||
|
window/size/viewport_height=1080
|
||||||
|
|
||||||
[input]
|
[input]
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
#include <godot_cpp/classes/input_event_mouse_motion.hpp>
|
#include <godot_cpp/classes/input_event_mouse_motion.hpp>
|
||||||
#include <godot_cpp/classes/input_map.hpp>
|
#include <godot_cpp/classes/input_map.hpp>
|
||||||
#include <godot_cpp/core/math.hpp>
|
#include <godot_cpp/core/math.hpp>
|
||||||
|
#include <godot_cpp/variant/utility_functions.hpp>
|
||||||
|
|
||||||
using namespace godot;
|
using namespace godot;
|
||||||
|
|
||||||
@@ -32,6 +33,9 @@ static constexpr float FOV_TRANSITION = 8.0f;
|
|||||||
static constexpr float MIN_FOV_VELOCITY = 0.5;
|
static constexpr float MIN_FOV_VELOCITY = 0.5;
|
||||||
static constexpr float MAX_FOV_VELOCITY = SPRINT_SPEED * 2.0f;
|
static constexpr float MAX_FOV_VELOCITY = SPRINT_SPEED * 2.0f;
|
||||||
|
|
||||||
|
static const float LerpValue = 0.10;
|
||||||
|
static const float AnimationBlend = 7.0;
|
||||||
|
|
||||||
void FirstPersonPlayer::_bind_methods() {}
|
void FirstPersonPlayer::_bind_methods() {}
|
||||||
|
|
||||||
FirstPersonPlayer::FirstPersonPlayer() : m_BobTime(0) {}
|
FirstPersonPlayer::FirstPersonPlayer() : m_BobTime(0) {}
|
||||||
@@ -44,9 +48,9 @@ void FirstPersonPlayer::_ready() {
|
|||||||
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
|
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
|
||||||
}
|
}
|
||||||
m_Head = Object::cast_to<Node3D>(find_child("Head"));
|
m_Head = Object::cast_to<Node3D>(find_child("Head"));
|
||||||
DEV_ASSERT(m_Head);
|
|
||||||
m_Camera = Object::cast_to<Camera3D>(m_Head->find_child("Camera"));
|
m_Camera = Object::cast_to<Camera3D>(m_Head->find_child("Camera"));
|
||||||
DEV_ASSERT(m_Camera);
|
m_AnimationTree = Object::cast_to<AnimationTree>(find_child("AnimationTree"));
|
||||||
|
m_Mesh = Object::cast_to<Node3D>(find_child("Mesh"));
|
||||||
}
|
}
|
||||||
|
|
||||||
void FirstPersonPlayer::_unhandled_input(const godot::Ref<godot::InputEvent>& a_Event) {
|
void FirstPersonPlayer::_unhandled_input(const godot::Ref<godot::InputEvent>& a_Event) {
|
||||||
@@ -84,6 +88,8 @@ void FirstPersonPlayer::_physics_process(float a_Delta) {
|
|||||||
UpdateFOV(a_Delta);
|
UpdateFOV(a_Delta);
|
||||||
UpdateBobbing(a_Delta);
|
UpdateBobbing(a_Delta);
|
||||||
|
|
||||||
|
UpdateAnimation(a_Delta);
|
||||||
|
|
||||||
move_and_slide();
|
move_and_slide();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,10 +104,11 @@ void FirstPersonPlayer::UpdateBobbing(float a_Delta) {
|
|||||||
|
|
||||||
void FirstPersonPlayer::UpdateCamera(const InputEventMouseMotion& a_Event) {
|
void FirstPersonPlayer::UpdateCamera(const InputEventMouseMotion& a_Event) {
|
||||||
m_Head->rotate_y(-a_Event.get_relative().x * SENSITIVITY);
|
m_Head->rotate_y(-a_Event.get_relative().x * SENSITIVITY);
|
||||||
|
m_Mesh->rotate_y(-a_Event.get_relative().x * 0.005);
|
||||||
m_Camera->rotate_x(-a_Event.get_relative().y * SENSITIVITY);
|
m_Camera->rotate_x(-a_Event.get_relative().y * SENSITIVITY);
|
||||||
|
|
||||||
float rotationX = m_Camera->get_rotation().x;
|
float rotationX = m_Camera->get_rotation().x;
|
||||||
CLAMP(rotationX, Math::deg_to_rad(-40.0), Math::deg_to_rad(60.0));
|
rotationX = CLAMP(rotationX, Math::deg_to_rad(-80.0), Math::deg_to_rad(80.0));
|
||||||
m_Camera->set_rotation({rotationX, get_rotation().y, get_rotation().z});
|
m_Camera->set_rotation({rotationX, get_rotation().y, get_rotation().z});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -128,6 +135,14 @@ void FirstPersonPlayer::UpdatePosition(float delta) {
|
|||||||
Math::lerp(static_cast<float>(get_velocity().z), static_cast<float>(direction.z * m_Speed),
|
Math::lerp(static_cast<float>(get_velocity().z), static_cast<float>(direction.z * m_Speed),
|
||||||
static_cast<float>(delta * AIR_MOVEMENT))});
|
static_cast<float>(delta * AIR_MOVEMENT))});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (!direction.is_zero_approx()) {
|
||||||
|
godot::Vector3 newRotation = m_Mesh->get_rotation();
|
||||||
|
newRotation.y = godot::UtilityFunctions::lerp_angle(
|
||||||
|
newRotation.y, godot::UtilityFunctions::atan2(get_velocity().x, get_velocity().z), LerpValue);
|
||||||
|
m_Mesh->set_rotation(newRotation);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FirstPersonPlayer::UpdateFOV(float a_Delta) {
|
void FirstPersonPlayer::UpdateFOV(float a_Delta) {
|
||||||
@@ -136,4 +151,25 @@ void FirstPersonPlayer::UpdateFOV(float a_Delta) {
|
|||||||
m_Camera->set_fov(Math::lerp(m_Camera->get_fov(), targetFOV, a_Delta * FOV_TRANSITION));
|
m_Camera->set_fov(Math::lerp(m_Camera->get_fov(), targetFOV, a_Delta * FOV_TRANSITION));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void FirstPersonPlayer::UpdateAnimation(float delta) {
|
||||||
|
if (is_on_floor()) {
|
||||||
|
m_AnimationTree->set("parameters/ground_air_transition/transition_request", "grounded");
|
||||||
|
|
||||||
|
if (get_velocity().length() > 0.2f) {
|
||||||
|
if (m_Speed == SPRINT_SPEED) {
|
||||||
|
m_AnimationTree->set("parameters/iwr_blend/blend_amount",
|
||||||
|
UtilityFunctions::lerp(m_AnimationTree->get("parameters/iwr_blend/blend_amount"), 1.0, delta * AnimationBlend));
|
||||||
|
} else {
|
||||||
|
m_AnimationTree->set("parameters/iwr_blend/blend_amount",
|
||||||
|
UtilityFunctions::lerp(m_AnimationTree->get("parameters/iwr_blend/blend_amount"), 0.0, delta * AnimationBlend));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
m_AnimationTree->set("parameters/iwr_blend/blend_amount",
|
||||||
|
UtilityFunctions::lerp(m_AnimationTree->get("parameters/iwr_blend/blend_amount"), -1.0, delta * AnimationBlend));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
m_AnimationTree->set("parameters/ground_air_transition/transition_request", "air");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace blitz
|
} // namespace blitz
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <godot_cpp/classes/animation_tree.hpp>
|
||||||
#include <godot_cpp/classes/camera3d.hpp>
|
#include <godot_cpp/classes/camera3d.hpp>
|
||||||
#include <godot_cpp/classes/character_body3d.hpp>
|
#include <godot_cpp/classes/character_body3d.hpp>
|
||||||
#include <godot_cpp/classes/input_event_mouse_motion.hpp>
|
#include <godot_cpp/classes/input_event_mouse_motion.hpp>
|
||||||
@@ -22,8 +23,10 @@ class FirstPersonPlayer : public godot::CharacterBody3D {
|
|||||||
void _ready();
|
void _ready();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
godot::AnimationTree* m_AnimationTree;
|
||||||
godot::Camera3D* m_Camera;
|
godot::Camera3D* m_Camera;
|
||||||
godot::Node3D* m_Head;
|
godot::Node3D* m_Head;
|
||||||
|
godot::Node3D* m_Mesh;
|
||||||
float m_BobTime;
|
float m_BobTime;
|
||||||
float m_Speed;
|
float m_Speed;
|
||||||
|
|
||||||
@@ -31,6 +34,8 @@ class FirstPersonPlayer : public godot::CharacterBody3D {
|
|||||||
void UpdateFOV(float delta);
|
void UpdateFOV(float delta);
|
||||||
void UpdateCamera(const godot::InputEventMouseMotion&);
|
void UpdateCamera(const godot::InputEventMouseMotion&);
|
||||||
void UpdatePosition(float delta);
|
void UpdatePosition(float delta);
|
||||||
|
|
||||||
|
void UpdateAnimation(float delta);
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace blitz
|
} // namespace blitz
|
||||||
96
src/Lobby.cpp
Normal file
96
src/Lobby.cpp
Normal file
@@ -0,0 +1,96 @@
|
|||||||
|
#include "Lobby.h"
|
||||||
|
|
||||||
|
#include <godot_cpp/classes/e_net_multiplayer_peer.hpp>
|
||||||
|
#include <godot_cpp/classes/multiplayer_api.hpp>
|
||||||
|
|
||||||
|
using namespace godot;
|
||||||
|
|
||||||
|
namespace blitz {
|
||||||
|
|
||||||
|
void Lobby::_bind_methods() {
|
||||||
|
godot::ClassDB::bind_method(godot::D_METHOD("create_game", "port", "dedicated"), &Lobby::CreateGame);
|
||||||
|
godot::ClassDB::bind_method(godot::D_METHOD("join_game", "address", "port"), &Lobby::JoinGame);
|
||||||
|
ADD_SIGNAL(MethodInfo("player_connected", PropertyInfo(Variant::INT, "peer_id"), PropertyInfo(Variant::STRING, "player_name")));
|
||||||
|
ADD_SIGNAL(MethodInfo("player_disconnected", PropertyInfo(Variant::INT, "peer_id")));
|
||||||
|
ADD_SIGNAL(MethodInfo("server_disconnected"));
|
||||||
|
ADD_SIGNAL(MethodInfo("local_player_connected"));
|
||||||
|
}
|
||||||
|
|
||||||
|
Lobby::Lobby() {}
|
||||||
|
|
||||||
|
Lobby::~Lobby() {}
|
||||||
|
|
||||||
|
void Lobby::_ready() {
|
||||||
|
get_multiplayer()->connect("peer_connected", callable_mp(this, &Lobby::OnPlayerConnected));
|
||||||
|
get_multiplayer()->connect("peer_disconnected", callable_mp(this, &Lobby::OnPlayerDisconnected));
|
||||||
|
get_multiplayer()->connect("connected_to_server", callable_mp(this, &Lobby::OnConnectOk));
|
||||||
|
get_multiplayer()->connect("connection_failed", callable_mp(this, &Lobby::OnConnectFail));
|
||||||
|
get_multiplayer()->connect("server_disconnected", callable_mp(this, &Lobby::OnServerDisconnected));
|
||||||
|
}
|
||||||
|
|
||||||
|
Error Lobby::JoinGame(const String& a_Address, uint16_t a_Port) {
|
||||||
|
auto* peer = memnew(ENetMultiplayerPeer);
|
||||||
|
Error error = peer->create_client(a_Address, a_Port);
|
||||||
|
if (error)
|
||||||
|
return error;
|
||||||
|
|
||||||
|
get_multiplayer()->set_multiplayer_peer(peer);
|
||||||
|
return Error::OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
Error Lobby::CreateGame(uint16_t a_Port, bool a_Dedicated) {
|
||||||
|
auto* peer = memnew(ENetMultiplayerPeer);
|
||||||
|
Error error = peer->create_server(a_Port);
|
||||||
|
if (error)
|
||||||
|
return error;
|
||||||
|
|
||||||
|
get_multiplayer()->set_multiplayer_peer(peer);
|
||||||
|
|
||||||
|
if (!a_Dedicated) {
|
||||||
|
emit_signal("local_player_connected");
|
||||||
|
String playerName = "Imtheadmin";
|
||||||
|
m_Players.insert({get_multiplayer()->get_unique_id(), {playerName}});
|
||||||
|
emit_signal("player_connected", get_multiplayer()->get_unique_id(), playerName);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Error::OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Lobby::Shutdown() {
|
||||||
|
get_multiplayer()->set_multiplayer_peer(nullptr);
|
||||||
|
m_Players.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Lobby::OnPlayerConnected(int32_t a_PeerId) {
|
||||||
|
emit_signal("player_connected", a_PeerId, "anonymous");
|
||||||
|
if (get_multiplayer()->is_server()) {
|
||||||
|
// TODO: broadcast player join
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Lobby::OnPlayerDisconnected(int32_t a_PeerId) {
|
||||||
|
m_Players.erase(a_PeerId);
|
||||||
|
emit_signal("player_disconnected", a_PeerId);
|
||||||
|
if (get_multiplayer()->is_server()) {
|
||||||
|
// TODO: broadcast player leave
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Lobby::OnConnectOk() {
|
||||||
|
int32_t peerId = get_multiplayer()->get_unique_id();
|
||||||
|
PlayerInfo localPlayer{"MonPseudo"};
|
||||||
|
m_Players.insert({peerId, localPlayer});
|
||||||
|
emit_signal("player_connected", peerId, localPlayer.m_Name);
|
||||||
|
emit_signal("local_player_connected");
|
||||||
|
}
|
||||||
|
|
||||||
|
void Lobby::OnConnectFail() {
|
||||||
|
Shutdown();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Lobby::OnServerDisconnected() {
|
||||||
|
Shutdown();
|
||||||
|
emit_signal("server_disconnected");
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace blitz
|
||||||
35
src/Lobby.h
Normal file
35
src/Lobby.h
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "PlayerInfo.h"
|
||||||
|
#include <godot_cpp/classes/node.hpp>
|
||||||
|
#include <map>
|
||||||
|
|
||||||
|
namespace blitz {
|
||||||
|
|
||||||
|
class Lobby : public godot::Node {
|
||||||
|
GDCLASS(Lobby, godot::Node)
|
||||||
|
protected:
|
||||||
|
static void _bind_methods();
|
||||||
|
|
||||||
|
public:
|
||||||
|
Lobby();
|
||||||
|
~Lobby();
|
||||||
|
|
||||||
|
void _ready() override;
|
||||||
|
|
||||||
|
godot::Error JoinGame(const godot::String& a_Address, uint16_t a_Port);
|
||||||
|
godot::Error CreateGame(uint16_t a_Port, bool a_Dedicated = false);
|
||||||
|
|
||||||
|
void Shutdown();
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::map<int32_t, PlayerInfo> m_Players;
|
||||||
|
|
||||||
|
void OnPlayerConnected(int32_t a_PeerId);
|
||||||
|
void OnPlayerDisconnected(int32_t a_PeerId);
|
||||||
|
void OnConnectOk();
|
||||||
|
void OnConnectFail();
|
||||||
|
void OnServerDisconnected();
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace blitz
|
||||||
40
src/Main.cpp
Normal file
40
src/Main.cpp
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
#include "Main.h"
|
||||||
|
|
||||||
|
#include <godot_cpp/classes/scene_tree.hpp>
|
||||||
|
#include <godot_cpp/classes/window.hpp>
|
||||||
|
#include <godot_cpp/classes/packed_scene.hpp>
|
||||||
|
#include <godot_cpp/classes/resource_loader.hpp>
|
||||||
|
#include <godot_cpp/classes/engine.hpp>
|
||||||
|
#include <godot_cpp/variant/utility_functions.hpp>
|
||||||
|
|
||||||
|
#include "Lobby.h"
|
||||||
|
#include "World.h"
|
||||||
|
|
||||||
|
using namespace godot;
|
||||||
|
|
||||||
|
namespace blitz {
|
||||||
|
|
||||||
|
static constexpr char MainScenePath[] = "res://Scenes/Levels/world.tscn";
|
||||||
|
|
||||||
|
void Main::_bind_methods() {
|
||||||
|
godot::ClassDB::bind_method(godot::D_METHOD("change_scene"), &Main::ChangeScene);
|
||||||
|
}
|
||||||
|
|
||||||
|
Main::Main() {}
|
||||||
|
|
||||||
|
Main::~Main() {}
|
||||||
|
|
||||||
|
void Main::ChangeScene() {
|
||||||
|
Ref<PackedScene> sceneData = ResourceLoader::get_singleton()->load(MainScenePath);
|
||||||
|
World* world = Object::cast_to<World>(sceneData->instantiate());
|
||||||
|
get_parent()->add_child(world);
|
||||||
|
|
||||||
|
Lobby* lobby = Object::cast_to<Lobby>(find_child("Lobby"));
|
||||||
|
DEV_ASSERT(lobby);
|
||||||
|
|
||||||
|
// connect signals
|
||||||
|
lobby->connect("player_connected", callable_mp(world, &World::AddPlayer));
|
||||||
|
lobby->connect("player_disconnected", callable_mp(world, &World::RemovePlayer));
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace blitz
|
||||||
19
src/Main.h
Normal file
19
src/Main.h
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <godot_cpp/classes/node.hpp>
|
||||||
|
|
||||||
|
namespace blitz {
|
||||||
|
|
||||||
|
class Main : public godot::Node {
|
||||||
|
GDCLASS(Main, godot::Node)
|
||||||
|
protected:
|
||||||
|
static void _bind_methods();
|
||||||
|
|
||||||
|
public:
|
||||||
|
Main();
|
||||||
|
~Main();
|
||||||
|
|
||||||
|
void ChangeScene();
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace blitz
|
||||||
55
src/MainMenu.cpp
Normal file
55
src/MainMenu.cpp
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
#include "MainMenu.h"
|
||||||
|
|
||||||
|
#include <godot_cpp/classes/resource_loader.hpp>
|
||||||
|
#include <godot_cpp/classes/scene_tree.hpp>
|
||||||
|
|
||||||
|
using namespace godot;
|
||||||
|
|
||||||
|
namespace blitz {
|
||||||
|
|
||||||
|
void MainMenu::_bind_methods() {
|
||||||
|
godot::ClassDB::bind_method(godot::D_METHOD("on_connected"), &MainMenu::OnConnected);
|
||||||
|
ADD_SIGNAL(MethodInfo("create_game", PropertyInfo(Variant::INT, "port"), PropertyInfo(Variant::BOOL, "dedicated")));
|
||||||
|
ADD_SIGNAL(MethodInfo("join_game", PropertyInfo(Variant::STRING, "address"), PropertyInfo(Variant::INT, "port")));
|
||||||
|
ADD_SIGNAL(MethodInfo("change_scene"));
|
||||||
|
}
|
||||||
|
|
||||||
|
MainMenu::MainMenu() {}
|
||||||
|
|
||||||
|
MainMenu::~MainMenu() {}
|
||||||
|
|
||||||
|
void MainMenu::_ready() {
|
||||||
|
Node* container = find_child("Container");
|
||||||
|
DEV_ASSERT(container);
|
||||||
|
|
||||||
|
m_JoinButton = Object::cast_to<Button>(container->find_child("JoinButton"));
|
||||||
|
m_CreateButton = Object::cast_to<Button>(container->find_child("CreateButton"));
|
||||||
|
m_QuitButton = Object::cast_to<Button>(container->find_child("QuitButton"));
|
||||||
|
|
||||||
|
DEV_ASSERT(m_JoinButton);
|
||||||
|
DEV_ASSERT(m_CreateButton);
|
||||||
|
DEV_ASSERT(m_QuitButton);
|
||||||
|
|
||||||
|
m_JoinButton->connect("pressed", callable_mp(this, &MainMenu::OnJoinPressed));
|
||||||
|
m_CreateButton->connect("pressed", callable_mp(this, &MainMenu::OnCreatePressed));
|
||||||
|
m_QuitButton->connect("pressed", callable_mp(this, &MainMenu::OnQuitPressed));
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainMenu::OnConnected() {
|
||||||
|
emit_signal("change_scene");
|
||||||
|
queue_free();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainMenu::OnJoinPressed() {
|
||||||
|
emit_signal("join_game", "localhost", 25565);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainMenu::OnCreatePressed() {
|
||||||
|
emit_signal("create_game", 25565, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainMenu::OnQuitPressed() {
|
||||||
|
get_tree()->quit();
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace blitz
|
||||||
32
src/MainMenu.h
Normal file
32
src/MainMenu.h
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <godot_cpp/classes/button.hpp>
|
||||||
|
#include <godot_cpp/classes/control.hpp>
|
||||||
|
|
||||||
|
namespace blitz {
|
||||||
|
|
||||||
|
class MainMenu : public godot::Control {
|
||||||
|
GDCLASS(MainMenu, godot::Control)
|
||||||
|
protected:
|
||||||
|
static void _bind_methods();
|
||||||
|
|
||||||
|
public:
|
||||||
|
MainMenu();
|
||||||
|
~MainMenu();
|
||||||
|
|
||||||
|
// Godot overrides
|
||||||
|
void _ready() override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
godot::Button* m_JoinButton;
|
||||||
|
godot::Button* m_CreateButton;
|
||||||
|
godot::Button* m_QuitButton;
|
||||||
|
|
||||||
|
void OnConnected();
|
||||||
|
|
||||||
|
void OnJoinPressed();
|
||||||
|
void OnCreatePressed();
|
||||||
|
void OnQuitPressed();
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace blitz
|
||||||
@@ -23,11 +23,9 @@ Player::~Player() {}
|
|||||||
|
|
||||||
void Player::_ready() {
|
void Player::_ready() {
|
||||||
godot::InputMap::get_singleton()->load_from_project_settings();
|
godot::InputMap::get_singleton()->load_from_project_settings();
|
||||||
m_PlayerMesh = Object::cast_to<godot::Node3D>(get_child(0));
|
m_PlayerMesh = Object::cast_to<godot::Node3D>(find_child("Mesh"));
|
||||||
m_SpringArmPivot = Object::cast_to<godot::Node3D>(get_child(2));
|
m_AnimationTree = Object::cast_to<godot::AnimationTree>(find_child("AnimationTree"));
|
||||||
m_AnimationTree = Object::cast_to<godot::AnimationTree>(get_child(4));
|
|
||||||
DEV_ASSERT(m_PlayerMesh);
|
DEV_ASSERT(m_PlayerMesh);
|
||||||
DEV_ASSERT(m_SpringArmPivot);
|
|
||||||
DEV_ASSERT(m_AnimationTree);
|
DEV_ASSERT(m_AnimationTree);
|
||||||
|
|
||||||
apply_floor_snap();
|
apply_floor_snap();
|
||||||
@@ -39,47 +37,6 @@ void Player::_physics_process(float delta) {
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
||||||
auto* Input = godot::Input::get_singleton();
|
|
||||||
godot::Vector3 move_direction{0, 0, 0};
|
|
||||||
move_direction.x = Input->get_action_strength("move_right") - Input->get_action_strength("move_left");
|
|
||||||
move_direction.z = Input->get_action_strength("move_backwards") - Input->get_action_strength("move_forwards");
|
|
||||||
move_direction = move_direction.rotated({0, 1, 0}, m_SpringArmPivot->get_rotation().y);
|
|
||||||
|
|
||||||
godot::Vector3 newVelocity = get_velocity();
|
|
||||||
newVelocity.y -= Gravity * delta;
|
|
||||||
set_velocity(newVelocity);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (Input->is_action_pressed("run"))
|
|
||||||
m_Speed = RunSpeed;
|
|
||||||
else
|
|
||||||
m_Speed = WalkSpeed;
|
|
||||||
|
|
||||||
newVelocity = get_velocity();
|
|
||||||
newVelocity.x = move_direction.x * m_Speed;
|
|
||||||
newVelocity.z = move_direction.z * m_Speed;
|
|
||||||
set_velocity(newVelocity);
|
|
||||||
|
|
||||||
if (move_direction != godot::Vector3{0, 0, 0}) {
|
|
||||||
godot::Vector3 newRotation = m_PlayerMesh->get_rotation();
|
|
||||||
newRotation.y = godot::UtilityFunctions::lerp_angle(
|
|
||||||
newRotation.y, godot::UtilityFunctions::atan2(get_velocity().x, get_velocity().z), LerpValue);
|
|
||||||
m_PlayerMesh->set_rotation(newRotation);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool justLanded = is_on_floor() && m_SnapVector == godot::Vector3{0, 0, 0};
|
|
||||||
bool isJumping = is_on_floor() && Input->is_action_just_pressed("jump");
|
|
||||||
|
|
||||||
if (isJumping) {
|
|
||||||
newVelocity = get_velocity();
|
|
||||||
newVelocity.y = JumpStrength;
|
|
||||||
set_velocity(newVelocity);
|
|
||||||
m_SnapVector.zero();
|
|
||||||
} else if (justLanded) {
|
|
||||||
m_SnapVector = {0, -1, 0};
|
|
||||||
}
|
|
||||||
|
|
||||||
apply_floor_snap();
|
apply_floor_snap();
|
||||||
move_and_slide();
|
move_and_slide();
|
||||||
animate(delta);
|
animate(delta);
|
||||||
|
|||||||
@@ -22,16 +22,9 @@ class Player : public godot::CharacterBody3D {
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
godot::Node3D* m_PlayerMesh;
|
godot::Node3D* m_PlayerMesh;
|
||||||
godot::Node3D* m_SpringArmPivot;
|
|
||||||
godot::AnimationTree* m_AnimationTree;
|
godot::AnimationTree* m_AnimationTree;
|
||||||
|
|
||||||
godot::Vector3 m_SnapVector;
|
godot::Vector3 m_SnapVector;
|
||||||
float m_Speed;
|
float m_Speed;
|
||||||
/*
|
|
||||||
@onready var player_mesh : Node3D = $Mesh
|
|
||||||
@onready var spring_arm_pivot : Node3D = $SpringArmPivot
|
|
||||||
@onready var animator : AnimationTree = $AnimationTree
|
|
||||||
|
|
||||||
*/
|
|
||||||
};
|
};
|
||||||
} // namespace blitz
|
} // namespace blitz
|
||||||
|
|||||||
11
src/PlayerInfo.h
Normal file
11
src/PlayerInfo.h
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <godot_cpp/variant/string.hpp>
|
||||||
|
|
||||||
|
namespace blitz {
|
||||||
|
|
||||||
|
struct PlayerInfo {
|
||||||
|
godot::String m_Name;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace blitz
|
||||||
28
src/World.cpp
Normal file
28
src/World.cpp
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
#include "World.h"
|
||||||
|
|
||||||
|
#include <godot_cpp/variant/utility_functions.hpp>
|
||||||
|
|
||||||
|
using namespace godot;
|
||||||
|
|
||||||
|
namespace blitz {
|
||||||
|
|
||||||
|
void World::_bind_methods() {
|
||||||
|
ClassDB::bind_method(D_METHOD("add_player", "id", "name"), &World::AddPlayer);
|
||||||
|
ClassDB::bind_method(D_METHOD("remove_player", "id"), &World::RemovePlayer);
|
||||||
|
}
|
||||||
|
|
||||||
|
World::World() {}
|
||||||
|
|
||||||
|
World::~World() {}
|
||||||
|
|
||||||
|
void World::_process(float delta) {
|
||||||
|
// do update here
|
||||||
|
}
|
||||||
|
|
||||||
|
void World::AddPlayer(int32_t a_PlayerId, String a_PlayerName) {
|
||||||
|
UtilityFunctions::print_rich("New player joined ! Id : ", a_PlayerId, ", Name : ", a_PlayerName);
|
||||||
|
}
|
||||||
|
|
||||||
|
void World::RemovePlayer(int32_t a_PlayerId) {}
|
||||||
|
|
||||||
|
} // namespace blitz
|
||||||
20
src/World.h
Normal file
20
src/World.h
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <godot_cpp/classes/node3d.hpp>
|
||||||
|
|
||||||
|
namespace blitz {
|
||||||
|
class World : public godot::Node3D {
|
||||||
|
GDCLASS(World, godot::Node3D)
|
||||||
|
protected:
|
||||||
|
static void _bind_methods();
|
||||||
|
|
||||||
|
public:
|
||||||
|
World();
|
||||||
|
~World();
|
||||||
|
|
||||||
|
void _process(float delta);
|
||||||
|
|
||||||
|
void AddPlayer(int32_t a_PlayerId, godot::String a_PlayerName);
|
||||||
|
void RemovePlayer(int32_t a_PlayerId);
|
||||||
|
};
|
||||||
|
} // namespace blitz
|
||||||
@@ -1,8 +1,12 @@
|
|||||||
#include "register_types.h"
|
#include "register_types.h"
|
||||||
|
|
||||||
#include "FirstPersonPlayer.h"
|
#include "FirstPersonPlayer.h"
|
||||||
|
#include "Lobby.h"
|
||||||
|
#include "Main.h"
|
||||||
|
#include "MainMenu.h"
|
||||||
#include "Player.h"
|
#include "Player.h"
|
||||||
#include "SpringArmPivot.h"
|
#include "SpringArmPivot.h"
|
||||||
|
#include "World.h"
|
||||||
|
|
||||||
#include <gdextension_interface.h>
|
#include <gdextension_interface.h>
|
||||||
#include <godot_cpp/core/defs.hpp>
|
#include <godot_cpp/core/defs.hpp>
|
||||||
@@ -10,14 +14,22 @@
|
|||||||
|
|
||||||
using namespace godot;
|
using namespace godot;
|
||||||
|
|
||||||
|
static void RegisterClasses() {
|
||||||
|
ClassDB::register_class<blitz::Player>();
|
||||||
|
ClassDB::register_class<blitz::SpringArmPivot>();
|
||||||
|
ClassDB::register_class<blitz::FirstPersonPlayer>();
|
||||||
|
ClassDB::register_class<blitz::MainMenu>();
|
||||||
|
ClassDB::register_class<blitz::Lobby>();
|
||||||
|
ClassDB::register_class<blitz::World>();
|
||||||
|
ClassDB::register_class<blitz::Main>();
|
||||||
|
}
|
||||||
|
|
||||||
void initialize_example_module(ModuleInitializationLevel p_level) {
|
void initialize_example_module(ModuleInitializationLevel p_level) {
|
||||||
if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
|
if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ClassDB::register_class<blitz::Player>();
|
RegisterClasses();
|
||||||
ClassDB::register_class<blitz::SpringArmPivot>();
|
|
||||||
ClassDB::register_class<blitz::FirstPersonPlayer>();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void uninitialize_example_module(ModuleInitializationLevel p_level) {
|
void uninitialize_example_module(ModuleInitializationLevel p_level) {
|
||||||
|
|||||||
Reference in New Issue
Block a user