PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

minor refactor

Browse Source
This commit is contained in:
MihailRis 2024-05-12 19:42:13 +03:00
parent 8de986346e
commit 60cfe8595e
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontend/screens/LevelScreen.cpp
View File

@ -24,9 +24,9 @@
static debug::Logger logger("level-screen");
LevelScreen::LevelScreen(Engine* engine, Level* level) : Screen(engine) {
postProcessing = std::make_unique<PostProcessing>();
LevelScreen::LevelScreen(Engine* engine, Level* level)
: Screen(engine), postProcessing(std::make_unique<PostProcessing>())
{
auto& settings = engine->getSettings();
auto assets = engine->getAssets();
auto menu = engine->getGUI()->getMenu();
@ -48,7 +48,11 @@ LevelScreen::LevelScreen(Engine* engine, Level* level) : Screen(engine) {
animator = std::make_unique<TextureAnimator>();
animator->addAnimations(assets->getAnimations());
auto content = level->content;
initializeContent();
}
void LevelScreen::initializeContent() {
auto content = controller->getLevel()->content;
for (auto& entry : content->getPacks()) {
auto pack = entry.second.get();
const ContentPack& info = pack->getInfo();

1
src/frontend/screens/LevelScreen.hpp
View File

@ -26,6 +26,7 @@ class LevelScreen : public Screen {
bool hudVisible = true;
void updateHotkeys();
void initializeContent();
public:
LevelScreen(Engine* engine, Level* level);
~LevelScreen();

5
src/window/Events.cpp
View File

@ -88,8 +88,7 @@ void Events::pollEvents() {
binding.justChange = true;
binding.onactived.notify();
}
}
else {
} else {
if (binding.state) {
binding.state = false;
binding.justChange = true;
@ -107,7 +106,7 @@ void Events::bind(const std::string& name, inputtype type, mousecode code) {
}
void Events::bind(const std::string& name, inputtype type, int code) {
bindings[name] = Binding(type, code);
bindings.emplace(name, Binding(type, code));
}
bool Events::active(const std::string& name) {