diff --git a/.gitignore b/.gitignore index 31cd7e69..4405e4a4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ Debug/voxel_engine /build /world -/worlds +/worlds/**/* .vscode @@ -15,4 +15,4 @@ Debug/voxel_engine .cproject .project .git -/Default/ \ No newline at end of file +/Default/ diff --git a/src/engine.cpp b/src/engine.cpp index ae35e5c2..13090a77 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -58,15 +58,6 @@ Engine::Engine(const EngineSettings& settings_) { gui = new GUI(); std::cout << "-- initializing finished" << std::endl; - std::cout << "-- loading world" << std::endl; - - //World* world = new World("world-1", enginefs::get_worlds_folder()/"world", 42, settings); - - //vec3 playerPosition = vec3(0, 64, 0); - //Camera* camera = new Camera(playerPosition, radians(90.0f)); - //Player* player = new Player(playerPosition, 4.0f, camera); - //setScreen(new LevelScreen(this, world->loadLevel(player, settings))); - setScreen(new MenuScreen(this)); } diff --git a/src/frontend/screens.cpp b/src/frontend/screens.cpp index 87ed5863..8abaeee9 100644 --- a/src/frontend/screens.cpp +++ b/src/frontend/screens.cpp @@ -40,6 +40,7 @@ MenuScreen::MenuScreen(Engine* engine_) : Screen(engine_) { { Button* button = new Button(L"Continue", vec4(12.0f, 10.0f, 12.0f, 10.0f)); button->listenAction([this, panel](GUI*) { + std::cout << "-- loading world" << std::endl; EngineSettings& settings = engine->getSettings(); World* world = new World("world", enginefs::get_worlds_folder()/"world", 42, settings); vec3 playerPosition = vec3(0, 64, 0);