summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 2d2b148..6c09c7b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,8 +10,10 @@
#include <SFML/Window/VideoMode.hpp>
#include <optional>
+#include "editor.hpp"
#include "floor.hpp"
#include "nfd.hpp"
+#include "tileset.hpp"
int main() {
NFD::Guard nfdGuard;
@@ -20,7 +22,10 @@ int main() {
window.setFramerateLimit(60);
ImGui::SFML::Init(window);
+ silly::editor::Tileset tileset;
+
silly::editor::TileFloor tileFloor(30, 30);
+ silly::editor::Editor editor(tileset, tileFloor);
sf::Clock deltaClock;
while (window.isOpen()) {
@@ -47,7 +52,7 @@ int main() {
}
}
- tileFloor.update(window);
+ editor.update(window);
ImGui::SFML::Update(window, deltaClock.restart());
@@ -67,6 +72,8 @@ int main() {
}
}
+ editor.render(window);
+
ImGui::SFML::Render(window);
window.display();
}