scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor controller

Browse Source
This commit is contained in:
scawful
2025-03-03 17:33:46 -05:00
parent b707345a06
commit 4c42dcc5dd
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/core/controller.cc
View File

@@ -33,16 +33,14 @@ void Controller::Initialize(std::string filename) {
} }
void Controller::OnInput() { void Controller::OnInput() {
int wheel = 0;
SDL_Event event;
ImGuiIO &io = ImGui::GetIO(); ImGuiIO &io = ImGui::GetIO();
SDL_Event event;
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
ImGui_ImplSDL2_ProcessEvent(&event); ImGui_ImplSDL2_ProcessEvent(&event);
switch (event.type) { switch (event.type) {
case SDL_KEYDOWN: case SDL_KEYDOWN:
case SDL_KEYUP: { case SDL_KEYUP: {
ImGuiIO &io = ImGui::GetIO();
io.KeyShift = ((SDL_GetModState() & KMOD_SHIFT) != 0); io.KeyShift = ((SDL_GetModState() & KMOD_SHIFT) != 0);
io.KeyCtrl = ((SDL_GetModState() & KMOD_CTRL) != 0); io.KeyCtrl = ((SDL_GetModState() & KMOD_CTRL) != 0);
io.KeyAlt = ((SDL_GetModState() & KMOD_ALT) != 0); io.KeyAlt = ((SDL_GetModState() & KMOD_ALT) != 0);
@@ -76,6 +74,8 @@ void Controller::OnInput() {
io.MouseDown[0] = buttons & SDL_BUTTON(SDL_BUTTON_LEFT); io.MouseDown[0] = buttons & SDL_BUTTON(SDL_BUTTON_LEFT);
io.MouseDown[1] = buttons & SDL_BUTTON(SDL_BUTTON_RIGHT); io.MouseDown[1] = buttons & SDL_BUTTON(SDL_BUTTON_RIGHT);
io.MouseDown[2] = buttons & SDL_BUTTON(SDL_BUTTON_MIDDLE); io.MouseDown[2] = buttons & SDL_BUTTON(SDL_BUTTON_MIDDLE);
int wheel = 0;
io.MouseWheel = static_cast<float>(wheel); io.MouseWheel = static_cast<float>(wheel);
} }
@@ -175,7 +175,7 @@ absl::Status Controller::CreateGuiContext() {
Renderer::GetInstance().renderer()); Renderer::GetInstance().renderer());
ImGui_ImplSDLRenderer2_Init(Renderer::GetInstance().renderer()); ImGui_ImplSDLRenderer2_Init(Renderer::GetInstance().renderer());
RETURN_IF_ERROR(LoadFontFamilies()); RETURN_IF_ERROR(LoadPackageFonts());
// Set the default style // Set the default style
gui::ColorsYaze(); gui::ColorsYaze();
@@ -187,11 +187,6 @@ absl::Status Controller::CreateGuiContext() {
return absl::OkStatus(); return absl::OkStatus();
} }
absl::Status Controller::LoadFontFamilies() const {
// LoadSystemFonts();
return LoadPackageFonts();
}
absl::Status Controller::LoadAudioDevice() { absl::Status Controller::LoadAudioDevice() {
SDL_AudioSpec want, have; SDL_AudioSpec want, have;
SDL_memset(&want, 0, sizeof(want)); SDL_memset(&want, 0, sizeof(want));

1
src/app/core/controller.h
View File

@@ -40,7 +40,6 @@ class Controller {
absl::Status CreateWindow(); absl::Status CreateWindow();
absl::Status CreateRenderer(); absl::Status CreateRenderer();
absl::Status CreateGuiContext(); absl::Status CreateGuiContext();
absl::Status LoadFontFamilies() const;
absl::Status LoadAudioDevice(); absl::Status LoadAudioDevice();
absl::Status LoadConfigFiles(); absl::Status LoadConfigFiles();