Skip to content

Commit 44de468

Browse files
vittorioromeovittorioromeo
committed
adapt to newest sfml
1 parent 88ade05 commit 44de468

19 files changed

+202
-82
lines changed

‎CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ set(SFML_ENABLE_PCH true)
9797
CPMAddPackage(
9898
NAME SFML
9999
GITHUB_REPOSITORY vittorioromeo/SFML
100-
GIT_TAG 0608821ff4e8de462d5aa44343df42d989f8102a
100+
GIT_TAG dd0cc60de5f07f4180821db9b3f89fbc15cdf03f
101101
)
102102

103103
set_target_properties(sfml-system PROPERTIES UNITY_BUILD ON)
@@ -201,7 +201,7 @@ if(NOT SSVOH_ANDROID)
201201
CPMAddPackage(
202202
NAME imgui-sfml
203203
GITHUB_REPOSITORY vittorioromeo/imgui-sfml
204-
GIT_TAG 32b2c1588b78b2946f8c7c61420fbd8a45ae4e9c
204+
GIT_TAG d65ebaba593dbda0353aab99ace9b895788f727d
205205
)
206206

207207
set_target_properties(ImGui-SFML PROPERTIES UNITY_BUILD ON)

‎build/r_gdb.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
(cp ./SSVOpenHexagon-Console.exe ../_RELEASE ; cd ../_RELEASE && gdb -- ./SSVOpenHexagon-Console.exe "$@")
2+
(cp ./SSVOpenHexagon.exe ../_RELEASE ; cd ../_RELEASE && gdb -- ./SSVOpenHexagon.exe "$@")

‎include/SSVOpenHexagon/Components/CWall.hpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
#include "SSVOpenHexagon/Utils/FastVertexVector.hpp"
1010

1111
#include <SFML/System/Vector2.hpp>
12+
#include <SFML/Base/Math/Cos.hpp>
13+
#include <SFML/Base/Math/Sin.hpp>
1214

1315
#include <array>
1416
#include <cstdint>
@@ -63,7 +65,7 @@ class CWall
6365
const float rad = getCurveRadians(ft);
6466

6567
moveVertexAlongCurveImpl(
66-
vertex, centerPos, std::sin(rad), std::cos(rad));
68+
vertex, centerPos, sf::base::sin(rad), sf::base::cos(rad));
6769
}
6870

6971
void draw(sf::Color color, Utils::FastVertexVectorTris& wallQuads);

‎include/SSVOpenHexagon/Core/HexagonGame.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <SFML/Graphics/Text.hpp>
3434
#include <SFML/Graphics/Texture.hpp>
3535

36-
#include <SFML/Window/GraphicsContext.hpp>
36+
#include <SFML/Graphics/GraphicsContext.hpp>
3737

3838
#include <SFML/System/Vector2.hpp>
3939
#include <SFML/System/Clock.hpp>

‎include/SSVOpenHexagon/Core/HexagonServer.hpp

+3-15
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,8 @@ class HexagonServer
9393

9494
std::optional<GameStatus> _gameStatus;
9595

96-
explicit ConnectedClient(const Utils::SCTimePoint lastActivity)
97-
: _socket{},
98-
_lastActivity{lastActivity},
99-
_consecutiveFailures{0},
100-
_mustDisconnect{false},
101-
_clientPublicKey{},
102-
_loginData{},
103-
_state{State::Disconnected}
104-
{}
105-
106-
~ConnectedClient()
107-
{
108-
_socket.disconnect();
109-
}
96+
explicit ConnectedClient(const Utils::SCTimePoint lastActivity);
97+
~ConnectedClient();
11098
};
11199

112100
std::list<ConnectedClient> _connectedClients;
@@ -156,7 +144,7 @@ class HexagonServer
156144
const ProtocolVersion& protocolVersion, const GameVersion& gameVersion,
157145
const std::vector<std::string>& supportedLevelValidators);
158146

159-
void kickAndRemoveClient(ConnectedClient& c);
147+
[[nodiscard]] bool kickAndRemoveClient(ConnectedClient& c);
160148

161149
void run();
162150
void runIteration();

‎include/SSVOpenHexagon/Core/MenuGame.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <SFML/Graphics/Text.hpp>
2727
#include <SFML/Graphics/Texture.hpp>
2828

29-
#include <SFML/Window/GraphicsContext.hpp>
29+
#include <SFML/Graphics/GraphicsContext.hpp>
3030

3131
#include <SFML/System/Vector2.hpp>
3232

‎include/SSVOpenHexagon/Global/PCH.hpp

+38-5
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,44 @@
129129
// SFML
130130
// ----------------------------------------------------------------------------
131131

132-
#include <SFML/Audio.hpp>
133-
#include <SFML/Graphics.hpp>
134-
#include <SFML/Network.hpp>
135-
#include <SFML/System.hpp>
136-
#include <SFML/Window.hpp>
132+
#include <SFML/Audio/Music.hpp>
133+
#include <SFML/Audio/PlaybackDevice.hpp>
134+
#include <SFML/Audio/SoundBuffer.hpp>
135+
136+
#include <SFML/Base/Optional.hpp>
137+
138+
#include <SFML/Graphics/Color.hpp>
139+
#include <SFML/Graphics/Font.hpp>
140+
#include <SFML/Graphics/Glsl.hpp>
141+
#include <SFML/Graphics/GraphicsContext.hpp>
142+
#include <SFML/Graphics/Image.hpp>
143+
#include <SFML/Graphics/RectangleShape.hpp>
144+
#include <SFML/Graphics/RenderStates.hpp>
145+
#include <SFML/Graphics/RenderTexture.hpp>
146+
#include <SFML/Graphics/Shader.hpp>
147+
#include <SFML/Graphics/Sprite.hpp>
148+
#include <SFML/Graphics/Text.hpp>
149+
#include <SFML/Graphics/Texture.hpp>
150+
151+
#include <SFML/Network/IpAddress.hpp>
152+
#include <SFML/Network/IpAddress.hpp>
153+
#include <SFML/Network/Packet.hpp>
154+
#include <SFML/Network/Packet.hpp>
155+
#include <SFML/Network/TcpListener.hpp>
156+
#include <SFML/Network/TcpListener.hpp>
157+
#include <SFML/Network/TcpSocket.hpp>
158+
#include <SFML/Network/TcpSocket.hpp>
159+
#include <SFML/Network/UdpSocket.hpp>
160+
#include <SFML/Network/UdpSocket.hpp>
161+
162+
#include <SFML/System/Angle.hpp>
163+
#include <SFML/System/Vector2.hpp>
164+
165+
#include <SFML/Window/Joystick.hpp>
166+
#include <SFML/Window/Keyboard.hpp>
167+
#include <SFML/Window/Mouse.hpp>
168+
#include <SFML/Window/VideoMode.hpp>
169+
#include <SFML/Window/VideoModeUtils.hpp>
137170

138171
//
139172
//

‎src/OHServerControl/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ int main(int argc, char* argv[])
3131

3232
std::string stringBuf;
3333
sf::Packet packet;
34-
sf::UdpSocket controlSocket;
34+
sf::UdpSocket controlSocket(true /* isBlocking */);
3535

3636
const auto sendToServer = [&]
3737
{

‎src/SSVOpenHexagon/Core/HGUpdate.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -1029,8 +1029,8 @@ void HexagonGame::updateTrailParticles(float mFT)
10291029

10301030
p.sprite.setScale(p.sprite.getScale() * 0.98f);
10311031

1032-
p.sprite.setPosition(
1033-
sf::Vector2f::fromAngle(status.radius + 2.4f, sf::radians(p.angle)));
1032+
p.sprite.setPosition(sf::Vector2f::fromAngle(
1033+
status.radius + 2.4f, sf::radians(p.angle)));
10341034
}
10351035

10361036
if (player.hasChangedAngle())
@@ -1064,8 +1064,9 @@ void HexagonGame::updateSwapParticles(float mFT)
10641064
c.a = alpha;
10651065
p.sprite.setColor(c);
10661066

1067-
p.velocity = sf::Vector2f::fromAngle(ssvu::getRndR(0.1f, 10.f) * speedMult,
1068-
sf::radians(si.angle + ssvu::getRndR(-expand, expand)));
1067+
p.velocity =
1068+
sf::Vector2f::fromAngle(ssvu::getRndR(0.1f, 10.f) * speedMult,
1069+
sf::radians(si.angle + ssvu::getRndR(-expand, expand)));
10691070

10701071
return p;
10711072
};

‎src/SSVOpenHexagon/Core/HexagonClient.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ HexagonClient::HexagonClient(Steam::steam_manager& steamManager,
440440
_ticketSteamID{},
441441
_serverIp{serverIp},
442442
_serverPort{serverPort},
443-
_socket{},
443+
_socket{true /* isBlocking */},
444444
_socketConnected{false},
445445
_packetBuffer{},
446446
_errorOss{},
@@ -497,7 +497,11 @@ void HexagonClient::disconnect()
497497
(void)sendDisconnect();
498498
}
499499

500-
_socket.disconnect();
500+
if (!_socket.disconnect())
501+
{
502+
SSVOH_CLOG << "Failure disconnecting client socket\n";
503+
}
504+
501505
_socketConnected = false;
502506

503507
SSVOH_CLOG << "Client disconnected\n";

0 commit comments

Comments
 (0)