generated from Persson-dev/Godot-Xmake
Compare commits
20 Commits
caca
...
03b6e577ea
| Author | SHA1 | Date | |
|---|---|---|---|
| 03b6e577ea | |||
| f557d0dd2d | |||
| a092f6fbc1 | |||
| 3cebb70289 | |||
| 27a3581af1 | |||
| 5c1793c1e7 | |||
| 211533d967 | |||
| 7948e0ce3a | |||
| 770e0281ef | |||
| 15a385a825 | |||
| 665dc4938f | |||
| ccb6870567 | |||
| 65808e9dee | |||
| d261672f51 | |||
| 9449b125eb | |||
| 3769fd3ace | |||
| 65e2a0b3ce | |||
| 960ce2a546 | |||
| eb8e3b0888 | |||
| d0028dd0f8 |
File diff suppressed because one or more lines are too long
@@ -3276,7 +3276,6 @@ node_connections = [&"ground_air_transition", 0, &"iwr_blend", &"ground_air_tran
|
||||
velocity = Vector3(0, -5821.84, 0)
|
||||
|
||||
[node name="Mesh" type="Node3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0730165, 0)
|
||||
|
||||
[node name="Armature" type="Node3D" parent="Mesh"]
|
||||
transform = Transform3D(0.01, 0, 0, 0, -3.57628e-09, -0.01, 0, 0.01, -3.57628e-09, 0, 0, 0)
|
||||
@@ -3750,15 +3749,6 @@ skin = SubResource("Skin_l3wpu")
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.908729, 0)
|
||||
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="."]
|
||||
root_node = NodePath("../Mesh")
|
||||
libraries = {
|
||||
|
||||
7
godot/Scenes/Levels/client_world.tscn
Normal file
7
godot/Scenes/Levels/client_world.tscn
Normal file
@@ -0,0 +1,7 @@
|
||||
[gd_scene load_steps=2 format=3 uid="uid://bqv0m8kbr300b"]
|
||||
|
||||
[ext_resource type="PackedScene" path="res://Scenes/Levels/world.tscn" id="1_ajsqk"]
|
||||
|
||||
[node name="World" type="ClientWorld"]
|
||||
|
||||
[node name="WorldContent" parent="." instance=ExtResource("1_ajsqk")]
|
||||
7
godot/Scenes/Levels/server_world.tscn
Normal file
7
godot/Scenes/Levels/server_world.tscn
Normal file
@@ -0,0 +1,7 @@
|
||||
[gd_scene load_steps=2 format=3 uid="uid://c2p67anlxe3mk"]
|
||||
|
||||
[ext_resource type="PackedScene" path="res://Scenes/Levels/world.tscn" id="1_tecss"]
|
||||
|
||||
[node name="World" type="ServerWorld"]
|
||||
|
||||
[node name="WorldContent" parent="." instance=ExtResource("1_tecss")]
|
||||
@@ -1,13 +1,12 @@
|
||||
[gd_scene load_steps=18 format=3 uid="uid://coue2qehpn4fr"]
|
||||
[gd_scene load_steps=17 format=3 uid="uid://cl8gww414apoq"]
|
||||
|
||||
[ext_resource type="Texture2D" path="res://Assets/Textures/Sky.png" id="1_mnexj"]
|
||||
[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/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="Texture2D" path="res://Assets/Textures/Sky.png" id="1_tcyn8"]
|
||||
[ext_resource type="Texture2D" path="res://Assets/Textures/Black.png" id="2_j33w8"]
|
||||
[ext_resource type="Texture2D" path="res://Assets/Textures/Orange.png" id="3_n1lus"]
|
||||
[ext_resource type="Texture2D" path="res://Assets/Textures/Green.png" id="4_klpsf"]
|
||||
|
||||
[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_6c4vd"]
|
||||
panorama = ExtResource("1_mnexj")
|
||||
panorama = ExtResource("1_tcyn8")
|
||||
|
||||
[sub_resource type="Sky" id="Sky_5ngqa"]
|
||||
sky_material = SubResource("PanoramaSkyMaterial_6c4vd")
|
||||
@@ -19,7 +18,7 @@ tonemap_mode = 2
|
||||
glow_enabled = true
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ajchh"]
|
||||
albedo_texture = ExtResource("2_fkwcn")
|
||||
albedo_texture = ExtResource("2_j33w8")
|
||||
uv1_triplanar = true
|
||||
|
||||
[sub_resource type="PlaneMesh" id="PlaneMesh_mmup0"]
|
||||
@@ -30,7 +29,7 @@ size = Vector2(50, 50)
|
||||
data = PackedVector3Array(25, 0, 25, -25, 0, 25, 25, 0, -25, -25, 0, 25, -25, 0, -25, 25, 0, -25)
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jkvud"]
|
||||
albedo_texture = ExtResource("3_ux02w")
|
||||
albedo_texture = ExtResource("3_n1lus")
|
||||
uv1_triplanar = true
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_plpqy"]
|
||||
@@ -45,7 +44,7 @@ left_to_right = -2.0
|
||||
size = Vector3(5, 5, 5)
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_pfpgv"]
|
||||
albedo_texture = ExtResource("4_wp15n")
|
||||
albedo_texture = ExtResource("4_klpsf")
|
||||
uv1_triplanar = true
|
||||
|
||||
[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_rit6o"]
|
||||
@@ -87,4 +86,4 @@ surface_material_override/0 = SubResource("StandardMaterial3D_pfpgv")
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Slope/StaticBody3D"]
|
||||
shape = SubResource("ConcavePolygonShape3D_rit6o")
|
||||
|
||||
[node name="FirstPersonPlayer" parent="." instance=ExtResource("5_8ctht")]
|
||||
[node name="Players" type="Node" parent="."]
|
||||
|
||||
41
godot/Scenes/Menus/mainmenu.tscn
Normal file
41
godot/Scenes/Menus/mainmenu.tscn
Normal file
@@ -0,0 +1,41 @@
|
||||
[gd_scene format=3 uid="uid://bqfqg7xwwlxd8"]
|
||||
|
||||
[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"
|
||||
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="NetworkInterface" type="NetworkInterface"]
|
||||
3
godot/Scenes/Network/server.tscn
Normal file
3
godot/Scenes/Network/server.tscn
Normal file
@@ -0,0 +1,3 @@
|
||||
[gd_scene format=3 uid="uid://us5sb4a0kq8d"]
|
||||
|
||||
[node name="Server" type="Server"]
|
||||
10
godot/Scenes/main.tscn
Normal file
10
godot/Scenes/main.tscn
Normal file
@@ -0,0 +1,10 @@
|
||||
[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="Network" parent="." instance=ExtResource("1_06ibn")]
|
||||
|
||||
[node name="MainMenu" parent="." instance=ExtResource("2_lavg1")]
|
||||
@@ -1,5 +1,5 @@
|
||||
[icons]
|
||||
Blitz3 = "res://icon.svg"
|
||||
Blitz3 = "res://icon.png"
|
||||
|
||||
[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]
|
||||
|
||||
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/icon="res://icon.svg"
|
||||
config/icon="res://icon.png"
|
||||
|
||||
[display]
|
||||
|
||||
window/size/viewport_width=1920
|
||||
window/size/viewport_height=1080
|
||||
|
||||
[input]
|
||||
|
||||
|
||||
25
include/blitz/common/NonCopyable.h
Normal file
25
include/blitz/common/NonCopyable.h
Normal file
@@ -0,0 +1,25 @@
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* \file NonCopyable.h
|
||||
* \brief File containing the blitz::NonCopyable class
|
||||
*/
|
||||
|
||||
namespace blitz {
|
||||
|
||||
/**
|
||||
* \class NonCopyable
|
||||
* \brief Class used to make a class non copyable
|
||||
* \note Inherit from this class privately to make a class non copyable
|
||||
*/
|
||||
class NonCopyable {
|
||||
public:
|
||||
NonCopyable(const NonCopyable&) = delete;
|
||||
NonCopyable& operator=(const NonCopyable&) = delete;
|
||||
|
||||
protected:
|
||||
NonCopyable() {}
|
||||
~NonCopyable() {}
|
||||
};
|
||||
|
||||
} // namespace blitz
|
||||
11
include/blitz/common/Types.h
Normal file
11
include/blitz/common/Types.h
Normal file
@@ -0,0 +1,11 @@
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace blitz {
|
||||
|
||||
using EntityID = std::uint64_t;
|
||||
using PeerID = std::int32_t;
|
||||
using PlayerID = PeerID;
|
||||
|
||||
} // namespace blitz
|
||||
40
include/blitz/godot/NetworkInterface.h
Normal file
40
include/blitz/godot/NetworkInterface.h
Normal file
@@ -0,0 +1,40 @@
|
||||
#pragma once
|
||||
|
||||
#include <blitz/protocol/PacketDispatcher.h>
|
||||
#include <blitz/protocol/Packets.h>
|
||||
#include <godot_cpp/classes/node.hpp>
|
||||
|
||||
namespace blitz {
|
||||
|
||||
class NetworkInterface : public godot::Node, public protocol::PacketDispatcher {
|
||||
GDCLASS(NetworkInterface, godot::Node)
|
||||
protected:
|
||||
static void _bind_methods();
|
||||
|
||||
public:
|
||||
NetworkInterface();
|
||||
~NetworkInterface();
|
||||
|
||||
void BroadcastPacket(const protocol::Packet& a_Packet);
|
||||
void SendPacket(PeerID a_Peer, const protocol::Packet& a_Packet);
|
||||
|
||||
godot::Error JoinGame(const godot::String& a_Address, uint16_t a_Port);
|
||||
godot::Error CreateGame(uint16_t a_Port, bool a_Dedicated = false);
|
||||
|
||||
void ShutdownNetwork();
|
||||
|
||||
void _ready() override;
|
||||
|
||||
private:
|
||||
void RecievePacketDataReliable(godot::PackedByteArray a_PacketData);
|
||||
void RecievePacketDataUnreliable(godot::PackedByteArray a_PacketData);
|
||||
void RecievePacketDataUnreliableOrdered(godot::PackedByteArray a_PacketData);
|
||||
|
||||
void OnPlayerConnected(PeerID a_PeerId);
|
||||
void OnPlayerDisconnected(PeerID a_PeerId);
|
||||
void OnConnectOk();
|
||||
void OnConnectFail();
|
||||
void OnServerDisconnected();
|
||||
};
|
||||
|
||||
} // namespace blitz
|
||||
40
include/blitz/godot/World.h
Normal file
40
include/blitz/godot/World.h
Normal file
@@ -0,0 +1,40 @@
|
||||
#pragma once
|
||||
|
||||
#include <godot_cpp/classes/node3d.hpp>
|
||||
|
||||
#include <blitz/protocol/PacketHandler.h>
|
||||
|
||||
namespace blitz {
|
||||
|
||||
class Player;
|
||||
class NetworkInterface;
|
||||
|
||||
class World : public godot::Node3D, public protocol::PacketHandler {
|
||||
GDCLASS(World, godot::Node3D)
|
||||
protected:
|
||||
static void _bind_methods();
|
||||
|
||||
World();
|
||||
~World();
|
||||
|
||||
public:
|
||||
// Godot overrides
|
||||
void _ready() override;
|
||||
|
||||
Player* GetPlayerById(PlayerID a_PlayerId);
|
||||
|
||||
void HandlePacket(const protocol::packets::PlayerJoin&) override;
|
||||
void HandlePacket(const protocol::packets::PlayerLeave&) override;
|
||||
void HandlePacket(const protocol::packets::PlayerPositionAndRotation&) override;
|
||||
|
||||
protected:
|
||||
NetworkInterface* m_NetworkInterface;
|
||||
godot::Node* m_Players;
|
||||
float m_PassedTime;
|
||||
|
||||
|
||||
void AddPlayer(PlayerID a_PlayerId, godot::String a_PlayerName);
|
||||
void RemovePlayer(PlayerID a_PlayerId);
|
||||
void SetPlayerPositionAndRotation(PlayerID a_PlayerId, const godot::Vector3& a_Position, const godot::Vector3& a_Rotation);
|
||||
};
|
||||
} // namespace blitz
|
||||
94
include/blitz/protocol/ByteBuffer.h
Normal file
94
include/blitz/protocol/ByteBuffer.h
Normal file
@@ -0,0 +1,94 @@
|
||||
#pragma once
|
||||
|
||||
#include <godot_cpp/variant/packed_byte_array.hpp>
|
||||
#include <godot_cpp/variant/string.hpp>
|
||||
#include <stdexcept>
|
||||
#include <vector>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
class PlayerInfo;
|
||||
|
||||
class ByteBuffer {
|
||||
private:
|
||||
godot::PackedByteArray m_Buffer;
|
||||
std::size_t m_ReadOffset;
|
||||
|
||||
public:
|
||||
class ReadError : public std::runtime_error {
|
||||
public:
|
||||
ReadError(const std::string& msg) : std::runtime_error(msg) {}
|
||||
};
|
||||
|
||||
ByteBuffer(godot::PackedByteArray&& a_Buffer) : m_Buffer(std::move(a_Buffer)), m_ReadOffset(0) {}
|
||||
ByteBuffer() : m_ReadOffset(0) {
|
||||
m_Buffer.resize(0);
|
||||
}
|
||||
|
||||
const godot::PackedByteArray& GetByteArray() const {
|
||||
return m_Buffer;
|
||||
}
|
||||
|
||||
godot::PackedByteArray& GetByteArray() {
|
||||
return m_Buffer;
|
||||
}
|
||||
|
||||
// Integers
|
||||
ByteBuffer& operator<<(int8_t a_Data);
|
||||
ByteBuffer& operator>>(int8_t& a_Data);
|
||||
ByteBuffer& operator<<(uint8_t a_Data);
|
||||
ByteBuffer& operator>>(uint8_t& a_Data);
|
||||
|
||||
ByteBuffer& operator<<(int16_t a_Data);
|
||||
ByteBuffer& operator>>(int16_t& a_Data);
|
||||
ByteBuffer& operator<<(uint16_t a_Data);
|
||||
ByteBuffer& operator>>(uint16_t& a_Data);
|
||||
|
||||
ByteBuffer& operator<<(int32_t a_Data);
|
||||
ByteBuffer& operator>>(int32_t& a_Data);
|
||||
ByteBuffer& operator<<(uint32_t a_Data);
|
||||
ByteBuffer& operator>>(uint32_t& a_Data);
|
||||
|
||||
ByteBuffer& operator<<(int64_t a_Data);
|
||||
ByteBuffer& operator>>(int64_t& a_Data);
|
||||
ByteBuffer& operator<<(uint64_t a_Data);
|
||||
ByteBuffer& operator>>(uint64_t& a_Data);
|
||||
|
||||
ByteBuffer& operator<<(float a_Data);
|
||||
ByteBuffer& operator>>(float& a_Data);
|
||||
ByteBuffer& operator<<(double a_Data);
|
||||
ByteBuffer& operator>>(double& a_Data);
|
||||
|
||||
ByteBuffer& operator<<(const godot::String& a_Data);
|
||||
ByteBuffer& operator>>(godot::String& a_Data);
|
||||
|
||||
ByteBuffer& operator<<(const godot::Vector3& a_Data);
|
||||
ByteBuffer& operator>>(godot::Vector3& a_Data);
|
||||
|
||||
template <typename T>
|
||||
ByteBuffer& operator<<(const std::vector<T>& a_Data) {
|
||||
*this << static_cast<std::uint32_t>(a_Data.size());
|
||||
for (const T& data : a_Data) {
|
||||
*this << data;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
ByteBuffer& operator>>(std::vector<T>& a_Data) {
|
||||
std::uint32_t arraySize;
|
||||
*this >> arraySize;
|
||||
a_Data.resize(arraySize);
|
||||
for (std::uint32_t i = 0; i < arraySize; i++) {
|
||||
*this >> a_Data[i];
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
ByteBuffer& operator<<(const PlayerInfo& a_Data);
|
||||
ByteBuffer& operator>>(PlayerInfo& a_Data);
|
||||
};
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
72
include/blitz/protocol/PacketData.h
Normal file
72
include/blitz/protocol/PacketData.h
Normal file
@@ -0,0 +1,72 @@
|
||||
#pragma once
|
||||
|
||||
#include <blitz/common/Types.h>
|
||||
#include <vector>
|
||||
#include <godot_cpp/variant/string.hpp>
|
||||
#include <godot_cpp/variant/vector3.hpp>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
struct PlayerInfo {
|
||||
PlayerID m_PlayerId;
|
||||
godot::String m_PlayerName;
|
||||
};
|
||||
|
||||
namespace data {
|
||||
|
||||
struct PlayerLogin {
|
||||
godot::String m_PlayerName;
|
||||
};
|
||||
|
||||
struct UpdateHealth {
|
||||
float m_NewHealth;
|
||||
};
|
||||
|
||||
struct LoggingSuccess {
|
||||
PlayerID m_PlayerId;
|
||||
};
|
||||
|
||||
struct PlayerDeath {};
|
||||
|
||||
struct PlayerJoin {
|
||||
PlayerInfo m_Player;
|
||||
};
|
||||
|
||||
struct PlayerLeave {
|
||||
PlayerID m_PlayerId;
|
||||
};
|
||||
|
||||
struct PlayerStats {};
|
||||
|
||||
struct PlayerList {
|
||||
std::vector<PlayerInfo> m_Players;
|
||||
};
|
||||
|
||||
struct ServerConfig {};
|
||||
|
||||
struct ServerTps {};
|
||||
|
||||
struct UpdateGameState {};
|
||||
|
||||
struct KeepAlive {
|
||||
std::uint64_t m_KeepAliveId;
|
||||
};
|
||||
|
||||
struct Disconnect {};
|
||||
|
||||
struct ChatMessage {
|
||||
godot::String m_Text;
|
||||
};
|
||||
|
||||
struct PlayerPositionAndRotation {
|
||||
PlayerID m_Player;
|
||||
godot::Vector3 m_Position;
|
||||
godot::Vector3 m_Rotation;
|
||||
};
|
||||
|
||||
struct PlayerShoot {};
|
||||
|
||||
} // namespace data
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
49
include/blitz/protocol/PacketDeclare.h
Normal file
49
include/blitz/protocol/PacketDeclare.h
Normal file
@@ -0,0 +1,49 @@
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* \file PacketDeclare.h
|
||||
* \brief Holds the definitions of the packets (but not their content)
|
||||
*/
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
/**
|
||||
* \enum PacketSender
|
||||
* \brief Indicate who should send a packet
|
||||
*/
|
||||
enum class PacketSenderType {
|
||||
/** Sent by clients and server */
|
||||
Both,
|
||||
/** Sent by clients to the server */
|
||||
Client,
|
||||
/** Sent by server to the clients */
|
||||
Server,
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* \def DeclareAllPacket
|
||||
* \brief Avoids repetitive operations on packets
|
||||
*/
|
||||
#define DeclareAllPacket() \
|
||||
DeclarePacket(ChatMessage, Reliable, Both) \
|
||||
DeclarePacket(Disconnect, Reliable, Both) \
|
||||
DeclarePacket(KeepAlive, Reliable, Both) \
|
||||
DeclarePacket(LoggingSuccess, Reliable, Server) \
|
||||
DeclarePacket(PlayerDeath, Reliable, Server) \
|
||||
DeclarePacket(PlayerJoin, Reliable, Server) \
|
||||
DeclarePacket(PlayerLeave, Reliable, Server) \
|
||||
DeclarePacket(PlayerList, Reliable, Server) \
|
||||
DeclarePacket(PlayerLogin, Reliable, Client) \
|
||||
DeclarePacket(PlayerPositionAndRotation, Unreliable, Both) \
|
||||
DeclarePacket(PlayerShoot, Reliable, Both) \
|
||||
DeclarePacket(PlayerStats, Reliable, Server) \
|
||||
DeclarePacket(ServerConfig, Reliable, Server) \
|
||||
DeclarePacket(ServerTps, Reliable, Server) \
|
||||
DeclarePacket(UpdateGameState, Reliable, Server) \
|
||||
DeclarePacket(UpdateHealth, Reliable, Client)
|
||||
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
58
include/blitz/protocol/PacketDispatcher.h
Normal file
58
include/blitz/protocol/PacketDispatcher.h
Normal file
@@ -0,0 +1,58 @@
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* \file PacketDispatcher.h
|
||||
* \brief File containing the blitz::protocol::PacketDispatcher class
|
||||
*/
|
||||
|
||||
#include <blitz/common/NonCopyable.h>
|
||||
#include <blitz/protocol/Packets.h>
|
||||
|
||||
#include <map>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
class PacketHandler;
|
||||
|
||||
/**
|
||||
* \class PacketDispatcher
|
||||
* \brief Class used to dispatch packets
|
||||
*/
|
||||
class PacketDispatcher : private NonCopyable {
|
||||
private:
|
||||
std::map<PacketType, std::vector<PacketHandler*>> m_Handlers;
|
||||
|
||||
public:
|
||||
/**
|
||||
* \brief Constructor
|
||||
*/
|
||||
PacketDispatcher() {}
|
||||
|
||||
/**
|
||||
* \brief Dispatch a packet
|
||||
* \param packet The packet to dispatch
|
||||
*/
|
||||
void Dispatch(const Packet& packet);
|
||||
|
||||
/**
|
||||
* \brief Register a packet handler
|
||||
* \param type The packet type
|
||||
* \param handler The packet handler
|
||||
*/
|
||||
void RegisterHandler(PacketType type, PacketHandler& handler);
|
||||
/**
|
||||
* \brief Unregister a packet handler
|
||||
* \param type The packet type
|
||||
* \param handler The packet handler
|
||||
*/
|
||||
void UnregisterHandler(PacketType type, PacketHandler& handler);
|
||||
/**
|
||||
* \brief Unregister a packet handler
|
||||
* \param handler The packet handler
|
||||
*/
|
||||
void UnregisterHandler(PacketHandler& handler);
|
||||
};
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
21
include/blitz/protocol/PacketFactory.h
Normal file
21
include/blitz/protocol/PacketFactory.h
Normal file
@@ -0,0 +1,21 @@
|
||||
#pragma once
|
||||
|
||||
#include <blitz/protocol/Packets.h>
|
||||
#include <memory>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
namespace PacketFactory {
|
||||
|
||||
template<typename PacketDerived, typename = typename std::enable_if<std::is_base_of<Packet, PacketDerived>::value>::type>
|
||||
std::unique_ptr<PacketDerived> CreatePacket() {
|
||||
return std::make_unique<PacketDerived>();
|
||||
}
|
||||
|
||||
const std::unique_ptr<Packet>& CreateReadOnlyPacket(PacketType a_Type);
|
||||
|
||||
void Init();
|
||||
|
||||
} // namespace PacketFactory
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
34
include/blitz/protocol/PacketHandler.h
Normal file
34
include/blitz/protocol/PacketHandler.h
Normal file
@@ -0,0 +1,34 @@
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* \file PacketHandler.h
|
||||
* \brief File containing the blitz::protocol::PacketHandler class
|
||||
*/
|
||||
|
||||
#include <blitz/protocol/Packets.h>
|
||||
#include <blitz/protocol/PacketVisitor.h>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
class PacketDispatcher;
|
||||
|
||||
#define DeclarePacket(PacketName, ...) virtual void Visit(const packets::PacketName&); virtual void HandlePacket(const packets::PacketName&) {}
|
||||
|
||||
/**
|
||||
* \class PacketHandler
|
||||
* \brief Class used to handle packets
|
||||
*/
|
||||
class PacketHandler : public PacketVisitor {
|
||||
public:
|
||||
PacketHandler() {}
|
||||
~PacketHandler() {}
|
||||
|
||||
DeclareAllPacket()
|
||||
|
||||
};
|
||||
|
||||
#undef DeclarePacket
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
57
include/blitz/protocol/PacketSender.h
Normal file
57
include/blitz/protocol/PacketSender.h
Normal file
@@ -0,0 +1,57 @@
|
||||
#pragma once
|
||||
|
||||
#include <blitz/protocol/PacketVisitor.h>
|
||||
|
||||
namespace blitz {
|
||||
|
||||
class NetworkInterface;
|
||||
|
||||
namespace protocol {
|
||||
|
||||
///////////////////////
|
||||
/* PacketBroadcaster */
|
||||
///////////////////////
|
||||
|
||||
#define DeclarePacket(PacketName, Reliability, ...) void Visit(const protocol::packets::PacketName& a_Packet) override;
|
||||
|
||||
class PacketBroadcaster : public protocol::PacketVisitor {
|
||||
private:
|
||||
NetworkInterface& m_NetworkInterface;
|
||||
|
||||
public:
|
||||
PacketBroadcaster(NetworkInterface& a_NetworkInterface) : m_NetworkInterface(a_NetworkInterface) {}
|
||||
|
||||
void BroadcastPacket(const protocol::Packet& a_Packet) {
|
||||
Check(a_Packet);
|
||||
}
|
||||
|
||||
DeclareAllPacket()
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//////////////////
|
||||
/* PacketSender */
|
||||
//////////////////
|
||||
class PacketSender : public protocol::PacketVisitor {
|
||||
private:
|
||||
NetworkInterface& m_NetworkInterface;
|
||||
PeerID m_PeerId;
|
||||
|
||||
public:
|
||||
PacketSender(PeerID a_PeerId, NetworkInterface& a_NetworkInterface) : m_PeerId(a_PeerId), m_NetworkInterface(a_NetworkInterface) {}
|
||||
|
||||
void SendPacket(const protocol::Packet& a_Packet) {
|
||||
Check(a_Packet);
|
||||
}
|
||||
|
||||
DeclareAllPacket()
|
||||
};
|
||||
|
||||
#undef DeclarePacket
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
20
include/blitz/protocol/PacketSerializer.h
Normal file
20
include/blitz/protocol/PacketSerializer.h
Normal file
@@ -0,0 +1,20 @@
|
||||
#pragma once
|
||||
|
||||
#include <blitz/protocol/Packets.h>
|
||||
#include <godot_cpp/variant/packed_byte_array.hpp>
|
||||
#include <memory>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
using PacketPtr = std::unique_ptr<Packet>;
|
||||
|
||||
namespace PacketSerializer {
|
||||
|
||||
godot::PackedByteArray Serialize(const Packet& a_Packet);
|
||||
|
||||
std::unique_ptr<Packet> Deserialize(godot::PackedByteArray& a_Data);
|
||||
|
||||
}
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
39
include/blitz/protocol/PacketVisitor.h
Normal file
39
include/blitz/protocol/PacketVisitor.h
Normal file
@@ -0,0 +1,39 @@
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* \file PacketVisitor.h
|
||||
* \brief File containing the blitz::protocol::PacketVisitor class
|
||||
*/
|
||||
|
||||
#include <blitz/protocol/Packets.h>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
#define DeclarePacket(PacketName, ...) \
|
||||
/** This function is called when the packet processed by PacketVisitor::Check is a PacketName */ \
|
||||
virtual void Visit(const packets::PacketName&) {}
|
||||
|
||||
/**
|
||||
* \class PacketVisitor
|
||||
* \brief This class uses double-dispatch in order to find the real type of a packet
|
||||
*/
|
||||
class PacketVisitor : private NonCopyable {
|
||||
protected:
|
||||
PacketVisitor() {}
|
||||
virtual ~PacketVisitor() {}
|
||||
|
||||
public:
|
||||
/**
|
||||
* \brief Calls the right PacketVisitor::Visit method corresponding to the real type of the packet
|
||||
* \param packet the Packet to visit
|
||||
*/
|
||||
void Check(const Packet& packet);
|
||||
|
||||
DeclareAllPacket()
|
||||
};
|
||||
|
||||
#undef DeclarePacket
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
112
include/blitz/protocol/Packets.h
Normal file
112
include/blitz/protocol/Packets.h
Normal file
@@ -0,0 +1,112 @@
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* \file Packets.h
|
||||
* \brief File containing the definitions of the packets
|
||||
*/
|
||||
|
||||
#include <blitz/common/NonCopyable.h>
|
||||
#include <blitz/protocol/PacketData.h>
|
||||
#include <blitz/protocol/PacketDeclare.h>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
class PacketVisitor;
|
||||
|
||||
/** A Packet id is 8 bits wide */
|
||||
using PacketID = std::uint8_t;
|
||||
|
||||
#define DeclarePacket(PacketName, ...) /** PacketName */ PacketName,
|
||||
|
||||
/**
|
||||
* \enum PacketType
|
||||
* \brief Map a Packet to an id
|
||||
*/
|
||||
enum class PacketType : PacketID {
|
||||
|
||||
DeclareAllPacket()
|
||||
|
||||
/** The number of packets */
|
||||
PACKET_COUNT
|
||||
};
|
||||
|
||||
|
||||
#undef DeclarePacket
|
||||
|
||||
|
||||
class Packet : private NonCopyable {
|
||||
public:
|
||||
/**
|
||||
* \return The real type of the packet
|
||||
*/
|
||||
virtual PacketType GetType() const = 0;
|
||||
|
||||
/**
|
||||
* \brief The network peer who sent the packet
|
||||
*/
|
||||
PeerID m_Sender;
|
||||
|
||||
private:
|
||||
/** Use a PacketVisitor to make double-dispatch possible */
|
||||
virtual void Accept(PacketVisitor& a_Visitor) const = 0;
|
||||
|
||||
friend class PacketVisitor;
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
namespace packets {
|
||||
|
||||
/**
|
||||
* \class ConcretePacket
|
||||
* \brief A Packet associated with an id and holding data
|
||||
* \tparam PT The packet type
|
||||
* \tparam Data The structure holding the data of the packet (in blitz::protocol::data namespace)
|
||||
*/
|
||||
template <PacketType PT, typename Data>
|
||||
class ConcretePacket : public Packet {
|
||||
public:
|
||||
/** The type of the struct holding the data */
|
||||
using PacketDataType = Data;
|
||||
|
||||
/** The structure holding the actual data */
|
||||
PacketDataType m_Data;
|
||||
|
||||
/** Construct the packet with data of type PacketDataType */
|
||||
ConcretePacket(const PacketDataType& a_Data = {});
|
||||
|
||||
constexpr PacketType GetType() const override {
|
||||
return PT;
|
||||
};
|
||||
|
||||
private:
|
||||
void Accept(PacketVisitor& a_Visitor) const override;
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// define BLITZ_INSTANCIATE_PACKETS
|
||||
// before including this file
|
||||
// if you want to instantiate templates
|
||||
#ifdef BLITZ_INSTANCIATE_PACKETS
|
||||
#define DeclarePacket(PacketName, ...) \
|
||||
using PacketName = ConcretePacket<PacketType::PacketName, data::PacketName>; \
|
||||
template class ConcretePacket<PacketType::PacketName, data::PacketName>;
|
||||
#else
|
||||
#define DeclarePacket(PacketName, ...) /** Defines the PacketName packet */ \
|
||||
using PacketName = ConcretePacket<PacketType::PacketName, data::PacketName>;
|
||||
#endif
|
||||
|
||||
DeclareAllPacket()
|
||||
|
||||
#undef DeclarePacket
|
||||
|
||||
} // namespace packets
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
19
include/client/ClientWorld.h
Normal file
19
include/client/ClientWorld.h
Normal file
@@ -0,0 +1,19 @@
|
||||
#include <blitz/godot/World.h>
|
||||
|
||||
namespace blitz {
|
||||
|
||||
class ClientWorld : public World {
|
||||
GDCLASS(ClientWorld, World)
|
||||
protected:
|
||||
static void _bind_methods();
|
||||
|
||||
public:
|
||||
ClientWorld();
|
||||
~ClientWorld();
|
||||
void _process(float delta);
|
||||
|
||||
private:
|
||||
void UpdatePlayerPos();
|
||||
};
|
||||
|
||||
} // namespace blitz
|
||||
@@ -1,13 +1,11 @@
|
||||
#pragma once
|
||||
|
||||
#include <godot_cpp/classes/camera3d.hpp>
|
||||
#include <godot_cpp/classes/character_body3d.hpp>
|
||||
#include <client/Player.h>
|
||||
#include <godot_cpp/classes/input_event_mouse_motion.hpp>
|
||||
#include <godot_cpp/classes/node3d.hpp>
|
||||
|
||||
namespace blitz {
|
||||
|
||||
class FirstPersonPlayer : public godot::CharacterBody3D {
|
||||
class FirstPersonPlayer : public Player {
|
||||
GDCLASS(FirstPersonPlayer, godot::CharacterBody3D)
|
||||
protected:
|
||||
static void _bind_methods();
|
||||
@@ -19,7 +17,7 @@ class FirstPersonPlayer : public godot::CharacterBody3D {
|
||||
// Godot overrides
|
||||
void _unhandled_input(const godot::Ref<godot::InputEvent>&);
|
||||
void _physics_process(float delta);
|
||||
void _ready();
|
||||
void _ready() override;
|
||||
|
||||
private:
|
||||
godot::Camera3D* m_Camera;
|
||||
@@ -31,6 +29,8 @@ class FirstPersonPlayer : public godot::CharacterBody3D {
|
||||
void UpdateFOV(float delta);
|
||||
void UpdateCamera(const godot::InputEventMouseMotion&);
|
||||
void UpdatePosition(float delta);
|
||||
|
||||
void UpdateAnimation(float delta);
|
||||
};
|
||||
|
||||
} // namespace blitz
|
||||
21
include/client/Main.h
Normal file
21
include/client/Main.h
Normal file
@@ -0,0 +1,21 @@
|
||||
#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 _ready() override;
|
||||
|
||||
void ChangeScene(bool a_Server);
|
||||
};
|
||||
|
||||
} // namespace blitz
|
||||
39
include/client/MainMenu.h
Normal file
39
include/client/MainMenu.h
Normal file
@@ -0,0 +1,39 @@
|
||||
#pragma once
|
||||
|
||||
#include <godot_cpp/classes/button.hpp>
|
||||
#include <godot_cpp/classes/control.hpp>
|
||||
#include <blitz/godot/NetworkInterface.h>
|
||||
|
||||
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;
|
||||
|
||||
NetworkInterface* m_NetworkInterface;
|
||||
|
||||
void OnConnected();
|
||||
void OnDisconnected();
|
||||
|
||||
void OnJoinPressed();
|
||||
void OnCreatePressed();
|
||||
void OnQuitPressed();
|
||||
|
||||
void DisableButtons();
|
||||
void EnableButtons();
|
||||
};
|
||||
|
||||
} // namespace blitz
|
||||
@@ -3,8 +3,12 @@
|
||||
#include <godot_cpp/classes/animation_tree.hpp>
|
||||
#include <godot_cpp/classes/character_body3d.hpp>
|
||||
#include <godot_cpp/classes/node3d.hpp>
|
||||
#include <blitz/common/Types.h>
|
||||
|
||||
namespace blitz {
|
||||
|
||||
class World;
|
||||
|
||||
class Player : public godot::CharacterBody3D {
|
||||
|
||||
GDCLASS(Player, godot::CharacterBody3D);
|
||||
@@ -20,18 +24,21 @@ class Player : public godot::CharacterBody3D {
|
||||
void _physics_process(float delta);
|
||||
void animate(float delta);
|
||||
|
||||
private:
|
||||
godot::Node3D* m_PlayerMesh;
|
||||
godot::Node3D* m_SpringArmPivot;
|
||||
godot::Vector3 GetCameraRotation() const;
|
||||
void SetCameraRotation(const godot::Vector3& a_Rotation);
|
||||
|
||||
PlayerID GetId() const {
|
||||
return m_PeerId;
|
||||
}
|
||||
|
||||
protected:
|
||||
godot::Node3D* m_Mesh;
|
||||
godot::AnimationTree* m_AnimationTree;
|
||||
|
||||
godot::Vector3 m_SnapVector;
|
||||
float m_Speed;
|
||||
/*
|
||||
@onready var player_mesh : Node3D = $Mesh
|
||||
@onready var spring_arm_pivot : Node3D = $SpringArmPivot
|
||||
@onready var animator : AnimationTree = $AnimationTree
|
||||
PeerID m_PeerId;
|
||||
|
||||
*/
|
||||
friend class World;
|
||||
};
|
||||
} // namespace blitz
|
||||
32
include/server/Server.h
Normal file
32
include/server/Server.h
Normal file
@@ -0,0 +1,32 @@
|
||||
#pragma once
|
||||
|
||||
#include <blitz/common/Types.h>
|
||||
#include <godot_cpp/classes/node.hpp>
|
||||
|
||||
namespace blitz {
|
||||
|
||||
class Lobby;
|
||||
class NetworkInterface;
|
||||
|
||||
class Server : public godot::Node {
|
||||
GDCLASS(Server, godot::Node)
|
||||
protected:
|
||||
static void _bind_methods();
|
||||
|
||||
public:
|
||||
Server();
|
||||
~Server();
|
||||
|
||||
void _ready() override;
|
||||
|
||||
void OnPlayerConnect(PeerID a_PeerId);
|
||||
void OnPlayerDisconnect(PeerID a_PeerId);
|
||||
|
||||
private:
|
||||
Lobby* m_Lobby;
|
||||
NetworkInterface* m_NetworkInterface;
|
||||
|
||||
godot::TypedArray<PeerID> m_Peers;
|
||||
};
|
||||
|
||||
} // namespace blitz
|
||||
19
include/server/ServerWorld.h
Normal file
19
include/server/ServerWorld.h
Normal file
@@ -0,0 +1,19 @@
|
||||
#include <blitz/godot/World.h>
|
||||
|
||||
namespace blitz {
|
||||
|
||||
class ServerWorld : public World {
|
||||
GDCLASS(ServerWorld, World)
|
||||
protected:
|
||||
static void _bind_methods();
|
||||
|
||||
public:
|
||||
ServerWorld();
|
||||
~ServerWorld();
|
||||
void _process(float delta);
|
||||
|
||||
private:
|
||||
void SyncPlayersPos();
|
||||
};
|
||||
|
||||
} // namespace blitz
|
||||
@@ -1,65 +0,0 @@
|
||||
#include "SpringArmPivot.h"
|
||||
|
||||
#include "Player.h"
|
||||
#include <godot_cpp/classes/engine.hpp>
|
||||
#include <godot_cpp/classes/input.hpp>
|
||||
#include <godot_cpp/classes/input_event_mouse_motion.hpp>
|
||||
#include <godot_cpp/classes/spring_arm3d.hpp>
|
||||
#include <godot_cpp/core/error_macros.hpp>
|
||||
#include <godot_cpp/core/math.hpp>
|
||||
#include <godot_cpp/variant/utility_functions.hpp>
|
||||
|
||||
static const float NormalFov = 75.0;
|
||||
static const float RunFov = 90.0;
|
||||
static const float CameraBlend = 0.05;
|
||||
|
||||
namespace blitz {
|
||||
|
||||
void SpringArmPivot::_bind_methods() {
|
||||
godot::ClassDB::bind_method(godot::D_METHOD("get_dynfov"), &SpringArmPivot::IsFovDynamic);
|
||||
godot::ClassDB::bind_method(godot::D_METHOD("set_dynfov", "dynamic_fov"), &SpringArmPivot::SetDynamicFov);
|
||||
ADD_PROPERTY(godot::PropertyInfo(godot::Variant::BOOL, "dynamic_fov"), "set_dynfov", "get_dynfov");
|
||||
}
|
||||
|
||||
SpringArmPivot::SpringArmPivot() {}
|
||||
|
||||
SpringArmPivot::~SpringArmPivot() {}
|
||||
|
||||
void SpringArmPivot::_ready() {
|
||||
m_SpringArm = Object::cast_to<godot::SpringArm3D>(get_child(0));
|
||||
m_Camera = Object::cast_to<godot::Camera3D>(m_SpringArm->get_child(0));
|
||||
DEV_ASSERT(m_SpringArm);
|
||||
DEV_ASSERT(m_Camera);
|
||||
if (!godot::Engine::get_singleton()->is_editor_hint()) {
|
||||
godot::Input::get_singleton()->set_mouse_mode(godot::Input::MOUSE_MODE_CAPTURED);
|
||||
}
|
||||
}
|
||||
|
||||
void SpringArmPivot::_unhandled_input(const godot::Ref<godot::InputEvent>& p_event) {
|
||||
auto* event = Object::cast_to<godot::InputEventMouseMotion>(p_event.ptr());
|
||||
if (event) {
|
||||
rotate_y(-event->get_relative().x * 0.005);
|
||||
m_SpringArm->rotate_x(-event->get_relative().y * 0.005);
|
||||
|
||||
godot::Vector3 rotationClamped = m_SpringArm->get_rotation();
|
||||
rotationClamped.x = godot::UtilityFunctions::clamp(rotationClamped.x, -Math_PI / 4, Math_PI / 4);
|
||||
m_SpringArm->set_rotation(rotationClamped);
|
||||
}
|
||||
}
|
||||
|
||||
void SpringArmPivot::_physics_process(float delta) {
|
||||
if (m_DynamicFOV) {
|
||||
auto* parent = Object::cast_to<Player>(get_owner());
|
||||
if (parent->is_on_floor()) {
|
||||
if (godot::Input::get_singleton()->is_action_pressed("run")) {
|
||||
m_Camera->set_fov(godot::UtilityFunctions::lerp(m_Camera->get_fov(), RunFov, CameraBlend));
|
||||
} else {
|
||||
m_Camera->set_fov(godot::UtilityFunctions::lerp(m_Camera->get_fov(), NormalFov, CameraBlend));
|
||||
}
|
||||
} else {
|
||||
m_Camera->set_fov(godot::UtilityFunctions::lerp(m_Camera->get_fov(), NormalFov, CameraBlend));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace blitz
|
||||
@@ -1,38 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <godot_cpp/classes/input_event.hpp>
|
||||
#include <godot_cpp/classes/node3d.hpp>
|
||||
#include <godot_cpp/classes/spring_arm3d.hpp>
|
||||
#include <godot_cpp/classes/camera3d.hpp>
|
||||
|
||||
namespace blitz {
|
||||
class SpringArmPivot : public godot::Node3D {
|
||||
|
||||
GDCLASS(SpringArmPivot, godot::Node3D);
|
||||
|
||||
protected:
|
||||
static void _bind_methods();
|
||||
|
||||
public:
|
||||
SpringArmPivot();
|
||||
~SpringArmPivot();
|
||||
|
||||
void _ready();
|
||||
void _unhandled_input(const godot::Ref<godot::InputEvent>& p_event);
|
||||
void _physics_process(float delta);
|
||||
|
||||
void SetDynamicFov(bool fov) {
|
||||
m_DynamicFOV = fov;
|
||||
}
|
||||
|
||||
bool IsFovDynamic() const {
|
||||
return m_DynamicFOV;
|
||||
}
|
||||
|
||||
private:
|
||||
godot::SpringArm3D* m_SpringArm;
|
||||
godot::Camera3D* m_Camera;
|
||||
|
||||
bool m_DynamicFOV = false;
|
||||
};
|
||||
} // namespace blitz
|
||||
160
src/blitz/godot/NetworkInterface.cpp
Normal file
160
src/blitz/godot/NetworkInterface.cpp
Normal file
@@ -0,0 +1,160 @@
|
||||
#include <blitz/godot/NetworkInterface.h>
|
||||
|
||||
#include <blitz/protocol/PacketFactory.h>
|
||||
#include <blitz/protocol/PacketSender.h>
|
||||
#include <blitz/protocol/PacketSerializer.h>
|
||||
#include <blitz/protocol/PacketVisitor.h>
|
||||
#include <godot_cpp/classes/e_net_multiplayer_peer.hpp>
|
||||
#include <godot_cpp/classes/multiplayer_api.hpp>
|
||||
#include <godot_cpp/classes/packed_scene.hpp>
|
||||
#include <godot_cpp/classes/resource_loader.hpp>
|
||||
#include <godot_cpp/variant/utility_functions.hpp>
|
||||
|
||||
|
||||
namespace blitz {
|
||||
|
||||
#define RPC_CONFIG(functionName, rpc_mode, transfer_mode, call_local, channel) \
|
||||
{ \
|
||||
Dictionary config; \
|
||||
config["rpc_mode"] = rpc_mode; \
|
||||
config["transfer_mode"] = transfer_mode; \
|
||||
config["call_local"] = call_local; \
|
||||
config["channel"] = channel; \
|
||||
rpc_config(functionName, config); \
|
||||
}
|
||||
|
||||
static const char ServerScenePath[] = "res://Scenes/Network/server.tscn";
|
||||
|
||||
using namespace godot;
|
||||
|
||||
void NetworkInterface::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("RecievePacketDataReliable", "a_PacketData"), &NetworkInterface::RecievePacketDataReliable);
|
||||
ClassDB::bind_method(D_METHOD("RecievePacketDataUnreliable", "a_PacketData"), &NetworkInterface::RecievePacketDataUnreliable);
|
||||
ClassDB::bind_method(
|
||||
D_METHOD("RecievePacketDataUnreliableOrdered", "a_PacketData"), &NetworkInterface::RecievePacketDataUnreliableOrdered);
|
||||
|
||||
// server
|
||||
ADD_SIGNAL(MethodInfo("player_connected", PropertyInfo(Variant::INT, "peer_id")));
|
||||
ADD_SIGNAL(MethodInfo("player_disconnected", PropertyInfo(Variant::INT, "peer_id")));
|
||||
|
||||
// client
|
||||
ADD_SIGNAL(MethodInfo("server_disconnected"));
|
||||
ADD_SIGNAL(MethodInfo("local_player_connected"));
|
||||
|
||||
protocol::PacketFactory::Init();
|
||||
}
|
||||
|
||||
NetworkInterface::NetworkInterface() {}
|
||||
|
||||
NetworkInterface::~NetworkInterface() {}
|
||||
|
||||
void NetworkInterface::_ready() {
|
||||
RPC_CONFIG("RecievePacketDataReliable", MultiplayerAPI::RPC_MODE_ANY_PEER, MultiplayerPeer::TRANSFER_MODE_RELIABLE, true, 0);
|
||||
RPC_CONFIG("RecievePacketDataUnreliable", MultiplayerAPI::RPC_MODE_ANY_PEER, MultiplayerPeer::TRANSFER_MODE_UNRELIABLE, true, 1);
|
||||
RPC_CONFIG("RecievePacketDataUnreliableOrdered", MultiplayerAPI::RPC_MODE_ANY_PEER,
|
||||
MultiplayerPeer::TRANSFER_MODE_UNRELIABLE_ORDERED, true, 2);
|
||||
|
||||
get_multiplayer()->connect("peer_connected", callable_mp(this, &NetworkInterface::OnPlayerConnected));
|
||||
get_multiplayer()->connect("peer_disconnected", callable_mp(this, &NetworkInterface::OnPlayerDisconnected));
|
||||
get_multiplayer()->connect("connected_to_server", callable_mp(this, &NetworkInterface::OnConnectOk));
|
||||
get_multiplayer()->connect("connection_failed", callable_mp(this, &NetworkInterface::OnConnectFail));
|
||||
get_multiplayer()->connect("server_disconnected", callable_mp(this, &NetworkInterface::OnServerDisconnected));
|
||||
}
|
||||
|
||||
void NetworkInterface::BroadcastPacket(const protocol::Packet& a_Packet) {
|
||||
protocol::PacketBroadcaster packetBroadcaster(*this);
|
||||
packetBroadcaster.BroadcastPacket(a_Packet);
|
||||
}
|
||||
|
||||
void NetworkInterface::SendPacket(PeerID a_Peer, const protocol::Packet& a_Packet) {
|
||||
protocol::PacketSender packetSender(a_Peer, *this);
|
||||
packetSender.SendPacket(a_Packet);
|
||||
}
|
||||
|
||||
void NetworkInterface::RecievePacketDataReliable(godot::PackedByteArray a_PacketData) {
|
||||
auto packet = protocol::PacketSerializer::Deserialize(a_PacketData);
|
||||
if (packet) {
|
||||
packet->m_Sender = get_multiplayer()->get_remote_sender_id();
|
||||
Dispatch(*packet);
|
||||
}
|
||||
}
|
||||
|
||||
void NetworkInterface::RecievePacketDataUnreliable(godot::PackedByteArray a_PacketData) {
|
||||
// we have to copy the function body in order to preserve the remote sender id
|
||||
auto packet = protocol::PacketSerializer::Deserialize(a_PacketData);
|
||||
if (packet) {
|
||||
packet->m_Sender = get_multiplayer()->get_remote_sender_id();
|
||||
Dispatch(*packet);
|
||||
}
|
||||
}
|
||||
|
||||
void NetworkInterface::RecievePacketDataUnreliableOrdered(godot::PackedByteArray a_PacketData) {
|
||||
// we have to copy the function body in order to preserve the remote sender id
|
||||
auto packet = protocol::PacketSerializer::Deserialize(a_PacketData);
|
||||
if (packet) {
|
||||
packet->m_Sender = get_multiplayer()->get_remote_sender_id();
|
||||
Dispatch(*packet);
|
||||
}
|
||||
}
|
||||
|
||||
Error NetworkInterface::JoinGame(const String& a_Address, uint16_t a_Port) {
|
||||
auto* peer = memnew(ENetMultiplayerPeer);
|
||||
Error error = peer->create_client(a_Address, a_Port, 3);
|
||||
if (error) {
|
||||
OnConnectFail();
|
||||
return error;
|
||||
}
|
||||
|
||||
get_multiplayer()->set_multiplayer_peer(peer);
|
||||
return Error::OK;
|
||||
}
|
||||
|
||||
Error NetworkInterface::CreateGame(uint16_t a_Port, bool a_Dedicated) {
|
||||
auto* peer = memnew(ENetMultiplayerPeer);
|
||||
Error error = peer->create_server(a_Port, 50, 3);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
get_multiplayer()->set_multiplayer_peer(peer);
|
||||
|
||||
Ref<PackedScene> serverScene = ResourceLoader::get_singleton()->load(ServerScenePath);
|
||||
add_child(serverScene->instantiate());
|
||||
|
||||
if (!a_Dedicated) {
|
||||
emit_signal("local_player_connected");
|
||||
emit_signal("player_connected", get_multiplayer()->get_unique_id());
|
||||
}
|
||||
|
||||
return Error::OK;
|
||||
}
|
||||
|
||||
void NetworkInterface::OnPlayerConnected(PeerID a_PeerId) {
|
||||
emit_signal("player_connected", a_PeerId);
|
||||
}
|
||||
|
||||
void NetworkInterface::OnPlayerDisconnected(PeerID a_PeerId) {
|
||||
emit_signal("player_disconnected", a_PeerId);
|
||||
}
|
||||
|
||||
void NetworkInterface::OnConnectOk() {
|
||||
emit_signal("local_player_connected");
|
||||
}
|
||||
|
||||
void NetworkInterface::OnConnectFail() {
|
||||
ShutdownNetwork();
|
||||
emit_signal("server_disconnected");
|
||||
}
|
||||
|
||||
void NetworkInterface::OnServerDisconnected() {
|
||||
ShutdownNetwork();
|
||||
emit_signal("server_disconnected");
|
||||
}
|
||||
|
||||
void NetworkInterface::ShutdownNetwork() {
|
||||
get_multiplayer()->set_multiplayer_peer(nullptr);
|
||||
if (auto* server = find_child("Server")) {
|
||||
server->queue_free();
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace blitz
|
||||
108
src/blitz/godot/World.cpp
Normal file
108
src/blitz/godot/World.cpp
Normal file
@@ -0,0 +1,108 @@
|
||||
#include <blitz/godot/World.h>
|
||||
|
||||
#include <blitz/godot/NetworkInterface.h>
|
||||
#include <client/FirstPersonPlayer.h>
|
||||
#include <client/Player.h>
|
||||
#include <godot_cpp/classes/engine.hpp>
|
||||
#include <godot_cpp/classes/multiplayer_api.hpp>
|
||||
#include <godot_cpp/classes/packed_scene.hpp>
|
||||
#include <godot_cpp/classes/resource_loader.hpp>
|
||||
#include <godot_cpp/variant/utility_functions.hpp>
|
||||
|
||||
|
||||
using namespace godot;
|
||||
|
||||
namespace blitz {
|
||||
|
||||
static const char FirstPersonPlayerScenePath[] = "res://Scenes/Characters/first_person_player.tscn";
|
||||
static const char PlayerScenePath[] = "res://Scenes/Characters/player.tscn";
|
||||
|
||||
void World::_bind_methods() {}
|
||||
|
||||
void World::_ready() {
|
||||
if (Engine::get_singleton()->is_editor_hint())
|
||||
return;
|
||||
|
||||
m_Players = find_child("Players");
|
||||
DEV_ASSERT(m_Players);
|
||||
|
||||
m_NetworkInterface = Object::cast_to<NetworkInterface>(get_parent()->find_child("Network"));
|
||||
DEV_ASSERT(m_NetworkInterface);
|
||||
|
||||
m_NetworkInterface->RegisterHandler(protocol::PacketType::PlayerJoin, *this);
|
||||
m_NetworkInterface->RegisterHandler(protocol::PacketType::PlayerLeave, *this);
|
||||
m_NetworkInterface->RegisterHandler(protocol::PacketType::PlayerPositionAndRotation, *this);
|
||||
}
|
||||
|
||||
|
||||
World::World() {}
|
||||
|
||||
World::~World() {
|
||||
if (Engine::get_singleton()->is_editor_hint())
|
||||
return;
|
||||
|
||||
m_NetworkInterface->UnregisterHandler(*this);
|
||||
}
|
||||
|
||||
Player* World::GetPlayerById(PlayerID a_PlayerId) {
|
||||
String stringId = UtilityFunctions::var_to_str(a_PlayerId);
|
||||
for (int i = 0; i < m_Players->get_child_count(); i++) {
|
||||
Node* player = m_Players->get_child(i);
|
||||
if (player->get_name() == stringId) {
|
||||
return Object::cast_to<Player>(player);
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void World::HandlePacket(const protocol::packets::PlayerJoin& a_PlayerJoin) {
|
||||
const protocol::PlayerInfo& playerInfo = a_PlayerJoin.m_Data.m_Player;
|
||||
AddPlayer(playerInfo.m_PlayerId, playerInfo.m_PlayerName);
|
||||
}
|
||||
|
||||
void World::HandlePacket(const protocol::packets::PlayerLeave& a_PlayerLeave) {
|
||||
RemovePlayer(a_PlayerLeave.m_Data.m_PlayerId);
|
||||
}
|
||||
|
||||
void World::HandlePacket(const protocol::packets::PlayerPositionAndRotation& a_PlayerPos) {
|
||||
const auto& data = a_PlayerPos.m_Data;
|
||||
if (data.m_Player == get_multiplayer()->get_unique_id() || data.m_Player != a_PlayerPos.m_Sender)
|
||||
return;
|
||||
|
||||
SetPlayerPositionAndRotation(data.m_Player, data.m_Position, data.m_Rotation);
|
||||
}
|
||||
|
||||
void World::AddPlayer(PlayerID a_PlayerId, String a_PlayerName) {
|
||||
UtilityFunctions::print("New Player with id : ", a_PlayerId, " and name ", a_PlayerName);
|
||||
if (a_PlayerId == get_multiplayer()->get_unique_id()) {
|
||||
Ref<PackedScene> serverScene = ResourceLoader::get_singleton()->load(FirstPersonPlayerScenePath);
|
||||
FirstPersonPlayer* player = Object::cast_to<FirstPersonPlayer>(serverScene->instantiate());
|
||||
player->set_name(UtilityFunctions::var_to_str(a_PlayerId));
|
||||
player->m_PeerId = a_PlayerId;
|
||||
m_Players->add_child(player);
|
||||
} else {
|
||||
Ref<PackedScene> serverScene = ResourceLoader::get_singleton()->load(PlayerScenePath);
|
||||
Player* player = Object::cast_to<Player>(serverScene->instantiate());
|
||||
player->set_name(UtilityFunctions::var_to_str(a_PlayerId));
|
||||
player->m_PeerId = a_PlayerId;
|
||||
m_Players->add_child(player);
|
||||
}
|
||||
}
|
||||
|
||||
void World::RemovePlayer(PlayerID a_PlayerId) {
|
||||
UtilityFunctions::print("Removing Player with id : ", a_PlayerId);
|
||||
Player* player = GetPlayerById(a_PlayerId);
|
||||
if (player) {
|
||||
player->queue_free();
|
||||
}
|
||||
}
|
||||
|
||||
void World::SetPlayerPositionAndRotation(PlayerID a_PlayerId, const Vector3& a_Position, const Vector3& a_Rotation) {
|
||||
Player* player = GetPlayerById(a_PlayerId);
|
||||
if (player) {
|
||||
player->set_position(a_Position);
|
||||
player->SetCameraRotation(a_Rotation);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace blitz
|
||||
79
src/blitz/protocol/ByteBuffer.cpp
Normal file
79
src/blitz/protocol/ByteBuffer.cpp
Normal file
@@ -0,0 +1,79 @@
|
||||
#include <blitz/protocol/ByteBuffer.h>
|
||||
|
||||
#include <blitz/protocol/PacketData.h>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
#define Operators(Type, GodotType) \
|
||||
ByteBuffer& ByteBuffer::operator>>(Type& a_Data) { \
|
||||
if (sizeof(a_Data) + m_ReadOffset > m_Buffer.size()) { \
|
||||
throw ReadError("Buffer is too small ! Can't read " #Type); \
|
||||
} \
|
||||
a_Data = m_Buffer.decode_##GodotType(m_ReadOffset); \
|
||||
m_ReadOffset += sizeof(a_Data); \
|
||||
return *this; \
|
||||
} \
|
||||
\
|
||||
ByteBuffer& ByteBuffer::operator<<(Type a_Data) { \
|
||||
m_Buffer.resize(m_Buffer.size() + sizeof(a_Data)); \
|
||||
m_Buffer.encode_##GodotType(m_Buffer.size() - sizeof(a_Data), a_Data); \
|
||||
return *this; \
|
||||
}
|
||||
|
||||
// Integers
|
||||
Operators(int8_t, s8);
|
||||
Operators(uint8_t, u8);
|
||||
Operators(int16_t, s16);
|
||||
Operators(uint16_t, u16);
|
||||
Operators(int32_t, s32);
|
||||
Operators(uint32_t, u32);
|
||||
Operators(int64_t, s64);
|
||||
Operators(uint64_t, u64);
|
||||
|
||||
// Reals
|
||||
Operators(float, float);
|
||||
Operators(double, double);
|
||||
|
||||
ByteBuffer& ByteBuffer::operator>>(PlayerInfo& a_Data) {
|
||||
*this >> a_Data.m_PlayerId >> a_Data.m_PlayerName;
|
||||
return *this;
|
||||
}
|
||||
|
||||
ByteBuffer& ByteBuffer::operator<<(const PlayerInfo& a_Data) {
|
||||
*this << a_Data.m_PlayerId << a_Data.m_PlayerName;
|
||||
return *this;
|
||||
}
|
||||
|
||||
ByteBuffer& ByteBuffer::operator<<(const godot::Vector3& a_Data) {
|
||||
*this << a_Data.x << a_Data.y << a_Data.z;
|
||||
return *this;
|
||||
}
|
||||
|
||||
ByteBuffer& ByteBuffer::operator>>(godot::Vector3& a_Data) {
|
||||
*this >> a_Data.x >> a_Data.y >> a_Data.z;
|
||||
return *this;
|
||||
}
|
||||
|
||||
ByteBuffer& ByteBuffer::operator>>(godot::String& a_Data) {
|
||||
int nullPos = m_Buffer.find(0, m_ReadOffset);
|
||||
if (nullPos < 0)
|
||||
throw ReadError("String does not have an and in buffer !");
|
||||
|
||||
|
||||
godot::PackedByteArray stringBuffer = m_Buffer.slice(m_ReadOffset, nullPos);
|
||||
a_Data = stringBuffer.get_string_from_utf8();
|
||||
m_ReadOffset = nullPos + 1;
|
||||
return *this;
|
||||
}
|
||||
|
||||
ByteBuffer& ByteBuffer::operator<<(const godot::String& a_Data) {
|
||||
godot::PackedByteArray stringBuffer = a_Data.to_utf8_buffer();
|
||||
m_Buffer.append_array(stringBuffer);
|
||||
// ends the string
|
||||
*this << static_cast<std::uint8_t>(0);
|
||||
return *this;
|
||||
}
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
37
src/blitz/protocol/PacketDispatcher.cpp
Normal file
37
src/blitz/protocol/PacketDispatcher.cpp
Normal file
@@ -0,0 +1,37 @@
|
||||
#include <blitz/protocol/PacketDispatcher.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <blitz/protocol/PacketHandler.h>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
void PacketDispatcher::RegisterHandler(PacketType type, PacketHandler& handler) {
|
||||
auto found = std::find(m_Handlers[type].begin(), m_Handlers[type].end(), &handler);
|
||||
if (found == m_Handlers[type].end())
|
||||
m_Handlers[type].push_back(&handler);
|
||||
}
|
||||
|
||||
void PacketDispatcher::UnregisterHandler(PacketType type, PacketHandler& handler) {
|
||||
m_Handlers[type].erase(std::remove(m_Handlers[type].begin(), m_Handlers[type].end(), &handler), m_Handlers[type].end());
|
||||
}
|
||||
|
||||
void PacketDispatcher::UnregisterHandler(PacketHandler& handler) {
|
||||
for (auto& pair : m_Handlers) {
|
||||
if (pair.second.empty())
|
||||
continue;
|
||||
|
||||
PacketType type = pair.first;
|
||||
|
||||
m_Handlers[type].erase(std::remove(m_Handlers[type].begin(), m_Handlers[type].end(), &handler), m_Handlers[type].end());
|
||||
}
|
||||
}
|
||||
|
||||
void PacketDispatcher::Dispatch(const Packet& packet) {
|
||||
PacketType type = packet.GetType();
|
||||
for (PacketHandler* handler : m_Handlers[type])
|
||||
handler->Check(packet);
|
||||
}
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
32
src/blitz/protocol/PacketFactory.cpp
Normal file
32
src/blitz/protocol/PacketFactory.cpp
Normal file
@@ -0,0 +1,32 @@
|
||||
#include <blitz/protocol/PacketFactory.h>
|
||||
|
||||
#include <array>
|
||||
#include <cassert>
|
||||
#include <functional>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
namespace PacketFactory {
|
||||
|
||||
using PacketCreator = std::function<std::unique_ptr<Packet>()>;
|
||||
|
||||
#define DeclarePacket(PacketName, ...) std::make_unique<packets::PacketName>(),
|
||||
|
||||
static std::array<std::unique_ptr<Packet>, static_cast<std::size_t>(PacketType::PACKET_COUNT)> Packets;
|
||||
|
||||
void Init() {
|
||||
Packets = {
|
||||
|
||||
DeclareAllPacket()
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
const std::unique_ptr<Packet>& CreateReadOnlyPacket(PacketType a_Type) {
|
||||
assert(a_Type < PacketType::PACKET_COUNT);
|
||||
return Packets[static_cast<std::size_t>(a_Type)];
|
||||
}
|
||||
|
||||
} // namespace PacketFactory
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
14
src/blitz/protocol/PacketHandler.cpp
Normal file
14
src/blitz/protocol/PacketHandler.cpp
Normal file
@@ -0,0 +1,14 @@
|
||||
#include <blitz/protocol/PacketHandler.h>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
#define DeclarePacket(PacketName, ...) \
|
||||
void PacketHandler::Visit(const packets::PacketName& a_Packet) { \
|
||||
HandlePacket(a_Packet); \
|
||||
}
|
||||
|
||||
DeclareAllPacket()
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
39
src/blitz/protocol/PacketSender.cpp
Normal file
39
src/blitz/protocol/PacketSender.cpp
Normal file
@@ -0,0 +1,39 @@
|
||||
#include <blitz/protocol/PacketSender.h>
|
||||
|
||||
#include <blitz/godot/NetworkInterface.h>
|
||||
#include <blitz/protocol/PacketSerializer.h>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
///////////////////////
|
||||
/* PacketBroadcaster */
|
||||
///////////////////////
|
||||
|
||||
#define DeclarePacket(PacketName, Reliability, ...) \
|
||||
void PacketBroadcaster::Visit(const protocol::packets::PacketName& a_Packet) { \
|
||||
m_NetworkInterface.rpc("RecievePacketData" #Reliability, protocol::PacketSerializer::Serialize(a_Packet)); \
|
||||
}
|
||||
|
||||
DeclareAllPacket()
|
||||
|
||||
#undef DeclarePacket
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//////////////////
|
||||
/* PacketSender */
|
||||
//////////////////
|
||||
#define DeclarePacket(PacketName, Reliability, ...) \
|
||||
void PacketSender::Visit(const protocol::packets::PacketName& a_Packet) { \
|
||||
m_NetworkInterface.rpc_id(m_PeerId, "RecievePacketData" #Reliability, protocol::PacketSerializer::Serialize(a_Packet)); \
|
||||
}
|
||||
|
||||
DeclareAllPacket()
|
||||
|
||||
#undef DeclarePacket
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
296
src/blitz/protocol/PacketSerializer.cpp
Normal file
296
src/blitz/protocol/PacketSerializer.cpp
Normal file
@@ -0,0 +1,296 @@
|
||||
#include <blitz/protocol/PacketSerializer.h>
|
||||
|
||||
#include <blitz/protocol/ByteBuffer.h>
|
||||
#include <blitz/protocol/PacketFactory.h>
|
||||
#include <blitz/protocol/PacketVisitor.h>
|
||||
|
||||
#include <godot_cpp/variant/utility_functions.hpp>
|
||||
#include <godot_cpp/variant/variant.hpp>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
namespace PacketSerializer {
|
||||
|
||||
#define DeclarePacket(PacketName, ...) \
|
||||
void Visit(const packets::PacketName& a_Packet) override { \
|
||||
const auto& packetData = a_Packet.m_Data; \
|
||||
SerializePacketData(packetData); \
|
||||
} \
|
||||
\
|
||||
void SerializePacketData(const packets::PacketName::PacketDataType& a_Packet);
|
||||
|
||||
|
||||
|
||||
|
||||
class Serializer : public PacketVisitor {
|
||||
private:
|
||||
ByteBuffer& m_Buffer;
|
||||
|
||||
public:
|
||||
Serializer(ByteBuffer& a_Buffer) : m_Buffer(a_Buffer) {}
|
||||
|
||||
void Serialize(const Packet& a_Packet) {
|
||||
m_Buffer << static_cast<PacketID>(a_Packet.GetType());
|
||||
Check(a_Packet);
|
||||
}
|
||||
|
||||
DeclareAllPacket()
|
||||
};
|
||||
|
||||
#undef DeclarePacket
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#define DeclarePacket(PacketName, ...) \
|
||||
void Visit(const packets::PacketName& a_Packet) override { \
|
||||
auto packetPtr = PacketFactory::CreatePacket<packets::PacketName>(); \
|
||||
auto& packetData = packetPtr->m_Data; \
|
||||
\
|
||||
DeserializePacketData(packetData); \
|
||||
\
|
||||
m_Packet = std::move(packetPtr); \
|
||||
} \
|
||||
\
|
||||
void DeserializePacketData(packets::PacketName::PacketDataType& a_Packet);
|
||||
|
||||
|
||||
|
||||
class Deserializer : public PacketVisitor {
|
||||
private:
|
||||
ByteBuffer& m_Buffer;
|
||||
PacketPtr m_Packet;
|
||||
|
||||
public:
|
||||
Deserializer(ByteBuffer&& a_Buffer) : m_Buffer(a_Buffer) {}
|
||||
|
||||
bool Deserialize(const PacketPtr& a_Packet) {
|
||||
try {
|
||||
Check(*a_Packet.get());
|
||||
} catch (ByteBuffer::ReadError& e) {
|
||||
godot::UtilityFunctions::printerr("[PacketSerializer::Deserializer] ", e.what());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
PacketPtr& GetPacket() {
|
||||
return m_Packet;
|
||||
}
|
||||
|
||||
DeclareAllPacket()
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
godot::PackedByteArray Serialize(const Packet& a_Packet) {
|
||||
ByteBuffer stream;
|
||||
|
||||
Serializer serializer(stream);
|
||||
serializer.Serialize(a_Packet);
|
||||
|
||||
return stream.GetByteArray();
|
||||
}
|
||||
|
||||
std::unique_ptr<Packet> Deserialize(godot::PackedByteArray& a_Data) {
|
||||
ByteBuffer stream(std::move(a_Data));
|
||||
|
||||
PacketID packetId;
|
||||
stream >> packetId;
|
||||
|
||||
if (packetId >= static_cast<PacketID>(PacketType::PACKET_COUNT))
|
||||
return nullptr;
|
||||
|
||||
PacketType packetType = PacketType(packetId);
|
||||
|
||||
// for double-dispatch
|
||||
const PacketPtr& emptyPacket = PacketFactory::CreateReadOnlyPacket(packetType);
|
||||
|
||||
Deserializer deserializer(std::move(stream));
|
||||
|
||||
if (deserializer.Deserialize(emptyPacket)) {
|
||||
PacketPtr packet = std::move(deserializer.GetPacket());
|
||||
return packet;
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//---------------------------------------------
|
||||
// Packet serializer implementation
|
||||
//----------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::PlayerLogin& a_Packet) {
|
||||
m_Buffer << a_Packet.m_PlayerName;
|
||||
}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::PlayerLogin& a_Packet) {
|
||||
m_Buffer >> a_Packet.m_PlayerName;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::UpdateHealth& a_Packet) {
|
||||
m_Buffer << a_Packet.m_NewHealth;
|
||||
}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::UpdateHealth& a_Packet) {
|
||||
m_Buffer >> a_Packet.m_NewHealth;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::LoggingSuccess& a_Packet) {
|
||||
m_Buffer << a_Packet.m_PlayerId;
|
||||
}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::LoggingSuccess& a_Packet) {
|
||||
m_Buffer >> a_Packet.m_PlayerId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::PlayerDeath& a_Packet) {}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::PlayerDeath& a_Packet) {}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::PlayerJoin& a_Packet) {
|
||||
m_Buffer << a_Packet.m_Player;
|
||||
}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::PlayerJoin& a_Packet) {
|
||||
m_Buffer >> a_Packet.m_Player;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::PlayerLeave& a_Packet) {
|
||||
m_Buffer << a_Packet.m_PlayerId;
|
||||
}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::PlayerLeave& a_Packet) {
|
||||
m_Buffer >> a_Packet.m_PlayerId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::PlayerList& a_Packet) {
|
||||
m_Buffer << a_Packet.m_Players;
|
||||
// m_Buffer << static_cast<std::uint8_t>(a_Packet.m_Players.size());
|
||||
// for (auto player : a_Packet.m_Players) {
|
||||
// m_Buffer << player.m_PlayerId << player.m_PlayerName;
|
||||
// }
|
||||
}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::PlayerList& a_Packet) {
|
||||
m_Buffer >> a_Packet.m_Players;
|
||||
// std::uint8_t playerCount;
|
||||
// m_Buffer >> playerCount;
|
||||
// for (std::uint8_t i = 0; i < playerCount; i++) {
|
||||
// PlayerInfo player;
|
||||
// m_Buffer >> player.m_PlayerId >> player.m_PlayerName;
|
||||
// a_Packet.m_Players.push_back(player);
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::PlayerStats& a_Packet) {}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::PlayerStats& a_Packet) {}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::ServerConfig& a_Packet) {}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::ServerConfig& a_Packet) {}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::ServerTps& a_Packet) {}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::ServerTps& a_Packet) {}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::UpdateGameState& a_Packet) {}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::UpdateGameState& a_Packet) {}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::KeepAlive& a_Packet) {
|
||||
m_Buffer << a_Packet.m_KeepAliveId;
|
||||
}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::KeepAlive& a_Packet) {
|
||||
m_Buffer >> a_Packet.m_KeepAliveId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::Disconnect& a_Packet) {}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::Disconnect& a_Packet) {}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::ChatMessage& a_Packet) {
|
||||
m_Buffer << a_Packet.m_Text;
|
||||
}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::ChatMessage& a_Packet) {
|
||||
m_Buffer >> a_Packet.m_Text;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::PlayerPositionAndRotation& a_Packet) {
|
||||
m_Buffer << a_Packet.m_Player << a_Packet.m_Position << a_Packet.m_Rotation;
|
||||
}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::PlayerPositionAndRotation& a_Packet) {
|
||||
m_Buffer >> a_Packet.m_Player >> a_Packet.m_Position >> a_Packet.m_Rotation;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void Serializer::SerializePacketData(const data::PlayerShoot& a_Packet) {}
|
||||
|
||||
void Deserializer::DeserializePacketData(data::PlayerShoot& a_Packet) {}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
} // namespace PacketSerializer
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
11
src/blitz/protocol/PacketVisitor.cpp
Normal file
11
src/blitz/protocol/PacketVisitor.cpp
Normal file
@@ -0,0 +1,11 @@
|
||||
#include <blitz/protocol/PacketVisitor.h>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
void PacketVisitor::Check(const Packet& a_Packet) {
|
||||
a_Packet.Accept(*this);
|
||||
}
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
18
src/blitz/protocol/Packets.cpp
Normal file
18
src/blitz/protocol/Packets.cpp
Normal file
@@ -0,0 +1,18 @@
|
||||
#define BLITZ_INSTANCIATE_PACKETS
|
||||
#include <blitz/protocol/Packets.h>
|
||||
|
||||
#include <blitz/protocol/PacketVisitor.h>
|
||||
|
||||
namespace blitz {
|
||||
namespace protocol {
|
||||
|
||||
template <PacketType PT, typename Data>
|
||||
packets::ConcretePacket<PT, Data>::ConcretePacket(const PacketDataType& a_Data) : m_Data(a_Data) {}
|
||||
|
||||
template <PacketType PT, typename Data>
|
||||
void packets::ConcretePacket<PT, Data>::Accept(PacketVisitor& a_Visitor) const {
|
||||
a_Visitor.Visit(*this);
|
||||
}
|
||||
|
||||
} // namespace protocol
|
||||
} // namespace blitz
|
||||
39
src/client/ClientWorld.cpp
Normal file
39
src/client/ClientWorld.cpp
Normal file
@@ -0,0 +1,39 @@
|
||||
#include <client/ClientWorld.h>
|
||||
|
||||
#include <blitz/godot/NetworkInterface.h>
|
||||
#include <client/Player.h>
|
||||
#include <godot_cpp/classes/engine.hpp>
|
||||
#include <godot_cpp/classes/multiplayer_api.hpp>
|
||||
|
||||
namespace blitz {
|
||||
|
||||
using namespace godot;
|
||||
|
||||
void ClientWorld::_bind_methods() {}
|
||||
|
||||
ClientWorld::ClientWorld() {}
|
||||
|
||||
ClientWorld::~ClientWorld() {}
|
||||
|
||||
void ClientWorld::_process(float delta) {
|
||||
#if DEBUG_ENABLED
|
||||
if (Engine::get_singleton()->is_editor_hint())
|
||||
return;
|
||||
#endif
|
||||
m_PassedTime += delta;
|
||||
if (m_PassedTime < 0.05f)
|
||||
return;
|
||||
|
||||
|
||||
UpdatePlayerPos();
|
||||
}
|
||||
|
||||
void ClientWorld::UpdatePlayerPos() {
|
||||
Player* player = GetPlayerById(get_multiplayer()->get_unique_id());
|
||||
if (player) {
|
||||
m_NetworkInterface->BroadcastPacket(protocol::packets::PlayerPositionAndRotation(
|
||||
{get_multiplayer()->get_unique_id(), player->get_position(), player->GetCameraRotation()}));
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace blitz
|
||||
@@ -1,10 +1,12 @@
|
||||
#include "FirstPersonPlayer.h"
|
||||
#include <client/FirstPersonPlayer.h>
|
||||
|
||||
#include <godot_cpp/classes/camera3d.hpp>
|
||||
#include <godot_cpp/classes/engine.hpp>
|
||||
#include <godot_cpp/classes/input.hpp>
|
||||
#include <godot_cpp/classes/input_event_mouse_motion.hpp>
|
||||
#include <godot_cpp/classes/input_map.hpp>
|
||||
#include <godot_cpp/core/math.hpp>
|
||||
#include <godot_cpp/variant/utility_functions.hpp>
|
||||
|
||||
using namespace godot;
|
||||
|
||||
@@ -32,6 +34,9 @@ static constexpr float FOV_TRANSITION = 8.0f;
|
||||
static constexpr float MIN_FOV_VELOCITY = 0.5;
|
||||
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() {}
|
||||
|
||||
FirstPersonPlayer::FirstPersonPlayer() : m_BobTime(0) {}
|
||||
@@ -44,9 +49,9 @@ void FirstPersonPlayer::_ready() {
|
||||
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
|
||||
}
|
||||
m_Head = Object::cast_to<Node3D>(find_child("Head"));
|
||||
DEV_ASSERT(m_Head);
|
||||
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) {
|
||||
@@ -84,6 +89,8 @@ void FirstPersonPlayer::_physics_process(float a_Delta) {
|
||||
UpdateFOV(a_Delta);
|
||||
UpdateBobbing(a_Delta);
|
||||
|
||||
UpdateAnimation(a_Delta);
|
||||
|
||||
move_and_slide();
|
||||
}
|
||||
|
||||
@@ -98,10 +105,11 @@ void FirstPersonPlayer::UpdateBobbing(float a_Delta) {
|
||||
|
||||
void FirstPersonPlayer::UpdateCamera(const InputEventMouseMotion& a_Event) {
|
||||
m_Head->rotate_y(-a_Event.get_relative().x * SENSITIVITY);
|
||||
m_Mesh->rotate_y(-a_Event.get_relative().x * SENSITIVITY);
|
||||
m_Camera->rotate_x(-a_Event.get_relative().y * SENSITIVITY);
|
||||
|
||||
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});
|
||||
}
|
||||
|
||||
@@ -128,6 +136,14 @@ void FirstPersonPlayer::UpdatePosition(float delta) {
|
||||
Math::lerp(static_cast<float>(get_velocity().z), static_cast<float>(direction.z * m_Speed),
|
||||
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) {
|
||||
@@ -136,4 +152,25 @@ void FirstPersonPlayer::UpdateFOV(float a_Delta) {
|
||||
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
|
||||
42
src/client/Main.cpp
Normal file
42
src/client/Main.cpp
Normal file
@@ -0,0 +1,42 @@
|
||||
#include <client/Main.h>
|
||||
|
||||
#include <godot_cpp/classes/engine.hpp>
|
||||
#include <godot_cpp/classes/packed_scene.hpp>
|
||||
#include <godot_cpp/classes/resource_loader.hpp>
|
||||
#include <godot_cpp/classes/scene_tree.hpp>
|
||||
#include <godot_cpp/classes/window.hpp>
|
||||
#include <godot_cpp/variant/utility_functions.hpp>
|
||||
|
||||
#include <client/ClientWorld.h>
|
||||
#include <server/ServerWorld.h>
|
||||
|
||||
using namespace godot;
|
||||
|
||||
namespace blitz {
|
||||
|
||||
static constexpr char ClientWorldScenePath[] = "res://Scenes/Levels/client_world.tscn";
|
||||
static constexpr char ServerWorldScenePath[] = "res://Scenes/Levels/server_world.tscn";
|
||||
|
||||
void Main::_bind_methods() {}
|
||||
|
||||
void Main::_ready() {
|
||||
auto* mainMenu = find_child("MainMenu");
|
||||
DEV_ASSERT(mainMenu);
|
||||
mainMenu->connect("change_scene_to_game", callable_mp(this, &Main::ChangeScene));
|
||||
}
|
||||
|
||||
Main::Main() {}
|
||||
|
||||
Main::~Main() {}
|
||||
|
||||
void Main::ChangeScene(bool a_Server) {
|
||||
Ref<PackedScene> sceneData;
|
||||
if (a_Server)
|
||||
sceneData = ResourceLoader::get_singleton()->load(ServerWorldScenePath);
|
||||
else
|
||||
sceneData = ResourceLoader::get_singleton()->load(ClientWorldScenePath);
|
||||
|
||||
add_child(sceneData->instantiate());
|
||||
}
|
||||
|
||||
} // namespace blitz
|
||||
81
src/client/MainMenu.cpp
Normal file
81
src/client/MainMenu.cpp
Normal file
@@ -0,0 +1,81 @@
|
||||
#include <client/MainMenu.h>
|
||||
|
||||
#include <godot_cpp/classes/engine.hpp>
|
||||
#include <godot_cpp/classes/multiplayer_api.hpp>
|
||||
#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("change_scene_to_game", PropertyInfo(Variant::BOOL, "server")));
|
||||
}
|
||||
|
||||
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));
|
||||
|
||||
|
||||
if (!Engine::get_singleton()->is_editor_hint()) {
|
||||
m_NetworkInterface = Object::cast_to<NetworkInterface>(get_parent()->find_child("Network"));
|
||||
DEV_ASSERT(m_NetworkInterface);
|
||||
|
||||
m_NetworkInterface->connect("local_player_connected", callable_mp(this, &MainMenu::OnConnected));
|
||||
m_NetworkInterface->connect("server_disconnected", callable_mp(this, &MainMenu::OnDisconnected));
|
||||
}
|
||||
}
|
||||
|
||||
void MainMenu::OnConnected() {
|
||||
emit_signal("change_scene_to_game", get_multiplayer()->is_server());
|
||||
set_visible(false);
|
||||
}
|
||||
|
||||
void MainMenu::OnDisconnected() {
|
||||
set_visible(true);
|
||||
EnableButtons();
|
||||
}
|
||||
|
||||
void MainMenu::OnJoinPressed() {
|
||||
DisableButtons();
|
||||
m_NetworkInterface->JoinGame("localhost", 25565);
|
||||
}
|
||||
|
||||
void MainMenu::OnCreatePressed() {
|
||||
DisableButtons();
|
||||
m_NetworkInterface->CreateGame(25565);
|
||||
}
|
||||
|
||||
void MainMenu::OnQuitPressed() {
|
||||
get_tree()->quit();
|
||||
}
|
||||
|
||||
void MainMenu::DisableButtons() {
|
||||
m_JoinButton->set_disabled(true);
|
||||
m_CreateButton->set_disabled(true);
|
||||
}
|
||||
|
||||
void MainMenu::EnableButtons() {
|
||||
m_JoinButton->set_disabled(false);
|
||||
m_CreateButton->set_disabled(false);
|
||||
}
|
||||
|
||||
} // namespace blitz
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "Player.h"
|
||||
#include <client/Player.h>
|
||||
|
||||
#include <godot_cpp/classes/engine.hpp>
|
||||
#include <godot_cpp/classes/input.hpp>
|
||||
@@ -16,18 +16,19 @@ static const float AnimationBlend = 7.0;
|
||||
|
||||
namespace blitz {
|
||||
|
||||
using namespace godot;
|
||||
|
||||
void Player::_bind_methods() {}
|
||||
|
||||
Player::Player() {}
|
||||
|
||||
Player::~Player() {}
|
||||
|
||||
void Player::_ready() {
|
||||
godot::InputMap::get_singleton()->load_from_project_settings();
|
||||
m_PlayerMesh = Object::cast_to<godot::Node3D>(get_child(0));
|
||||
m_SpringArmPivot = Object::cast_to<godot::Node3D>(get_child(2));
|
||||
m_AnimationTree = Object::cast_to<godot::AnimationTree>(get_child(4));
|
||||
DEV_ASSERT(m_PlayerMesh);
|
||||
DEV_ASSERT(m_SpringArmPivot);
|
||||
m_Mesh = Object::cast_to<godot::Node3D>(find_child("Mesh"));
|
||||
m_AnimationTree = Object::cast_to<godot::AnimationTree>(find_child("AnimationTree"));
|
||||
DEV_ASSERT(m_Mesh);
|
||||
DEV_ASSERT(m_AnimationTree);
|
||||
|
||||
apply_floor_snap();
|
||||
@@ -38,50 +39,6 @@ void Player::_physics_process(float delta) {
|
||||
if (godot::Engine::get_singleton()->is_editor_hint())
|
||||
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();
|
||||
move_and_slide();
|
||||
animate(delta);
|
||||
}
|
||||
|
||||
@@ -108,4 +65,13 @@ void Player::animate(float delta) {
|
||||
m_AnimationTree->set("parameters/ground_air_transition/transition_request", "air");
|
||||
}
|
||||
}
|
||||
|
||||
Vector3 Player::GetCameraRotation() const {
|
||||
return m_Mesh->get_rotation();
|
||||
}
|
||||
|
||||
void Player::SetCameraRotation(const Vector3& a_Rotation) {
|
||||
m_Mesh->set_rotation(a_Rotation);
|
||||
}
|
||||
|
||||
} // namespace blitz
|
||||
51
src/client/register_types.cpp
Normal file
51
src/client/register_types.cpp
Normal file
@@ -0,0 +1,51 @@
|
||||
#include <blitz/godot/NetworkInterface.h>
|
||||
#include <client/ClientWorld.h>
|
||||
#include <client/FirstPersonPlayer.h>
|
||||
#include <client/Main.h>
|
||||
#include <client/MainMenu.h>
|
||||
#include <client/Player.h>
|
||||
#include <server/Server.h>
|
||||
#include <server/ServerWorld.h>
|
||||
|
||||
#include <gdextension_interface.h>
|
||||
#include <godot_cpp/core/defs.hpp>
|
||||
#include <godot_cpp/godot.hpp>
|
||||
|
||||
using namespace godot;
|
||||
|
||||
static void RegisterClasses() {
|
||||
GDREGISTER_CLASS(blitz::Player);
|
||||
GDREGISTER_CLASS(blitz::FirstPersonPlayer);
|
||||
GDREGISTER_CLASS(blitz::MainMenu);
|
||||
GDREGISTER_CLASS(blitz::Main);
|
||||
GDREGISTER_CLASS(blitz::NetworkInterface);
|
||||
GDREGISTER_CLASS(blitz::Server);
|
||||
GDREGISTER_ABSTRACT_CLASS(blitz::World);
|
||||
GDREGISTER_CLASS(blitz::ClientWorld);
|
||||
GDREGISTER_CLASS(blitz::ServerWorld);
|
||||
}
|
||||
|
||||
static void initialize_blitz_module(ModuleInitializationLevel p_level) {
|
||||
if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
|
||||
return;
|
||||
}
|
||||
|
||||
RegisterClasses();
|
||||
}
|
||||
|
||||
static void uninitialize_blitz_module(ModuleInitializationLevel p_level) {
|
||||
if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" GDExtensionBool GDE_EXPORT library_init(GDExtensionInterfaceGetProcAddress p_get_proc,
|
||||
const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization* r_initialization) {
|
||||
godot::GDExtensionBinding::InitObject init_obj(p_get_proc, p_library, r_initialization);
|
||||
|
||||
init_obj.register_initializer(initialize_blitz_module);
|
||||
init_obj.register_terminator(uninitialize_blitz_module);
|
||||
init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_SCENE);
|
||||
|
||||
return init_obj.init();
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
#include "register_types.h"
|
||||
|
||||
#include "FirstPersonPlayer.h"
|
||||
#include "Player.h"
|
||||
#include "SpringArmPivot.h"
|
||||
|
||||
#include <gdextension_interface.h>
|
||||
#include <godot_cpp/core/defs.hpp>
|
||||
#include <godot_cpp/godot.hpp>
|
||||
|
||||
using namespace godot;
|
||||
|
||||
void initialize_example_module(ModuleInitializationLevel p_level) {
|
||||
if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
|
||||
return;
|
||||
}
|
||||
|
||||
ClassDB::register_class<blitz::Player>();
|
||||
ClassDB::register_class<blitz::SpringArmPivot>();
|
||||
ClassDB::register_class<blitz::FirstPersonPlayer>();
|
||||
}
|
||||
|
||||
void uninitialize_example_module(ModuleInitializationLevel p_level) {
|
||||
if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" GDExtensionBool GDE_EXPORT library_init(GDExtensionInterfaceGetProcAddress p_get_proc,
|
||||
const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization* r_initialization) {
|
||||
godot::GDExtensionBinding::InitObject init_obj(p_get_proc, p_library, r_initialization);
|
||||
|
||||
init_obj.register_initializer(initialize_example_module);
|
||||
init_obj.register_terminator(uninitialize_example_module);
|
||||
init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_SCENE);
|
||||
|
||||
return init_obj.init();
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
#ifndef GDEXAMPLE_REGISTER_TYPES_H
|
||||
#define GDEXAMPLE_REGISTER_TYPES_H
|
||||
|
||||
#include <godot_cpp/core/class_db.hpp>
|
||||
|
||||
using namespace godot;
|
||||
|
||||
void initialize_example_module(ModuleInitializationLevel p_level);
|
||||
void uninitialize_example_module(ModuleInitializationLevel p_level);
|
||||
|
||||
#endif
|
||||
42
src/server/Server.cpp
Normal file
42
src/server/Server.cpp
Normal file
@@ -0,0 +1,42 @@
|
||||
#include <server/Server.h>
|
||||
|
||||
#include <blitz/godot/NetworkInterface.h>
|
||||
#include <godot_cpp/classes/engine.hpp>
|
||||
|
||||
using namespace godot;
|
||||
|
||||
namespace blitz {
|
||||
|
||||
void Server::_bind_methods() {}
|
||||
|
||||
Server::Server() {}
|
||||
|
||||
Server::~Server() {}
|
||||
|
||||
void Server::_ready() {
|
||||
if (Engine::get_singleton()->is_editor_hint())
|
||||
return;
|
||||
|
||||
|
||||
m_NetworkInterface = Object::cast_to<NetworkInterface>(get_parent());
|
||||
DEV_ASSERT(m_NetworkInterface);
|
||||
|
||||
m_NetworkInterface->connect("player_connected", callable_mp(this, &Server::OnPlayerConnect));
|
||||
m_NetworkInterface->connect("player_disconnected", callable_mp(this, &Server::OnPlayerDisconnect));
|
||||
}
|
||||
|
||||
void Server::OnPlayerConnect(PeerID a_PeerId) {
|
||||
protocol::PlayerInfo playerInfo{a_PeerId, "whoami"};
|
||||
for (int i = 0; i < m_Peers.size(); i++) {
|
||||
m_NetworkInterface->SendPacket(a_PeerId, protocol::packets::PlayerJoin({m_Peers[i], "whoami"}));
|
||||
}
|
||||
m_Peers.push_back(a_PeerId);
|
||||
m_NetworkInterface->BroadcastPacket(protocol::packets::PlayerJoin({playerInfo}));
|
||||
}
|
||||
|
||||
void Server::OnPlayerDisconnect(PeerID a_PeerId) {
|
||||
m_Peers.erase(a_PeerId);
|
||||
m_NetworkInterface->BroadcastPacket(protocol::packets::PlayerLeave({a_PeerId}));
|
||||
}
|
||||
|
||||
} // namespace blitz
|
||||
38
src/server/ServerWorld.cpp
Normal file
38
src/server/ServerWorld.cpp
Normal file
@@ -0,0 +1,38 @@
|
||||
#include <server/ServerWorld.h>
|
||||
|
||||
#include <blitz/godot/NetworkInterface.h>
|
||||
#include <client/Player.h>
|
||||
#include <godot_cpp/classes/engine.hpp>
|
||||
|
||||
namespace blitz {
|
||||
|
||||
using namespace godot;
|
||||
|
||||
void ServerWorld::_bind_methods() {}
|
||||
|
||||
ServerWorld::ServerWorld() {}
|
||||
|
||||
ServerWorld::~ServerWorld() {}
|
||||
|
||||
void ServerWorld::_process(float delta) {
|
||||
#if DEBUG_ENABLED
|
||||
if (Engine::get_singleton()->is_editor_hint())
|
||||
return;
|
||||
#endif
|
||||
m_PassedTime += delta;
|
||||
if (m_PassedTime < 0.05f)
|
||||
return;
|
||||
|
||||
SyncPlayersPos();
|
||||
}
|
||||
|
||||
void ServerWorld::SyncPlayersPos() {
|
||||
for (int i = 0; i < m_Players->get_child_count(); i++) {
|
||||
Player* player = Object::cast_to<Player>(m_Players->get_child(i));
|
||||
DEV_ASSERT(player);
|
||||
m_NetworkInterface->BroadcastPacket(
|
||||
protocol::packets::PlayerPositionAndRotation({player->GetId(), player->get_position(), player->GetCameraRotation()}));
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace blitz
|
||||
@@ -16,7 +16,7 @@ add_rules("mode.debug", "mode.release")
|
||||
set_languages("c++20")
|
||||
|
||||
-- use latest 4.x version by default
|
||||
add_requires("godotcpp4")
|
||||
add_requires("godotcpp4 4.2")
|
||||
|
||||
|
||||
includes("tasks.lua")
|
||||
|
||||
@@ -14,6 +14,8 @@ target(PROJECT_NAME)
|
||||
-- more on https://xmake.io/#/manual/project_target?id=targetadd_files
|
||||
add_files("../src/**.cpp")
|
||||
|
||||
add_includedirs("../include")
|
||||
|
||||
-- change the output name
|
||||
set_basename(PROJECT_NAME .. ".$(os)_$(mode)_$(arch)")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user