Merge pull request #35 from markusmoenig/poly

Poly
markusmoenig · Dec 9, 2024 · e06fc48 · e06fc48
2 parents 9eebbd5 + ecd5b8c
commit e06fc48
Show file tree

Hide file tree

Showing 61 changed files with 5,945 additions and 1,552 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
@@ -62,3 +62,6 @@ Create classical RPGs with Eldiron.
 # [lib]
 # name = "rustapi"
 # crate-type = ["staticlib"]
+
+# vek = { version = "0.17", default-features = false, features = ["rgba"] }
+# euc = { git = "https://github.com/zesterer/euc" }
diff --git a/creator/embedded/bricks.png b/creator/embedded/bricks.png
diff --git a/creator/embedded/cursor.png b/creator/embedded/cursor.png
diff --git a/creator/embedded/dot-outline.png b/creator/embedded/dot-outline.png
diff --git a/creator/embedded/geo_wall_back.png b/creator/embedded/geo_wall_back.png
diff --git a/creator/embedded/geo_wall_front.png b/creator/embedded/geo_wall_front.png
diff --git a/creator/embedded/geo_wall_left.png b/creator/embedded/geo_wall_left.png
diff --git a/creator/embedded/geo_wall_middlex.png b/creator/embedded/geo_wall_middlex.png
diff --git a/creator/embedded/geo_wall_middley.png b/creator/embedded/geo_wall_middley.png
diff --git a/creator/embedded/geo_wall_right.png b/creator/embedded/geo_wall_right.png
diff --git a/creator/embedded/input.png b/creator/embedded/input.png
diff --git a/creator/embedded/joystick.png b/creator/embedded/joystick.png
diff --git a/creator/embedded/line-segment.png b/creator/embedded/line-segment.png
diff --git a/creator/embedded/polygon.png b/creator/embedded/polygon.png
diff --git a/creator/src/editor.rs b/creator/src/editor.rs
diff --git a/creator/src/main.rs b/creator/src/main.rs
@@ -6,6 +6,7 @@ pub mod brushes;
 pub mod brushlist;
 pub mod editor;
 pub mod externals;
+pub mod mapeditor;
 pub mod materialeditor;
 pub mod minimap;
 pub mod misc;
@@ -16,8 +17,6 @@ pub mod regionfxeditor;
 pub mod screeneditor;
 pub mod self_update;
 pub mod sidebar;
-pub mod terraineditor;
-pub mod tileeditor;
 pub mod tilefxeditor;
 pub mod tilemapeditor;
 pub mod tilepicker;
@@ -44,6 +43,7 @@ pub mod prelude {
 
     pub use crate::brushlist::*;
     pub use crate::externals::*;
+    pub use crate::mapeditor::*;
     pub use crate::materialeditor::*;
     pub use crate::misc::*;
     pub use crate::modeleditor::*;
@@ -52,8 +52,6 @@ pub mod prelude {
     pub use crate::regionfxeditor::*;
     pub use crate::screeneditor::*;
     pub use crate::sidebar::*;
-    pub use crate::terraineditor::*;
-    pub use crate::tileeditor::*;
     pub use crate::tilefxeditor::*;
     pub use crate::tilemapeditor::*;
     pub use crate::tilepicker::*;
@@ -64,27 +62,29 @@ pub mod prelude {
     pub use crate::undo::*;
 
     pub use crate::tools::code::CodeTool;
-    pub use crate::tools::draw::DrawTool;
-    pub use crate::tools::eraser::EraserTool;
+    // pub use crate::tools::draw::DrawTool;
+    // pub use crate::tools::eraser::EraserTool;
     pub use crate::tools::fx::FXTool;
     pub use crate::tools::game::GameTool;
-    pub use crate::tools::mapobjects::MapObjectsTool;
-    pub use crate::tools::model::edit::ModelNodeEditTool;
-    pub use crate::tools::picker::PickerTool;
+    pub use crate::tools::linedef::LinedefTool;
+    // pub use crate::tools::mapobjects::MapObjectsTool;
+    // pub use crate::tools::model::edit::ModelNodeEditTool;
+    //pub use crate::tools::picker::PickerTool;
     pub use crate::tools::render::RenderTool;
-    pub use crate::tools::resize::ResizeTool;
+    // pub use crate::tools::resize::ResizeTool;
     pub use crate::tools::screen::eraser::ScreenEraserTool;
     pub use crate::tools::screen::game::ScreenGameTool;
     pub use crate::tools::screen::material::edit::MaterialNodeEditTool;
     pub use crate::tools::screen::picker::ScreenPickerTool;
     pub use crate::tools::screen::tiledrawer::ScreenTileDrawerTool;
+    pub use crate::tools::sector::SectorTool;
     pub use crate::tools::selection::SelectionTool;
-    pub use crate::tools::terrain::draw::TerrainDrawTool;
-    pub use crate::tools::terrain::height::TerrainHeightTool;
-    pub use crate::tools::terrain::selection::TerrainSelectionTool;
-    pub use crate::tools::terrain::zoom::TerrainZoomTool;
-    pub use crate::tools::tiledrawer::TileDrawerTool;
+    // pub use crate::tools::terrain::draw::TerrainDrawTool;
+    // pub use crate::tools::terrain::height::TerrainHeightTool;
+    // pub use crate::tools::terrain::selection::TerrainSelectionTool;
+    // pub use crate::tools::terrain::zoom::TerrainZoomTool;
     pub use crate::tools::tilemap::TilemapTool;
+    pub use crate::tools::vertex::VertexTool;
     pub use crate::tools::zoom::ZoomTool;
     pub use crate::tools::*;