SquareGameLiberationFront/jujube
1
0
Fork 0
mirror of synced 2025-02-08 22:59:41 +01:00
Code Releases Activity

FIx option menu screen filter and drawing order of Music Select

Browse Source
This commit is contained in:
Stepland 2020-03-07 00:30:17 +01:00
parent f4e3467097
commit 2c0d643440
3 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -32,6 +32,7 @@
- Async playback - Async playback
- Options menu - Options menu
- Marker Selection - Marker Selection
- Fix screen filter not resizing properly
## Misc ## Misc
- Handling Resolution changes - Handling Resolution changes

4
TODO.md
View File

@ -4,7 +4,7 @@
## Music Select Screen ## Music Select Screen
- Options menu - Options menu
- Controller mapping - Controller mapping
- fix screen filter not resizing properly - Global Offset
- Visible controls - Visible controls
- Start Button - Start Button
@ -19,7 +19,7 @@
- bound memory usage of Toolkit::Cache - bound memory usage of Toolkit::Cache
- Chart Panel - Chart Panel
- Sort menu - Sort menu
- Differenciate Sort / Folder - Differenciate Sort / Selection
- Song Panel click - Song Panel click
- animation - animation
- cd - cd

31
src/Screens/MusicSelect/MusicSelect.cpp
View File

@ -28,11 +28,6 @@ MusicSelect::Screen::Screen(
black_frame(t_preferences), black_frame(t_preferences),
key_mapping() key_mapping()
{ {
panel_filter.setSize(sf::Vector2f(
resources.m_preferences.layout.panel_step()*resources.m_preferences.screen.width*4.f,
resources.m_preferences.layout.panel_step()*resources.m_preferences.screen.width*4.f
));
Toolkit::set_origin_normalized(panel_filter, 0.5f, 0.5f);
panel_filter.setFillColor(sf::Color(0,0,0,128)); panel_filter.setFillColor(sf::Color(0,0,0,128));
std::cout << "loaded MusicSelect::Screen" << std::endl; std::cout << "loaded MusicSelect::Screen" << std::endl;
} }
@ -50,16 +45,7 @@ void MusicSelect::Screen::select_chart(sf::RenderWindow& window) {
resources.m_preferences.layout.ribbon_x*resources.m_preferences.screen.width, resources.m_preferences.layout.ribbon_x*resources.m_preferences.screen.width,
resources.m_preferences.layout.ribbon_y*resources.m_preferences.screen.width resources.m_preferences.layout.ribbon_y*resources.m_preferences.screen.width
); );
panel_filter.setPosition( panel_filter.setSize(sf::Vector2f{window.getSize()});
sf::Vector2f{resources.m_preferences.layout.ribbon_x + (
3.f*resources.m_preferences.layout.panel_spacing +
4.f*resources.m_preferences.layout.panel_size
) / 2.f,
resources.m_preferences.layout.ribbon_y + (
3.f*resources.m_preferences.layout.panel_spacing +
4.f*resources.m_preferences.layout.panel_size
) / 2.f}*static_cast<float>(resources.m_preferences.screen.width)
);
while ((not chart_selected) and window.isOpen()) { while ((not chart_selected) and window.isOpen()) {
sf::Event event; sf::Event event;
while (window.pollEvent(event)) { while (window.pollEvent(event)) {
@ -87,16 +73,7 @@ void MusicSelect::Screen::select_chart(sf::RenderWindow& window) {
resources.m_preferences.layout.ribbon_x*resources.m_preferences.screen.width, resources.m_preferences.layout.ribbon_x*resources.m_preferences.screen.width,
resources.m_preferences.layout.ribbon_y*resources.m_preferences.screen.width resources.m_preferences.layout.ribbon_y*resources.m_preferences.screen.width
); );
panel_filter.setPosition( panel_filter.setSize(sf::Vector2f{window.getSize()});
sf::Vector2f{resources.m_preferences.layout.ribbon_x + (
3.f*resources.m_preferences.layout.panel_spacing +
4.f*resources.m_preferences.layout.panel_size
) / 2.f,
resources.m_preferences.layout.ribbon_y + (
3.f*resources.m_preferences.layout.panel_spacing +
4.f*resources.m_preferences.layout.panel_size
) / 2.f}*static_cast<float>(resources.m_preferences.screen.width)
);
if (not resources.options_state.empty()) { if (not resources.options_state.empty()) {
resources.options_state.top().get().update(); resources.options_state.top().get().update();
} }
@ -107,15 +84,15 @@ void MusicSelect::Screen::select_chart(sf::RenderWindow& window) {
} }
ImGui::SFML::Update(window, imguiClock.restart()); ImGui::SFML::Update(window, imguiClock.restart());
window.clear(sf::Color(7, 23, 53)); window.clear(sf::Color(7, 23, 53));
ribbon.draw_debug();
window.draw(ribbon); window.draw(ribbon);
window.draw(song_info);
if (not resources.options_state.empty()) { if (not resources.options_state.empty()) {
window.draw(panel_filter); window.draw(panel_filter);
window.draw(resources.options_state.top()); window.draw(resources.options_state.top());
} }
window.draw(button_highlight); window.draw(button_highlight);
window.draw(song_info);
window.draw(black_frame); window.draw(black_frame);
ribbon.draw_debug();
draw_debug(); draw_debug();
ImGui::SFML::Render(window); ImGui::SFML::Render(window);
window.display(); window.display();