fixed player spawn point

This commit is contained in:
MihailRis
2024-01-23 01:44:16 +03:00
parent b4bf0dd0f7
commit 4fe79458ab
3 changed files with 78 additions and 26 deletions
+29
View File
@@ -117,12 +117,33 @@ void Player::update(
input.noclip = false;
input.flight = false;
if (spawnpoint.y <= 0.1) {
attemptToFindSpawnpoint(level);
}
}
void Player::teleport(glm::vec3 position) {
hitbox->position = position;
}
void Player::attemptToFindSpawnpoint(Level* level) {
glm::vec3 ppos = hitbox->position;
glm::vec3 newpos {ppos.x + (rand() % 200 - 100),
rand() % 80 + 100,
ppos.z + (rand() % 200 - 100)};
while (newpos.y > 0 && !level->chunks->isObstacleBlock(newpos.x, newpos.y-2, newpos.z)) {
newpos.y--;
}
voxel* headvox = level->chunks->get(newpos.x, newpos.y+1, newpos.z);
if (level->chunks->isObstacleBlock(newpos.x, newpos.y, newpos.z) ||
headvox == nullptr || headvox->id != 0)
return;
spawnpoint = newpos;
teleport(spawnpoint);
}
void Player::setChosenSlot(int index) {
chosenSlot = index;
}
@@ -138,3 +159,11 @@ float Player::getSpeed() const {
std::shared_ptr<Inventory> Player::getInventory() const {
return inventory;
}
void Player::setSpawnPoint(glm::vec3 spawnpoint) {
this->spawnpoint = spawnpoint;
}
glm::vec3 Player::getSpawnPoint() const {
return spawnpoint;
}
+31 -25
View File
@@ -15,47 +15,53 @@ class Chunks;
class Level;
struct PlayerInput {
bool zoom;
bool cameraMode;
bool moveForward;
bool moveBack;
bool moveRight;
bool moveLeft;
bool sprint;
bool shift;
bool cheat;
bool jump;
bool noclip;
bool flight;
bool zoom;
bool cameraMode;
bool moveForward;
bool moveBack;
bool moveRight;
bool moveLeft;
bool sprint;
bool shift;
bool cheat;
bool jump;
bool noclip;
bool flight;
};
class Player {
float speed;
float speed;
int chosenSlot;
glm::vec3 spawnpoint {};
public:
std::shared_ptr<Camera> camera, spCamera, tpCamera;
std::shared_ptr<Camera> camera, spCamera, tpCamera;
std::shared_ptr<Camera> currentCamera;
std::unique_ptr<Hitbox> hitbox;
std::unique_ptr<Hitbox> hitbox;
std::shared_ptr<Inventory> inventory;
bool flight = false;
bool noclip = false;
bool debug = false;
voxel selectedVoxel {0, 0};
bool flight = false;
bool noclip = false;
bool debug = false;
voxel selectedVoxel {0, 0};
glm::vec2 cam = {};
glm::vec2 cam = {};
Player(glm::vec3 position, float speed);
~Player();
Player(glm::vec3 position, float speed);
~Player();
void teleport(glm::vec3 position);
void update(Level* level, PlayerInput& input, float delta);
void teleport(glm::vec3 position);
void update(Level* level, PlayerInput& input, float delta);
void attemptToFindSpawnpoint(Level* level);
void setChosenSlot(int index);
int getChosenSlot() const;
float getSpeed() const;
float getSpeed() const;
std::shared_ptr<Inventory> getInventory() const;
void setSpawnPoint(glm::vec3 point);
glm::vec3 getSpawnPoint() const;
};
#endif /* SRC_OBJECTS_PLAYER_H_ */