Unarelith/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ClientPlayer] Temporary fix for MinGW.

Browse Source
This commit is contained in:
Quentin Bazin 2020-02-18 00:04:29 +09:00
parent d47d5d39e4
commit e5b5ba9568
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/source/world/ClientPlayer.cpp
View File

@ -35,7 +35,7 @@ ClientPlayer *ClientPlayer::s_instance = nullptr;
ClientPlayer::ClientPlayer(gk::Camera &camera) : m_camera(camera) {
// FIXME: Warning: Duplicated in ServerCommandHandler.hpp
m_x = 12;
m_y = 18;
m_y = 20;
m_z = 12;
m_angleH = -90.0;
@ -146,6 +146,19 @@ void ClientPlayer::updatePosition(const ClientWorld &world) {
}
void ClientPlayer::checkCollisions(const ClientWorld &world) {
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(__ANDROID__)
const float PLAYER_HEIGHT = 1.8;
float eyeheight = m_y + PLAYER_HEIGHT - 1.4;
// testPoint(world, glm::vec3(m_x, m_y, m_z), m_velocity);
testPoint(world, m_x - 0.2, eyeheight - PLAYER_HEIGHT - 0.4, m_z - 0.2, m_velocity);
testPoint(world, m_x + 0.2, eyeheight - PLAYER_HEIGHT - 0.4, m_z - 0.2, m_velocity);
testPoint(world, m_x - 0.2, eyeheight - PLAYER_HEIGHT - 0.4, m_z + 0.2, m_velocity);
testPoint(world, m_x + 0.2, eyeheight - PLAYER_HEIGHT - 0.4, m_z + 0.2, m_velocity);
testPoint(world, m_x - 0.2, eyeheight - 0.4, m_z - 0.2, m_velocity);
testPoint(world, m_x + 0.2, eyeheight - 0.4, m_z - 0.2, m_velocity);
testPoint(world, m_x - 0.2, eyeheight - 0.4, m_z + 0.2, m_velocity);
testPoint(world, m_x + 0.2, eyeheight - 0.4, m_z + 0.2, m_velocity);
#else
for (float x = m_x + m_hitbox.x ; x <= m_x + m_hitbox.x + m_hitbox.width + 0.1f ; x += 0.2f) {
for (float y = m_y + m_hitbox.y ; y <= m_y + m_hitbox.y + m_hitbox.height + 0.1f ; y += 0.9f) {
for (float z = m_z + m_hitbox.z ; z <= m_z + m_hitbox.z + m_hitbox.depth + 0.1f ; z += 0.2f) {
@ -156,6 +169,7 @@ void ClientPlayer::checkCollisions(const ClientWorld &world) {
}
}
}
#endif
}
bool passable(const ClientWorld &world, float x, float y, float z) {

2
server/include/network/ServerCommandHandler.hpp
View File

@ -60,7 +60,7 @@ class ServerCommandHandler {
Registry &m_registry;
// FIXME: Warning: Duplicated in ClientPlayer.cpp
gk::Vector3<s32> m_spawnPosition{12, 18, 12};
gk::Vector3<s32> m_spawnPosition{12, 20, 12};
};
#endif // SERVERCOMMANDHANDLER_HPP_