-
Notifications
You must be signed in to change notification settings - Fork 9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ui: refactor spinner using raylib #33738
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
#include <algorithm> | ||
#include <cmath> | ||
#include <iostream> | ||
|
||
#include "selfdrive/ui/raylib/util.h" | ||
#include "third_party/raylib/include/raylib.h" | ||
|
||
constexpr int kProgressBarWidth = 1000; | ||
constexpr int kProgressBarHeight = 20; | ||
constexpr float kRotationRate = 12.0f; | ||
constexpr int kMargin = 200; | ||
constexpr int kTextureSize = 360; | ||
constexpr int kFontSize = 80; | ||
|
||
int main(int argc, char *argv[]) { | ||
initApp("spinner", 30); | ||
|
||
// Turn off input buffering for std::cin | ||
std::cin.sync_with_stdio(false); | ||
std::cin.tie(nullptr); | ||
|
||
Texture2D commaTexture = LoadTextureResized("../assets/img_spinner_comma.png", kTextureSize); | ||
Texture2D spinnerTexture = LoadTextureResized("../assets/img_spinner_track.png", kTextureSize); | ||
|
||
float rotation = 0.0f; | ||
std::string userInput; | ||
|
||
while (!WindowShouldClose()) { | ||
BeginDrawing(); | ||
ClearBackground(BLACK); | ||
|
||
rotation = fmod(rotation + kRotationRate, 360.0f); | ||
Vector2 center = {GetScreenWidth() / 2.0f, GetScreenHeight() / 2.0f}; | ||
const Vector2 spinnerOrigin{kTextureSize / 2.0f, kTextureSize / 2.0f}; | ||
const Vector2 commaPosition{center.x - kTextureSize / 2.0f, center.y - kTextureSize / 2.0f}; | ||
|
||
// Draw rotating spinner and static comma logo | ||
DrawTexturePro(spinnerTexture, {0, 0, (float)kTextureSize, (float)kTextureSize}, | ||
{center.x, center.y, (float)kTextureSize, (float)kTextureSize}, | ||
spinnerOrigin, rotation, WHITE); | ||
DrawTextureV(commaTexture, commaPosition, WHITE); | ||
|
||
// Check for user input | ||
if (std::cin.rdbuf()->in_avail() > 0) { | ||
std::getline(std::cin, userInput); | ||
} | ||
|
||
// Display either a progress bar or user input text based on input | ||
if (!userInput.empty()) { | ||
float yPos = GetScreenHeight() - kMargin - kProgressBarHeight; | ||
if (std::all_of(userInput.begin(), userInput.end(), ::isdigit)) { | ||
Rectangle bar = {center.x - kProgressBarWidth / 2.0f, yPos, kProgressBarWidth, kProgressBarHeight}; | ||
DrawRectangleRounded(bar, 0.5f, 10, GRAY); | ||
|
||
int progress = std::clamp(std::stoi(userInput), 0, 100); | ||
bar.width *= progress / 100.0f; | ||
DrawRectangleRounded(bar, 0.5f, 10, RAYWHITE); | ||
} else { | ||
Vector2 textSize = MeasureTextEx(getFont(), userInput.c_str(), kFontSize, 1.0); | ||
DrawTextEx(getFont(), userInput.c_str(), {center.x - textSize.x / 2, yPos}, kFontSize, 1.0, WHITE); | ||
} | ||
} | ||
|
||
EndDrawing(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. raylib handles the FPS here? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes, raylib hand FPS and poll input events in EndDrawing(). |
||
} | ||
|
||
CloseWindow(); | ||
return 0; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
#include "selfdrive/ui/raylib/util.h" | ||
|
||
#include <array> | ||
|
||
#undef GREEN | ||
#undef RED | ||
#undef YELLOW | ||
#include "common/swaglog.h" | ||
#include "system/hardware/hw.h" | ||
|
||
constexpr std::array<const char *, static_cast<int>(FontWeight::Count)> FONT_FILE_PATHS = { | ||
"../assets/fonts/Inter-Black.ttf", | ||
"../assets/fonts/Inter-Bold.ttf", | ||
"../assets/fonts/Inter-ExtraBold.ttf", | ||
"../assets/fonts/Inter-ExtraLight.ttf", | ||
"../assets/fonts/Inter-Medium.ttf", | ||
"../assets/fonts/Inter-Regular.ttf", | ||
"../assets/fonts/Inter-SemiBold.ttf", | ||
"../assets/fonts/Inter-Thin.ttf", | ||
}; | ||
|
||
struct FontManager { | ||
FontManager() { | ||
for (int i = 0; i < fonts.size(); ++i) { | ||
fonts[i] = LoadFontEx(FONT_FILE_PATHS[i], 120, nullptr, 250); | ||
SetTextureFilter(fonts[i].texture, TEXTURE_FILTER_TRILINEAR); | ||
} | ||
} | ||
|
||
~FontManager() { | ||
for (auto &f : fonts) UnloadFont(f); | ||
} | ||
|
||
std::array<Font, static_cast<int>(FontWeight::Count)> fonts; | ||
}; | ||
|
||
const Font& getFont(FontWeight weight) { | ||
static FontManager font_manager; | ||
return font_manager.fonts[(int)weight]; | ||
} | ||
|
||
Texture2D LoadTextureResized(const char *fileName, int size) { | ||
Image img = LoadImage(fileName); | ||
ImageResize(&img, size, size); | ||
Texture2D texture = LoadTextureFromImage(img); | ||
SetTextureFilter(texture, TEXTURE_FILTER_TRILINEAR); | ||
return texture; | ||
} | ||
|
||
void initApp(const char *title, int fps) { | ||
Hardware::set_display_power(true); | ||
Hardware::set_brightness(65); | ||
// SetTraceLogLevel(LOG_NONE); | ||
InitWindow(0, 0, title); | ||
SetTargetFPS(fps); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
#pragma once | ||
|
||
#include <string> | ||
|
||
#include "third_party/raylib/include/raylib.h" | ||
|
||
enum class FontWeight { | ||
Normal, | ||
Bold, | ||
ExtraBold, | ||
ExtraLight, | ||
Medium, | ||
Regular, | ||
SemiBold, | ||
Thin, | ||
Count // To represent the total number of fonts | ||
}; | ||
|
||
void initApp(const char *title, int fps); | ||
const Font& getFont(FontWeight weight = FontWeight::Normal); | ||
Texture2D LoadTextureResized(const char *fileName, int size); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
make a helper for this?