zhenyan121/Cubed
1
0
Fork 0
mirror of https://github.com/zhenyan121/Cubed.git synced 2026-06-18 00:27:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add Spectator Mode

Browse Source
This commit is contained in:
zhenyan121
2026-04-18 20:01:29 +08:00
parent 0a0024361d
commit ca82d6a447
6 changed files with 100 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app.cpp
View File

@@ -39,7 +39,7 @@ void App::init() {
glfwSetWindowFocusCallback(m_window.get_glfw_window(), window_focus_callback);
glfwSetWindowSizeCallback(m_window.get_glfw_window(), window_reshape_callback);
glfwSetKeyCallback(m_window.get_glfw_window(), key_callback);
glfwSetScrollCallback(m_window.get_glfw_window(), mouse_scroll_callback);
PerlinNoise::init();
m_renderer.init();
@@ -132,7 +132,11 @@ void App::window_reshape_callback(GLFWwindow* window, int new_width, int new_hei
app->m_window.update_viewport();
}
void App::mouse_scroll_callback(GLFWwindow* window, double xoffset, double yoffset) {
App* app = static_cast<App*>(glfwGetWindowUserPointer(window));
auto& player = app->m_world.get_player("TestPlayer");
player.update_scroll(yoffset);
}
void App::render() {

6
src/debug_collector.cpp
View File

@@ -22,6 +22,7 @@ void DebugCollector::init_text() {
Text gpu_text("gpu");
Text opengl_version_text("opengl_version");
Text biome_text("biome");
Text speed_text("speed");
version_text
.position(0.0f, 100.0f)
.scale(0.8f)
@@ -73,6 +74,10 @@ void DebugCollector::init_text() {
.text("Biome: ")
.scale(0.8f)
.position(0.0f, 500.0f);
speed_text
.text("Speed: 0 m/s")
.scale(0.8f)
.position(0.0f, 550.0f);
m_texts.insert({version_text.uuid(), std::move(version_text)});
m_texts.insert({fps_text.uuid(), std::move(fps_text)});
m_texts.insert({player_pos_text.uuid(), std::move(player_pos_text)});
@@ -83,6 +88,7 @@ void DebugCollector::init_text() {
m_texts.insert({gpu_text.uuid(), std::move(gpu_text)});
m_texts.insert({opengl_version_text.uuid(), std::move(opengl_version_text)});
m_texts.insert({biome_text.uuid(), std::move(biome_text)});
m_texts.insert({speed_text.uuid(), std::move(speed_text)});
}
std::unordered_map<std::size_t, Text>& DebugCollector::all_texts() {

75
src/gameplay/player.cpp
View File

@@ -7,7 +7,6 @@
#include <Cubed/tools/log.hpp>
#include <GLFW/glfw3.h>
Player::Player(World& world, const std::string& name) :
m_world(world),
m_name(name)
@@ -131,19 +130,34 @@ bool Player::ray_cast(const glm::vec3& start, const glm::vec3& front, glm::ivec3
return false;
}
void Player::change_mode(GameMode mode) {
m_game_mode = mode;
Logger::info("Change GameMode to {}", to_str(mode));
if (mode == CREATIVE) {
is_fly = false;
m_gait = Gait::WALK;
} else if (mode == SPECTATOR) {
is_fly = true;
m_gait = Gait::RUN;
}
}
void Player::set_player_pos(const glm::vec3& pos) {
m_player_pos = pos;
}
void Player::update(float delta_time) {
update_move(delta_time);
update_lookup_block();
check_player_chunk_transition();
std::string player_pos = std::format("x: {:.2f} y: {:.2f} z: {:.2f}", m_player_pos.x, m_player_pos.y, m_player_pos.z);
DebugCollector::get().report("player_pos", player_pos);
DebugCollector::get().report("player_pos",
std::format("x: {:.2f} y: {:.2f} z: {:.2f}",
m_player_pos.x, m_player_pos.y, m_player_pos.z
));
DebugCollector::get().report("speed", std::format("Speed: {:.2} m/s", speed));
}
void Player::update_player_move_state(int key, int action) {
@@ -154,7 +168,10 @@ void Player::update_player_move_state(int key, int action) {
}
if (action == GLFW_RELEASE) {
m_move_state.forward = false;
m_gait = Gait::WALK;
if (m_game_mode != SPECTATOR) {
m_gait = Gait::WALK;
}
}
break;
case GLFW_KEY_S:
@@ -185,8 +202,10 @@ void Player::update_player_move_state(int key, int action) {
if (action == GLFW_PRESS) {
m_move_state.up = true;
if (space_on) {
is_fly = !is_fly ? true : false;
y_speed = 0.0f;
if (m_game_mode == CREATIVE) {
is_fly = !is_fly ? true : false;
y_speed = 0.0f;
}
space_on = false;
space_on_time = 0.0f;
} else {
@@ -210,6 +229,15 @@ void Player::update_player_move_state(int key, int action) {
m_gait = Gait::RUN;
}
break;
case GLFW_KEY_F4:
if (action == GLFW_PRESS) {
if (m_game_mode == CREATIVE) {
change_mode(SPECTATOR);
} else {
change_mode(CREATIVE);
}
}
break;
}
}
@@ -318,11 +346,13 @@ void Player::update_move(float delta_time) {
if (delta_time > 1.0f) {
return;
}
if (m_gait == Gait::RUN) {
max_speed = RUN_SPEED;
}
if (m_gait == Gait::WALK) {
max_speed = WALK_SPEED;
if (m_game_mode != SPECTATOR) {
if (m_gait == Gait::RUN) {
max_speed = RUN_SPEED;
}
if (m_gait == Gait::WALK) {
max_speed = WALK_SPEED;
}
}
if (space_on) {
@@ -391,6 +421,9 @@ void Player::update_move(float delta_time) {
void Player::update_x_move() {
m_player_pos.x += move_distance.x;
if (m_game_mode == SPECTATOR) {
return;
}
AABB player_box = get_aabb();
int minx = std::floor(player_box.min.x);
int maxx = std::floor(player_box.max.x);
@@ -420,6 +453,9 @@ void Player::update_x_move() {
void Player::update_y_move() {
m_player_pos.y += move_distance.y;
if (m_game_mode == SPECTATOR) {
return;
}
AABB player_box = get_aabb();
int minx = std::floor(player_box.min.x);
int maxx = std::floor(player_box.max.x);
@@ -453,6 +489,9 @@ void Player::update_y_move() {
void Player::update_z_move() {
m_player_pos.z += move_distance.z;
if (m_game_mode == SPECTATOR) {
return;
}
AABB player_box = get_aabb();
int minx = std::floor(player_box.min.x);
int maxx = std::floor(player_box.max.x);
@@ -478,4 +517,16 @@ void Player::update_z_move() {
}
}
}
}
void Player::update_scroll(double yoffset) {
if (m_game_mode == SPECTATOR) {
if (yoffset > 0) {
max_speed += 1.0f;
} else {
if (max_speed > WALK_SPEED) {
max_speed -= 1.0f;
}
}
}
}