Merge pull request #83 from zzhgithub/feature-support-more-mesh

Feature support more mesh

Cargo.toml

@@ -55,10 +55,14 @@ huffman-compress = { git = "https://github.com/zzhgithub/rust-huffman-compress",
     "serde",
 ] }
 noise = { version = "0.8.2" }
+lazy_static = "1.4.0"
+bevy_vox_mesh = { git = "https://github.com/zzhgithub/bevy_vox_mesh.git", branch = "fix" }
+
 #  解决冲突
 lock_api = "0.4.10"
 codespan-reporting = "0.11.1"
 
+
 [profile.dev.package.bevy_rapier3d]
 opt-level = 3
 

README_CN.md

@@ -21,6 +21,7 @@ cargo run --release --no-default-features --features headless --bin server
 For Client
 ```shell
 cargo run --release --bin client
+# WGPU_BACKEND=opengl 
 ```
 
 # 控制

src/bin/client.rs

@@ -24,6 +24,7 @@ use just_join::{
     },
     staff::StaffInfoPlugin,
     tools::inspector_egui::inspector_ui,
+    voxel_world::voxel_mesh::VoxelMeshPlugin,
     CLIENT_DEBUG, CLIENT_FPS,
 };
 fn main() {
@@ -53,6 +54,7 @@ fn main() {
     app.add_plugins(StaffInfoPlugin);
     app.add_plugins(UiResourcePlugin);
     app.add_plugins(Sprite3dPlugin);
+    app.add_plugins(VoxelMeshPlugin);
 
     app.add_plugins((SplashPlugin, MenuPlugin, NotificationPlugin, GamePlugin));
     // 调试工具

src/bin/server.rs

@@ -24,7 +24,7 @@ use just_join::{
     },
     sky::ServerSkyPlugins,
     staff::ServerStaffInfoPlugin,
-    voxel_world::biomes::OtherTreePlugin,
+    voxel_world::{biomes::OtherTreePlugin, voxel_mesh::VoxelMeshPlugin},
     PROTOCOL_ID,
 };
 use renet_visualizer::RenetServerVisualizer;
@@ -43,7 +43,11 @@ use {
 };
 
 #[cfg(feature = "headless")]
-use bevy::MinimalPlugins;
+use bevy::{
+    asset::AssetPlugin,
+    prelude::{AddAsset, Mesh},
+    MinimalPlugins,
+};
 
 fn new_renet_server() -> (RenetServer, NetcodeServerTransport) {
     let server = RenetServer::new(connection_config());
@@ -101,6 +105,8 @@ fn main() {
     #[cfg(feature = "headless")]
     {
         app.add_plugins(MinimalPlugins);
+        app.add_plugins(AssetPlugin::default());
+        app.add_asset::<Mesh>();
     }
 
     app.add_plugins(RenetServerPlugin);
@@ -121,6 +127,7 @@ fn main() {
         ServerStaffRulePlugin,
         CossTroughCheckPlugin,
         OtherTreePlugin,
+        VoxelMeshPlugin,
     ));
 
     let (server, transport) = new_renet_server();

src/client/mesh_display.rs

@@ -7,7 +7,7 @@ use bevy::{
     prelude::{
         AlphaMode, AssetServer, Assets, Color, Commands, Component, Entity, Handle, IVec3,
         IntoSystemConfigs, Last, MaterialMeshBundle, MaterialPlugin, Mesh, Plugin, PreUpdate, Res,
-        ResMut, Resource, StandardMaterial, Startup, Transform, Update,
+        ResMut, Resource, StandardMaterial, Startup, Transform, Update, Vec3,
     },
     tasks::{AsyncComputeTaskPool, Task},
     time::{Time, Timer, TimerMode},
@@ -327,7 +327,14 @@ pub fn save_chunk_result(
 }
 
 #[derive(Debug, Component)]
-pub struct TerrainMesh;
+pub struct TerrainMesh(pub HitMeshType);
+
+// 可以被识别的方式!
+#[derive(Debug, Clone)]
+pub enum HitMeshType {
+    Common,
+    Sp(Vec3),
+}
 
 #[derive(Debug, Component)]
 pub struct WaterMesh;
@@ -372,7 +379,7 @@ pub fn update_mesh_system(
                                     material: materials.0.clone(),
                                     ..Default::default()
                                 },
-                                TerrainMesh,
+                                TerrainMesh(HitMeshType::Common),
                                 RaycastMesh::<MyRaycastSet>::default(), // Make this mesh ray cast-able
                             ))
                             .id(),

src/client/mod.rs

@@ -31,6 +31,7 @@ pub mod state_manager;
 pub mod tool_bar_manager;
 pub mod ui;
 pub mod voxels;
+pub mod sp_mesh_display;
 
 // 同步创建或者删除角色
 pub fn client_sync_players(

src/client/player/mouse_control.rs

@@ -161,8 +161,12 @@ pub fn mouse_button_system(
     }
 
     if mouse_button_input.just_pressed(MouseButton::Right) {
-        if let Some(crate::staff::StaffType::Voxel(voxel_type)) = tool_bar_data.staff_type() {
+        // Note: 这里放置时尝试转换成体素再传递
+        if let Some(crate::staff::StaffType::Voxel(voxel_type)) =
+            tool_bar_data.staff_type_try_to_voxel()
+        {
             if let Some(pos) = choose_cube.out_center {
+                println!("放置物品{:?}", voxel_type);
                 // 判断当前这里是否和 其他的player的位置冲突
                 if check_player_put_object_available(pos.clone(), &player_query) {
                     // 还要发送当前生效的 tool_bar的 index

src/client/ray_cast/mod.rs

@@ -1,8 +1,8 @@
 use bevy::{
     prelude::{
         AlphaMode, Assets, Color, Commands, Entity, Gizmos, GlobalTransform, Mesh, PbrBundle,
-        Plugin, Query, Res, ResMut, StandardMaterial, Startup, Transform, Update, Vec3, Visibility,
-        With, Without,
+        Plugin, Quat, Query, Res, ResMut, StandardMaterial, Startup, Transform, Update, Vec3,
+        Visibility, With, Without,
     },
     reflect::Reflect,
     render::render_resource::PrimitiveTopology,
@@ -118,7 +118,7 @@ pub fn touth_mesh_ray_cast(
     query: Query<&GlobalTransform, With<CameraTag>>,
     mut choose_cube: ResMut<ChooseCube>,
     mut gizmos: Gizmos,
-    query_mesh: Query<Entity, &TerrainMesh>,
+    query_mesh: Query<(Entity, &TerrainMesh)>,
     mut query_help_cube: Query<
         (&mut Transform, &mut Visibility),
         (With<HelpCube>, Without<CameraTag>),
@@ -147,7 +147,8 @@ pub fn touth_mesh_ray_cast(
         },
     );
 
-    if let Some((_, hit)) = hits.first() {
+    if let Some((entity, hit)) = hits.first() {
+        let (_, mesh_data) = query_mesh.get(*entity).unwrap();
         let hit_point = hit.position();
         if ray_pos.distance(hit_point) <= TOUCH_RADIUS {
             let normal = hit.normal();
@@ -159,15 +160,27 @@ pub fn touth_mesh_ray_cast(
                 let rate = timer.elapsed().as_millis() as f32 / timer.duration().as_millis() as f32;
                 gizmos.circle(hit_point, normal, 0.1 * rate, Color::BLUE);
             }
-            let center_point = get_pos_chunk_center(hit_point, normal);
-            let out_center_point = get_pos_chunk_center(hit_point, -normal);
 
+            let center_point: Vec3;
+            match mesh_data.0 {
+                super::mesh_display::HitMeshType::Common => {
+                    center_point = get_pos_chunk_center(hit_point, normal);
+                    let out_center_point = get_pos_chunk_center(hit_point, -normal);
+                    gizmos.sphere(out_center_point, Quat::IDENTITY, 0.5, Color::GREEN);
+                    choose_cube.out_center = Some(out_center_point);
+                }
+                super::mesh_display::HitMeshType::Sp(center) => {
+                    center_point = center;
+                    choose_cube.out_center = None;
+                }
+            }
+
+            gizmos.sphere(center_point, Quat::IDENTITY, 0.5, Color::DARK_GRAY);
             *visibility = Visibility::Visible;
             *chue_pos = Transform::from_translation(center_point);
 
             choose_cube.choose_on = Some(hit_point);
             choose_cube.center = Some(center_point);
-            choose_cube.out_center = Some(out_center_point);
         } else {
             hidden_help_cube(choose_cube.as_mut(), &mut visibility);
         }