Rusterix integration WiP

markusmoenig · Dec 17, 2024 · 3fb05a6 · 3fb05a6
1 parent 5b86330
commit 3fb05a6
Show file tree

Hide file tree

Showing 20 changed files with 232 additions and 969 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/StarterProject.eldiron b/StarterProject.eldiron
diff --git a/creator/Cargo.toml b/creator/Cargo.toml
@@ -46,6 +46,7 @@ self_update = { version = "0.39.0", features = [
     "archive-tar",
     "compression-flate2",
 ] }
+vek = { version = "0.17.1", default-features = true }
 
 [package.metadata.bundle]
 name = "Eldiron"

diff --git a/creator/src/editor.rs b/creator/src/editor.rs
@@ -1511,6 +1511,10 @@ impl TheTrait for Editor {
                                 {
                                     self.server.update_region(region);
                                 }
+                                ctx.ui.send(TheEvent::Custom(
+                                    TheId::named("Update Minimap"),
+                                    TheValue::Empty,
+                                ));
                             } else if manager.context == UndoManagerContext::MaterialFX {
                                 if id.name == "Undo" {
                                     manager.undo(

diff --git a/creator/src/mapeditor.rs b/creator/src/mapeditor.rs
@@ -2,6 +2,7 @@
 
 use crate::editor::{CODEEDITOR, MAPRENDER, TILEDRAWER, UNDOMANAGER};
 use crate::prelude::*;
+use vek::Vec2;
 
 #[derive(PartialEq, Clone, Copy, Debug)]
 pub enum EditorDrawMode {
@@ -275,7 +276,7 @@ impl MapEditor {
                             region.map.grid_size += coord.y as f32;
                             region.map.grid_size = clamp(region.map.grid_size, 5.0, 100.0);
                         } else {
-                            region.map.offset += Vec2f::new(-coord.x as f32, coord.y as f32);
+                            region.map.offset += Vec2::new(-coord.x as f32, coord.y as f32);
                         }
                         region.editing_position_3d.x += coord.x as f32 / region.map.grid_size;
                         region.editing_position_3d.z += coord.y as f32 / region.map.grid_size;

diff --git a/creator/src/materialeditor.rs b/creator/src/materialeditor.rs
@@ -112,6 +112,8 @@ impl MaterialEditor {
                         //     ui.set_node_canvas("Map NodeCanvas", node_canvas);
                         // }
                         if let Some(map) = project.get_map_mut(server_ctx) {
+                            let prev = map.clone();
+
                             match server_ctx.curr_texture_mode {
                                 MapTextureMode::Floor => {
                                     for sector_id in &map.selected_sectors.clone() {
@@ -121,7 +123,27 @@ impl MaterialEditor {
                                         }
                                     }
                                 }
-                                MapTextureMode::Wall => {}
+                                MapTextureMode::Wall => {
+                                    let mut linedef_ids = Vec::new();
+                                    for sector_id in &map.selected_sectors {
+                                        if let Some(sector) = map.find_sector(*sector_id) {
+                                            linedef_ids.extend(&sector.linedefs);
+                                        }
+                                    }
+
+                                    for linedef_id in &map.selected_linedefs {
+                                        if !linedef_ids.contains(linedef_id) {
+                                            linedef_ids.push(*linedef_id);
+                                        }
+                                    }
+
+                                    for linedef_id in linedef_ids {
+                                        if let Some(linedef) = map.find_linedef_mut(linedef_id) {
+                                            linedef.material = Some(index);
+                                            linedef.texture = None;
+                                        }
+                                    }
+                                }
                                 MapTextureMode::Ceiling => {
                                     for sector_id in &map.selected_sectors.clone() {
                                         if let Some(sector) = map.find_sector_mut(*sector_id) {
@@ -132,6 +154,21 @@ impl MaterialEditor {
                                 }
                                 _ => {}
                             }
+
+                            let undo =
+                                RegionUndoAtom::MapEdit(Box::new(prev), Box::new(map.clone()));
+
+                            UNDOMANAGER.lock().unwrap().add_region_undo(
+                                &server_ctx.curr_region,
+                                undo,
+                                ctx,
+                            );
+
+                            ctx.ui.send(TheEvent::Custom(
+                                TheId::named("Update Minimap"),
+                                TheValue::Empty,
+                            ));
+
                             self.set_material_selection(ui, ctx, project, server_ctx, Some(index));
                         }
                     }

diff --git a/creator/src/minimap.rs b/creator/src/minimap.rs
@@ -1,7 +1,6 @@
-use shared::server::prelude::MapToolType;
-
 use crate::editor::MAPRENDER;
 use crate::prelude::*;
+use vek::Vec2;
 
 pub fn draw_minimap(orig_region: &Region, buffer: &mut TheRGBABuffer) {
     // let background = *ui
@@ -45,7 +44,7 @@ pub fn draw_minimap(orig_region: &Region, buffer: &mut TheRGBABuffer) {
         // Compute the offset to center the map
         region.map.offset.x = -bbox_center_x * region.map.grid_size;
         region.map.offset.y = bbox_center_y * region.map.grid_size;
-        region.map.camera_xz = Some(vec2f(
+        region.map.camera_xz = Some(Vec2::new(
             region.editing_position_3d.x,
             region.editing_position_3d.z,
         ));

diff --git a/creator/src/tools/linedef.rs b/creator/src/tools/linedef.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use shared::server::prelude::MapToolType;
+use vek::Vec2;
 use MapEvent::*;
 use ToolEvent::*;
 
@@ -268,7 +268,7 @@ impl Tool for LinedefTool {
                         }
 
                         if set_current_gid_pos {
-                            map.curr_grid_pos = Some(grid_pos);
+                            map.curr_grid_pos = Some(vek::Vec2::new(grid_pos.x, grid_pos.y));
                         }
                     }
                 }
@@ -362,8 +362,10 @@ impl Tool for LinedefTool {
 
                             *map = self.rectangle_undo_map.clone();
                             map.curr_grid_pos = None;
-                            map.curr_rectangle =
-                                Some((self.click_pos, vec2f(coord.x as f32, coord.y as f32)));
+                            map.curr_rectangle = Some((
+                                Vec2::new(self.click_pos.x, self.click_pos.y),
+                                Vec2::new(coord.x as f32, coord.y as f32),
+                            ));
 
                             if ui.shift {
                                 // Add
@@ -410,7 +412,7 @@ impl Tool for LinedefTool {
                 if let Some(render_view) = ui.get_render_view("PolyView") {
                     let dim = *render_view.dim();
                     if !self.rectangle_mode {
-                        map.curr_mouse_pos = Some(vec2f(coord.x as f32, coord.y as f32));
+                        map.curr_mouse_pos = Some(Vec2::new(coord.x as f32, coord.y as f32));
                     }
                     let mut hover = server_ctx.geometry_at(
                         vec2f(dim.width as f32, dim.height as f32),

diff --git a/creator/src/tools/sector.rs b/creator/src/tools/sector.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use shared::server::prelude::MapToolType;
+use vek::Vec2;
 use MapEvent::*;
 use ToolEvent::*;
 
@@ -247,9 +247,10 @@ impl Tool for SectorTool {
                     selection.1 = vec![];
 
                     *map = self.rectangle_undo_map.clone();
-                    map.curr_rectangle =
-                        Some((self.click_pos, vec2f(coord.x as f32, coord.y as f32)));
-
+                    map.curr_rectangle = Some((
+                        Vec2::new(self.click_pos.x, self.click_pos.y),
+                        Vec2::new(coord.x as f32, coord.y as f32),
+                    ));
                     if ui.shift {
                         // Add
                         map.add_to_selection(selection.0, selection.1, selection.2);

diff --git a/creator/src/tools/selection.rs b/creator/src/tools/selection.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-use shared::server::prelude::MapToolType;
 use MapEvent::*;
 use ToolEvent::*;
 
@@ -317,8 +316,10 @@ impl Tool for SelectionTool {
                     let selection = server_ctx.geometry_in_rectangle(top_left, bottom_right, map);
 
                     *map = self.rectangle_undo_map.clone();
-                    map.curr_rectangle =
-                        Some((self.click_pos, vec2f(coord.x as f32, coord.y as f32)));
+                    map.curr_rectangle = Some((
+                        vek::Vec2::new(self.click_pos.x, self.click_pos.y),
+                        vek::Vec2::new(coord.x as f32, coord.y as f32),
+                    ));
 
                     if ui.shift {
                         // Add

diff --git a/creator/src/tools/vertex.rs b/creator/src/tools/vertex.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-use shared::server::prelude::MapToolType;
 use MapEvent::*;
 use ToolEvent::*;
 
@@ -208,8 +207,10 @@ impl Tool for VertexTool {
                     selection.2 = vec![];
 
                     *map = self.rectangle_undo_map.clone();
-                    map.curr_rectangle =
-                        Some((self.click_pos, vec2f(coord.x as f32, coord.y as f32)));
+                    map.curr_rectangle = Some((
+                        vek::Vec2::new(self.click_pos.x, self.click_pos.y),
+                        vek::Vec2::new(coord.x as f32, coord.y as f32),
+                    ));
 
                     if ui.shift {
                         // Add

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -33,6 +33,9 @@ noiselib = "0.2.3"
 regex = "1"
 num_cpus = "1.16.0"
 half = { version = "2.4", features = ["serde"] }
+# rusterix = "0.1.0"
+#rusterix = { path = "../../rusterix" }
+rusterix = { git = "https://github.com/markusmoenig/Rusterix" }
 
 vek = { version = "0.17", default-features = false, features = ["rgba"] }
 euc = { git = "https://github.com/zesterer/euc" }