mirror of
https://github.com/griffi-gh/kubi.git
synced 2024-12-26 05:38:20 -06:00
add chat
This commit is contained in:
parent
ee6a5dd2f9
commit
09af18dda0
|
@ -43,6 +43,7 @@ fn need_perspective_calc(
|
||||||
pub fn update_matrices() -> Workload {
|
pub fn update_matrices() -> Workload {
|
||||||
(
|
(
|
||||||
update_view_matrix,
|
update_view_matrix,
|
||||||
|
//update_perspective_matrix,
|
||||||
update_perspective_matrix.run_if(need_perspective_calc),
|
update_perspective_matrix.run_if(need_perspective_calc),
|
||||||
).into_sequential_workload()
|
).into_sequential_workload()
|
||||||
}
|
}
|
||||||
|
|
54
kubi/src/chat.rs
Normal file
54
kubi/src/chat.rs
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
use shipyard::{AllStoragesView, Unique, UniqueViewMut};
|
||||||
|
|
||||||
|
pub enum ChatMessage {
|
||||||
|
PlayerMessage {
|
||||||
|
username: String,
|
||||||
|
message: String,
|
||||||
|
},
|
||||||
|
PlayerJoin {
|
||||||
|
username: String,
|
||||||
|
},
|
||||||
|
PlayerLeave {
|
||||||
|
username: String,
|
||||||
|
},
|
||||||
|
System(String),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Unique, Default)]
|
||||||
|
pub struct ChatManager {
|
||||||
|
pub messages: Vec<ChatMessage>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ChatManager {
|
||||||
|
pub fn add_message(&mut self, message: ChatMessage) {
|
||||||
|
self.messages.push(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn add_chat_message(&mut self, username: String, message: String,) {
|
||||||
|
self.messages.push(ChatMessage::PlayerMessage { username, message });
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn add_player_join(&mut self, username: String) {
|
||||||
|
self.messages.push(ChatMessage::PlayerJoin { username });
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn add_player_leave(&mut self, username: String) {
|
||||||
|
self.messages.push(ChatMessage::PlayerLeave { username });
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn add_system_message(&mut self, message: String) {
|
||||||
|
self.messages.push(ChatMessage::System(message));
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_messages(&self) -> &[ChatMessage] {
|
||||||
|
&self.messages[..]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn init_chat_manager(
|
||||||
|
storages: AllStoragesView,
|
||||||
|
) {
|
||||||
|
let mut chat_manager = ChatManager::default();
|
||||||
|
chat_manager.add_system_message("Welcome to Kubi!".to_string());
|
||||||
|
storages.add_unique(chat_manager);
|
||||||
|
}
|
|
@ -18,8 +18,9 @@ pub(crate) use kubi_shared::transform;
|
||||||
mod ui {
|
mod ui {
|
||||||
pub(crate) mod loading_screen;
|
pub(crate) mod loading_screen;
|
||||||
pub(crate) mod connecting_screen;
|
pub(crate) mod connecting_screen;
|
||||||
|
pub(crate) mod chat_ui;
|
||||||
}
|
}
|
||||||
pub(crate) use ui::{loading_screen, connecting_screen};
|
pub(crate) use ui::{loading_screen, connecting_screen, chat_ui};
|
||||||
|
|
||||||
pub(crate) mod rendering;
|
pub(crate) mod rendering;
|
||||||
pub(crate) mod world;
|
pub(crate) mod world;
|
||||||
|
@ -42,6 +43,7 @@ pub(crate) mod color;
|
||||||
pub(crate) mod fixed_timestamp;
|
pub(crate) mod fixed_timestamp;
|
||||||
pub(crate) mod filesystem;
|
pub(crate) mod filesystem;
|
||||||
pub(crate) mod client_physics;
|
pub(crate) mod client_physics;
|
||||||
|
pub(crate) mod chat;
|
||||||
|
|
||||||
use world::{
|
use world::{
|
||||||
init_game_world,
|
init_game_world,
|
||||||
|
@ -87,6 +89,8 @@ use connecting_screen::update_connecting_screen;
|
||||||
use fixed_timestamp::init_fixed_timestamp_storage;
|
use fixed_timestamp::init_fixed_timestamp_storage;
|
||||||
use filesystem::AssetManager;
|
use filesystem::AssetManager;
|
||||||
use client_physics::{init_client_physics, update_client_physics_late};
|
use client_physics::{init_client_physics, update_client_physics_late};
|
||||||
|
use chat_ui::render_chat;
|
||||||
|
use chat::init_chat_manager;
|
||||||
|
|
||||||
/// stuff required to init the renderer and other basic systems
|
/// stuff required to init the renderer and other basic systems
|
||||||
fn pre_startup() -> Workload {
|
fn pre_startup() -> Workload {
|
||||||
|
@ -111,6 +115,7 @@ fn startup() -> Workload {
|
||||||
insert_control_flow_unique,
|
insert_control_flow_unique,
|
||||||
init_delta_time,
|
init_delta_time,
|
||||||
init_client_physics,
|
init_client_physics,
|
||||||
|
init_chat_manager,
|
||||||
).into_sequential_workload()
|
).into_sequential_workload()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -144,6 +149,7 @@ fn update() -> Workload {
|
||||||
update_raycasts,
|
update_raycasts,
|
||||||
update_block_placement,
|
update_block_placement,
|
||||||
apply_queued_blocks,
|
apply_queued_blocks,
|
||||||
|
render_chat,
|
||||||
).into_sequential_workload().run_if(is_ingame),
|
).into_sequential_workload().run_if(is_ingame),
|
||||||
update_networking_late.run_if(is_multiplayer),
|
update_networking_late.run_if(is_multiplayer),
|
||||||
compute_cameras,
|
compute_cameras,
|
||||||
|
|
39
kubi/src/ui/chat_ui.rs
Normal file
39
kubi/src/ui/chat_ui.rs
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
use hui::{element::{container::Container, text::Text, UiElementExt}, layout::Alignment, size};
|
||||||
|
use shipyard::{NonSendSync, UniqueView, UniqueViewMut};
|
||||||
|
use crate::{chat::{ChatManager, ChatMessage}, hui_integration::UiState, rendering::WindowSize};
|
||||||
|
|
||||||
|
pub fn render_chat(
|
||||||
|
mut hui: NonSendSync<UniqueViewMut<UiState>>,
|
||||||
|
size: UniqueView<WindowSize>,
|
||||||
|
chat: UniqueView<ChatManager>,
|
||||||
|
) {
|
||||||
|
let messages = chat.get_messages();
|
||||||
|
if messages.is_empty() { return }
|
||||||
|
Container::default()
|
||||||
|
.with_size(size!(100%, 100%))
|
||||||
|
.with_align((Alignment::Begin, Alignment::End))
|
||||||
|
.with_children(|ui| {
|
||||||
|
for message in messages.iter().rev().take(10).rev() {
|
||||||
|
let text = match message {
|
||||||
|
ChatMessage::PlayerMessage { username, message } => {
|
||||||
|
format!("{}: {}", username, message)
|
||||||
|
}
|
||||||
|
ChatMessage::PlayerJoin { username } => {
|
||||||
|
format!("{} joined the game", username)
|
||||||
|
}
|
||||||
|
ChatMessage::PlayerLeave { username } => {
|
||||||
|
format!("{} left the game", username)
|
||||||
|
}
|
||||||
|
ChatMessage::System(message) => message.clone(),
|
||||||
|
};
|
||||||
|
Container::default()
|
||||||
|
.with_background((0., 0., 0., 0.5))
|
||||||
|
.with_children(|ui| {
|
||||||
|
Text::new(text)
|
||||||
|
.add_child(ui)
|
||||||
|
})
|
||||||
|
.add_child(ui);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.add_root(&mut hui.hui, size.0.as_vec2());
|
||||||
|
}
|
Loading…
Reference in a new issue